diff --git a/macosx/EternityEngine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macosx/EternityEngine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/macosx/EternityEngine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/macosx/EternityEngine.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/macosx/EternityEngine.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000..0c67376eb
--- /dev/null
+++ b/macosx/EternityEngine.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/macosx/launcher/English.lproj/About.xib b/macosx/launcher/Base.lproj/About.xib
similarity index 100%
rename from macosx/launcher/English.lproj/About.xib
rename to macosx/launcher/Base.lproj/About.xib
diff --git a/macosx/launcher/English.lproj/Launcher.xib b/macosx/launcher/Base.lproj/Launcher.xib
similarity index 100%
rename from macosx/launcher/English.lproj/Launcher.xib
rename to macosx/launcher/Base.lproj/Launcher.xib
diff --git a/macosx/launcher/EternityLaunch.xcodeproj/project.pbxproj b/macosx/launcher/EternityLaunch.xcodeproj/project.pbxproj
index 26fc90d24..7c59de4a8 100644
--- a/macosx/launcher/EternityLaunch.xcodeproj/project.pbxproj
+++ b/macosx/launcher/EternityLaunch.xcodeproj/project.pbxproj
@@ -63,9 +63,10 @@
 		256AC3F00F4B6AF500CF3369 /* EternityLaunch_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EternityLaunch_Prefix.pch; sourceTree = "<group>"; };
 		4F015B8A18775CB100ADB3F4 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AUTHORS; path = ../../AUTHORS; sourceTree = "<group>"; };
 		4F015B8B18775CB100ADB3F4 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../../COPYING; sourceTree = "<group>"; };
-		4F015B8F1877613100ADB3F4 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/About.xib; sourceTree = "<group>"; };
 		4F015B941877636F00ADB3F4 /* ELAboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELAboutController.h; sourceTree = "<group>"; };
 		4F015B951877636F00ADB3F4 /* ELAboutController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ELAboutController.m; sourceTree = "<group>"; };
+		4F1C35A3219E111500795EA0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Launcher.xib; sourceTree = "<group>"; };
+		4F1C35A4219E111500795EA0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/About.xib; sourceTree = "<group>"; };
 		4F2F32B1186710B100EED7DE /* EternityEngine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = EternityEngine.xcodeproj; path = ../EternityEngine.xcodeproj; sourceTree = "<group>"; };
 		4F48AAC820E5682B00AD935F /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = "../sdl-mac-releases/SDL2.framework"; sourceTree = "<group>"; };
 		4F48AACA20E5682B00AD935F /* SDL2_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_mixer.framework; path = "../sdl-mac-releases/SDL2_mixer.framework"; sourceTree = "<group>"; };
@@ -79,7 +80,6 @@
 		FA3011F0168A427B005D25A8 /* ELCommandLineArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ELCommandLineArgument.m; sourceTree = "<group>"; };
 		FA3011F2168A44DF005D25A8 /* ELCommandLineArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELCommandLineArray.h; sourceTree = "<group>"; };
 		FA3011F3168A44DF005D25A8 /* ELCommandLineArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ELCommandLineArray.m; sourceTree = "<group>"; };
-		FA601C7A1696246800046D2D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Launcher.xib; sourceTree = "<group>"; };
 		FA82164B1647128900FF998A /* base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = base; path = ../../base; sourceTree = SOURCE_ROOT; };
 		FA8216761647128900FF998A /* docs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = docs; path = ../../docs; sourceTree = SOURCE_ROOT; };
 		FA8216871647128900FF998A /* user */ = {isa = PBXFileReference; lastKnownFileType = folder; name = user; path = ../../user; sourceTree = SOURCE_ROOT; };
@@ -234,7 +234,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1010;
 				TargetAttributes = {
 					8D1107260486CEB800E47090 = {
 						DevelopmentTeam = 66L236F264;
@@ -251,6 +251,7 @@
 				French,
 				German,
 				en,
+				Base,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* EternityLaunch */;
 			projectDirPath = "";
@@ -329,7 +330,7 @@
 		4F015B8E1877613100ADB3F4 /* About.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				4F015B8F1877613100ADB3F4 /* English */,
+				4F1C35A4219E111500795EA0 /* Base */,
 			);
 			name = About.xib;
 			sourceTree = "<group>";
@@ -337,7 +338,7 @@
 		FA601C791696246800046D2D /* Launcher.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				FA601C7A1696246800046D2D /* English */,
+				4F1C35A3219E111500795EA0 /* Base */,
 			);
 			name = Launcher.xib;
 			sourceTree = "<group>";
@@ -349,6 +350,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_MODEL_TUNING = G5;
@@ -366,6 +368,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_MODEL_TUNING = G5;
diff --git a/macosx/launcher/EternityLaunch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macosx/launcher/EternityLaunch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/macosx/launcher/EternityLaunch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/macosx/launcher/LauncherController.m b/macosx/launcher/LauncherController.m
index 22516723b..6a83f1145 100644
--- a/macosx/launcher/LauncherController.m
+++ b/macosx/launcher/LauncherController.m
@@ -656,7 +656,7 @@ -(BOOL)doAddIwadFromURL:(NSURL *)wURL atIndex:(NSInteger)ind
       
       SET_UNDO(iwadPopUp, doRemoveIwadAtIndex:ind, @"Add/Remove Game WAD")
 
-      NSArray<NSMenuItem *> *items = iwadPopUp.menu.itemArray;
+      NSArray *items = iwadPopUp.menu.itemArray;
       if(ind < 0 || ind >= items.count)
          last = items.lastObject;
       else