diff --git a/MacVim.xcodeproj/project.pbxproj b/MacVim.xcodeproj/project.pbxproj
index 84316bbd38..1c75bb2418 100644
--- a/MacVim.xcodeproj/project.pbxproj
+++ b/MacVim.xcodeproj/project.pbxproj
@@ -513,10 +513,7 @@
 		1DF7D93A0BC05175006CF13F /* My Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -550,10 +547,7 @@
 		C01FCF4B08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -578,10 +572,7 @@
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/MacVim.xcodeproj/winckler.mode1 b/MacVim.xcodeproj/winckler.mode1
index d8b9ba9ed1..ce5ec79ef7 100644
--- a/MacVim.xcodeproj/winckler.mode1
+++ b/MacVim.xcodeproj/winckler.mode1
@@ -263,7 +263,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>0</integer>
+									<integer>6</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
@@ -367,9 +367,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>1DDE37030C572B47007FB583</string>
+				<string>1DC70EB80C57D44B0079D3C6</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>1DDE37040C572B47007FB583</string>
+				<string>1DC70EB90C57D44B0079D3C6</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -504,8 +504,7 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>1D16B9EF0BA33E3800A69B33</string>
-		<string>1C0AD2B3069F1EA900FABCE6</string>
-		<string>/Users/winckler/Projects/vim70/src/MacVim/MacVim.xcodeproj</string>
+		<string>/Users/winckler/Projects/vim7/src/MacVim/MacVim.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>168 349 690 397 0 0 1024 746 </string>
@@ -546,6 +545,8 @@
 							<string>194pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -585,7 +586,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1D16B9EF0BA33E3800A69B33</string>
-				<string>1DDE37050C572B47007FB583</string>
+				<string>1DC70EB70C57D44A0079D3C6</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
diff --git a/MacVim.xcodeproj/winckler.pbxuser b/MacVim.xcodeproj/winckler.pbxuser
index 04c3529812..088bfefa8a 100644
--- a/MacVim.xcodeproj/winckler.pbxuser
+++ b/MacVim.xcodeproj/winckler.pbxuser
@@ -215,8 +215,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 207039262;
-			PBXWorkspaceStateSaveDate = 207039262;
+			PBXPerProjectTemplateStateSaveDate = 207082110;
+			PBXWorkspaceStateSaveDate = 207082110;
 		};
 		sourceControlManager = 1D16B9DD0BA33BB000A69B33 /* Source Control */;
 		userBuildSettings = {
diff --git a/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj b/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj
index 78cf6b6d03..15efd2030f 100644
--- a/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj
+++ b/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj
@@ -534,10 +534,7 @@
 		C056398008A954F8003078D8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -563,10 +560,7 @@
 		C056398108A954F8003078D8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(NATIVE_ARCH)";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
diff --git a/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.mode1 b/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.mode1
index fc778d781a..524ae0f825 100644
--- a/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.mode1
+++ b/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.mode1
@@ -367,9 +367,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>1D493DC50C5253D100AB718C</string>
+				<string>1DC70EA20C57D2650079D3C6</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>1D493DC60C5253D100AB718C</string>
+				<string>1DC70EA30C57D2650079D3C6</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -503,8 +503,7 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>1D82C60E0AC093AF00AAD418</string>
-		<string>/Users/winckler/Projects/vim70/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj</string>
+		<string>/Users/winckler/Projects/vim7/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>160 82 690 397 0 0 1024 746 </string>
diff --git a/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.pbxuser b/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.pbxuser
index 745102e89d..1acc84889c 100644
--- a/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.pbxuser
+++ b/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.pbxuser
@@ -49,8 +49,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 206721719;
-			PBXWorkspaceStateSaveDate = 206721719;
+			PBXPerProjectTemplateStateSaveDate = 207082065;
+			PBXWorkspaceStateSaveDate = 207082065;
 		};
 		sourceControlManager = 1D82C6100AC093AF00AAD418 /* Source Control */;
 		userBuildSettings = {