diff --git a/Tools/XcodeCapp/English.lproj/MainMenu.nib/designable.nib b/Tools/XcodeCapp/English.lproj/MainMenu.nib/designable.nib
index db4db42b2..c200e4951 100644
--- a/Tools/XcodeCapp/English.lproj/MainMenu.nib/designable.nib
+++ b/Tools/XcodeCapp/English.lproj/MainMenu.nib/designable.nib
@@ -60,7 +60,7 @@
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="524832152">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSTextField" id="135374801">
@@ -103,7 +103,6 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 							<int key="NSvFlags">269</int>
 							<string key="NSFrame">{{108, 20}, {158, 14}}</string>
 							<reference key="NSSuperview" ref="524832152"/>
-							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="371811048">
 								<int key="NSCellFlags">68157504</int>
@@ -118,7 +117,6 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 						</object>
 					</array>
 					<string key="NSFrameSize">{375, 153}</string>
-					<reference key="NSSuperview"/>
 					<reference key="NSNextKeyView" ref="135374801"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -230,6 +228,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{512, 249}</string>
 											<reference key="NSSuperview" ref="493529786"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="185808728"/>
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -314,6 +313,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 									</array>
 									<string key="NSFrame">{{1, 1}, {512, 249}}</string>
 									<reference key="NSSuperview" ref="351336909"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="578469478"/>
 									<reference key="NSDocView" ref="578469478"/>
 									<reference key="NSBGColor" ref="254108606"/>
@@ -324,6 +324,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{413, 17}, {15, 166}}</string>
 									<reference key="NSSuperview" ref="351336909"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="169310253"/>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<reference key="NSTarget" ref="351336909"/>
@@ -335,6 +336,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 183}, {427, 15}}</string>
 									<reference key="NSSuperview" ref="351336909"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="437791480"/>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<int key="NSsFlags">1</int>
@@ -345,6 +347,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 							</array>
 							<string key="NSFrame">{{-1, 35}, {514, 251}}</string>
 							<reference key="NSSuperview" ref="166068453"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="493529786"/>
 							<int key="NSsFlags">133682</int>
 							<reference key="NSVScroller" ref="185808728"/>
@@ -360,6 +363,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{314, 8}, {85, 19}}</string>
 							<reference key="NSSuperview" ref="166068453"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="873219284"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="302978101">
@@ -386,6 +390,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{407, 8}, {85, 19}}</string>
 							<reference key="NSSuperview" ref="166068453"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="566868790">
@@ -406,6 +411,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 					</array>
 					<string key="NSFrameSize">{512, 285}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="351336909"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -422,7 +428,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="516282358">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSScrollView" id="1007710927">
@@ -458,7 +464,7 @@ YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">11525</int>
+												<int key="NSFlags">67120389</int>
 												<int key="NSTextCheckingTypes">0</int>
 												<nil key="NSMarkedAttributes"/>
 												<reference key="NSBackgroundColor" ref="379312939"/>
@@ -566,7 +572,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 						</object>
 					</array>
 					<string key="NSFrameSize">{716, 571}</string>
-					<reference key="NSSuperview"/>
 					<reference key="NSNextKeyView" ref="1007710927"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -853,8 +858,9 @@ d2hhdCB5b3UgYXJlIGRvaW5nLCBsZWF2ZSB0aGlzIG9uICJBdXRvIi4</string>
 					<object class="NSButton" id="1003500738">
 						<reference key="NSNextResponder" ref="765897076"/>
 						<int key="NSvFlags">297</int>
-						<string key="NSFrame">{{281, 18}, {18, 19}}</string>
+						<string key="NSFrame">{{182, 19}, {18, 19}}</string>
 						<reference key="NSSuperview" ref="765897076"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="16212794">
@@ -879,8 +885,9 @@ d2hhdCB5b3UgYXJlIGRvaW5nLCBsZWF2ZSB0aGlzIG9uICJBdXRvIi4</string>
 					<object class="NSTextField" id="284994474">
 						<reference key="NSNextResponder" ref="765897076"/>
 						<int key="NSvFlags">274</int>
-						<string key="NSFrame">{{7, 12}, {265, 18}}</string>
+						<string key="NSFrame">{{7, 9}, {170, 18}}</string>
 						<reference key="NSSuperview" ref="765897076"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1003500738"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="24981968">
@@ -897,8 +904,9 @@ d2hhdCB5b3UgYXJlIGRvaW5nLCBsZWF2ZSB0aGlzIG9uICJBdXRvIi4</string>
 					<object class="NSTextField" id="1060533501">
 						<reference key="NSNextResponder" ref="765897076"/>
 						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{7, 30}, {265, 17}}</string>
+						<string key="NSFrame">{{7, 30}, {170, 17}}</string>
 						<reference key="NSSuperview" ref="765897076"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="284994474"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1045170492">
@@ -920,8 +928,9 @@ d2hhdCB5b3UgYXJlIGRvaW5nLCBsZWF2ZSB0aGlzIG9uICJBdXRvIi4</string>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{308, 56}</string>
+				<string key="NSFrameSize">{209, 57}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1060533501"/>
 				<string key="NSClassName">TNErrorDataView</string>
 			</object>
@@ -1791,8 +1800,8 @@ d2hhdCB5b3UgYXJlIGRvaW5nLCBsZWF2ZSB0aGlzIG9uICJBdXRvIi4</string>
 						<reference key="object" ref="765897076"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="1060533501"/>
-							<reference ref="284994474"/>
 							<reference ref="1003500738"/>
+							<reference ref="284994474"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1924,7 +1933,192 @@ d2hhdCB5b3UgYXJlIGRvaW5nLCBsZWF2ZSB0aGlzIG9uICJBdXRvIi4</string>
 			<nil key="sourceID"/>
 			<int key="maxID">690</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">AppController</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="chooseFolder:">id</string>
+						<string key="clearErrors:">id</string>
+						<string key="openAbout:">id</string>
+						<string key="openErrors:">id</string>
+						<string key="openHelp:">id</string>
+						<string key="openXCode:">id</string>
+						<string key="stopListener:">id</string>
+						<string key="updatePreferences:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="chooseFolder:">
+							<string key="name">chooseFolder:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="clearErrors:">
+							<string key="name">clearErrors:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="openAbout:">
+							<string key="name">openAbout:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="openErrors:">
+							<string key="name">openErrors:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="openHelp:">
+							<string key="name">openHelp:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="openXCode:">
+							<string key="name">openXCode:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="stopListener:">
+							<string key="name">stopListener:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="updatePreferences:">
+							<string key="name">updatePreferences:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="aboutWindow">NSPanel</string>
+						<string key="buttonPreferencesAPIMode">NSPopUpButton</string>
+						<string key="checkBoxPreferencesReactMode">NSButton</string>
+						<string key="dataViewError">TNErrorDataView</string>
+						<string key="errorsPanel">NSPanel</string>
+						<string key="errorsTable">NSTableView</string>
+						<string key="helpTextView">NSTextView</string>
+						<string key="helpWindow">NSWindow</string>
+						<string key="labelVersion">NSTextField</string>
+						<string key="menuDebug">NSMenuItem</string>
+						<string key="menuItemOpenXCode">NSMenuItem</string>
+						<string key="menuItemStartStop">NSMenuItem</string>
+						<string key="preferencesController">NSUserDefaultsController</string>
+						<string key="statusMenu">NSMenu</string>
+						<string key="windowDebug">NSWindow</string>
+						<string key="xcc">TNXCodeCapp</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="aboutWindow">
+							<string key="name">aboutWindow</string>
+							<string key="candidateClassName">NSPanel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="buttonPreferencesAPIMode">
+							<string key="name">buttonPreferencesAPIMode</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkBoxPreferencesReactMode">
+							<string key="name">checkBoxPreferencesReactMode</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dataViewError">
+							<string key="name">dataViewError</string>
+							<string key="candidateClassName">TNErrorDataView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="errorsPanel">
+							<string key="name">errorsPanel</string>
+							<string key="candidateClassName">NSPanel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="errorsTable">
+							<string key="name">errorsTable</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="helpTextView">
+							<string key="name">helpTextView</string>
+							<string key="candidateClassName">NSTextView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="helpWindow">
+							<string key="name">helpWindow</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="labelVersion">
+							<string key="name">labelVersion</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="menuDebug">
+							<string key="name">menuDebug</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="menuItemOpenXCode">
+							<string key="name">menuItemOpenXCode</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="menuItemStartStop">
+							<string key="name">menuItemStartStop</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="preferencesController">
+							<string key="name">preferencesController</string>
+							<string key="candidateClassName">NSUserDefaultsController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="statusMenu">
+							<string key="name">statusMenu</string>
+							<string key="candidateClassName">NSMenu</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="windowDebug">
+							<string key="name">windowDebug</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="xcc">
+							<string key="name">xcc</string>
+							<string key="candidateClassName">TNXCodeCapp</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AppController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TNErrorDataView</string>
+					<string key="superclassName">NSView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">openFile:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">openFile:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">openFile:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="buttonOpenFile">NSButton</string>
+						<string key="fieldFileName">NSTextField</string>
+						<string key="fieldMessage">NSTextField</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="buttonOpenFile">
+							<string key="name">buttonOpenFile</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fieldFileName">
+							<string key="name">fieldFileName</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fieldMessage">
+							<string key="name">fieldMessage</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TNErrorDataView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TNXCodeCapp</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TNXCodeCapp.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
diff --git a/Tools/XcodeCapp/English.lproj/MainMenu.nib/keyedobjects.nib b/Tools/XcodeCapp/English.lproj/MainMenu.nib/keyedobjects.nib
index d5521dd50..3d5aee710 100644
Binary files a/Tools/XcodeCapp/English.lproj/MainMenu.nib/keyedobjects.nib and b/Tools/XcodeCapp/English.lproj/MainMenu.nib/keyedobjects.nib differ