diff --git a/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme b/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme
index 6a17e02b3..3b26c2a7d 100644
--- a/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme	
+++ b/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:CogAudio.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj
index 63ef22a99..b4b4a2e44 100644
--- a/Cog.xcodeproj/project.pbxproj
+++ b/Cog.xcodeproj/project.pbxproj
@@ -1946,11 +1946,11 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1100;
 				TargetAttributes = {
 					8D1107260486CEB800E47090 = {
 						DevelopmentTeam = N6E749HJ2X;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};
@@ -2482,7 +2482,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PROJECT_DIR}/Scripts/genversion.sh\"\nif [ \"$CODE_SIGN_IDENTITY\" != \"\" ]; then codesign -f -s \"${CODE_SIGN_IDENTITY}\" --deep \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.app\"; fi\n";
+			shellScript = "\"${PROJECT_DIR}/Scripts/genversion.sh\"\nif [ \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" != \"\" ]; then codesign --verbose --force --deep -o runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}\"; fi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -2823,10 +2823,12 @@
 		C01FCF4B08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = N6E749HJ2X;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = ThirdParty/Frameworks;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -2849,6 +2851,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cogx.cog;
 				PRODUCT_NAME = Cog;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
 			};
@@ -2857,9 +2860,11 @@
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = N6E749HJ2X;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = ThirdParty/Frameworks;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				INFOPLIST_FILE = Info.plist;
@@ -2880,6 +2885,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cogx.cog;
 				PRODUCT_NAME = Cog;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
 			};
diff --git a/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme b/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme
index 5ee496206..1e9cd532d 100644
--- a/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme
+++ b/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Cog.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Cog.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/English.lproj/Credits.html b/English.lproj/Credits.html
new file mode 100644
index 000000000..6ff360281
--- /dev/null
+++ b/English.lproj/Credits.html
@@ -0,0 +1,9 @@
+<html>
+    <body style="text-align:center;">
+        Now with 92% more future!
+        <br><br>
+        <em>This program has been made possible through contributions from users like you.</em>
+        <br><br>
+        All Cog code is copyrighted by me, and is licensed under the <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GPL</a>. Cog contains bits of other code from third parties that are under their own licenses.
+    </body>
+</html>
diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..a6ed999ac
Binary files /dev/null and b/English.lproj/InfoPlist.strings differ
diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings
new file mode 100644
index 000000000..fb5a457e0
--- /dev/null
+++ b/English.lproj/Localizable.strings
@@ -0,0 +1,30 @@
+"FeedbackFailedMessageText" = "Failed";
+"FeedbackFailedInformativeText" = "Feedback failed to send.";
+"FeedbackSuccessMessageText" = "Success";
+"FeedbackSuccessInformativeText" = "Feedback successfully sent!";
+
+"PlayButtonTooltip" = "Play";
+"StopButtonTooltip" = "Stop";
+"PrevButtonTooltip" = "Previous";
+"NextButtonTooltip" = "Next";
+
+"TimeElapsed" = "%i:%02i";
+"TimeRemaining" = "-%i:%02i";
+
+"AddButtonTooltip" = "Add files";
+"RemoveButtonTooltip" = "Remove selected files";
+"InfoButtonTooltip" = "Information on the selected file";
+"ShuffleButtonTooltip" = "Shuffle mode";
+"RepeatButtonTooltip" = "Repeat mode";
+"RandomizeButtonTooltip" = "Randomize playlist";
+"FileButtonTooltip" = "File drawer";
+
+"replayGainAlbumGain" = "The volume level of playback output will be detected through enumeration, \
+                         re";
+
+"InvalidURLShort" = "Invalid URL";
+"InvalidURLLong" = "The URL is not valid.";
+
+"SwitchToMiniPlayer" = "Switch to Mini Player";
+"SwitchFromMiniPlayer" = "Switch from Mini Player";
+
diff --git a/Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj b/Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj
index 5752d1fb5..c841c0b55 100644
--- a/Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj
+++ b/Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj
@@ -576,6 +576,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 83D3C4CA201C654F005564CB;
 			productRefGroup = 83D3C4D5201C654F005564CB /* Products */;
diff --git a/Frameworks/FLAC/flac.xcodeproj/xcshareddata/xcschemes/FLAC Framework.xcscheme b/Frameworks/FLAC/flac.xcodeproj/xcshareddata/xcschemes/FLAC Framework.xcscheme
index eb18fd79c..59371962d 100644
--- a/Frameworks/FLAC/flac.xcodeproj/xcshareddata/xcschemes/FLAC Framework.xcscheme	
+++ b/Frameworks/FLAC/flac.xcodeproj/xcshareddata/xcschemes/FLAC Framework.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:flac.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj b/Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj
index 29da56e97..a7fd8881b 100644
--- a/Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj
+++ b/Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj
@@ -630,11 +630,12 @@
 			};
 			buildConfigurationList = 8359FF3617FEF39F0060F3ED /* Build configuration list for PBXProject "File_Extractor" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8359FF3217FEF39F0060F3ED;
 			productRefGroup = 8359FF3D17FEF39F0060F3ED /* Products */;
diff --git a/Frameworks/File_Extractor/File_Extractor.xcodeproj/xcshareddata/xcschemes/File_Extractor.xcscheme b/Frameworks/File_Extractor/File_Extractor.xcodeproj/xcshareddata/xcschemes/File_Extractor.xcscheme
index 9196ca702..33cd81c67 100644
--- a/Frameworks/File_Extractor/File_Extractor.xcodeproj/xcshareddata/xcschemes/File_Extractor.xcscheme
+++ b/Frameworks/File_Extractor/File_Extractor.xcodeproj/xcshareddata/xcschemes/File_Extractor.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:File_Extractor.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/GME/English.lproj/InfoPlist.strings b/Frameworks/GME/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..948e12b99
Binary files /dev/null and b/Frameworks/GME/English.lproj/InfoPlist.strings differ
diff --git a/Frameworks/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Framework.xcscheme b/Frameworks/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Framework.xcscheme
index 5b42f4dc4..18dea3fad 100644
--- a/Frameworks/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Framework.xcscheme	
+++ b/Frameworks/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Framework.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:GME.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj b/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj
index 1ee38b15b..816e37af2 100644
--- a/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj
+++ b/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj
@@ -246,11 +246,12 @@
 			};
 			buildConfigurationList = 8343792F17F97BDB00584396 /* Build configuration list for PBXProject "HighlyAdvanced" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8343792B17F97BDB00584396;
 			productRefGroup = 8343793617F97BDB00584396 /* Products */;
diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/xcshareddata/xcschemes/HighlyAdvanced.xcscheme b/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/xcshareddata/xcschemes/HighlyAdvanced.xcscheme
index d4f726dca..da5edbb53 100644
--- a/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/xcshareddata/xcschemes/HighlyAdvanced.xcscheme
+++ b/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/xcshareddata/xcschemes/HighlyAdvanced.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:HighlyAdvanced.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj
index 08b432b00..878557fe8 100644
--- a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj
+++ b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj
@@ -185,11 +185,12 @@
 			};
 			buildConfigurationList = 8360EF0A17F92C91005208A4 /* Build configuration list for PBXProject "HighlyExperimental" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8360EF0617F92C91005208A4;
 			productRefGroup = 8360EF1117F92C91005208A4 /* Products */;
diff --git a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/xcshareddata/xcschemes/HighlyExperimental.xcscheme b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/xcshareddata/xcschemes/HighlyExperimental.xcscheme
index d6b33a88c..b628de990 100644
--- a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/xcshareddata/xcschemes/HighlyExperimental.xcscheme
+++ b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/xcshareddata/xcschemes/HighlyExperimental.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:HighlyExperimental.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj
index 7835e076c..fa60f2d87 100644
--- a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj
+++ b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj
@@ -157,11 +157,12 @@
 			};
 			buildConfigurationList = 834378D817F96E2600584396 /* Build configuration list for PBXProject "HighlyQuixotic" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 834378D417F96E2600584396;
 			productRefGroup = 834378DF17F96E2600584396 /* Products */;
diff --git a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/xcshareddata/xcschemes/HighlyQuixotic.xcscheme b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/xcshareddata/xcschemes/HighlyQuixotic.xcscheme
index 3e85a3d47..c028ac579 100644
--- a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/xcshareddata/xcschemes/HighlyQuixotic.xcscheme
+++ b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/xcshareddata/xcschemes/HighlyQuixotic.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:HighlyQuixotic.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj
index d470fef4f..00cade9ea 100644
--- a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj
+++ b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj
@@ -199,11 +199,12 @@
 			};
 			buildConfigurationList = 8343786817F9658E00584396 /* Build configuration list for PBXProject "HighlyTheoretical" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8343786417F9658E00584396;
 			productRefGroup = 8343786F17F9658E00584396 /* Products */;
diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/xcshareddata/xcschemes/HighlyTheoretical.xcscheme b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/xcshareddata/xcschemes/HighlyTheoretical.xcscheme
index 3281d3e0d..496c423df 100644
--- a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/xcshareddata/xcschemes/HighlyTheoretical.xcscheme
+++ b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/xcshareddata/xcschemes/HighlyTheoretical.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:HighlyTheoretical.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj
index e48c91635..8a2b8559e 100644
--- a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj
+++ b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj
@@ -139,11 +139,12 @@
 			};
 			buildConfigurationList = 836FB550182053D700B3AD2D /* Build configuration list for PBXProject "HivelyPlayer" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 836FB54C182053D700B3AD2D;
 			productRefGroup = 836FB557182053D700B3AD2D /* Products */;
diff --git a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/xcshareddata/xcschemes/HivelyPlayer.xcscheme b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/xcshareddata/xcschemes/HivelyPlayer.xcscheme
index 1de9f1858..ef0b8c65f 100644
--- a/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/xcshareddata/xcschemes/HivelyPlayer.xcscheme
+++ b/Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/xcshareddata/xcschemes/HivelyPlayer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:HivelyPlayer.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/MPCDec/English.lproj/InfoPlist.strings b/Frameworks/MPCDec/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..7080cf949
Binary files /dev/null and b/Frameworks/MPCDec/English.lproj/InfoPlist.strings differ
diff --git a/Frameworks/MPCDec/MPCDec.xcodeproj/xcshareddata/xcschemes/mpcdec Framework.xcscheme b/Frameworks/MPCDec/MPCDec.xcodeproj/xcshareddata/xcschemes/mpcdec Framework.xcscheme
index a20a8ea9c..6e18ef7cb 100644
--- a/Frameworks/MPCDec/MPCDec.xcodeproj/xcshareddata/xcschemes/mpcdec Framework.xcscheme	
+++ b/Frameworks/MPCDec/MPCDec.xcodeproj/xcshareddata/xcschemes/mpcdec Framework.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:MPCDec.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj b/Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj
index d5975acdb..1d4192cea 100644
--- a/Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj
+++ b/Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj
@@ -162,11 +162,12 @@
 			};
 			buildConfigurationList = 32F1614F14E6BB3B00D6AB2F /* Build configuration list for PBXProject "NDHotKey" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 32F1614A14E6BB3B00D6AB2F;
 			productRefGroup = 32F1615714E6BB3B00D6AB2F /* Products */;
diff --git a/Frameworks/NDHotKey/NDHotKey.xcodeproj/xcshareddata/xcschemes/NDHotKey.xcscheme b/Frameworks/NDHotKey/NDHotKey.xcodeproj/xcshareddata/xcschemes/NDHotKey.xcscheme
index 4dca595a5..aa1f679eb 100644
--- a/Frameworks/NDHotKey/NDHotKey.xcodeproj/xcshareddata/xcschemes/NDHotKey.xcscheme
+++ b/Frameworks/NDHotKey/NDHotKey.xcodeproj/xcshareddata/xcschemes/NDHotKey.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:NDHotKey.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/Ogg/macosx/English.lproj/InfoPlist.strings b/Frameworks/Ogg/macosx/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..b230fea49
Binary files /dev/null and b/Frameworks/Ogg/macosx/English.lproj/InfoPlist.strings differ
diff --git a/Frameworks/Ogg/macosx/Ogg.xcodeproj/xcshareddata/xcschemes/Ogg.xcscheme b/Frameworks/Ogg/macosx/Ogg.xcodeproj/xcshareddata/xcschemes/Ogg.xcscheme
index daa39fc31..6984620ae 100644
--- a/Frameworks/Ogg/macosx/Ogg.xcodeproj/xcshareddata/xcschemes/Ogg.xcscheme
+++ b/Frameworks/Ogg/macosx/Ogg.xcodeproj/xcshareddata/xcschemes/Ogg.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Ogg.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/Ogg/macosx/Ogg.xcodeproj/xcshareddata/xcschemes/libogg (static).xcscheme b/Frameworks/Ogg/macosx/Ogg.xcodeproj/xcshareddata/xcschemes/libogg (static).xcscheme
index 83130e077..6c3150671 100644
--- a/Frameworks/Ogg/macosx/Ogg.xcodeproj/xcshareddata/xcschemes/libogg (static).xcscheme	
+++ b/Frameworks/Ogg/macosx/Ogg.xcodeproj/xcshareddata/xcschemes/libogg (static).xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Ogg.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj b/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj
index 2f4921442..dbeed8cc5 100644
--- a/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj
+++ b/Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj
@@ -1151,6 +1151,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 83E5EFB31FFEF7CC00659F0F;
 			productRefGroup = 83E5EFBE1FFEF7CC00659F0F /* Products */;
diff --git a/Frameworks/Opus/Opus.xcodeproj/project.pbxproj b/Frameworks/Opus/Opus.xcodeproj/project.pbxproj
index 15b09179e..4fc846e64 100644
--- a/Frameworks/Opus/Opus.xcodeproj/project.pbxproj
+++ b/Frameworks/Opus/Opus.xcodeproj/project.pbxproj
@@ -999,11 +999,12 @@
 			};
 			buildConfigurationList = 8375B05C17FFEABB0092A79F /* Build configuration list for PBXProject "Opus" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8375B05817FFEABB0092A79F;
 			productRefGroup = 8375B06317FFEABB0092A79F /* Products */;
diff --git a/Frameworks/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme b/Frameworks/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme
index 1c0a5119b..cda2eb097 100644
--- a/Frameworks/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme
+++ b/Frameworks/Opus/Opus.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Opus.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj
index dcc437759..b69cdd9e3 100644
--- a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj
+++ b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj
@@ -248,11 +248,12 @@
 			};
 			buildConfigurationList = 83848FB21807623F00E7332D /* Build configuration list for PBXProject "SSEQPlayer" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 83848FAE1807623F00E7332D;
 			productRefGroup = 83848FB91807623F00E7332D /* Products */;
diff --git a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/xcshareddata/xcschemes/SSEQPlayer.xcscheme b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/xcshareddata/xcschemes/SSEQPlayer.xcscheme
index 7e2e5dcd0..a41ad6bb4 100644
--- a/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/xcshareddata/xcschemes/SSEQPlayer.xcscheme
+++ b/Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/xcshareddata/xcschemes/SSEQPlayer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:SSEQPlayer.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/Shorten/English.lproj/InfoPlist.strings b/Frameworks/Shorten/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..7080cf949
Binary files /dev/null and b/Frameworks/Shorten/English.lproj/InfoPlist.strings differ
diff --git a/Frameworks/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Framework.xcscheme b/Frameworks/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Framework.xcscheme
index 86b007fc9..e2a080830 100644
--- a/Frameworks/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Framework.xcscheme	
+++ b/Frameworks/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Framework.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Shorten.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/Sparkle b/Frameworks/Sparkle
index ed6ca2bcd..c21d76f62 160000
--- a/Frameworks/Sparkle
+++ b/Frameworks/Sparkle
@@ -1 +1 @@
-Subproject commit ed6ca2bcd7896da5c1c890b1ef8fffa29a1e06c7
+Subproject commit c21d76f62e7748f0333e82a173c783df5c9180d2
diff --git a/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/xcshareddata/xcschemes/Syntrax_c.xcscheme b/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/xcshareddata/xcschemes/Syntrax_c.xcscheme
index 2edb44780..c82f4f082 100644
--- a/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/xcshareddata/xcschemes/Syntrax_c.xcscheme
+++ b/Frameworks/Syntrax-c/Syntrax_c.xcodeproj/xcshareddata/xcschemes/Syntrax_c.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Syntrax_c.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/TagLib/English.lproj/InfoPlist.strings b/Frameworks/TagLib/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..cde2c3450
--- /dev/null
+++ b/Frameworks/TagLib/English.lproj/InfoPlist.strings
@@ -0,0 +1,3 @@
+/* Localized versions of Info.plist keys */
+
+NSHumanReadableCopyright = "© __MyCompanyName__, 2006";
diff --git a/Frameworks/TagLib/TagLib.xcodeproj/xcshareddata/xcschemes/TagLib Framework.xcscheme b/Frameworks/TagLib/TagLib.xcodeproj/xcshareddata/xcschemes/TagLib Framework.xcscheme
index 9866dfe26..451a0f6ae 100644
--- a/Frameworks/TagLib/TagLib.xcodeproj/xcshareddata/xcschemes/TagLib Framework.xcscheme	
+++ b/Frameworks/TagLib/TagLib.xcodeproj/xcshareddata/xcschemes/TagLib Framework.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:TagLib.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/Vorbis/macosx/English.lproj/InfoPlist.strings b/Frameworks/Vorbis/macosx/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..cfe1b22a8
Binary files /dev/null and b/Frameworks/Vorbis/macosx/English.lproj/InfoPlist.strings differ
diff --git a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis.xcscheme b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis.xcscheme
index c89a7f188..8e6319596 100644
--- a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis.xcscheme
+++ b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/Vorbis.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Vorbis.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbis (static).xcscheme b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbis (static).xcscheme
index cdcc04c6d..2995e0d1e 100644
--- a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbis (static).xcscheme	
+++ b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbis (static).xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Vorbis.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbisenc (static).xcscheme b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbisenc (static).xcscheme
index 5331cd9f2..d7901322c 100644
--- a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbisenc (static).xcscheme	
+++ b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbisenc (static).xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Vorbis.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbisfile (static).xcscheme b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbisfile (static).xcscheme
index 916839989..957344a5d 100644
--- a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbisfile (static).xcscheme	
+++ b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/xcshareddata/xcschemes/libvorbisfile (static).xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Vorbis.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/WavPack/English.lproj/InfoPlist.strings b/Frameworks/WavPack/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..7080cf949
Binary files /dev/null and b/Frameworks/WavPack/English.lproj/InfoPlist.strings differ
diff --git a/Frameworks/WavPack/WavPack.xcodeproj/xcshareddata/xcschemes/WavPack Framework.xcscheme b/Frameworks/WavPack/WavPack.xcodeproj/xcshareddata/xcschemes/WavPack Framework.xcscheme
index 91aadac5f..610215cda 100644
--- a/Frameworks/WavPack/WavPack.xcodeproj/xcshareddata/xcschemes/WavPack Framework.xcscheme	
+++ b/Frameworks/WavPack/WavPack.xcodeproj/xcshareddata/xcschemes/WavPack Framework.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:WavPack.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/g719/g719.xcodeproj/xcshareddata/xcschemes/g719.xcscheme b/Frameworks/g719/g719.xcodeproj/xcshareddata/xcschemes/g719.xcscheme
index a0848a352..ec908f02e 100644
--- a/Frameworks/g719/g719.xcodeproj/xcshareddata/xcschemes/g719.xcscheme
+++ b/Frameworks/g719/g719.xcodeproj/xcshareddata/xcschemes/g719.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:g719.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/g7221/g7221.xcodeproj/xcshareddata/xcschemes/g7221.xcscheme b/Frameworks/g7221/g7221.xcodeproj/xcshareddata/xcschemes/g7221.xcscheme
index df046d73c..4919208da 100644
--- a/Frameworks/g7221/g7221.xcodeproj/xcshareddata/xcschemes/g7221.xcscheme
+++ b/Frameworks/g7221/g7221.xcodeproj/xcshareddata/xcschemes/g7221.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:g7221.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj b/Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj
index 96bc9d05b..15e3a94ee 100644
--- a/Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj
+++ b/Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj
@@ -609,11 +609,11 @@
 			};
 			buildConfigurationList = 83C8B61C18AF57770071B040 /* Build configuration list for PBXProject "lazyusf" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
+				Base,
 			);
 			mainGroup = 83C8B61818AF57770071B040;
 			productRefGroup = 83C8B62318AF57770071B040 /* Products */;
diff --git a/Frameworks/lazyusf/lazyusf.xcodeproj/xcshareddata/xcschemes/lazyusf.xcscheme b/Frameworks/lazyusf/lazyusf.xcodeproj/xcshareddata/xcschemes/lazyusf.xcscheme
index 145e5a45a..798f0e890 100644
--- a/Frameworks/lazyusf/lazyusf.xcodeproj/xcshareddata/xcschemes/lazyusf.xcscheme
+++ b/Frameworks/lazyusf/lazyusf.xcodeproj/xcshareddata/xcschemes/lazyusf.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:lazyusf.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/libatrac9/libatrac9.xcodeproj/project.pbxproj b/Frameworks/libatrac9/libatrac9.xcodeproj/project.pbxproj
index 9a17b652e..e10d6edf2 100644
--- a/Frameworks/libatrac9/libatrac9.xcodeproj/project.pbxproj
+++ b/Frameworks/libatrac9/libatrac9.xcodeproj/project.pbxproj
@@ -216,6 +216,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 830EBD7D20045F190023AA10;
 			productRefGroup = 830EBD8820045F190023AA10 /* Products */;
diff --git a/Frameworks/libbinio/libbinio.xcodeproj/project.pbxproj b/Frameworks/libbinio/libbinio.xcodeproj/project.pbxproj
index bf3616486..6bf0e1a29 100644
--- a/Frameworks/libbinio/libbinio.xcodeproj/project.pbxproj
+++ b/Frameworks/libbinio/libbinio.xcodeproj/project.pbxproj
@@ -129,6 +129,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 83D3C671201D37D8005564CB;
 			productRefGroup = 83D3C67C201D37D8005564CB /* Products */;
diff --git a/Frameworks/libsidplay/sidplayfp.xcodeproj/xcshareddata/xcschemes/sidplayfp.xcscheme b/Frameworks/libsidplay/sidplayfp.xcodeproj/xcshareddata/xcschemes/sidplayfp.xcscheme
index 760d2ca54..123e5bb62 100644
--- a/Frameworks/libsidplay/sidplayfp.xcodeproj/xcshareddata/xcschemes/sidplayfp.xcscheme
+++ b/Frameworks/libsidplay/sidplayfp.xcodeproj/xcshareddata/xcschemes/sidplayfp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:sidplayfp.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj b/Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj
index 40a1b3821..a4e2374fa 100644
--- a/Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj
+++ b/Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj
@@ -134,6 +134,7 @@
 		8333B6631DCC440C004C140D /* sharkport.c in Sources */ = {isa = PBXBuildFile; fileRef = 8333B6611DCC440C004C140D /* sharkport.c */; };
 		8333B6671DCC4451004C140D /* tile-cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 8333B6651DCC4451004C140D /* tile-cache.c */; };
 		837612EE1DD6AA2B001EED3D /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 837612ED1DD6AA2B001EED3D /* LICENSE */; };
+		837CEA73234875D700E62A4A /* audio-mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 837CEA70234875D700E62A4A /* audio-mixer.c */; };
 		83CA29381D7BC4EE00F2EA53 /* arm.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA245A1D7BC4ED00F2EA53 /* arm.c */; };
 		83CA29401D7BC4EE00F2EA53 /* decoder-arm.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24631D7BC4ED00F2EA53 /* decoder-arm.c */; };
 		83CA29421D7BC4EE00F2EA53 /* decoder-thumb.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24651D7BC4ED00F2EA53 /* decoder-thumb.c */; };
@@ -142,12 +143,6 @@
 		83CA294B1D7BC4EE00F2EA53 /* isa-thumb.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA246E1D7BC4ED00F2EA53 /* isa-thumb.c */; };
 		83CA29961D7BC4EE00F2EA53 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24C21D7BC4ED00F2EA53 /* audio.c */; };
 		83CA29981D7BC4EE00F2EA53 /* bios.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24C41D7BC4ED00F2EA53 /* bios.c */; };
-		83CA299A1D7BC4EE00F2EA53 /* codebreaker.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24C71D7BC4ED00F2EA53 /* codebreaker.c */; };
-		83CA299B1D7BC4EE00F2EA53 /* gameshark.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24C81D7BC4ED00F2EA53 /* gameshark.c */; };
-		83CA299C1D7BC4EE00F2EA53 /* gameshark.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CA24C91D7BC4ED00F2EA53 /* gameshark.h */; };
-		83CA299D1D7BC4EE00F2EA53 /* parv3.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24CA1D7BC4ED00F2EA53 /* parv3.c */; };
-		83CA299E1D7BC4EE00F2EA53 /* parv3.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CA24CB1D7BC4ED00F2EA53 /* parv3.h */; };
-		83CA299F1D7BC4EE00F2EA53 /* cheats.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24CC1D7BC4ED00F2EA53 /* cheats.c */; };
 		83CA29A11D7BC4EE00F2EA53 /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24CE1D7BC4ED00F2EA53 /* core.c */; };
 		83CA29A91D7BC4EE00F2EA53 /* gba.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24D71D7BC4ED00F2EA53 /* gba.c */; };
 		83CA29AB1D7BC4EE00F2EA53 /* hardware.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA24D91D7BC4ED00F2EA53 /* hardware.c */; };
@@ -173,14 +168,11 @@
 		83CA2D591D7BC4F000F2EA53 /* table.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA28E91D7BC4EE00F2EA53 /* table.c */; };
 		83CA2D621D7BC4F000F2EA53 /* vfs-mem.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA28F31D7BC4EE00F2EA53 /* vfs-mem.c */; };
 		83CA2D641D7BC4F000F2EA53 /* vfs.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA28F51D7BC4EE00F2EA53 /* vfs.c */; };
-		83CA2D951D7BC83E00F2EA53 /* cheats.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D7A1D7BC83E00F2EA53 /* cheats.c */; };
 		83CA2D971D7BC83E00F2EA53 /* config.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D7C1D7BC83E00F2EA53 /* config.c */; };
 		83CA2D9C1D7BC83E00F2EA53 /* directories.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D811D7BC83E00F2EA53 /* directories.c */; };
 		83CA2D9E1D7BC83E00F2EA53 /* input.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D831D7BC83E00F2EA53 /* input.c */; };
 		83CA2DA01D7BC83E00F2EA53 /* interface.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D851D7BC83E00F2EA53 /* interface.c */; };
 		83CA2DA41D7BC83E00F2EA53 /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D891D7BC83E00F2EA53 /* log.c */; };
-		83CA2DA61D7BC83E00F2EA53 /* rewind.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D8B1D7BC83E00F2EA53 /* rewind.c */; };
-		83CA2DA81D7BC83E00F2EA53 /* serialize.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D8D1D7BC83E00F2EA53 /* serialize.c */; };
 		83CA2DAA1D7BC83E00F2EA53 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D8F1D7BC83E00F2EA53 /* sync.c */; };
 		83CA2DAC1D7BC83E00F2EA53 /* thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 83CA2D911D7BC83E00F2EA53 /* thread.c */; };
 		83CA2DB81D7BC9BC00F2EA53 /* cli-debugger.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CA2DB21D7BC9BC00F2EA53 /* cli-debugger.h */; };
@@ -329,6 +321,7 @@
 		8333B6611DCC440C004C140D /* sharkport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sharkport.c; sourceTree = "<group>"; };
 		8333B6651DCC4451004C140D /* tile-cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "tile-cache.c"; sourceTree = "<group>"; };
 		837612ED1DD6AA2B001EED3D /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
+		837CEA70234875D700E62A4A /* audio-mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "audio-mixer.c"; sourceTree = "<group>"; };
 		83CA24131D7BC47C00F2EA53 /* mGBA.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = mGBA.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		83CA24171D7BC47C00F2EA53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		83CA245A1D7BC4ED00F2EA53 /* arm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = arm.c; sourceTree = "<group>"; };
@@ -339,12 +332,6 @@
 		83CA246E1D7BC4ED00F2EA53 /* isa-thumb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "isa-thumb.c"; sourceTree = "<group>"; };
 		83CA24C21D7BC4ED00F2EA53 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio.c; sourceTree = "<group>"; };
 		83CA24C41D7BC4ED00F2EA53 /* bios.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bios.c; sourceTree = "<group>"; };
-		83CA24C71D7BC4ED00F2EA53 /* codebreaker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = codebreaker.c; sourceTree = "<group>"; };
-		83CA24C81D7BC4ED00F2EA53 /* gameshark.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gameshark.c; sourceTree = "<group>"; };
-		83CA24C91D7BC4ED00F2EA53 /* gameshark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gameshark.h; sourceTree = "<group>"; };
-		83CA24CA1D7BC4ED00F2EA53 /* parv3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parv3.c; sourceTree = "<group>"; };
-		83CA24CB1D7BC4ED00F2EA53 /* parv3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parv3.h; sourceTree = "<group>"; };
-		83CA24CC1D7BC4ED00F2EA53 /* cheats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cheats.c; sourceTree = "<group>"; };
 		83CA24CE1D7BC4ED00F2EA53 /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = core.c; sourceTree = "<group>"; };
 		83CA24D71D7BC4ED00F2EA53 /* gba.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gba.c; sourceTree = "<group>"; };
 		83CA24D91D7BC4ED00F2EA53 /* hardware.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hardware.c; sourceTree = "<group>"; };
@@ -371,14 +358,11 @@
 		83CA28F31D7BC4EE00F2EA53 /* vfs-mem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "vfs-mem.c"; sourceTree = "<group>"; };
 		83CA28F51D7BC4EE00F2EA53 /* vfs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vfs.c; sourceTree = "<group>"; };
 		83CA290C1D7BC4EE00F2EA53 /* version.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = version.cmake; sourceTree = "<group>"; };
-		83CA2D7A1D7BC83E00F2EA53 /* cheats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cheats.c; sourceTree = "<group>"; };
 		83CA2D7C1D7BC83E00F2EA53 /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = config.c; sourceTree = "<group>"; };
 		83CA2D811D7BC83E00F2EA53 /* directories.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = directories.c; sourceTree = "<group>"; };
 		83CA2D831D7BC83E00F2EA53 /* input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = input.c; sourceTree = "<group>"; };
 		83CA2D851D7BC83E00F2EA53 /* interface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = interface.c; sourceTree = "<group>"; };
 		83CA2D891D7BC83E00F2EA53 /* log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = log.c; sourceTree = "<group>"; };
-		83CA2D8B1D7BC83E00F2EA53 /* rewind.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rewind.c; sourceTree = "<group>"; };
-		83CA2D8D1D7BC83E00F2EA53 /* serialize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = serialize.c; sourceTree = "<group>"; };
 		83CA2D8F1D7BC83E00F2EA53 /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sync.c; sourceTree = "<group>"; };
 		83CA2D911D7BC83E00F2EA53 /* thread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = thread.c; sourceTree = "<group>"; };
 		83CA2D931D7BC83E00F2EA53 /* version.c.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = version.c.in; sourceTree = "<group>"; };
@@ -760,6 +744,14 @@
 			path = windows;
 			sourceTree = "<group>";
 		};
+		837CEA6E234875D700E62A4A /* extra */ = {
+			isa = PBXGroup;
+			children = (
+				837CEA70234875D700E62A4A /* audio-mixer.c */,
+			);
+			path = extra;
+			sourceTree = "<group>";
+		};
 		83CA24091D7BC47C00F2EA53 = {
 			isa = PBXGroup;
 			children = (
@@ -827,10 +819,9 @@
 		83CA24C11D7BC4ED00F2EA53 /* gba */ = {
 			isa = PBXGroup;
 			children = (
+				837CEA6E234875D700E62A4A /* extra */,
 				83CA24C21D7BC4ED00F2EA53 /* audio.c */,
 				83CA24C41D7BC4ED00F2EA53 /* bios.c */,
-				83CA24C61D7BC4ED00F2EA53 /* cheats */,
-				83CA24CC1D7BC4ED00F2EA53 /* cheats.c */,
 				83CA24CE1D7BC4ED00F2EA53 /* core.c */,
 				83299FBC1E7657B2003A3242 /* dma.c */,
 				83CA24D71D7BC4ED00F2EA53 /* gba.c */,
@@ -854,18 +845,6 @@
 			path = gba;
 			sourceTree = "<group>";
 		};
-		83CA24C61D7BC4ED00F2EA53 /* cheats */ = {
-			isa = PBXGroup;
-			children = (
-				83CA24C71D7BC4ED00F2EA53 /* codebreaker.c */,
-				83CA24C81D7BC4ED00F2EA53 /* gameshark.c */,
-				83CA24C91D7BC4ED00F2EA53 /* gameshark.h */,
-				83CA24CA1D7BC4ED00F2EA53 /* parv3.c */,
-				83CA24CB1D7BC4ED00F2EA53 /* parv3.h */,
-			);
-			path = cheats;
-			sourceTree = "<group>";
-		};
 		83CA24FE1D7BC4ED00F2EA53 /* sio */ = {
 			isa = PBXGroup;
 			children = (
@@ -924,7 +903,6 @@
 		83CA2D791D7BC83E00F2EA53 /* core */ = {
 			isa = PBXGroup;
 			children = (
-				83CA2D7A1D7BC83E00F2EA53 /* cheats.c */,
 				83CA2D7C1D7BC83E00F2EA53 /* config.c */,
 				83CA2E421D7BD82100F2EA53 /* core.c */,
 				83CA2D811D7BC83E00F2EA53 /* directories.c */,
@@ -932,8 +910,6 @@
 				83CA2D851D7BC83E00F2EA53 /* interface.c */,
 				83299FC01E7657ED003A3242 /* lockstep.c */,
 				83CA2D891D7BC83E00F2EA53 /* log.c */,
-				83CA2D8B1D7BC83E00F2EA53 /* rewind.c */,
-				83CA2D8D1D7BC83E00F2EA53 /* serialize.c */,
 				83CA2D8F1D7BC83E00F2EA53 /* sync.c */,
 				83CA2D911D7BC83E00F2EA53 /* thread.c */,
 				8333B6651DCC4451004C140D /* tile-cache.c */,
@@ -1043,7 +1019,6 @@
 				83299FBB1E765789003A3242 /* vfs.h in Headers */,
 				83299FAC1E765789003A3242 /* 3ds-vfs.h in Headers */,
 				83299F4E1E765789003A3242 /* log.h in Headers */,
-				83CA299E1D7BC4EE00F2EA53 /* parv3.h in Headers */,
 				83299F4C1E765789003A3242 /* library.h in Headers */,
 				83299F9A1E765789003A3242 /* circle-buffer.h in Headers */,
 				83299F661E765789003A3242 /* macros.h in Headers */,
@@ -1060,7 +1035,6 @@
 				83299F721E765789003A3242 /* overrides.h in Headers */,
 				83299F481E765789003A3242 /* cpu.h in Headers */,
 				83299F521E765789003A3242 /* thread.h in Headers */,
-				83CA299C1D7BC4EE00F2EA53 /* gameshark.h in Headers */,
 				83299F551E765789003A3242 /* version.h in Headers */,
 				83299F8D1E765789003A3242 /* sharkport.h in Headers */,
 				83299F441E765789003A3242 /* blip_buf.h in Headers */,
@@ -1204,7 +1178,6 @@
 				83CA29AB1D7BC4EE00F2EA53 /* hardware.c in Sources */,
 				83CA29A91D7BC4EE00F2EA53 /* gba.c in Sources */,
 				83CA29B11D7BC4EE00F2EA53 /* input.c in Sources */,
-				83CA2D951D7BC83E00F2EA53 /* cheats.c in Sources */,
 				83CA2D641D7BC4F000F2EA53 /* vfs.c in Sources */,
 				83CA2E2C1D7BCB5200F2EA53 /* vfs-fd.c in Sources */,
 				83CA2D541D7BC4F000F2EA53 /* ring-fifo.c in Sources */,
@@ -1215,18 +1188,15 @@
 				83CA2DBF1D7BC9DF00F2EA53 /* configuration.c in Sources */,
 				83299FC31E7657ED003A3242 /* timing.c in Sources */,
 				83CA2DA01D7BC83E00F2EA53 /* interface.c in Sources */,
-				83CA2DA81D7BC83E00F2EA53 /* serialize.c in Sources */,
 				83CA29401D7BC4EE00F2EA53 /* decoder-arm.c in Sources */,
-				83CA299F1D7BC4EE00F2EA53 /* cheats.c in Sources */,
+				837CEA73234875D700E62A4A /* audio-mixer.c in Sources */,
 				83299FBF1E7657B2003A3242 /* timer.c in Sources */,
 				83CA29CE1D7BC4EE00F2EA53 /* lockstep.c in Sources */,
 				83CA29D41D7BC4EE00F2EA53 /* video.c in Sources */,
 				83CA2E291D7BCB2E00F2EA53 /* patch.c in Sources */,
 				83CA2E3B1D7BCBD300F2EA53 /* memory.c in Sources */,
 				83CA2E271D7BCB2E00F2EA53 /* patch-ups.c in Sources */,
-				83CA299D1D7BC4EE00F2EA53 /* parv3.c in Sources */,
 				83CA29D01D7BC4EE00F2EA53 /* sio.c in Sources */,
-				83CA2DA61D7BC83E00F2EA53 /* rewind.c in Sources */,
 				83CA294B1D7BC4EE00F2EA53 /* isa-thumb.c in Sources */,
 				83CA29981D7BC4EE00F2EA53 /* bios.c in Sources */,
 				83CA2DA41D7BC83E00F2EA53 /* log.c in Sources */,
@@ -1236,7 +1206,6 @@
 				83CA2D9E1D7BC83E00F2EA53 /* input.c in Sources */,
 				83CA2A9F1D7BC4EF00F2EA53 /* blip_buf.c in Sources */,
 				83CA29B41D7BC4EE00F2EA53 /* io.c in Sources */,
-				83CA299A1D7BC4EE00F2EA53 /* codebreaker.c in Sources */,
 				83CA2D311D7BC4F000F2EA53 /* circle-buffer.c in Sources */,
 				83CA2D591D7BC4F000F2EA53 /* table.c in Sources */,
 				83299FC21E7657ED003A3242 /* lockstep.c in Sources */,
@@ -1246,7 +1215,6 @@
 				83CA29D21D7BC4EE00F2EA53 /* vfame.c in Sources */,
 				83D7282420A673BB00076FC5 /* matrix.c in Sources */,
 				8333B6671DCC4451004C140D /* tile-cache.c in Sources */,
-				83CA299B1D7BC4EE00F2EA53 /* gameshark.c in Sources */,
 				83CA2D9C1D7BC83E00F2EA53 /* directories.c in Sources */,
 				83CA29B81D7BC4EE00F2EA53 /* overrides.c in Sources */,
 				83299FBE1E7657B2003A3242 /* dma.c in Sources */,
@@ -1393,6 +1361,7 @@
 					"$(inherited)",
 					"HAVE_XLOCALE=1",
 					"HAVE_STRTOF_L=1",
+					MGBA_STANDALONE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/mGBA/mgba/src",
@@ -1421,6 +1390,7 @@
 					M_CORE_GBA,
 					"HAVE_XLOCALE=1",
 					"HAVE_STRTOF_L=1",
+					MGBA_STANDALONE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/mGBA/mgba/src",
diff --git a/Frameworks/mGBA/mGBA.xcodeproj/xcshareddata/xcschemes/mGBA.xcscheme b/Frameworks/mGBA/mGBA.xcodeproj/xcshareddata/xcschemes/mGBA.xcscheme
index 846422d84..1ca421dc7 100644
--- a/Frameworks/mGBA/mGBA.xcodeproj/xcshareddata/xcschemes/mGBA.xcscheme
+++ b/Frameworks/mGBA/mGBA.xcodeproj/xcshareddata/xcschemes/mGBA.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:mGBA.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/mGBA/mGBA/mgba b/Frameworks/mGBA/mGBA/mgba
index 45190acaf..04221d56f 160000
--- a/Frameworks/mGBA/mGBA/mgba
+++ b/Frameworks/mGBA/mGBA/mgba
@@ -1 +1 @@
-Subproject commit 45190acaf285d563e4208c98ead93829fdf70e27
+Subproject commit 04221d56f221fb3ce2caf05515aeb88d0cfc9d01
diff --git a/Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj b/Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj
index 6f4207876..abe12e89f 100644
--- a/Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj
+++ b/Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj
@@ -169,11 +169,12 @@
 			};
 			buildConfigurationList = 83B066A6180D56B9008E3612 /* Build configuration list for PBXProject "midi_processing" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 83B066A2180D56B9008E3612;
 			productRefGroup = 83B066AD180D56B9008E3612 /* Products */;
diff --git a/Frameworks/midi_processing/midi_processing.xcodeproj/xcshareddata/xcschemes/midi_processing.xcscheme b/Frameworks/midi_processing/midi_processing.xcodeproj/xcshareddata/xcschemes/midi_processing.xcscheme
index 5fff95e9c..2fb0cabf4 100644
--- a/Frameworks/midi_processing/midi_processing.xcodeproj/xcshareddata/xcschemes/midi_processing.xcscheme
+++ b/Frameworks/midi_processing/midi_processing.xcodeproj/xcshareddata/xcschemes/midi_processing.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:midi_processing.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/mpg123/mpg123.xcodeproj/project.pbxproj b/Frameworks/mpg123/mpg123.xcodeproj/project.pbxproj
index 789cd3268..74d1055ed 100644
--- a/Frameworks/mpg123/mpg123.xcodeproj/project.pbxproj
+++ b/Frameworks/mpg123/mpg123.xcodeproj/project.pbxproj
@@ -323,11 +323,12 @@
 			};
 			buildConfigurationList = 8313E3091901FBDC00B4B6F1 /* Build configuration list for PBXProject "mpg123" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8313E3051901FBDC00B4B6F1;
 			productRefGroup = 8313E3101901FBDC00B4B6F1 /* Products */;
diff --git a/Frameworks/mpg123/mpg123.xcodeproj/xcshareddata/xcschemes/mpg123.xcscheme b/Frameworks/mpg123/mpg123.xcodeproj/xcshareddata/xcschemes/mpg123.xcscheme
index d5a4d897f..1b594b09d 100644
--- a/Frameworks/mpg123/mpg123.xcodeproj/xcshareddata/xcschemes/mpg123.xcscheme
+++ b/Frameworks/mpg123/mpg123.xcodeproj/xcshareddata/xcschemes/mpg123.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:mpg123.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/psflib/psflib.xcodeproj/project.pbxproj b/Frameworks/psflib/psflib.xcodeproj/project.pbxproj
index c58fe4118..2b427e5de 100644
--- a/Frameworks/psflib/psflib.xcodeproj/project.pbxproj
+++ b/Frameworks/psflib/psflib.xcodeproj/project.pbxproj
@@ -143,11 +143,12 @@
 			};
 			buildConfigurationList = 8343781617F93CB500584396 /* Build configuration list for PBXProject "psflib" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8343781217F93CB500584396;
 			productRefGroup = 8343781D17F93CB500584396 /* Products */;
diff --git a/Frameworks/psflib/psflib.xcodeproj/xcshareddata/xcschemes/psflib.xcscheme b/Frameworks/psflib/psflib.xcodeproj/xcshareddata/xcschemes/psflib.xcscheme
index 0decb12f6..021c4a83b 100644
--- a/Frameworks/psflib/psflib.xcodeproj/xcshareddata/xcschemes/psflib.xcscheme
+++ b/Frameworks/psflib/psflib.xcodeproj/xcshareddata/xcschemes/psflib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:psflib.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj b/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj
index 37e41a1df..6309bc4df 100644
--- a/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj
+++ b/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj
@@ -555,6 +555,8 @@
 			isa = PBXBuildRule;
 			compilerSpec = com.apple.compilers.proxy.script;
 			fileType = sourcecode.swift;
+			inputFiles = (
+			);
 			isEditable = 1;
 			outputFiles = (
 			);
@@ -2014,12 +2016,12 @@
 			};
 			buildConfigurationList = 836F6B3318BDB8880095E648 /* Build configuration list for PBXProject "libvgmstream" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 836F6B2F18BDB8880095E648;
 			productRefGroup = 836F6B3A18BDB8880095E648 /* Products */;
diff --git a/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme b/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme
index 61038696b..5c5890180 100644
--- a/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme
+++ b/Frameworks/vgmstream/libvgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:libvgmstream.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj b/Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj
index e33a9d1dc..e5948b1c4 100644
--- a/Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj
+++ b/Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj
@@ -293,11 +293,12 @@
 			};
 			buildConfigurationList = 83DE0C00180A9BD400269051 /* Build configuration list for PBXProject "vio2sf" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 83DE0BFC180A9BD400269051;
 			productRefGroup = 83DE0C07180A9BD400269051 /* Products */;
diff --git a/Frameworks/vio2sf/vio2sf.xcodeproj/xcshareddata/xcschemes/vio2sf.xcscheme b/Frameworks/vio2sf/vio2sf.xcodeproj/xcshareddata/xcschemes/vio2sf.xcscheme
index 0d4427c9f..1f719a625 100644
--- a/Frameworks/vio2sf/vio2sf.xcodeproj/xcshareddata/xcschemes/vio2sf.xcscheme
+++ b/Frameworks/vio2sf/vio2sf.xcodeproj/xcshareddata/xcschemes/vio2sf.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:vio2sf.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/APL/APL.xcodeproj/xcshareddata/xcschemes/APL Plugin.xcscheme b/Plugins/APL/APL.xcodeproj/xcshareddata/xcschemes/APL Plugin.xcscheme
index 232732f1a..cbbea010b 100644
--- a/Plugins/APL/APL.xcodeproj/xcshareddata/xcschemes/APL Plugin.xcscheme	
+++ b/Plugins/APL/APL.xcodeproj/xcshareddata/xcschemes/APL Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:APL.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj b/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj
index 5c7eec422..f8fbd95ac 100644
--- a/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj
+++ b/Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj
@@ -178,6 +178,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 83D3C5EA201C674D005564CB;
 			productRefGroup = 83D3C5F4201C674D005564CB /* Products */;
diff --git a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj
index 2b79524c9..d831144fe 100644
--- a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj
+++ b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj
@@ -185,11 +185,12 @@
 			};
 			buildConfigurationList = 8359FF1217FEF35C0060F3ED /* Build configuration list for PBXProject "ArchiveSource" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8359FF0E17FEF35C0060F3ED;
 			productRefGroup = 8359FF1817FEF35C0060F3ED /* Products */;
diff --git a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/xcshareddata/xcschemes/ArchiveSource.xcscheme b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/xcshareddata/xcschemes/ArchiveSource.xcscheme
index 5277117bc..8a3fecdbc 100644
--- a/Plugins/ArchiveSource/ArchiveSource.xcodeproj/xcshareddata/xcschemes/ArchiveSource.xcscheme
+++ b/Plugins/ArchiveSource/ArchiveSource.xcodeproj/xcshareddata/xcschemes/ArchiveSource.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:ArchiveSource.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/CoreAudio/CoreAudio.xcodeproj/xcshareddata/xcschemes/CoreAudio Plugin.xcscheme b/Plugins/CoreAudio/CoreAudio.xcodeproj/xcshareddata/xcschemes/CoreAudio Plugin.xcscheme
index 17cc6d4d8..6296a383e 100644
--- a/Plugins/CoreAudio/CoreAudio.xcodeproj/xcshareddata/xcschemes/CoreAudio Plugin.xcscheme	
+++ b/Plugins/CoreAudio/CoreAudio.xcodeproj/xcshareddata/xcschemes/CoreAudio Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:CoreAudio.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/CueSheet/CueSheet.xcodeproj/xcshareddata/xcschemes/CueSheet.xcscheme b/Plugins/CueSheet/CueSheet.xcodeproj/xcshareddata/xcschemes/CueSheet.xcscheme
index 3503661ad..28adc302f 100644
--- a/Plugins/CueSheet/CueSheet.xcodeproj/xcshareddata/xcschemes/CueSheet.xcscheme
+++ b/Plugins/CueSheet/CueSheet.xcodeproj/xcshareddata/xcschemes/CueSheet.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:CueSheet.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/CueSheet/English.lproj/InfoPlist.strings b/Plugins/CueSheet/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..99142f9ac
Binary files /dev/null and b/Plugins/CueSheet/English.lproj/InfoPlist.strings differ
diff --git a/Plugins/FFMPEG/FFMPEG.xcodeproj/xcshareddata/xcschemes/FFMPEG Plugin.xcscheme b/Plugins/FFMPEG/FFMPEG.xcodeproj/xcshareddata/xcschemes/FFMPEG Plugin.xcscheme
index c8e09f764..8821c13ff 100644
--- a/Plugins/FFMPEG/FFMPEG.xcodeproj/xcshareddata/xcschemes/FFMPEG Plugin.xcscheme	
+++ b/Plugins/FFMPEG/FFMPEG.xcodeproj/xcshareddata/xcschemes/FFMPEG Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:FFMPEG.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/FileSource/FileSource.xcodeproj/xcshareddata/xcschemes/FileSource Plugin.xcscheme b/Plugins/FileSource/FileSource.xcodeproj/xcshareddata/xcschemes/FileSource Plugin.xcscheme
index c2fa1c86f..79b97bc75 100644
--- a/Plugins/FileSource/FileSource.xcodeproj/xcshareddata/xcschemes/FileSource Plugin.xcscheme	
+++ b/Plugins/FileSource/FileSource.xcodeproj/xcshareddata/xcschemes/FileSource Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:FileSource.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/Flac/Flac.xcodeproj/xcshareddata/xcschemes/Flac Plugin.xcscheme b/Plugins/Flac/Flac.xcodeproj/xcshareddata/xcschemes/Flac Plugin.xcscheme
index 6c4551333..0ef28291d 100644
--- a/Plugins/Flac/Flac.xcodeproj/xcshareddata/xcschemes/Flac Plugin.xcscheme	
+++ b/Plugins/Flac/Flac.xcodeproj/xcshareddata/xcschemes/Flac Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Flac.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/GME/English.lproj/InfoPlist.strings b/Plugins/GME/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..948e12b99
Binary files /dev/null and b/Plugins/GME/English.lproj/InfoPlist.strings differ
diff --git a/Plugins/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Plugin.xcscheme b/Plugins/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Plugin.xcscheme
index 278785c47..9b8330f8f 100644
--- a/Plugins/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Plugin.xcscheme	
+++ b/Plugins/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:GME.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/HTTPSource/HTTPSource.xcodeproj/xcshareddata/xcschemes/HTTPSource Plugin.xcscheme b/Plugins/HTTPSource/HTTPSource.xcodeproj/xcshareddata/xcschemes/HTTPSource Plugin.xcscheme
index 959a9c54f..1b94f1c93 100644
--- a/Plugins/HTTPSource/HTTPSource.xcodeproj/xcshareddata/xcschemes/HTTPSource Plugin.xcscheme	
+++ b/Plugins/HTTPSource/HTTPSource.xcodeproj/xcshareddata/xcschemes/HTTPSource Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:HTTPSource.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj b/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj
index fc9ebfe35..ddd6f580b 100644
--- a/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj
+++ b/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj
@@ -415,11 +415,12 @@
 			};
 			buildConfigurationList = 8360EEDF17F92AC8005208A4 /* Build configuration list for PBXProject "HighlyComplete" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8360EEDB17F92AC8005208A4;
 			productRefGroup = 8360EEE517F92AC8005208A4 /* Products */;
@@ -719,6 +720,7 @@
 					EMU_LITTLE_ENDIAN,
 					HAVE_STDINT_H,
 					"MINIMAL_CORE=2",
+					MGBA_STANDALONE,
 				);
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Frameworks/mGBA/mGBA/mgba/include";
 				INFOPLIST_FILE = "HighlyComplete/HighlyComplete-Info.plist";
@@ -740,6 +742,7 @@
 					HAVE_STDINT_H,
 					EMU_LITTLE_ENDIAN,
 					"MINIMAL_CORE=2",
+					MGBA_STANDALONE,
 				);
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Frameworks/mGBA/mGBA/mgba/include";
 				INFOPLIST_FILE = "HighlyComplete/HighlyComplete-Info.plist";
diff --git a/Plugins/HighlyComplete/HighlyComplete.xcodeproj/xcshareddata/xcschemes/HighlyComplete.xcscheme b/Plugins/HighlyComplete/HighlyComplete.xcodeproj/xcshareddata/xcschemes/HighlyComplete.xcscheme
index 4411c1257..05a30050f 100644
--- a/Plugins/HighlyComplete/HighlyComplete.xcodeproj/xcshareddata/xcschemes/HighlyComplete.xcscheme
+++ b/Plugins/HighlyComplete/HighlyComplete.xcodeproj/xcshareddata/xcschemes/HighlyComplete.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:HighlyComplete.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/Hively/Hively.xcodeproj/project.pbxproj b/Plugins/Hively/Hively.xcodeproj/project.pbxproj
index 4e5277a6f..dcc91018e 100644
--- a/Plugins/Hively/Hively.xcodeproj/project.pbxproj
+++ b/Plugins/Hively/Hively.xcodeproj/project.pbxproj
@@ -190,11 +190,12 @@
 			};
 			buildConfigurationList = 836FB5281820538700B3AD2D /* Build configuration list for PBXProject "Hively" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 836FB5241820538700B3AD2D;
 			productRefGroup = 836FB52E1820538700B3AD2D /* Products */;
diff --git a/Plugins/Hively/Hively.xcodeproj/xcshareddata/xcschemes/Hively.xcscheme b/Plugins/Hively/Hively.xcodeproj/xcshareddata/xcschemes/Hively.xcscheme
index 85a8fa4eb..af3838d72 100644
--- a/Plugins/Hively/Hively.xcodeproj/xcshareddata/xcschemes/Hively.xcscheme
+++ b/Plugins/Hively/Hively.xcodeproj/xcshareddata/xcschemes/Hively.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Hively.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/M3u/English.lproj/InfoPlist.strings b/Plugins/M3u/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..99142f9ac
Binary files /dev/null and b/Plugins/M3u/English.lproj/InfoPlist.strings differ
diff --git a/Plugins/M3u/M3u.xcodeproj/xcshareddata/xcschemes/M3u.xcscheme b/Plugins/M3u/M3u.xcodeproj/xcshareddata/xcschemes/M3u.xcscheme
index ddb2ef253..6ac90cead 100644
--- a/Plugins/M3u/M3u.xcodeproj/xcshareddata/xcschemes/M3u.xcscheme
+++ b/Plugins/M3u/M3u.xcodeproj/xcshareddata/xcschemes/M3u.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:M3u.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj b/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj
index 9b30fee49..6f62c3d00 100644
--- a/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj
+++ b/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj
@@ -373,11 +373,12 @@
 			};
 			buildConfigurationList = 83B06682180D5668008E3612 /* Build configuration list for PBXProject "MIDI" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 83B0667E180D5668008E3612;
 			productRefGroup = 83B06688180D5668008E3612 /* Products */;
diff --git a/Plugins/MIDI/MIDI.xcodeproj/xcshareddata/xcschemes/MIDI.xcscheme b/Plugins/MIDI/MIDI.xcodeproj/xcshareddata/xcschemes/MIDI.xcscheme
index 286891ec6..fee193291 100644
--- a/Plugins/MIDI/MIDI.xcodeproj/xcshareddata/xcschemes/MIDI.xcscheme
+++ b/Plugins/MIDI/MIDI.xcodeproj/xcshareddata/xcschemes/MIDI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:MIDI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/Musepack/Musepack.xcodeproj/xcshareddata/xcschemes/Musepack Plugin.xcscheme b/Plugins/Musepack/Musepack.xcodeproj/xcshareddata/xcschemes/Musepack Plugin.xcscheme
index 00db53420..68d6a2257 100644
--- a/Plugins/Musepack/Musepack.xcodeproj/xcshareddata/xcschemes/Musepack Plugin.xcscheme	
+++ b/Plugins/Musepack/Musepack.xcodeproj/xcshareddata/xcschemes/Musepack Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Musepack.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
index f96d13a3d..c558c1228 100644
--- a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
+++ b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
@@ -172,6 +172,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 83E5EF9A1FFEF78100659F0F;
 			productRefGroup = 83E5EFA41FFEF78100659F0F /* Products */;
diff --git a/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj b/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj
index 332569104..dbe8389f9 100644
--- a/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj
+++ b/Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj
@@ -180,11 +180,12 @@
 			};
 			buildConfigurationList = 8375B03717FFEA400092A79F /* Build configuration list for PBXProject "OpusPlugin" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 8375B03317FFEA400092A79F;
 			productRefGroup = 8375B03D17FFEA400092A79F /* Products */;
diff --git a/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme b/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme
index 7183d8280..6202cf3c4 100644
--- a/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme
+++ b/Plugins/Opus/OpusPlugin.xcodeproj/xcshareddata/xcschemes/Opus.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:OpusPlugin.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/Pls/English.lproj/InfoPlist.strings b/Plugins/Pls/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..99142f9ac
Binary files /dev/null and b/Plugins/Pls/English.lproj/InfoPlist.strings differ
diff --git a/Plugins/Pls/Pls.xcodeproj/xcshareddata/xcschemes/Pls.xcscheme b/Plugins/Pls/Pls.xcodeproj/xcshareddata/xcschemes/Pls.xcscheme
index c32e9cf4c..e8de48cf0 100644
--- a/Plugins/Pls/Pls.xcodeproj/xcshareddata/xcschemes/Pls.xcscheme
+++ b/Plugins/Pls/Pls.xcodeproj/xcshareddata/xcschemes/Pls.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Pls.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Plugin.xcscheme b/Plugins/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Plugin.xcscheme
index 04638af6a..ff1168755 100644
--- a/Plugins/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Plugin.xcscheme	
+++ b/Plugins/Shorten/Shorten.xcodeproj/xcshareddata/xcschemes/Shorten Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Shorten.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/xcshareddata/xcschemes/SilenceDecoder.xcscheme b/Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/xcshareddata/xcschemes/SilenceDecoder.xcscheme
index 38e9dcab0..7b63eb315 100644
--- a/Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/xcshareddata/xcschemes/SilenceDecoder.xcscheme
+++ b/Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/xcshareddata/xcschemes/SilenceDecoder.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:SilenceDecoder.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/Syntrax/Syntrax.xcodeproj/xcshareddata/xcschemes/Syntrax.xcscheme b/Plugins/Syntrax/Syntrax.xcodeproj/xcshareddata/xcschemes/Syntrax.xcscheme
index 833864cad..c68d054e2 100644
--- a/Plugins/Syntrax/Syntrax.xcodeproj/xcshareddata/xcschemes/Syntrax.xcscheme
+++ b/Plugins/Syntrax/Syntrax.xcodeproj/xcshareddata/xcschemes/Syntrax.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Syntrax.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/TagLib/TagLib.xcodeproj/xcshareddata/xcschemes/TagLib Plugin.xcscheme b/Plugins/TagLib/TagLib.xcodeproj/xcshareddata/xcschemes/TagLib Plugin.xcscheme
index 77f821ec0..0b8775401 100644
--- a/Plugins/TagLib/TagLib.xcodeproj/xcshareddata/xcschemes/TagLib Plugin.xcscheme	
+++ b/Plugins/TagLib/TagLib.xcodeproj/xcshareddata/xcschemes/TagLib Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:TagLib.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme b/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme
index b373f9e8b..776a75540 100644
--- a/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme	
+++ b/Plugins/Vorbis/VorbisPlugin.xcodeproj/xcshareddata/xcschemes/Vorbis Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:VorbisPlugin.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/WavPack/WavPack.xcodeproj/xcshareddata/xcschemes/WavPack Plugin.xcscheme b/Plugins/WavPack/WavPack.xcodeproj/xcshareddata/xcschemes/WavPack Plugin.xcscheme
index 6e4c6e6c6..636cfd203 100644
--- a/Plugins/WavPack/WavPack.xcodeproj/xcshareddata/xcschemes/WavPack Plugin.xcscheme	
+++ b/Plugins/WavPack/WavPack.xcodeproj/xcshareddata/xcschemes/WavPack Plugin.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:WavPack.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/sidplay/sidplay.xcodeproj/xcshareddata/xcschemes/sidplay.xcscheme b/Plugins/sidplay/sidplay.xcodeproj/xcshareddata/xcschemes/sidplay.xcscheme
index f6fec7894..133a747c9 100644
--- a/Plugins/sidplay/sidplay.xcodeproj/xcshareddata/xcschemes/sidplay.xcscheme
+++ b/Plugins/sidplay/sidplay.xcodeproj/xcshareddata/xcschemes/sidplay.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:sidplay.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj b/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj
index 7ccc6412d..ce12e89fd 100644
--- a/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj
+++ b/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj
@@ -196,12 +196,12 @@
 			};
 			buildConfigurationList = 836F6B0B18BDB80D0095E648 /* Build configuration list for PBXProject "vgmstream" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				es,
+				Base,
 			);
 			mainGroup = 836F6B0718BDB80D0095E648;
 			productRefGroup = 836F6B1118BDB80D0095E648 /* Products */;
diff --git a/Plugins/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme b/Plugins/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme
index 63ba5e4be..790c624fc 100644
--- a/Plugins/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme
+++ b/Plugins/vgmstream/vgmstream.xcodeproj/xcshareddata/xcschemes/vgmstream.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:vgmstreamPlugin.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Preferences/General/English.lproj/InfoPlist.strings b/Preferences/General/English.lproj/InfoPlist.strings
new file mode 100644
index 000000000..4ddea496e
--- /dev/null
+++ b/Preferences/General/English.lproj/InfoPlist.strings
@@ -0,0 +1,3 @@
+/* Localized versions of Info.plist keys */
+
+NSHumanReadableCopyright = "© Vincent Spader, 2005-2011\n© mamburu, 2012-2013\n© Christopher Snowhill, 2013-2019";
diff --git a/Preferences/General/English.lproj/Localizable.strings b/Preferences/General/English.lproj/Localizable.strings
new file mode 100644
index 000000000..967314319
--- /dev/null
+++ b/Preferences/General/English.lproj/Localizable.strings
@@ -0,0 +1,20 @@
+"Nightly" = "Nightly";
+"Stable" = "Stable";
+"Unstable" = "Unstable";
+
+"File Drawer" = "File Drawer";
+"Hot Keys" = "Hot Keys";
+"Output" = "Output";
+
+"Updates" = "Updates";
+"Last.fm" = "Last.fm";
+"Playlist" = "Playlist";
+"Growl" = "Growl";
+"Appearance" = "Appearance";
+"MIDI" = "MIDI";
+
+"Press Key..." = "Press Key...";
+
+"Clear playlist and play" = "Clear playlist and play";
+"Enqueue" = "Enqueue";
+"Enqueue and play" = "Enqueue and play";
\ No newline at end of file
diff --git a/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme b/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme
index 8fd8667cf..7b95cf209 100644
--- a/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme
+++ b/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:General.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"