diff --git a/Tools/xcodecapp-cocoa/AppController.h b/Tools/xcodecapp-cocoa/AppController.h
index 7e363729e..8e661090e 100644
--- a/Tools/xcodecapp-cocoa/AppController.h
+++ b/Tools/xcodecapp-cocoa/AppController.h
@@ -23,22 +23,26 @@
 
 @interface AppController : NSObject <NSMenuDelegate>
 {
-    IBOutlet NSMenu                 *statusMenu;
-    IBOutlet NSMenuItem             *menuItemOpenXCode;
-    IBOutlet NSMenuItem             *menuItemStartStop;
-    IBOutlet NSPanel                *errorsPanel;
-    IBOutlet NSTableView            *errorsTable;
-    IBOutlet NSPanel                *aboutWindow;
-    IBOutlet NSWindow               *helpWindow;
-    IBOutlet NSTextView             *helpTextView;
-    IBOutlet NSTextField            *labelVersion;
-    
-    TNXCodeCapp                     *xcc;
-    NSImage                         *_iconActive;
-    NSImage                         *_iconInactive;
-    NSImage                         *_iconWorking;
-    NSStatusItem                    *_statusItem;
-    PRHEmptyGrowlDelegate           *growlDelegateRef;
+    IBOutlet NSMenu                     *statusMenu;
+    IBOutlet NSMenuItem                 *menuItemOpenXCode;
+    IBOutlet NSMenuItem                 *menuItemStartStop;
+    IBOutlet NSPanel                    *errorsPanel;
+    IBOutlet NSTableView                *errorsTable;
+    IBOutlet NSPanel                    *aboutWindow;
+    IBOutlet NSWindow                   *helpWindow;
+    IBOutlet NSTextView                 *helpTextView;
+    IBOutlet NSTextField                *labelVersion;
+    IBOutlet NSPopUpButton              *buttonPreferencesAPIMode;
+    IBOutlet NSButton                   *checkBoxPreferencesReactMode;
+    IBOutlet NSUserDefaultsController   *preferencesController;
+    IBOutlet TNXCodeCapp                *xcc;
+    IBOutlet NSWindow                   *preferencesWindow;
+
+    NSImage                             *_iconActive;
+    NSImage                             *_iconInactive;
+    NSImage                             *_iconWorking;
+    NSStatusItem                        *_statusItem;
+    PRHEmptyGrowlDelegate               *growlDelegateRef;
 }
 
 @property BOOL supportsFileModeListening;
@@ -59,6 +63,7 @@
 - (IBAction)stopListener:(id)aSender;
 - (IBAction)openHelp:(id)aSender;
 - (IBAction)openAbout:(id)aSender;
+- (IBAction)updatePreferences:(id)aSender;
 
 - (CGFloat)tableView:(NSTableView *)tableView heightOfRow:(int)aRow;
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row;
diff --git a/Tools/xcodecapp-cocoa/AppController.m b/Tools/xcodecapp-cocoa/AppController.m
index 70221e6f2..370a87b21 100644
--- a/Tools/xcodecapp-cocoa/AppController.m
+++ b/Tools/xcodecapp-cocoa/AppController.m
@@ -75,8 +75,7 @@ AppController *SharedAppControllerInstance = nil;
         [[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithInt:0] forKey:@"FirstLaunch"];
         [self openHelp:self];
     }
-    
-    xcc = [[TNXCodeCapp alloc] init];
+
     [xcc setDelegate:self];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(XCodeCappConversionDidStart:) name:XCCConversionStartNotification object:xcc];
@@ -101,6 +100,9 @@ AppController *SharedAppControllerInstance = nil;
     
     [appDefaults setObject:streamEventIdSinceNow forKey:@"lastEventId"];
     [appDefaults setObject:[NSNumber numberWithInt:1] forKey:@"FirstLaunch"];
+    [appDefaults setObject:[NSNumber numberWithInt:0] forKey:@"XCCAPIMode"];
+    [appDefaults setObject:[NSNumber numberWithInt:1] forKey:@"XCCReactMode"];
+    [appDefaults setObject:[NSNumber numberWithInt:1] forKey:@"XCCReopenLastProject"];
     
     [defaults registerDefaults:appDefaults];
 }
@@ -185,6 +187,18 @@ AppController *SharedAppControllerInstance = nil;
 #pragma mark -
 #pragma mark Actions
 
+/*!
+ Save preferences
+ @param aSender the sender of the action
+ */
+- (IBAction)updatePreferences:(id)aSender
+{
+    [preferencesController save:aSender];
+    NSLog(@"Preferences change notified");
+
+    [xcc configure];
+}
+
 /*!
  Open the folder chooser and eventually start to listen
  @param aSender the sender of the action
@@ -284,6 +298,15 @@ AppController *SharedAppControllerInstance = nil;
     [self openCenteredWindow:aboutWindow];
 }
 
+/*!
+ Open the preferences window
+ @param aSender the sender of the action
+ */
+- (IBAction)openPreferences:(id)aSender
+{
+    [self openCenteredWindow:preferencesWindow];
+}
+
 /*!
  Open a centered window.
 */
diff --git a/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/designable.nib b/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/designable.nib
index bc6963aa9..d8640f623 100644
--- a/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/designable.nib
+++ b/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/designable.nib
@@ -2,16 +2,19 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1923</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.SystemVersion">11C74</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1923</string>
+			<string key="NS.object.0">1938</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSPopUpButtonCell</string>
+			<string>NSUserDefaultsController</string>
 			<string>NSScroller</string>
+			<string>NSPopUpButton</string>
 			<string>NSMenuItem</string>
 			<string>NSMenu</string>
 			<string>NSScrollView</string>
@@ -54,6 +57,7 @@
 				<string key="NSWindowTitle">About</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="524832152">
 					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -112,8 +116,9 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 					<string key="NSFrameSize">{375, 153}</string>
 					<reference key="NSNextKeyView" ref="135374801"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1600, 1178}}</string>
-				<string key="NSMaxSize">{1e+13, 1e+13}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSMenu" id="293792969">
 				<string key="NSTitle"/>
@@ -159,6 +164,24 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 						<reference key="NSMixedImage" ref="521607813"/>
 					</object>
 					<object class="NSMenuItem" id="607933104">
+						<reference key="NSMenu" ref="293792969"/>
+						<string key="NSTitle">Preferences</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="451435966"/>
+						<reference key="NSMixedImage" ref="521607813"/>
+					</object>
+					<object class="NSMenuItem" id="822200114">
+						<reference key="NSMenu" ref="293792969"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="451435966"/>
+						<reference key="NSMixedImage" ref="521607813"/>
+					</object>
+					<object class="NSMenuItem" id="8232279">
 						<reference key="NSMenu" ref="293792969"/>
 						<string key="NSTitle">About...</string>
 						<string key="NSKeyEquiv"/>
@@ -202,6 +225,7 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 				<string key="NSWindowTitle">Errors and Warnings</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="166068453">
 					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -256,7 +280,7 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 														<int key="NSCellFlags">337772032</int>
 														<int key="NSCellFlags2">0</int>
 														<string key="NSContents">Text Cell</string>
-														<object class="NSFont" key="NSSupport">
+														<object class="NSFont" key="NSSupport" id="14768023">
 															<string key="NSName">LucidaGrande</string>
 															<double key="NSSize">13</double>
 															<int key="NSfFlags">1044</int>
@@ -268,7 +292,7 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 															<string key="NSColorName">controlBackgroundColor</string>
 															<reference key="NSColor" ref="203781804"/>
 														</object>
-														<object class="NSColor" key="NSTextColor">
+														<object class="NSColor" key="NSTextColor" id="861717130">
 															<int key="NSColorSpace">6</int>
 															<string key="NSCatalogName">System</string>
 															<string key="NSColorName">controlTextColor</string>
@@ -296,6 +320,7 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 											<int key="NSDraggingSourceMaskForNonLocal">0</int>
 											<bool key="NSAllowsTypeSelect">YES</bool>
 											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
 										</object>
 									</array>
 									<string key="NSFrame">{{1, 1}, {512, 249}}</string>
@@ -330,7 +355,7 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 							<string key="NSFrame">{{-1, 35}, {514, 251}}</string>
 							<reference key="NSSuperview" ref="166068453"/>
 							<reference key="NSNextKeyView" ref="493529786"/>
-							<int key="NSsFlags">562</int>
+							<int key="NSsFlags">133682</int>
 							<reference key="NSVScroller" ref="185808728"/>
 							<reference key="NSHScroller" ref="169310253"/>
 							<reference key="NSContentView" ref="493529786"/>
@@ -385,8 +410,9 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 					<string key="NSFrameSize">{512, 285}</string>
 					<reference key="NSNextKeyView" ref="351336909"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1600, 1178}}</string>
-				<string key="NSMaxSize">{1e+13, 1e+13}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSWindowTemplate" id="180699084">
 				<int key="NSWindowStyleMask">15</int>
@@ -396,8 +422,9 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 				<string key="NSWindowTitle">Help</string>
 				<string key="NSWindowClass">NSWindow</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">
@@ -413,8 +440,7 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 											<int key="NSvFlags">2322</int>
 											<string key="NSFrameSize">{701, 14}</string>
 											<reference key="NSSuperview" ref="599960028"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="56491000"/>
+											<reference key="NSNextKeyView" ref="568058546"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="3515472">
 												<object class="NSLayoutManager" key="NSLayoutManager">
 													<object class="NSTextStorage" key="NSTextStorage">
@@ -434,7 +460,7 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</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"/>
@@ -465,16 +491,17 @@ bgphcGFyYWppdGFAYXBhcmFqaXRhLmNvbQ</string>
 													<integer value="1" key="NSUnderline"/>
 												</dictionary>
 												<nil key="NSDefaultParagraphStyle"/>
+												<nil key="NSTextFinder"/>
+												<int key="NSPreferredTextFinderStyle">1</int>
 											</object>
 											<int key="NSTVFlags">6</int>
-											<string key="NSMaxSize">{716, 1e+07}</string>
+											<string key="NSMaxSize">{716, 10000000}</string>
 											<string key="NSMinize">{238, 0}</string>
 											<nil key="NSDelegate"/>
 										</object>
 									</array>
 									<string key="NSFrame">{{1, 1}, {701, 571}}</string>
 									<reference key="NSSuperview" ref="1007710927"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="690414145"/>
 									<reference key="NSDocView" ref="690414145"/>
 									<reference key="NSBGColor" ref="379312939"/>
@@ -509,8 +536,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{702, 1}, {15, 571}}</string>
 									<reference key="NSSuperview" ref="1007710927"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView"/>
 									<reference key="NSTarget" ref="1007710927"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSCurValue">1</double>
@@ -521,7 +546,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="1007710927"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="599960028"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="1007710927"/>
@@ -532,21 +556,299 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							</array>
 							<string key="NSFrame">{{-1, -1}, {718, 573}}</string>
 							<reference key="NSSuperview" ref="516282358"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="568058546"/>
-							<int key="NSsFlags">18</int>
+							<reference key="NSNextKeyView" ref="599960028"/>
+							<int key="NSsFlags">133138</int>
 							<reference key="NSVScroller" ref="56491000"/>
 							<reference key="NSHScroller" ref="568058546"/>
 							<reference key="NSContentView" ref="599960028"/>
 						</object>
 					</array>
 					<string key="NSFrameSize">{716, 571}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="1007710927"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1600, 1178}}</string>
-				<string key="NSMaxSize">{1e+13, 1e+13}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSWindowTemplate" id="414718773">
+				<int key="NSWindowStyleMask">3</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{529, 541}, {478, 265}}</string>
+				<int key="NSWTFlags">1685586944</int>
+				<string key="NSWindowTitle">Preferences</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="145172240">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="278198131">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{128, 64}, {234, 18}}</string>
+							<reference key="NSSuperview" ref="145172240"/>
+							<reference key="NSNextKeyView" ref="837705184"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="766305922">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Inode meta informations changes</string>
+								<reference key="NSSupport" ref="14768023"/>
+								<reference key="NSControlView" ref="278198131"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">2</int>
+								<object class="NSCustomResource" key="NSNormalImage" id="607294165">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSSwitch</string>
+								</object>
+								<object class="NSButtonImageSource" key="NSAlternateImage" id="588602230">
+									<string key="NSImageName">NSSwitch</string>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSPopUpButton" id="664905069">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{127, 121}, {120, 26}}</string>
+							<reference key="NSSuperview" ref="145172240"/>
+							<reference key="NSNextKeyView" ref="774386819"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="872628707">
+								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags2">2048</int>
+								<reference key="NSSupport" ref="14768023"/>
+								<reference key="NSControlView" ref="664905069"/>
+								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<object class="NSMenuItem" key="NSMenuItem" id="117306174">
+									<reference key="NSMenu" ref="1068290386"/>
+									<string key="NSTitle">Auto</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<int key="NSState">1</int>
+									<reference key="NSOnImage" ref="451435966"/>
+									<reference key="NSMixedImage" ref="521607813"/>
+									<string key="NSAction">_popUpItemAction:</string>
+									<reference key="NSTarget" ref="872628707"/>
+								</object>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="1068290386">
+									<string key="NSTitle">OtherViews</string>
+									<array class="NSMutableArray" key="NSMenuItems">
+										<reference ref="117306174"/>
+										<object class="NSMenuItem" id="1072046121">
+											<reference key="NSMenu" ref="1068290386"/>
+											<string key="NSTitle">File level</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="451435966"/>
+											<reference key="NSMixedImage" ref="521607813"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="872628707"/>
+										</object>
+										<object class="NSMenuItem" id="20682067">
+											<reference key="NSMenu" ref="1068290386"/>
+											<string key="NSTitle">Folder level</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="451435966"/>
+											<reference key="NSMixedImage" ref="521607813"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="872628707"/>
+										</object>
+									</array>
+									<reference key="NSMenuFont" ref="14768023"/>
+								</object>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+								<int key="NSArrowPosition">2</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="874707784">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 223}, {128, 22}}</string>
+							<reference key="NSSuperview" ref="145172240"/>
+							<reference key="NSNextKeyView" ref="793473756"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="605626416">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">272629760</int>
+								<string key="NSContents">Preferences</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">18</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<reference key="NSControlView" ref="874707784"/>
+								<reference key="NSBackgroundColor" ref="457896886"/>
+								<object class="NSColor" key="NSTextColor" id="1009685512">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4zNDU1Mjg0ODM0IDAuMzQ1NTI4NDgzNCAwLjM0NTUyODQ4MzQAA</bytes>
+								</object>
+							</object>
+						</object>
+						<object class="NSTextField" id="550296209">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{58, 65}, {60, 17}}</string>
+							<reference key="NSSuperview" ref="145172240"/>
+							<reference key="NSNextKeyView" ref="278198131"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="143474538">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">React to:</string>
+								<reference key="NSSupport" ref="14768023"/>
+								<reference key="NSControlView" ref="550296209"/>
+								<reference key="NSBackgroundColor" ref="457896886"/>
+								<reference key="NSTextColor" ref="861717130"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="938798083">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{51, 153}, {67, 17}}</string>
+							<reference key="NSSuperview" ref="145172240"/>
+							<reference key="NSNextKeyView" ref="379787391"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="620393439">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">API Mode:</string>
+								<reference key="NSSupport" ref="14768023"/>
+								<reference key="NSControlView" ref="938798083"/>
+								<reference key="NSBackgroundColor" ref="457896886"/>
+								<reference key="NSTextColor" ref="861717130"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="379787391">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{127, 153}, {184, 17}}</string>
+							<reference key="NSSuperview" ref="145172240"/>
+							<reference key="NSNextKeyView" ref="664905069"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="559029248">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Current API Mode</string>
+								<reference key="NSSupport" ref="14768023"/>
+								<reference key="NSControlView" ref="379787391"/>
+								<reference key="NSBackgroundColor" ref="457896886"/>
+								<reference key="NSTextColor" ref="861717130"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="837705184">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<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>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">On file "File Level", it will react to touch, or chown, etc.</string>
+								<object class="NSFont" key="NSSupport" id="645134184">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<reference key="NSControlView" ref="837705184"/>
+								<reference key="NSBackgroundColor" ref="457896886"/>
+								<reference key="NSTextColor" ref="1009685512"/>
+							</object>
+						</object>
+						<object class="NSButton" id="968161559">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{128, 182}, {176, 18}}</string>
+							<reference key="NSSuperview" ref="145172240"/>
+							<reference key="NSNextKeyView" ref="938798083"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="211556683">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Listen to the last project</string>
+								<reference key="NSSupport" ref="14768023"/>
+								<reference key="NSControlView" ref="968161559"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">2</int>
+								<reference key="NSNormalImage" ref="607294165"/>
+								<reference key="NSAlternateImage" ref="588602230"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="793473756">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{42, 183}, {76, 17}}</string>
+							<reference key="NSSuperview" ref="145172240"/>
+							<reference key="NSNextKeyView" ref="968161559"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="416218233">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">On Launch:</string>
+								<reference key="NSSupport" ref="14768023"/>
+								<reference key="NSControlView" ref="793473756"/>
+								<reference key="NSBackgroundColor" ref="457896886"/>
+								<reference key="NSTextColor" ref="861717130"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="774386819">
+							<reference key="NSNextResponder" ref="145172240"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{127, 90}, {301, 28}}</string>
+							<reference key="NSSuperview" ref="145172240"/>
+							<reference key="NSNextKeyView" ref="550296209"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="421671669">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string type="base64-UTF8" key="NSContents">RmlsZSBtb2RlIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggT1MgWCAxMC42LgpVbmxlc3MgeW91IGtub3cg
+d2hhdCB5b3UgZG8sIGxlYXZlIHRoaXMgdG8gIkF1dG8iLg</string>
+								<reference key="NSSupport" ref="645134184"/>
+								<reference key="NSControlView" ref="774386819"/>
+								<reference key="NSBackgroundColor" ref="457896886"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4zNDU1Mjg0ODM0IDAuMzQ1NTI4NDgzNCAwLjM0NTUyODQ4MzQAA</bytes>
+								</object>
+							</object>
+						</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>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<string key="NSFrameAutosaveName">xcc-prefs</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSUserDefaultsController" id="524632060">
+				<bool key="NSSharedInstance">YES</bool>
+			</object>
+			<object class="NSCustomObject" id="53821139">
+				<string key="NSClassName">TNXCodeCapp</string>
 			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -655,14 +957,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					</object>
 					<int key="connectionID">525</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openAbout:</string>
-						<reference key="source" ref="138157001"/>
-						<reference key="destination" ref="607933104"/>
-					</object>
-					<int key="connectionID">526</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">openErrors:</string>
@@ -671,14 +965,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					</object>
 					<int key="connectionID">527</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">menuItemStart</string>
-						<reference key="source" ref="138157001"/>
-						<reference key="destination" ref="378733091"/>
-					</object>
-					<int key="connectionID">528</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menuItemStartStop</string>
@@ -695,6 +981,78 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					</object>
 					<int key="connectionID">540</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">openAbout:</string>
+						<reference key="source" ref="138157001"/>
+						<reference key="destination" ref="8232279"/>
+					</object>
+					<int key="connectionID">571</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">buttonPreferencesAPIMode</string>
+						<reference key="source" ref="138157001"/>
+						<reference key="destination" ref="664905069"/>
+					</object>
+					<int key="connectionID">573</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">checkBoxPreferencesReactMode</string>
+						<reference key="source" ref="138157001"/>
+						<reference key="destination" ref="278198131"/>
+					</object>
+					<int key="connectionID">574</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">updatePreferences:</string>
+						<reference key="source" ref="138157001"/>
+						<reference key="destination" ref="664905069"/>
+					</object>
+					<int key="connectionID">600</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">updatePreferences:</string>
+						<reference key="source" ref="138157001"/>
+						<reference key="destination" ref="278198131"/>
+					</object>
+					<int key="connectionID">601</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">preferencesController</string>
+						<reference key="source" ref="138157001"/>
+						<reference key="destination" ref="524632060"/>
+					</object>
+					<int key="connectionID">602</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">xcc</string>
+						<reference key="source" ref="138157001"/>
+						<reference key="destination" ref="53821139"/>
+					</object>
+					<int key="connectionID">611</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">openPreferences:</string>
+						<reference key="source" ref="138157001"/>
+						<reference key="destination" ref="607933104"/>
+					</object>
+					<int key="connectionID">646</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">preferencesWindow</string>
+						<reference key="source" ref="138157001"/>
+						<reference key="destination" ref="414718773"/>
+					</object>
+					<int key="connectionID">647</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">performClose:</string>
@@ -719,6 +1077,152 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					</object>
 					<int key="connectionID">478</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.XCCReactMode</string>
+						<reference key="source" ref="278198131"/>
+						<reference key="destination" ref="524632060"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="278198131"/>
+							<reference key="NSDestination" ref="524632060"/>
+							<string key="NSLabel">value: values.XCCReactMode</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.XCCReactMode</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValidatesImmediately</string>
+								<boolean value="YES" key="NS.object.0"/>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">594</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: isUsingFileLevelAPI</string>
+						<reference key="source" ref="278198131"/>
+						<reference key="destination" ref="53821139"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="278198131"/>
+							<reference key="NSDestination" ref="53821139"/>
+							<string key="NSLabel">enabled: isUsingFileLevelAPI</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">isUsingFileLevelAPI</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">641</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedIndex: values.XCCAPIMode</string>
+						<reference key="source" ref="664905069"/>
+						<reference key="destination" ref="524632060"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="664905069"/>
+							<reference key="NSDestination" ref="524632060"/>
+							<string key="NSLabel">selectedIndex: values.XCCAPIMode</string>
+							<string key="NSBinding">selectedIndex</string>
+							<string key="NSKeyPath">values.XCCAPIMode</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValidatesImmediately</string>
+								<boolean value="YES" key="NS.object.0"/>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">605</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: supportFileLevelAPI</string>
+						<reference key="source" ref="664905069"/>
+						<reference key="destination" ref="53821139"/>
+						<object class="NSNibBindingConnector" key="connector" id="492464664">
+							<reference key="NSSource" ref="664905069"/>
+							<reference key="NSDestination" ref="53821139"/>
+							<string key="NSLabel">enabled: supportFileLevelAPI</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">supportFileLevelAPI</string>
+							<dictionary key="NSOptions">
+								<integer value="-1" key="NSMultipleValuesPlaceholder"/>
+								<integer value="-1" key="NSNoSelectionPlaceholder"/>
+								<integer value="-1" key="NSNotApplicablePlaceholder"/>
+								<integer value="-1" key="NSNullPlaceholder"/>
+							</dictionary>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">642</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled2: isListening</string>
+						<reference key="source" ref="664905069"/>
+						<reference key="destination" ref="53821139"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="664905069"/>
+							<reference key="NSDestination" ref="53821139"/>
+							<string key="NSLabel">enabled2: isListening</string>
+							<string key="NSBinding">enabled2</string>
+							<string key="NSKeyPath">isListening</string>
+							<dictionary key="NSOptions">
+								<integer value="-1" key="NSMultipleValuesPlaceholder"/>
+								<integer value="-1" key="NSNoSelectionPlaceholder"/>
+								<integer value="-1" key="NSNotApplicablePlaceholder"/>
+								<integer value="-1" key="NSNullPlaceholder"/>
+								<string key="NSValueTransformerName">NSNegateBoolean</string>
+							</dictionary>
+							<reference key="NSPreviousConnector" ref="492464664"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">645</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">save:</string>
+						<reference key="source" ref="524632060"/>
+						<reference key="destination" ref="968161559"/>
+					</object>
+					<int key="connectionID">658</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: currentAPIMode</string>
+						<reference key="source" ref="379787391"/>
+						<reference key="destination" ref="53821139"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="379787391"/>
+							<reference key="NSDestination" ref="53821139"/>
+							<string key="NSLabel">value: currentAPIMode</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">currentAPIMode</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">615</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.XCCReopenLastProject</string>
+						<reference key="source" ref="968161559"/>
+						<reference key="destination" ref="524632060"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="968161559"/>
+							<reference key="NSDestination" ref="524632060"/>
+							<string key="NSLabel">value: values.XCCReopenLastProject</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.XCCReopenLastProject</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValidatesImmediately</string>
+								<boolean value="YES" key="NS.object.0"/>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">657</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -787,12 +1291,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 						<array class="NSMutableArray" key="children">
 							<reference ref="808338190"/>
 							<reference ref="378733091"/>
-							<reference ref="607933104"/>
 							<reference ref="1057567843"/>
 							<reference ref="806558167"/>
 							<reference ref="931008714"/>
 							<reference ref="1053204856"/>
 							<reference ref="109499447"/>
+							<reference ref="822200114"/>
+							<reference ref="607933104"/>
+							<reference ref="8232279"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -975,6 +1481,209 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 						<reference key="object" ref="371811048"/>
 						<reference key="parent" ref="445944489"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">541</int>
+						<reference key="object" ref="414718773"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="145172240"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">542</int>
+						<reference key="object" ref="145172240"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="874707784"/>
+							<reference ref="379787391"/>
+							<reference ref="774386819"/>
+							<reference ref="550296209"/>
+							<reference ref="837705184"/>
+							<reference ref="664905069"/>
+							<reference ref="938798083"/>
+							<reference ref="793473756"/>
+							<reference ref="968161559"/>
+							<reference ref="278198131"/>
+						</array>
+						<reference key="parent" ref="414718773"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">543</int>
+						<reference key="object" ref="278198131"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="766305922"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">544</int>
+						<reference key="object" ref="766305922"/>
+						<reference key="parent" ref="278198131"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">545</int>
+						<reference key="object" ref="664905069"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="872628707"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">546</int>
+						<reference key="object" ref="872628707"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1068290386"/>
+						</array>
+						<reference key="parent" ref="664905069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">547</int>
+						<reference key="object" ref="1068290386"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="117306174"/>
+							<reference ref="1072046121"/>
+							<reference ref="20682067"/>
+						</array>
+						<reference key="parent" ref="872628707"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">548</int>
+						<reference key="object" ref="117306174"/>
+						<reference key="parent" ref="1068290386"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">549</int>
+						<reference key="object" ref="1072046121"/>
+						<reference key="parent" ref="1068290386"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">550</int>
+						<reference key="object" ref="20682067"/>
+						<reference key="parent" ref="1068290386"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">551</int>
+						<reference key="object" ref="874707784"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="605626416"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">552</int>
+						<reference key="object" ref="605626416"/>
+						<reference key="parent" ref="874707784"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">553</int>
+						<reference key="object" ref="550296209"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="143474538"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">554</int>
+						<reference key="object" ref="143474538"/>
+						<reference key="parent" ref="550296209"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">555</int>
+						<reference key="object" ref="837705184"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="858384253"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">556</int>
+						<reference key="object" ref="858384253"/>
+						<reference key="parent" ref="837705184"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">557</int>
+						<reference key="object" ref="938798083"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="620393439"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">558</int>
+						<reference key="object" ref="620393439"/>
+						<reference key="parent" ref="938798083"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">559</int>
+						<reference key="object" ref="774386819"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="421671669"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">560</int>
+						<reference key="object" ref="421671669"/>
+						<reference key="parent" ref="774386819"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">569</int>
+						<reference key="object" ref="822200114"/>
+						<reference key="parent" ref="293792969"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">570</int>
+						<reference key="object" ref="8232279"/>
+						<reference key="parent" ref="293792969"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">587</int>
+						<reference key="object" ref="524632060"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">608</int>
+						<reference key="object" ref="379787391"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="559029248"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">609</int>
+						<reference key="object" ref="559029248"/>
+						<reference key="parent" ref="379787391"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">610</int>
+						<reference key="object" ref="53821139"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">648</int>
+						<reference key="object" ref="968161559"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="211556683"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">649</int>
+						<reference key="object" ref="793473756"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="416218233"/>
+						</array>
+						<reference key="parent" ref="145172240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">652</int>
+						<reference key="object" ref="416218233"/>
+						<reference key="parent" ref="793473756"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">653</int>
+						<reference key="object" ref="211556683"/>
+						<reference key="parent" ref="968161559"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1020,113 +1729,47 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 				<string key="518.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="522.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="523.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="541.IBNSWindowAutoPositionCentersHorizontal"/>
+				<boolean value="YES" key="541.IBNSWindowAutoPositionCentersVertical"/>
+				<string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="541.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="542.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="546.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="547.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="548.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="549.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="550.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="551.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="552.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="553.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="554.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="555.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="556.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="557.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="558.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="559.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="560.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="569.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="570.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="587.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="608.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="609.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="610.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="648.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="649.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="652.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="653.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">540</int>
-		</object>
-		<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>
-					</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>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="aboutWindow">NSPanel</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="statusMenu">NSMenu</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="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="statusMenu">
-							<string key="name">statusMenu</string>
-							<string key="candidateClassName">NSMenu</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-			</array>
+			<int key="maxID">658</int>
 		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
@@ -1142,6 +1785,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NSMenuCheckmark">{9, 8}</string>
 			<string key="NSMenuMixedState">{7, 2}</string>
+			<string key="NSSwitch">{15, 15}</string>
 		</dictionary>
 	</data>
 </archive>
diff --git a/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/keyedobjects.nib b/Tools/xcodecapp-cocoa/English.lproj/MainMenu.nib/keyedobjects.nib
index 2df780f1a..342a7406a 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.m b/Tools/xcodecapp-cocoa/FSEventCallback.m
index 7de6a5e2a..8577badd6 100644
--- a/Tools/xcodecapp-cocoa/FSEventCallback.m
+++ b/Tools/xcodecapp-cocoa/FSEventCallback.m
@@ -38,9 +38,19 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
     for (i = 0; i < numEvents; i++)
     {
         NSString *path = [[(NSArray *)eventPaths objectAtIndex:i] stringByStandardizingPath];
+        BOOL isDir = NO;
+
+        [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir];
 
         if (useFileBasedListening)
         {
+            // kFSEventStreamEventFlagItemIsFile = 0x00010000
+            // kFSEventStreamEventFlagItemRemoved = 0x00000200
+            if (eventFlags[i] & 0x00010000 && eventFlags[i] & 0x00000200)
+            {
+                [xcc tidyShadowedFiles:path];
+            }
+
             // kFSEventStreamEventFlagItemIsFile = 0x00010000
             if (!(eventFlags[i] & 0x00010000)
                 || [xcc isPathMatchingIgnoredPaths:path]
@@ -55,9 +65,17 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
             }
 
             // kFSEventStreamEventFlagItemCreated = 0x00000200
-            if (eventFlags[i] & 0x00000100)
+            // kFSEventStreamEventFlagItemModified = 0x00001000
+            if (eventFlags[i] & 0x00000100 || eventFlags[i] & 0x00001000)
             {
-                DLog(@"event type: kFSEventStreamEventFlagItemCreated for path %@", path);
+                DLog(@"event type: kFSEventStreamEventFlagItemCreated or kFSEventStreamEventFlagItemModified for path %@", path);
+                [xcc handleFileModification:path notify:YES];
+            }
+
+            // kFSEventStreamEventFlagItemInodeMetaMod = 0x00000400
+            if (eventFlags[i] & 0x00000400 && [xcc reactToInodeModification])
+            {
+                DLog(@"event type: kFSEventStreamEventFlagItemInodeMetaMod for path %@", path);
                 [xcc handleFileModification:path notify:YES];
             }
 
@@ -80,11 +98,10 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
         {
             NSArray *subpaths = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:NULL];
 
-            // Uncomment to test under 10.7
-            // BOOL isDir;
-            // [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir];
-            // if (!isDir)
-            //    continue;
+            // If for some reasons the path is not a directory,
+            // we don't want to deal with it in this mode.
+            if (!isDir)
+                continue;
 
             [xcc tidyShadowedFiles:path];
 
diff --git a/Tools/xcodecapp-cocoa/TNXCodeCapp.h b/Tools/xcodecapp-cocoa/TNXCodeCapp.h
index 0f9bb7297..f196de030 100644
--- a/Tools/xcodecapp-cocoa/TNXCodeCapp.h
+++ b/Tools/xcodecapp-cocoa/TNXCodeCapp.h
@@ -33,6 +33,7 @@ extern NSString * const XCCListeningStartNotification;
     NSMutableArray                  *errorList;
     NSMutableSet                    *ignoredFilePaths;
     NSNumber                        *lastEventId;
+    NSString                        *currentAPIMode;
     NSString                        *currentProjectName;
     NSString                        *parserPath;
     NSString                        *XCodeSupportPBXPath;
@@ -48,6 +49,10 @@ extern NSString * const XCCListeningStartNotification;
     NSDate                          *appStartedTimestamp;
     NSMutableDictionary             *pathModificationDates;
     BOOL                            supportsFileBasedListening;
+    BOOL                            reactToInodeModification;
+    BOOL                            isListening;
+    BOOL                            isUsingFileLevelAPI;
+    BOOL                            supportFileLevelAPI;
 }
 
 @property (retain) NSObject* delegate;
@@ -55,7 +60,12 @@ extern NSString * const XCCListeningStartNotification;
 @property (retain) NSURL* XCodeSupportProject;
 @property (retain) NSURL* currentProjectURL;
 @property (retain) NSString* currentProjectName;
+@property (retain) NSString* currentAPIMode;
 @property BOOL supportsFileBasedListening;
+@property BOOL reactToInodeModification;
+@property BOOL isListening;
+@property BOOL supportFileLevelAPI;
+@property BOOL isUsingFileLevelAPI;
 
 - (BOOL)isObjJFile:(NSString*)path;
 - (void)computeIgnoredPaths;
@@ -64,6 +74,7 @@ extern NSString * const XCCListeningStartNotification;
 - (BOOL)isXCCIgnoreFile:(NSString *)path;
 - (BOOL)prepareXCodeSupportProject;
 - (NSURL*)shadowURLForSourceURL:(NSURL*)aSourceURL;
+- (NSURL*)sourceURLForShadowName:(NSString *)aString;
 - (void)handleFileModification:(NSString*)fullPath notify:(BOOL)shouldNotify;
 - (void)handleFileRemoval:(NSString*)fullPath;
 - (void)initializeEventStreamWithPath:(NSString*)aPath;
@@ -72,6 +83,8 @@ extern NSString * const XCCListeningStartNotification;
 - (void)listenProjectAtPath:(NSString *)path;
 - (void)clear;
 - (void)start;
+- (void)configure;
+- (void)tidyShadowedFiles:(NSString*)basePath;
 
 @end
 
@@ -80,8 +93,6 @@ extern NSString * const XCCListeningStartNotification;
 
 - (void)updateLastModificationDate:(NSDate *)date forPath:(NSString *)path;
 - (NSDate*)lastModificationDateForPath:(NSString *)path;
-- (NSString *)unshadowURLForString:(NSString *)aString;
-- (void)tidyShadowedFiles:(NSString*)basePath;
 
 @end
 
diff --git a/Tools/xcodecapp-cocoa/TNXCodeCapp.m b/Tools/xcodecapp-cocoa/TNXCodeCapp.m
index 24f2d3a91..cdae5eaf8 100644
--- a/Tools/xcodecapp-cocoa/TNXCodeCapp.m
+++ b/Tools/xcodecapp-cocoa/TNXCodeCapp.m
@@ -33,6 +33,14 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
 @synthesize currentProjectURL;
 @synthesize currentProjectName;
 @synthesize supportsFileBasedListening;
+@synthesize reactToInodeModification;
+@synthesize currentAPIMode;
+@synthesize isListening;
+@synthesize supportFileLevelAPI;
+@synthesize isUsingFileLevelAPI;
+
+#pragma mark -
+#pragma mark Initialization
 
 /*!
  Initialize the AppController
@@ -50,20 +58,20 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
         lastEventId = [[NSUserDefaults standardUserDefaults] objectForKey:@"lastEventId"];
         appStartedTimestamp = [NSDate date];
         
+        [self setIsListening:NO];
+        [self setIsUsingFileLevelAPI:NO];
+
         SInt32 versionMajor = 0;
         SInt32 versionMinor = 0;
         Gestalt(gestaltSystemVersionMajor, &versionMajor);
         Gestalt(gestaltSystemVersionMinor, &versionMinor);
         
-        supportsFileBasedListening = versionMajor >= 10 && versionMinor >= 7;
-        // Uncomment to test under 10.7
-        // supportsFileBasedListening = NO;
-
-        if (supportsFileBasedListening)
-            DLog(@"using 10.7+ mode listening (clean)");
-        else
-            DLog(@"using 10.6 mode listening (dirty)");
+        [self setSupportFileLevelAPI:versionMajor >= 10 && versionMinor >= 7];
+        // Uncomment to simulate 10.6 mode
+        //[self setSupportFileLevelAPI:NO];
         
+        [self configure];
+
         if([fm fileExistsAtPath:[@"~/.bash_profile" stringByExpandingTildeInPath]])
             profilePath = [@"source ~/.bash_profile" stringByExpandingTildeInPath];
         else if([fm fileExistsAtPath:[@"~/.profile" stringByExpandingTildeInPath]])
@@ -89,6 +97,9 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
 
 - (void)start
 {        
+    if (![[NSUserDefaults standardUserDefaults] boolForKey:@"XCCReopenLastProject"])
+        return;
+
     NSString *lastOpenedPath = [[NSUserDefaults standardUserDefaults] objectForKey:@"LastOpenedPath"];
     
     if (lastOpenedPath)
@@ -135,8 +146,13 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
     
     FSEventStreamScheduleWithRunLoop(stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
     FSEventStreamStart(stream);
+    [self setIsListening:YES];
 }
 
+
+#pragma mark -
+#pragma mark Utilities
+
 /*!
  Stop listening the FSEvent stream if active
  */
@@ -148,6 +164,8 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
         FSEventStreamInvalidate(stream);
         stream = nil;
     }
+
+    [self setIsListening:NO];
 }
 
 /*!
@@ -161,9 +179,46 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
     [self stopEventStream];
 }
 
+/*!
+ Choose the API mode according to default
+ */
+- (void)configure
+{
+    if (![self supportFileLevelAPI])
+    {
+        DLog(@"System doesn't support file level API");
+        [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithInt:2] forKey:@"XCCAPIMode"];
+    }
 
-#pragma mark -
-#pragma mark Utilities
+    switch ([[NSUserDefaults standardUserDefaults] integerForKey:@"XCCAPIMode"])
+    {
+        case 0:
+            supportsFileBasedListening = [self supportFileLevelAPI] ? YES : NO;
+            break;
+        case 1:
+            supportsFileBasedListening = YES;
+            break;
+        case 2:
+            supportsFileBasedListening = NO;
+            break;
+    }
+
+    if (supportsFileBasedListening)
+    {
+        DLog(@"using 10.7+ mode listening (clean)");
+
+        [self setCurrentAPIMode:@"File level (Lion)"];
+        [self setIsUsingFileLevelAPI:YES];
+        reactToInodeModification = [[NSUserDefaults standardUserDefaults] boolForKey:@"XCCReactMode"];
+    }
+    else
+    {
+        DLog(@"using 10.6 mode listening (dirty)");
+        reactToInodeModification = NO;
+        [self setCurrentAPIMode:@"Folder level (Snow Leopard)"];
+        [self setIsUsingFileLevelAPI:NO];
+    }
+}
 
 /*!
  Update the last event ID. We use a method because
@@ -398,12 +453,16 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
 {
     [delegate performSelector:@selector(growlWithTitle:message:) withObject:@"Loading project" withObject:[currentProjectURL path]];
     
-    [self handleFileModification:[NSString stringWithFormat:@"%@", [currentProjectURL path]] notify:NO];
-    NSArray *subdirs = [fm subpathsAtPath:[currentProjectURL path]];
-    
-    for (NSString *p in subdirs)
-        [self handleFileModification:[NSString stringWithFormat:@"%@/%@", [currentProjectURL path], p] notify:NO];
+    //[self handleFileModification:[NSString stringWithFormat:@"%@", [currentProjectURL path]] notify:NO];
+    NSArray *subdpaths = [fm subpathsAtPath:[currentProjectURL path]];
     
+    for (NSString *p in subdpaths)
+    {
+        NSString *filePath = [NSString stringWithFormat:@"%@/%@", [currentProjectURL path], p];
+        DLog(@"Original import of %@", filePath);
+        [self handleFileModification:filePath notify:NO];
+    }
+
     NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:currentProjectURL, @"URL", nil];
     [[NSNotificationCenter defaultCenter] postNotificationName:XCCDidPopulateProjectNotification object:self userInfo:info];
 }
@@ -413,12 +472,17 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
  @param aSourceURL the origin path
  @return NSURL representing the shadow path
  */
-- (NSURL*)shadowURLForSourceURL:(NSURL*)aSourceURL
+- (NSURL *)shadowURLForSourceURL:(NSURL*)aSourceURL
 {
     if (!aSourceURL)
         [NSException raise:NSInvalidArgumentException format:@"shadowURLForSourceURL: aSource URL must not be null"];
 
     NSMutableString *flattenedPath = [NSMutableString stringWithString:[aSourceURL path]];
+    [flattenedPath replaceOccurrencesOfString:@"_"
+                                   withString:@"-OLDUNDERSCORE-"
+                                      options:NSCaseInsensitiveSearch
+                                        range:NSMakeRange(0, [[aSourceURL path] length])];
+
     [flattenedPath replaceOccurrencesOfString:@"/"
                                    withString:@"_"
                                       options:NSCaseInsensitiveSearch
@@ -430,6 +494,29 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
     return [NSURL URLWithString:basename relativeToURL:XCodeSupportProjectSources];
 }
 
+- (NSURL *)sourceURLForShadowName:(NSString *)aString
+{
+    NSMutableString * unshadowedPath = [NSMutableString stringWithString:aString];
+
+    [unshadowedPath replaceOccurrencesOfString:@"_"
+                                    withString:@"/"
+                                       options:NSCaseInsensitiveSearch
+                                         range:NSMakeRange(0, [unshadowedPath length])];
+
+    [unshadowedPath replaceOccurrencesOfString:@"-OLDUNDERSCORE-"
+                                   withString:@"_"
+                                      options:NSCaseInsensitiveSearch
+                                        range:NSMakeRange(0, [unshadowedPath length])];
+
+    [unshadowedPath replaceOccurrencesOfString:@".h"
+                                    withString:@".j"
+                                       options:NSCaseInsensitiveSearch
+                                         range:NSMakeRange(0, [unshadowedPath length])];
+
+    return [NSURL URLWithString:[NSString stringWithString:unshadowedPath]];
+}
+
+
 /*!
  Compute the ignored paths according to any existing
  .xcodecapp-ignore file
@@ -438,12 +525,12 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
 {
     NSString *ignorePath = [NSString stringWithFormat:@"%@/.xcodecapp-ignore", [currentProjectURL path]];
     [ignoredFilePaths removeAllObjects];
-    
+
     if ([fm fileExistsAtPath:ignorePath])
     {
         NSString *ignoreFileContent = [NSString stringWithContentsOfFile:ignorePath encoding:NSUTF8StringEncoding error:nil];
         NSArray *ignoredPatterns = [ignoreFileContent componentsSeparatedByString:@"\n"];
-        
+
         for (NSString *pattern in ignoredPatterns)
         {
             if ([pattern length])
@@ -531,6 +618,28 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
     [[NSUserDefaults standardUserDefaults] setObject:[currentProjectURL path] forKey:@"LastOpenedPath"];
 }
 
+/*!
+ Clean the support folder according to files present in given path
+ @param basePath the path of the folder to check
+ */
+- (void)tidyShadowedFiles:(NSString*)basePath
+{
+    NSArray *subpaths = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[XCodeSupportProjectSources path] error:NULL];
+
+    for (NSString *subpath in subpaths)
+    {
+        NSString *unshadowed = [[self sourceURLForShadowName:subpath] path];
+        NSString *shadowFullPath = [NSString stringWithFormat:@"%@/%@", [XCodeSupportProjectSources path], subpath];
+        if (![fm fileExistsAtPath:unshadowed])
+        {
+            DLog(@"cleaning shadow file: %@", subpath);
+            [fm removeItemAtPath:shadowFullPath error:nil];
+            if (![self supportFileLevelAPI] && [self respondsToSelector:@selector(updateLastModificationDate:forPath:)])
+                [self performSelector:@selector(updateLastModificationDate:forPath:) withObject:nil withObject:unshadowed];
+        }
+    }
+}
+
 @end
 
 
@@ -570,38 +679,4 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
         return appStartedTimestamp;
 }
 
-- (NSString *)unshadowURLForString:(NSString *)aString
-{
-    NSMutableString * unshadowedPath = [NSMutableString stringWithString:aString];
-
-    [unshadowedPath replaceOccurrencesOfString:@"_"
-                             withString:@"/"
-                                options:NSCaseInsensitiveSearch
-                                  range:NSMakeRange(0, [unshadowedPath length])];
-
-    [unshadowedPath replaceOccurrencesOfString:@".h"
-                                    withString:@".j"
-                                       options:NSCaseInsensitiveSearch
-                                         range:NSMakeRange(0, [unshadowedPath length])];
-
-    return [NSString stringWithString:unshadowedPath];
-}
-
-- (void)tidyShadowedFiles:(NSString*)basePath
-{
-    NSArray *subpaths = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[XCodeSupportProjectSources path] error:NULL];
-
-    for (NSString *subpath in subpaths)
-    {
-        NSString *unshadowed = [self unshadowURLForString:subpath];
-        NSString *shadowFullPath = [NSString stringWithFormat:@"%@/%@", [XCodeSupportProjectSources path], subpath];
-        if (![fm fileExistsAtPath:unshadowed])
-        {
-            DLog(@"cleaning shadow file: %@", subpath);
-            [fm removeItemAtPath:shadowFullPath error:nil];
-            [self updateLastModificationDate:nil forPath:unshadowed];
-        }
-    }
-}
-
 @end