diff --git a/Tools/xcodecapp-cocoa/AppController.h b/Tools/xcodecapp-cocoa/AppController.h
index 8e661090e..be33fbfcf 100644
--- a/Tools/xcodecapp-cocoa/AppController.h
+++ b/Tools/xcodecapp-cocoa/AppController.h
@@ -1,6 +1,6 @@
 /*
- * This file is a part of program xcodecapp-cocoa
- * Copyright (C) 2011  Antoine Mercadal (primalmotion@archipelproject.org)
+ * This file is a part of program XcodeCapp
+ * Copyright (C) 2011  Antoine Mercadal (<primalmotion@archipelproject.org>)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Tools/xcodecapp-cocoa/AppController.m b/Tools/xcodecapp-cocoa/AppController.m
index 370a87b21..b6aabb8ae 100644
--- a/Tools/xcodecapp-cocoa/AppController.m
+++ b/Tools/xcodecapp-cocoa/AppController.m
@@ -1,6 +1,6 @@
 /*
- * This file is a part of program xcodecapp-cocoa
- * Copyright (C) 2011  Antoine Mercadal (primalmotion@archipelproject.org)
+ * This file is a part of program XcodeCapp
+ * Copyright (C) 2011  Antoine Mercadal (<primalmotion@archipelproject.org>)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,9 +57,9 @@ AppController *SharedAppControllerInstance = nil;
 
     [self registerDefaults];
     
-    _iconInactive = [[NSImage alloc] initWithContentsOfFile:[bundle pathForResource:@"xcodecapp-cocoa-icon-inactive" ofType:@"png"]];
-    _iconActive = [[NSImage alloc] initWithContentsOfFile:[bundle pathForResource:@"xcodecapp-cocoa-icon-active" ofType:@"png"]];
-    _iconWorking = [[NSImage alloc] initWithContentsOfFile:[bundle pathForResource:@"xcodecapp-cocoa-icon-working" ofType:@"png"]];
+    _iconInactive = [[NSImage alloc] initWithContentsOfFile:[bundle pathForResource:@"xcodecapp-icon-inactive" ofType:@"png"]];
+    _iconActive = [[NSImage alloc] initWithContentsOfFile:[bundle pathForResource:@"xcodecapp-icon-active" ofType:@"png"]];
+    _iconWorking = [[NSImage alloc] initWithContentsOfFile:[bundle pathForResource:@"xcodecapp-icon-working" ofType:@"png"]];
     [_iconActive setSize:NSMakeSize(14.0, 16.0)];
     [_iconInactive setSize:NSMakeSize(14.0, 16.0)];
     [_iconWorking setSize:NSMakeSize(14.0, 16.0)];
diff --git a/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/designable.nib b/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/designable.nib
index d8640f623..47037a4e4 100644
--- a/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/designable.nib
+++ b/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/designable.nib
@@ -59,7 +59,7 @@
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="524832152">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSTextField" id="135374801">
@@ -67,14 +67,15 @@
 							<int key="NSvFlags">269</int>
 							<string key="NSFrame">{{27, 63}, {320, 70}}</string>
 							<reference key="NSSuperview" ref="524832152"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="445944489"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="192314140">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">138544128</int>
-								<string type="base64-UTF8" key="NSContents">eENvZGVDYXBwLWNvY29hIGRldmVsb3BlZCBieSBBbnRvaW5lIE1lcmNhZGFsCnByaW1hbG1vdGlvbkBh
-cmNoaXBlbHByb2plY3Qub3JnCgp3aXRoIGNvbnRyaWJ1dGlvbnMgZnJvbSBBcGFyYWppdGEgRmlzaG1h
-bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
+								<string type="base64-UTF8" key="NSContents">WGNvZGVDYXBwIGRldmVsb3BlZCBieSBBbnRvaW5lIE1lcmNhZGFsCnByaW1hbG1vdGlvbkBhcmNoaXBl
+bHByb2plY3Qub3JnCgp3aXRoIGNvbnRyaWJ1dGlvbnMgZnJvbSBBcGFyYWppdGEgRmlzaG1hbgphcGFy
+YWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 								<object class="NSFont" key="NSSupport" id="26">
 									<string key="NSName">LucidaGrande</string>
 									<double key="NSSize">11</double>
@@ -101,6 +102,7 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 							<int key="NSvFlags">269</int>
 							<string key="NSFrame">{{108, 20}, {158, 14}}</string>
 							<reference key="NSSuperview" ref="524832152"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="371811048">
 								<int key="NSCellFlags">68288064</int>
@@ -114,6 +116,8 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 						</object>
 					</array>
 					<string key="NSFrameSize">{375, 153}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="135374801"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -580,7 +584,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="145172240">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSButton" id="278198131">
@@ -757,7 +761,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							<int key="NSvFlags">269</int>
 							<string key="NSFrame">{{127, 41}, {303, 17}}</string>
 							<reference key="NSSuperview" ref="145172240"/>
-							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="858384253">
 								<int key="NSCellFlags">68288064</int>
@@ -836,7 +839,6 @@ d2hhdCB5b3UgZG8sIGxlYXZlIHRoaXMgdG8gIkF1dG8iLg</string>
 						</object>
 					</array>
 					<string key="NSFrameSize">{478, 265}</string>
-					<reference key="NSSuperview"/>
 					<reference key="NSNextKeyView" ref="874707784"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -1769,7 +1771,144 @@ d2hhdCB5b3UgZG8sIGxlYXZlIHRoaXMgdG8gIkF1dG8iLg</string>
 			<nil key="sourceID"/>
 			<int key="maxID">658</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="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="menuItemOpenXCode">NSMenuItem</string>
+						<string key="menuItemStartStop">NSMenuItem</string>
+						<string key="preferencesController">NSUserDefaultsController</string>
+						<string key="preferencesWindow">NSWindow</string>
+						<string key="statusMenu">NSMenu</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="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="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="preferencesWindow">
+							<string key="name">preferencesWindow</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="statusMenu">
+							<string key="name">statusMenu</string>
+							<string key="candidateClassName">NSMenu</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">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-cocoa/English.lproj/MainMenu.nib/keyedobjects.nib b/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/keyedobjects.nib
index 342a7406a..838794262 100644
Binary files a/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/keyedobjects.nib and b/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/Tools/xcodecapp-cocoa/FSEventCallback.h b/Tools/xcodecapp-cocoa/FSEventCallback.h
index 8a785ec53..c2be69d15 100644
--- a/Tools/xcodecapp-cocoa/FSEventCallback.h
+++ b/Tools/xcodecapp-cocoa/FSEventCallback.h
@@ -1,6 +1,6 @@
 /*
- * This file is a part of program xcodecapp-cocoa
- * Copyright (C) 2011  Antoine Mercadal (primalmotion@archipelproject.org)
+ * This file is a part of program XcodeCapp
+ * Copyright (C) 2011  Antoine Mercadal (<primalmotion@archipelproject.org>)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Tools/xcodecapp-cocoa/FSEventCallback.m b/Tools/xcodecapp-cocoa/FSEventCallback.m
index 8577badd6..98eb65c8d 100644
--- a/Tools/xcodecapp-cocoa/FSEventCallback.m
+++ b/Tools/xcodecapp-cocoa/FSEventCallback.m
@@ -1,6 +1,6 @@
 /*
- * This file is a part of program xcodecapp-cocoa
- * Copyright (C) 2011  Antoine Mercadal (primalmotion@archipelproject.org)
+ * This file is a part of program XcodeCapp
+ * Copyright (C) 2011  Antoine Mercadal (<primalmotion@archipelproject.org>)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Tools/xcodecapp-cocoa/Info.plist b/Tools/xcodecapp-cocoa/Info.plist
index 36e05c47e..53973c70a 100644
--- a/Tools/xcodecapp-cocoa/Info.plist
+++ b/Tools/xcodecapp-cocoa/Info.plist
@@ -7,24 +7,28 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string>xcodecapp-cocoa.icns</string>
+	<string>XcodeCapp.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.cappuccino.xcodecapp-cocoa</string>
+	<string>org.cappuccino.xcodecapp</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>2.0</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
+	<key>LSUIElement</key>
+	<true/>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>LSUIElement</key>
-	<true/>
 </dict>
 </plist>
diff --git a/Tools/xcodecapp-cocoa/PRHEmptyGrowlDelegate.h b/Tools/xcodecapp-cocoa/PRHEmptyGrowlDelegate.h
index 9e516f08b..480ea6d46 100644
--- a/Tools/xcodecapp-cocoa/PRHEmptyGrowlDelegate.h
+++ b/Tools/xcodecapp-cocoa/PRHEmptyGrowlDelegate.h
@@ -1,6 +1,6 @@
 //
 //  PRHEmptyGrowlDelegate.h
-//  xcodecapp-cocoa
+//  XcodeCapp
 //
 //  Created by Andrea D'Amore on 19/06/11.
 //  Copyright 2011 by author. All rights reserved.
diff --git a/Tools/xcodecapp-cocoa/PRHEmptyGrowlDelegate.m b/Tools/xcodecapp-cocoa/PRHEmptyGrowlDelegate.m
index 76dc231dc..cdd5148a0 100644
--- a/Tools/xcodecapp-cocoa/PRHEmptyGrowlDelegate.m
+++ b/Tools/xcodecapp-cocoa/PRHEmptyGrowlDelegate.m
@@ -1,6 +1,6 @@
 //
 //  PRHEmptyGrowlDelegate.h
-//  xcodecapp-cocoa
+//  XcodeCapp
 //
 //  Created by Andrea D'Amore on 19/06/11.
 //  Copyright 2011 by author. All rights reserved.
diff --git a/Tools/xcodecapp-cocoa/TNXCodeCapp.h b/Tools/xcodecapp-cocoa/TNXCodeCapp.h
index f196de030..b4459f4a0 100644
--- a/Tools/xcodecapp-cocoa/TNXCodeCapp.h
+++ b/Tools/xcodecapp-cocoa/TNXCodeCapp.h
@@ -1,6 +1,6 @@
 /*
- * This file is a part of program xcodecapp-cocoa
- * Copyright (C) 2011  Antoine Mercadal (primalmotion@archipelproject.org)
+ * This file is a part of program XcodeCapp
+ * Copyright (C) 2011  Antoine Mercadal (<primalmotion@archipelproject.org>)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Tools/xcodecapp-cocoa/TNXCodeCapp.m b/Tools/xcodecapp-cocoa/TNXCodeCapp.m
index cdae5eaf8..672db20c8 100644
--- a/Tools/xcodecapp-cocoa/TNXCodeCapp.m
+++ b/Tools/xcodecapp-cocoa/TNXCodeCapp.m
@@ -1,6 +1,6 @@
 /*
- * This file is a part of program xcodecapp-cocoa
- * Copyright (C) 2011  Antoine Mercadal (primalmotion@archipelproject.org)
+ * This file is a part of program XcodeCapp
+ * Copyright (C) 2011  Antoine Mercadal (<primalmotion@archipelproject.org>)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -86,7 +86,7 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
                                              defaultButton:@"OK"
                                            alternateButton:nil
                                                otherButton:nil
-                                 informativeTextWithFormat:@"Neither ~/.bash_profile, ~/.profile, ~/.bashrc nor ~/.zshrc can be found.\n\nWithout this XcodeCapp-cocoa cannot locate nib2cib.\n\nIf you notice any errors or strange behaviour, please look at the system log for messages and open a ticket."];
+                                 informativeTextWithFormat:@"Neither ~/.bash_profile, ~/.profile, ~/.bashrc nor ~/.zshrc can be found.\n\nWithout this XcodeCapp cannot locate nib2cib.\n\nIf you notice any errors or strange behaviour, please look at the system log for messages and open a ticket."];
             [alert runModal];
             profilePath = @"";
         }
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.icns b/Tools/xcodecapp-cocoa/XcodeCapp.icns
similarity index 100%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa.icns
rename to Tools/xcodecapp-cocoa/XcodeCapp.icns
diff --git a/Tools/xcodecapp-cocoa/XcodeCapp.pch b/Tools/xcodecapp-cocoa/XcodeCapp.pch
new file mode 100644
index 000000000..c3ac0cfad
--- /dev/null
+++ b/Tools/xcodecapp-cocoa/XcodeCapp.pch
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'XcodeCapp' target in the 'XcodeCapp' project
+//
+
+#ifdef __OBJC__
+    #import <Cocoa/Cocoa.h>
+#endif
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/TemplateIcon.icns b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/TemplateIcon.icns
similarity index 100%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/TemplateIcon.icns
rename to Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/TemplateIcon.icns
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/awt.mode1v3 b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/awt.mode1v3
similarity index 100%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/awt.mode1v3
rename to Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/awt.mode1v3
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/awt.pbxuser b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/awt.pbxuser
similarity index 100%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/awt.pbxuser
rename to Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/awt.pbxuser
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/project.pbxproj b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/project.pbxproj
similarity index 82%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/project.pbxproj
rename to Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/project.pbxproj
index 995980dfd..f09cdea57 100644
--- a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/project.pbxproj
+++ b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/project.pbxproj
@@ -7,12 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		024A03DD13696C1900DCBE4D /* xcodecapp-cocoa.icns in Resources */ = {isa = PBXBuildFile; fileRef = 024A03DC13696C1900DCBE4D /* xcodecapp-cocoa.icns */; };
-		024A03DF13696D9500DCBE4D /* xcodecapp-cocoa.png in Resources */ = {isa = PBXBuildFile; fileRef = 024A03DE13696D9500DCBE4D /* xcodecapp-cocoa.png */; };
 		024A040B13698E7800DCBE4D /* project.pbxproj in Resources */ = {isa = PBXBuildFile; fileRef = 024A040A13698E7700DCBE4D /* project.pbxproj */; };
 		024A041413699DD400DCBE4D /* parser.j in Resources */ = {isa = PBXBuildFile; fileRef = 024A041113699D6800DCBE4D /* parser.j */; };
-		026F3B6213866B0B00EE5B83 /* xcodecapp-cocoa-icon-inactive.png in Resources */ = {isa = PBXBuildFile; fileRef = 026F3B6113866B0B00EE5B83 /* xcodecapp-cocoa-icon-inactive.png */; };
-		026F3B6513866E7D00EE5B83 /* xcodecapp-cocoa-icon-active.png in Resources */ = {isa = PBXBuildFile; fileRef = 026F3B6413866E7D00EE5B83 /* xcodecapp-cocoa-icon-active.png */; };
+		026F3B6213866B0B00EE5B83 /* xcodecapp-icon-inactive.png in Resources */ = {isa = PBXBuildFile; fileRef = 026F3B6113866B0B00EE5B83 /* xcodecapp-icon-inactive.png */; };
+		026F3B6513866E7D00EE5B83 /* xcodecapp-icon-active.png in Resources */ = {isa = PBXBuildFile; fileRef = 026F3B6413866E7D00EE5B83 /* xcodecapp-icon-active.png */; };
 		027D999B13696A7000D3DB13 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
 		027D999C13696A7000D3DB13 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		027D999E13696A7000D3DB13 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
@@ -21,8 +19,9 @@
 		027D99A213696A7000D3DB13 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E01A8DD0DE51A7C0008BB35 /* CoreServices.framework */; };
 		027FE49A1462C6CF00B1AB92 /* help.rtfd in Resources */ = {isa = PBXBuildFile; fileRef = 027FE4991462C6CF00B1AB92 /* help.rtfd */; };
 		027FE49D1462D74C00B1AB92 /* TNXCodeCapp.m in Sources */ = {isa = PBXBuildFile; fileRef = 027FE49C1462D74C00B1AB92 /* TNXCodeCapp.m */; };
-		027FE4BA1462F64E00B1AB92 /* xcodecapp-cocoa-icon-working.png in Resources */ = {isa = PBXBuildFile; fileRef = 027FE4B91462F64E00B1AB92 /* xcodecapp-cocoa-icon-working.png */; };
+		027FE4BA1462F64E00B1AB92 /* xcodecapp-icon-working.png in Resources */ = {isa = PBXBuildFile; fileRef = 027FE4B91462F64E00B1AB92 /* xcodecapp-icon-working.png */; };
 		027FE4BD1462F7EB00B1AB92 /* FSEventCallback.m in Sources */ = {isa = PBXBuildFile; fileRef = 027FE4BC1462F7EB00B1AB92 /* FSEventCallback.m */; };
+		0289AC9414668CAF003CD975 /* XcodeCapp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0289AC9314668CAF003CD975 /* XcodeCapp.icns */; };
 		02998CEB1369BF7D006C73DB /* Growl Registration Ticket.growlRegDict in Resources */ = {isa = PBXBuildFile; fileRef = 02998CEA1369BF7D006C73DB /* Growl Registration Ticket.growlRegDict */; };
 		02998CF71369C339006C73DB /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02998CF61369C339006C73DB /* Growl.framework */; };
 		02998CF91369C38A006C73DB /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 02998CF61369C339006C73DB /* Growl.framework */; };
@@ -43,20 +42,19 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		024A03DC13696C1900DCBE4D /* xcodecapp-cocoa.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "xcodecapp-cocoa.icns"; sourceTree = "<group>"; };
-		024A03DE13696D9500DCBE4D /* xcodecapp-cocoa.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "xcodecapp-cocoa.png"; sourceTree = "<group>"; };
 		024A040A13698E7700DCBE4D /* project.pbxproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.pbxproject; path = project.pbxproj; sourceTree = "<group>"; };
 		024A041113699D6800DCBE4D /* parser.j */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.objj; path = parser.j; sourceTree = "<group>"; };
-		026F3B6113866B0B00EE5B83 /* xcodecapp-cocoa-icon-inactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "xcodecapp-cocoa-icon-inactive.png"; sourceTree = "<group>"; };
-		026F3B6413866E7D00EE5B83 /* xcodecapp-cocoa-icon-active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "xcodecapp-cocoa-icon-active.png"; sourceTree = "<group>"; };
-		027D9989136969DD00D3DB13 /* xcodecapp-cocoa.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "xcodecapp-cocoa.pch"; sourceTree = "<group>"; };
-		027D99A613696A7000D3DB13 /* xcodecapp-cocoa.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "xcodecapp-cocoa.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		026F3B6113866B0B00EE5B83 /* xcodecapp-icon-inactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "xcodecapp-icon-inactive.png"; sourceTree = "<group>"; };
+		026F3B6413866E7D00EE5B83 /* xcodecapp-icon-active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "xcodecapp-icon-active.png"; sourceTree = "<group>"; };
+		027D9989136969DD00D3DB13 /* XcodeCapp.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XcodeCapp.pch; sourceTree = "<group>"; };
+		027D99A613696A7000D3DB13 /* XcodeCapp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XcodeCapp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		027FE4991462C6CF00B1AB92 /* help.rtfd */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; path = help.rtfd; sourceTree = "<group>"; };
 		027FE49B1462D74C00B1AB92 /* TNXCodeCapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TNXCodeCapp.h; sourceTree = "<group>"; };
 		027FE49C1462D74C00B1AB92 /* TNXCodeCapp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TNXCodeCapp.m; sourceTree = "<group>"; };
-		027FE4B91462F64E00B1AB92 /* xcodecapp-cocoa-icon-working.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "xcodecapp-cocoa-icon-working.png"; sourceTree = "<group>"; };
+		027FE4B91462F64E00B1AB92 /* xcodecapp-icon-working.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "xcodecapp-icon-working.png"; sourceTree = "<group>"; };
 		027FE4BB1462F7D600B1AB92 /* FSEventCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSEventCallback.h; sourceTree = "<group>"; };
 		027FE4BC1462F7EB00B1AB92 /* FSEventCallback.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSEventCallback.m; sourceTree = "<group>"; };
+		0289AC9314668CAF003CD975 /* XcodeCapp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = XcodeCapp.icns; sourceTree = "<group>"; };
 		02998CEA1369BF7D006C73DB /* Growl Registration Ticket.growlRegDict */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Growl Registration Ticket.growlRegDict"; sourceTree = "<group>"; };
 		02998CF61369C339006C73DB /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; };
 		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -126,7 +124,7 @@
 		19C28FACFE9D520D11CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				027D99A613696A7000D3DB13 /* xcodecapp-cocoa.app */,
+				027D99A613696A7000D3DB13 /* XcodeCapp.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -146,7 +144,7 @@
 		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
-				027D9989136969DD00D3DB13 /* xcodecapp-cocoa.pch */,
+				027D9989136969DD00D3DB13 /* XcodeCapp.pch */,
 				29B97316FDCFA39411CA2CEA /* main.m */,
 				E12AA95F14637828006F55D6 /* macros.h */,
 			);
@@ -156,15 +154,14 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				027FE4B91462F64E00B1AB92 /* xcodecapp-cocoa-icon-working.png */,
+				027FE4B91462F64E00B1AB92 /* xcodecapp-icon-working.png */,
 				027FE4991462C6CF00B1AB92 /* help.rtfd */,
-				026F3B6413866E7D00EE5B83 /* xcodecapp-cocoa-icon-active.png */,
-				026F3B6113866B0B00EE5B83 /* xcodecapp-cocoa-icon-inactive.png */,
+				026F3B6413866E7D00EE5B83 /* xcodecapp-icon-active.png */,
+				026F3B6113866B0B00EE5B83 /* xcodecapp-icon-inactive.png */,
 				024A041113699D6800DCBE4D /* parser.j */,
-				024A03DE13696D9500DCBE4D /* xcodecapp-cocoa.png */,
 				024A040A13698E7700DCBE4D /* project.pbxproj */,
-				024A03DC13696C1900DCBE4D /* xcodecapp-cocoa.icns */,
 				8D1107310486CEB800E47090 /* Info.plist */,
+				0289AC9314668CAF003CD975 /* XcodeCapp.icns */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
 				02998CEA1369BF7D006C73DB /* Growl Registration Ticket.growlRegDict */,
@@ -185,9 +182,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		027D999913696A7000D3DB13 /* xcodecapp-cocoa */ = {
+		027D999913696A7000D3DB13 /* XcodeCapp */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 027D99A313696A7000D3DB13 /* Build configuration list for PBXNativeTarget "xcodecapp-cocoa" */;
+			buildConfigurationList = 027D99A313696A7000D3DB13 /* Build configuration list for PBXNativeTarget "XcodeCapp" */;
 			buildPhases = (
 				027D999A13696A7000D3DB13 /* Resources */,
 				027D999D13696A7000D3DB13 /* Sources */,
@@ -198,10 +195,10 @@
 			);
 			dependencies = (
 			);
-			name = "xcodecapp-cocoa";
+			name = XcodeCapp;
 			productInstallPath = "$(HOME)/Applications";
 			productName = "xcodecapp-cocoa";
-			productReference = 027D99A613696A7000D3DB13 /* xcodecapp-cocoa.app */;
+			productReference = 027D99A613696A7000D3DB13 /* XcodeCapp.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -212,7 +209,7 @@
 			attributes = {
 				LastUpgradeCheck = 0420;
 			};
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "xcodecapp-cocoa" */;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "XcodeCapp" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -223,7 +220,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				027D999913696A7000D3DB13 /* xcodecapp-cocoa */,
+				027D999913696A7000D3DB13 /* XcodeCapp */,
 			);
 		};
 /* End PBXProject section */
@@ -235,15 +232,14 @@
 			files = (
 				027D999B13696A7000D3DB13 /* MainMenu.nib in Resources */,
 				027D999C13696A7000D3DB13 /* InfoPlist.strings in Resources */,
-				024A03DD13696C1900DCBE4D /* xcodecapp-cocoa.icns in Resources */,
 				024A041413699DD400DCBE4D /* parser.j in Resources */,
-				024A03DF13696D9500DCBE4D /* xcodecapp-cocoa.png in Resources */,
 				024A040B13698E7800DCBE4D /* project.pbxproj in Resources */,
 				02998CEB1369BF7D006C73DB /* Growl Registration Ticket.growlRegDict in Resources */,
-				026F3B6213866B0B00EE5B83 /* xcodecapp-cocoa-icon-inactive.png in Resources */,
-				026F3B6513866E7D00EE5B83 /* xcodecapp-cocoa-icon-active.png in Resources */,
+				026F3B6213866B0B00EE5B83 /* xcodecapp-icon-inactive.png in Resources */,
+				026F3B6513866E7D00EE5B83 /* xcodecapp-icon-active.png in Resources */,
 				027FE49A1462C6CF00B1AB92 /* help.rtfd in Resources */,
-				027FE4BA1462F64E00B1AB92 /* xcodecapp-cocoa-icon-working.png in Resources */,
+				027FE4BA1462F64E00B1AB92 /* xcodecapp-icon-working.png in Resources */,
+				0289AC9414668CAF003CD975 /* XcodeCapp.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -298,10 +294,10 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "xcodecapp-cocoa.pch";
+				GCC_PREFIX_HEADER = XcodeCapp.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Applications;
-				PRODUCT_NAME = "xcodecapp-cocoa";
+				PRODUCT_NAME = XcodeCapp;
 			};
 			name = Debug;
 		};
@@ -317,10 +313,10 @@
 				GCC_ENABLE_OBJC_GC = required;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "xcodecapp-cocoa.pch";
+				GCC_PREFIX_HEADER = XcodeCapp.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Applications;
-				PRODUCT_NAME = "xcodecapp-cocoa";
+				PRODUCT_NAME = XcodeCapp;
 			};
 			name = Release;
 		};
@@ -361,7 +357,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		027D99A313696A7000D3DB13 /* Build configuration list for PBXNativeTarget "xcodecapp-cocoa" */ = {
+		027D99A313696A7000D3DB13 /* Build configuration list for PBXNativeTarget "XcodeCapp" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				027D99A413696A7000D3DB13 /* Debug */,
@@ -370,7 +366,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "xcodecapp-cocoa" */ = {
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "XcodeCapp" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 68%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 51526990b..3573bd231 100644
--- a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:xcodecapp-cocoa.xcodeproj">
+      location = "self:XcodeCapp.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/project.xcworkspace/xcuserdata/Tonio.xcuserdatad/WorkspaceSettings.xcsettings b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/project.xcworkspace/xcuserdata/Tonio.xcuserdatad/WorkspaceSettings.xcsettings
similarity index 100%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/project.xcworkspace/xcuserdata/Tonio.xcuserdatad/WorkspaceSettings.xcsettings
rename to Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/project.xcworkspace/xcuserdata/Tonio.xcuserdatad/WorkspaceSettings.xcsettings
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
similarity index 100%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
rename to Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcschememanagement.plist b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcschememanagement.plist
similarity index 89%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcschememanagement.plist
rename to Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcschememanagement.plist
index 0204e662c..06978ff0b 100644
--- a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Tools/xcodecapp-cocoa/XcodeCapp.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,16 +4,16 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>xcodecapp-cocoa RELEASE.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
-		<key>xcodecapp-cocoa.xcscheme</key>
+		<key>XcodeCapp Debug.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>XcodeCapp Release.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
diff --git a/Tools/xcodecapp-cocoa/help.rtfd/TXT.rtf b/Tools/xcodecapp-cocoa/help.rtfd/TXT.rtf
index df5200b5e..b357ad64d 100644
--- a/Tools/xcodecapp-cocoa/help.rtfd/TXT.rtf
+++ b/Tools/xcodecapp-cocoa/help.rtfd/TXT.rtf
@@ -5,22 +5,23 @@
 \paperw11900\paperh16840\margl1440\margr1440\vieww19580\viewh15960\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\f0\b\fs36 \cf0 xCodeCapp Help
+\f0\b\fs36 \cf0 XcodeCapp Help
 \b0 \
 \
 
-\b\fs24 What it xCodeCapp\
+\b\fs24 What it XcodeCapp\
 
 \b0\fs36 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qj
 
-\fs24 \cf0 xCodeCapp-Cocoa is an utility tool that helps you to greatly improve your Cappuccino development workflow. One of the main stunning thing about Cappuccino is the ability to use Apple's xCode IDE to create your interfaces for web application. But Cappuccino can't read XIB (ones produced by xCode) directly and you have to run the tool nib2cib manually at each change of your interface. Moreover you cannot link Outlets and Actions directly.\
-Well, now all of this is possible, thanks to xCodeCapp-Cocoa. This tool is a port of another one written in Objective-J but much more faster and much more integrated. XCodeCapp-Cocoa will silently listen the directory tree of your Cappuccino project using Mac OS X FSEvent API \'97 no dirty polling \'97 and will convert your XIB files into CIB (ones that can be read by Cappuccino) at each change. It will also listen for your Objective-J files, and will convert them into hidden .h files in order to allow you to use Outlets and Actions from xCode as soon as you edit your code.\
+\fs24 \cf0 XcodeCapp is an utility tool that helps you to greatly improve your Cappuccino development workflow. One of the main stunning thing about Cappuccino is the ability to use Apple's xCode IDE to create your interfaces for web application. But Cappuccino can't read XIB (ones produced by xCode) directly and you have to run the tool nib2cib manually at each change of your interface. Moreover you cannot link Outlets and Actions directly.\
+Well, now all of this is possible, thanks to XcodeCapp. This tool is a port of another one written in Objective-J but much more faster and much more integrated. XcodeCapp will silently listen the directory tree of your Cappuccino project using Mac OS X FSEvent API \'97 no dirty polling \'97 and will convert your XIB files into CIB (ones that can be read by Cappuccino) at each change. It will also listen for your Objective-J files, and will convert them into hidden .h files in order to allow you to use Outlets and Actions from xCode as soon as you edit your code.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 \cf0 \
 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\b Video
+\b \cf0 Video
 \b0 \
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qj
@@ -28,8 +29,9 @@ Well, now all of this is possible, thanks to xCodeCapp-Cocoa. This tool is a por
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 \cf0 \
 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\b Quick start
+\b \cf0 Quick start
 \b0 \
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qj
@@ -39,8 +41,9 @@ Well, now all of this is possible, thanks to xCodeCapp-Cocoa. This tool is a por
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc
 
 \f1 \cf0 {{\NeXTGraphic 1.PNG \width4700 \height4180
-}¬}
-\f0 \
+}¬}\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc
+
+\f0 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 \cf0 \
 \
@@ -64,8 +67,9 @@ Now, when you edit a Objective-J file and when you save, you will see a Growl no
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
 \cf0 \
 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
 
-\b Play with XIBs\
+\b \cf0 Play with XIBs\
 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qj
 
@@ -87,16 +91,18 @@ To do so, click on the xCodeCapp icon, and select "Open xCode".\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 \cf0 \
 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\b Ignoring files and folder\
+\b \cf0 Ignoring files and folder\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qj
 
 \b0 \cf0 xCodeCapp is able to ignore some files and/or folders. By default, it will ignore "Frameworks", ".git", ".svn", ".xCodeSupport" and "Build" directory. To add some path you can create a file in the root project directory (where is stored .xCodeSupport) named ".xcodecapp-ignore". The syntax is pretty straightforward:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 \cf0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\f2 Build*\
+\f2 \cf0 Build*\
 Libraries/Cappuccino*\
 Libraries/StropheCappuccino*\
 Libraries/*/Build/*\
@@ -113,8 +119,9 @@ You must put only one ignore directive per line.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 \cf0 \
 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\b Help\
+\b \cf0 Help\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qj
 
diff --git a/Tools/xcodecapp-cocoa/macros.h b/Tools/xcodecapp-cocoa/macros.h
index c2ac1e1fe..7e337dfd6 100644
--- a/Tools/xcodecapp-cocoa/macros.h
+++ b/Tools/xcodecapp-cocoa/macros.h
@@ -1,10 +1,20 @@
-//
-//  macros.h
-//  xcodecapp-cocoa
-//
-//  Created by Aparajita Fishman on 11/3/11.
-//  Copyright (c) 2011 Victory-Heart Productions. All rights reserved.
-//
+/*
+ * This file is a part of program XcodeCapp
+ * Copyright (C) 2011  Aparajita Fishman (<aparajita@aparajitaworld.com>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef xcodecapp_cocoa_macros_h
 #define xcodecapp_cocoa_macros_h
diff --git a/Tools/xcodecapp-cocoa/main.m b/Tools/xcodecapp-cocoa/main.m
index 8060df53a..1dc23cbfb 100644
--- a/Tools/xcodecapp-cocoa/main.m
+++ b/Tools/xcodecapp-cocoa/main.m
@@ -1,6 +1,6 @@
 /*
- * This file is a part of program xcodecapp-cocoa
- * Copyright (C) 2011  Antoine Mercadal (primalmotion@archipelproject.org)
+ * This file is a part of program XcodeCapp
+ * Copyright (C) 2011  Antoine Mercadal (<primalmotion@archipelproject.org>)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.pch b/Tools/xcodecapp-cocoa/xcodecapp-cocoa.pch
deleted file mode 100644
index ffbc47584..000000000
--- a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'xcodecapp-cocoa' target in the 'xcodecapp-cocoa' project
-//
-
-#ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
-#endif
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.png b/Tools/xcodecapp-cocoa/xcodecapp-cocoa.png
deleted file mode 100644
index 155ead65d..000000000
Binary files a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.png and /dev/null differ
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcodecapp-cocoa RELEASE.xcscheme b/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcodecapp-cocoa RELEASE.xcscheme
deleted file mode 100644
index b2bb1efb2..000000000
--- a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcodecapp-cocoa RELEASE.xcscheme	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "027D999913696A7000D3DB13"
-               BuildableName = "xcodecapp-cocoa.app"
-               BlueprintName = "xcodecapp-cocoa"
-               ReferencedContainer = "container:xcodecapp-cocoa.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      displayScaleIsEnabled = "NO"
-      displayScale = "1.00"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "027D999913696A7000D3DB13"
-            BuildableName = "xcodecapp-cocoa.app"
-            BlueprintName = "xcodecapp-cocoa"
-            ReferencedContainer = "container:xcodecapp-cocoa.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      displayScaleIsEnabled = "NO"
-      displayScale = "1.00"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "027D999913696A7000D3DB13"
-            BuildableName = "xcodecapp-cocoa.app"
-            BlueprintName = "xcodecapp-cocoa"
-            ReferencedContainer = "container:xcodecapp-cocoa.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcodecapp-cocoa.xcscheme b/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcodecapp-cocoa.xcscheme
deleted file mode 100644
index 150c83147..000000000
--- a/Tools/xcodecapp-cocoa/xcodecapp-cocoa.xcodeproj/xcuserdata/Tonio.xcuserdatad/xcschemes/xcodecapp-cocoa.xcscheme
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.8">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "027D999913696A7000D3DB13"
-               BuildableName = "xcodecapp-cocoa.app"
-               BlueprintName = "xcodecapp-cocoa"
-               ReferencedContainer = "container:xcodecapp-cocoa.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "027D999913696A7000D3DB13"
-            BuildableName = "xcodecapp-cocoa.app"
-            BlueprintName = "xcodecapp-cocoa"
-            ReferencedContainer = "container:xcodecapp-cocoa.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      displayScaleIsEnabled = "NO"
-      displayScale = "1.00"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "027D999913696A7000D3DB13"
-            BuildableName = "xcodecapp-cocoa.app"
-            BlueprintName = "xcodecapp-cocoa"
-            ReferencedContainer = "container:xcodecapp-cocoa.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      displayScaleIsEnabled = "NO"
-      displayScale = "1.00"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "027D999913696A7000D3DB13"
-            BuildableName = "xcodecapp-cocoa.app"
-            BlueprintName = "xcodecapp-cocoa"
-            ReferencedContainer = "container:xcodecapp-cocoa.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa-icon-active.png b/Tools/xcodecapp-cocoa/xcodecapp-icon-active.png
similarity index 100%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa-icon-active.png
rename to Tools/xcodecapp-cocoa/xcodecapp-icon-active.png
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa-icon-inactive.png b/Tools/xcodecapp-cocoa/xcodecapp-icon-inactive.png
similarity index 100%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa-icon-inactive.png
rename to Tools/xcodecapp-cocoa/xcodecapp-icon-inactive.png
diff --git a/Tools/xcodecapp-cocoa/xcodecapp-cocoa-icon-working.png b/Tools/xcodecapp-cocoa/xcodecapp-icon-working.png
similarity index 100%
rename from Tools/xcodecapp-cocoa/xcodecapp-cocoa-icon-working.png
rename to Tools/xcodecapp-cocoa/xcodecapp-icon-working.png