Fix up cocoa frontend.

- Convert to ARC
- Fix crash due to endless responder chain recursion
- Update makefile to find openssl installed via home-brew
- Fix most compiler warnings 

56 files changed, 2517 insertions, 2678 deletions

diff --git a/frontends/cocoa/.gitignore b/frontends/cocoa/.gitignore
new file mode 100644
index 000000000..99c6c7d4f
--- /dev/null
+++ b/frontends/cocoa/.gitignore
@@ -0,0 +1 @@
+**/*.xc*/xcuserdata/
diff --git a/frontends/cocoa/ArrowBox.m b/frontends/cocoa/ArrowBox.m
index 6605fcca9..3eb7411a2 100644
--- a/frontends/cocoa/ArrowBox.m
+++ b/frontends/cocoa/ArrowBox.m
@@ -85,12 +85,12 @@
 
         NSBezierPath *path = [NSBezierPath bezierPath];
 
-        NSRect bounds = [self convertRectToBase: NSInsetRect( [self bounds], 2, 2 )];
+        NSRect bounds = [self.window convertRectToScreen: NSInsetRect( [self bounds], 2, 2 )];
         bounds.origin.x = floor( bounds.origin.x );
         bounds.origin.y = floor( bounds.origin.y );
         bounds.size.width = floor( bounds.size.width );
         bounds.size.height = floor( bounds.size.height );
-        bounds = [self convertRectFromBase: bounds];
+        bounds = [self.window convertRectFromScreen: bounds];
 
         const CGFloat right = bounds.size.width - arrowSize;
         const CGFloat top = bounds.size.height - arrowSize;
diff --git a/frontends/cocoa/ArrowWindow.m b/frontends/cocoa/ArrowWindow.m
index 8edc32e9f..84dbe1ef7 100644
--- a/frontends/cocoa/ArrowWindow.m
+++ b/frontends/cocoa/ArrowWindow.m
@@ -28,9 +28,9 @@
 
 @synthesize acceptsKey;
 
-- (id) initWithContentRect: (NSRect)contentRect styleMask: (NSUInteger)aStyle backing: (NSBackingStoreType)bufferingType defer: (BOOL)flag
+- (id) initWithContentRect: (NSRect)contentRect styleMask: (NSWindowStyleMask)aStyle backing: (NSBackingStoreType)bufferingType defer: (BOOL)flag
 {
-        if ((self = [super initWithContentRect: contentRect styleMask: NSBorderlessWindowMask backing: bufferingType defer: flag]) == nil) {
+        if ((self = [super initWithContentRect: contentRect styleMask: NSWindowStyleMaskBorderless backing: bufferingType defer: flag]) == nil) {
                 return nil;
         }
 
@@ -54,13 +54,12 @@
                 box = [[ArrowBox alloc] initWithFrame: NSZeroRect];
                 [box setArrowEdge: ArrowTopEdge];
                 [super setContentView: box];
-                [box release];
         }
 
         [box addSubview: content];
 
         NSRect frame = [self contentRectForFrameRect: [self frame]];
-        frame.origin = [self convertScreenToBase: frame.origin];
+    frame.origin = [self convertRectFromScreen: (CGRect){.origin = frame.origin}].origin;
         frame = [box convertRect: frame fromView: nil];
 
         [content setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
@@ -73,7 +72,7 @@
         frame.size = aSize;
 
         frame = [box convertRect: frame toView: nil];
-        frame.origin = [self convertBaseToScreen: frame.origin];
+    frame.origin = [self convertRectToScreen: (CGRect){.origin = frame.origin}].origin;
         frame = [self frameRectForContentRect: frame];
 
         [self setFrame: frame display: YES];
@@ -97,7 +96,7 @@ static const CGFloat padding = 0;
         return NSInsetRect( contentRect, offset, offset );
 }
 
-+ (NSRect) frameRectForContentRect: (NSRect)cRect styleMask: (NSUInteger)aStyle
++ (NSRect) frameRectForContentRect: (NSRect)cRect styleMask: (NSWindowStyleMask)aStyle
 {
         const CGFloat DefaultArrowSize = 15;
         const CGFloat offset = -2 * (padding + DefaultArrowSize);
@@ -144,7 +143,7 @@ static NSRect ScreenRectForView( NSView *view )
 {
         NSRect viewRect = [view bounds]; // in View coordinate system
         viewRect = [view convertRect: viewRect toView: nil]; // translate to window coordinates
-        viewRect.origin = [[view window] convertBaseToScreen: viewRect.origin]; // translate to screen coordinates
+    viewRect.origin = [[view window] convertRectToScreen: (CGRect){.origin = viewRect.origin}].origin; // translate to screen coordinates
         return viewRect;
 }
 
diff --git a/frontends/cocoa/BlackScroller.m b/frontends/cocoa/BlackScroller.m
index 2ee739f3a..025e3a955 100644
--- a/frontends/cocoa/BlackScroller.m
+++ b/frontends/cocoa/BlackScroller.m
@@ -45,18 +45,18 @@
 - (void) drawKnobSlotInRect: (NSRect)slotRect highlight: (BOOL)flag
 {
         slotRect = NSInsetRect( slotRect, 2, 2 );
-        slotRect = [self convertRectToBase: slotRect];
+    slotRect = [self.window convertRectToScreen: slotRect];
         slotRect.origin.x = floor( slotRect.origin.x ) + 0.5;
         slotRect.origin.y = floor( slotRect.origin.y ) + 0.5;
         slotRect.size.width = floor( slotRect.size.width );
         slotRect.size.height = floor( slotRect.size.height );
-        slotRect = [self convertRectFromBase: slotRect];
+        slotRect = [self.window convertRectFromScreen: slotRect];
 
-        NSGradient *gradient = [[[NSGradient alloc] initWithColorsAndLocations:
+        NSGradient *gradient = [[NSGradient alloc] initWithColorsAndLocations:
                                                             [NSColor clearColor], 0.0,
                                                     [NSColor clearColor], 0.4,
                                                     [NSColor whiteColor], 1.0,
-                                                    nil] autorelease];
+                                                    nil];
         [[NSColor whiteColor] set];
         const float radius = 0.5 * ([self isHorizontal] ? NSHeight( slotRect ) : NSWidth( slotRect ));
         NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect: slotRect
@@ -77,12 +77,12 @@
 {
         NSRect rect = NSInsetRect( [self rectForPart: NSScrollerKnob], 2, 2 );
 
-        rect = [self convertRectToBase: rect];
+        rect = [self.window convertRectToScreen: rect];
         rect.origin.x = floor( rect.origin.x ) + 0.5;
         rect.origin.y = floor( rect.origin.y ) + 0.5;
         rect.size.width = floor( rect.size.width );
         rect.size.height = floor( rect.size.height );
-        rect = [self convertRectFromBase: rect];
+        rect = [self.window convertRectFromScreen: rect];
 
         [[NSColor colorWithDeviceWhite: 1.0 alpha: drawTrack ? 1.0 : 0.6] set];
 
diff --git a/frontends/cocoa/BookmarksController.h b/frontends/cocoa/BookmarksController.h
index aa71a1ac0..4c90424e7 100644
--- a/frontends/cocoa/BookmarksController.h
+++ b/frontends/cocoa/BookmarksController.h
@@ -23,9 +23,7 @@
 
 @interface BookmarksController : NSWindowController {
 	Tree *tree;
-	TreeView *view;
 	NSMapTable *nodeForMenu;
-	NSMenu *defaultMenu;
 }
 
 @property (readwrite, assign, nonatomic) IBOutlet NSMenu *defaultMenu;
diff --git a/frontends/cocoa/BookmarksController.m b/frontends/cocoa/BookmarksController.m
index d7918d9fc..c8a23cb8d 100644
--- a/frontends/cocoa/BookmarksController.m
+++ b/frontends/cocoa/BookmarksController.m
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import <stddef.h>
+
 #import "utils/messages.h"
 #import "utils/utils.h"
 #import "utils/nsurl.h"
@@ -83,11 +85,8 @@ static const char *cocoa_hotlist_path( void )
 {
         [self setView: nil];
         NSFreeMapTable( nodeForMenu );
-        [tree release];
 
         [[NSNotificationCenter defaultCenter] removeObserver: self];
-
-        [super dealloc];
 }
 
 - (void) menuNeedsUpdate: (NSMenu *)menu
diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index e6e8e0b17..31e74255d 100644
--- a/frontends/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
@@ -63,7 +63,7 @@
 static const CGFloat CaretWidth = 1.0;
 static const NSTimeInterval CaretBlinkTime = 0.8;
 
-- initWithFrame: (NSRect) frame
+- (instancetype)initWithFrame: (NSRect) frame
 {
         if ((self = [super initWithFrame: frame]) == nil) {
                 return nil;
@@ -78,17 +78,13 @@ static const NSTimeInterval CaretBlinkTime = 0.8;
 {
         [self setCaretTimer: nil];
         [self setMarkedText: nil];
-        [history release];
-
-        [super dealloc];
 }
 
 - (void) setCaretTimer: (NSTimer *)newTimer
 {
         if (newTimer != caretTimer) {
                 [caretTimer invalidate];
-                [caretTimer release];
-                caretTimer = [newTimer retain];
+                caretTimer = newTimer;
         }
 }
 
@@ -148,7 +144,7 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view )
 
 - (void)drawRect:(NSRect)dirtyRect
 {
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    @autoreleasepool {
 
         struct redraw_context ctx = {
                 .interactive = true,
@@ -177,7 +173,7 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view )
                 [NSBezierPath fillRect: caretRect];
         }
 
-        [pool release];
+    }
 }
 
 - (BOOL) isFlipped
@@ -192,7 +188,6 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view )
                                                               owner: self
                                                            userInfo: nil];
         [self addTrackingArea: area];
-        [area release];
 }
 
 static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
@@ -200,8 +195,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
         browser_mouse_state result = 0;
         NSUInteger flags = [evt modifierFlags];
 
-        if (flags & NSShiftKeyMask) result |= BROWSER_MOUSE_MOD_1;
-        if (flags & NSAlternateKeyMask) result |= BROWSER_MOUSE_MOD_2;
+        if (flags & NSEventModifierFlagShift) result |= BROWSER_MOUSE_MOD_1;
+        if (flags & NSEventModifierFlagOption) result |= BROWSER_MOUSE_MOD_2;
 
         return result;
 }
@@ -221,7 +216,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
 
 - (void) mouseDown: (NSEvent *)theEvent
 {
-        if ([theEvent modifierFlags] & NSControlKeyMask) {
+        if ([theEvent modifierFlags] & NSEventModifierFlagControl) {
                 [self popUpContextMenuForEvent: theEvent];
                 return;
         }
@@ -527,7 +522,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
                                keyEquivalent: @""] setRepresentedObject: imageURL];
                 [[popupMenu addItemWithTitle: NSLocalizedString( @"Copy image", @"Context menu" )
                                       action: @selector(cmImageCopy:)
-                               keyEquivalent: @""] setRepresentedObject: (id)content_get_bitmap( cont.object )];
+                               keyEquivalent: @""] setRepresentedObject: (__bridge id)content_get_bitmap( cont.object )];
 
                 [popupMenu addItem: [NSMenuItem separatorItem]];
         }
@@ -561,8 +556,6 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
                              action: @selector(viewSource:) keyEquivalent: @""];
 
         [NSMenu popUpContextMenu: popupMenu withEvent: event forView: self];
-
-        [popupMenu release];
 }
 
 - (IBAction) cmOpenURLInTab: (id)sender
@@ -693,7 +686,6 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
 
 - (void) setMarkedText: (id) aString selectedRange: (NSRange) selRange
 {
-        [markedText release];
         markedText = [aString isEqualToString: @""] ? nil : [aString copy];
 }
 
@@ -714,7 +706,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
 
 - (NSAttributedString *) attributedSubstringFromRange: (NSRange) theRange
 {
-        return [[[NSAttributedString alloc] initWithString: @""] autorelease];
+        return [[NSAttributedString alloc] initWithString: @""];
 }
 
 - (NSRange) markedRange
@@ -742,7 +734,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
         return [NSArray array];
 }
 
-- (void) doCommandBySelector: (SEL) sel;
+- (void) doCommandBySelector: (SEL) sel
 {
         [super doCommandBySelector: sel];
 }
diff --git a/frontends/cocoa/BrowserViewController.h b/frontends/cocoa/BrowserViewController.h
index 6b4c3e79c..a37081013 100644
--- a/frontends/cocoa/BrowserViewController.h
+++ b/frontends/cocoa/BrowserViewController.h
@@ -26,7 +26,6 @@ struct browser_window;
 @interface BrowserViewController : NSViewController {
 	struct browser_window *browser;
 	NSString *url;
-	BrowserView *browserView;
 	BrowserWindowController *windowController;
 	NSString *title;
 	NSString *status;
@@ -40,7 +39,7 @@ struct browser_window;
 @property (readwrite, copy, nonatomic) NSString *url;
 @property (readwrite, assign, nonatomic) IBOutlet BrowserView *browserView;
 @property (readwrite, retain, nonatomic) BrowserWindowController *windowController;
-@property (readwrite, copy, nonatomic) NSString *title;
+@property (readwrite, copy) NSString *title;
 @property (readwrite, copy, nonatomic) NSString *status;
 @property (readwrite, assign, nonatomic) BOOL isProcessing;
 @property (readwrite, copy, nonatomic) NSImage *favicon;
diff --git a/frontends/cocoa/BrowserViewController.m b/frontends/cocoa/BrowserViewController.m
index 4cac57ef3..4db479a1b 100644
--- a/frontends/cocoa/BrowserViewController.m
+++ b/frontends/cocoa/BrowserViewController.m
@@ -47,19 +47,8 @@
 @synthesize canGoBack;
 @synthesize canGoForward;
 
-- (void) dealloc
-{
-        [self setUrl: nil];
-        [self setBrowserView: nil];
-        [self setWindowController: nil];
-        [self setTitle: nil];
-        [self setStatus: nil];
-        [self setFavicon: nil];
-
-        [super dealloc];
-}
 
-- initWithBrowser: (struct browser_window *) bw
+- (instancetype)initWithBrowser: (struct browser_window *) bw
 {
         if ((self = [super initWithNibName: @"Browser" bundle: nil]) == nil) {
                 return nil;
@@ -221,8 +210,8 @@
                 lwc_string *str = content_get_mime_type(content);
                 if (str) {
                         NSString *mime = [NSString stringWithUTF8String:lwc_string_data(str)];
-                        NSString *uti = (NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, (CFStringRef)mime, NULL);
-                        NSString *ext = (NSString *)UTTypeCopyPreferredTagWithClass((CFStringRef)uti, kUTTagClassFilenameExtension);
+                        NSString *uti = (__bridge_transfer NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, (__bridge CFStringRef)mime, NULL);
+                        NSString *ext = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)uti, kUTTagClassFilenameExtension);
                         extension = [ext UTF8String];
                         lwc_string_unref(str);
                 }
@@ -233,7 +222,7 @@
 
                 NSData *data = [NSData dataWithBytes:source length:size];
                 [data writeToURL:dataUrl atomically:NO];
-                path = [[dataUrl path] UTF8String];
+                path = (char *)[[dataUrl path] UTF8String];
         }
 
         if (path) {
@@ -306,10 +295,19 @@ compare_float( float a, float b )
 
 struct history_add_menu_item_data {
         NSInteger index;
-        NSMenu *menu;
-        id target;
+        void *menu;
+        void *target;
 };
 
+
+static NSMenu *get_menu(const struct history_add_menu_item_data *data) {
+    return (__bridge NSMenu *)data->menu;
+}
+
+static id get_target (const struct history_add_menu_item_data *data) {
+    return (__bridge id)data->target;
+}
+
 static bool
 history_add_menu_item_cb(const struct browser_window *bw,
                          int x0, int y0, int x1, int y1,
@@ -319,18 +317,17 @@ history_add_menu_item_cb(const struct browser_window *bw,
         struct history_add_menu_item_data *data = user_data;
 
         NSMenuItem *item = nil;
-        if (data->index < [data->menu numberOfItems]) {
-                item = [data->menu itemAtIndex: data->index];
+        if (data->index < [get_menu(data) numberOfItems]) {
+                item = [get_menu(data) itemAtIndex: data->index];
         } else {
                 item = [[NSMenuItem alloc] initWithTitle: @""
                                                   action: @selector( historyItemSelected: )
                                            keyEquivalent: @""];
-                [data->menu addItem: item];
-                [item release];
+                [get_menu(data) addItem: item];
         }
         ++data->index;
 
-        [item setTarget: data->target];
+        [item setTarget: get_target(data)];
         [item setTitle: [NSString stringWithUTF8String: browser_window_history_entry_get_title( page )]];
         [item setRepresentedObject: [NSValue valueWithPointer: page]];
 
@@ -348,8 +345,8 @@ history_add_menu_item_cb(const struct browser_window *bw,
 {
         struct history_add_menu_item_data data = {
                 .index = 0,
-                .menu = menu,
-                .target = self
+                .menu = (__bridge void *)menu,
+                .target = (__bridge void *)self
         };
         browser_window_history_enumerate_back(browser,
                                               history_add_menu_item_cb,
@@ -363,8 +360,8 @@ history_add_menu_item_cb(const struct browser_window *bw,
 {
         struct history_add_menu_item_data data = {
                 .index = 0,
-                .menu = menu,
-                .target = self
+                .menu = (__bridge void *)menu,
+                .target = (__bridge void *)self
         };
         browser_window_history_enumerate_forward(browser,
                                                  history_add_menu_item_cb,
diff --git a/frontends/cocoa/BrowserWindowController.h b/frontends/cocoa/BrowserWindowController.h
index 22e199509..1b40ca8b0 100644
--- a/frontends/cocoa/BrowserWindowController.h
+++ b/frontends/cocoa/BrowserWindowController.h
@@ -22,17 +22,7 @@
 @class BrowserViewController;
 @class URLFieldCell;
 
-@interface BrowserWindowController : NSWindowController {
-	PSMTabBarControl *tabBar;
-	NSTabView *tabView;
-	URLFieldCell *urlField;
-	NSObjectController *activeBrowserController;
-	NSSegmentedControl *navigationControl;
-	NSButton *historyButton;
-	BrowserViewController *activeBrowser;
-	NSMenu *historyBackMenu;
-	NSMenu *historyForwardMenu;
-}
+@interface BrowserWindowController : NSWindowController 
 
 @property (readwrite, assign, nonatomic) IBOutlet PSMTabBarControl *tabBar;
 @property (readwrite, assign, nonatomic) IBOutlet NSTabView *tabView;
diff --git a/frontends/cocoa/BrowserWindowController.m b/frontends/cocoa/BrowserWindowController.m
index aa7375a0e..1fa78b47b 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -52,24 +52,15 @@
 @synthesize activeBrowser;
 @synthesize activeBrowserController;
 
-- (id) init;
+- (id) init
 {
 	if (nil == (self = [super initWithWindowNibName: @"BrowserWindow"])) return nil;
 	
 	return self;
 }
 
-- (void) dealloc;
-{
-	[self setTabBar: nil];
-	[self setTabView: nil];
-	[self setUrlField: nil];
-	[self setNavigationControl: nil];
-	
-	[super dealloc];
-}
 
-- (void) awakeFromNib;
+- (void) awakeFromNib
 {
 	[tabBar setShowAddTabButton: YES];
 	[tabBar setTearOffStyle: PSMTabBarTearOffMiniwindow];
@@ -94,9 +85,9 @@
 	[navigationControl setMenu: historyForwardMenu forSegment: 1];
 }
 
-- (void) addTab: (BrowserViewController *)browser;
+- (void) addTab: (BrowserViewController *)browser
 {
-	NSTabViewItem *item = [[[NSTabViewItem alloc] initWithIdentifier: browser] autorelease];
+	NSTabViewItem *item = [[NSTabViewItem alloc] initWithIdentifier: browser];
 	
 	[item setView: [browser view]];
 	[item bind: @"label" toObject: browser withKeyPath: @"title" options: nil];
@@ -107,7 +98,7 @@
 	[tabView selectTabViewItem: item];
 }
 
-- (void) removeTab: (BrowserViewController *)browser;
+- (void) removeTab: (BrowserViewController *)browser
 {
 	NSUInteger itemIndex = [tabView indexOfTabViewItemWithIdentifier: browser];
 	if (itemIndex != NSNotFound) {
@@ -117,7 +108,7 @@
 	}
 }
 
-- (BOOL) windowShouldClose: (NSWindow *) window;
+- (BOOL) windowShouldClose: (NSWindow *) window
 {
 	if ([tabView numberOfTabViewItems] <= 1) return YES;
 	if ([[NSUserDefaults standardUserDefaults] boolForKey: kAlwaysCloseMultipleTabs]) return YES;
@@ -136,23 +127,23 @@
 	return NO;
 }
 
-- (void) canCloseAlertDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo;
+- (void) canCloseAlertDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo
 {
-	if (returnCode == NSOKButton) {
+	if (returnCode == NSModalResponseOK) {
 		[[NSUserDefaults standardUserDefaults] setBool: [[alert suppressionButton] state] == NSOnState 
 												forKey: kAlwaysCloseMultipleTabs];
 		[[self window] close];
 	}
 }
 
-- (void) windowWillClose: (NSNotification *)notification;
+- (void) windowWillClose: (NSNotification *)notification
 {
 	for (NSTabViewItem *tab in [tabView tabViewItems]) {
 		[tabView removeTabViewItem: tab];
 	}
 }
 
-- (IBAction) newTab: (id) sender;
+- (IBAction) newTab: (id) sender
 {
 	nsurl *url;
 	nserror error;
@@ -176,38 +167,38 @@
         }
 }
 
-- (IBAction) closeCurrentTab: (id) sender;
+- (IBAction) closeCurrentTab: (id) sender
 {
 	[self removeTab: activeBrowser];
 }
 
-- (void) setActiveBrowser: (BrowserViewController *)newBrowser;
+- (void) setActiveBrowser: (BrowserViewController *)newBrowser
 {
 	activeBrowser = newBrowser;
-	[self setNextResponder: activeBrowser];
+	//[self setNextResponder: activeBrowser];
 }
 
-- (void) setCanGoBack: (BOOL)can;
+- (void) setCanGoBack: (BOOL)can
 {
 	[navigationControl setEnabled: can forSegment: 0];
 }
 
-- (BOOL) canGoBack;
+- (BOOL) canGoBack
 {
 	return [navigationControl isEnabledForSegment: 0];
 }
 
-- (void) setCanGoForward: (BOOL)can;
+- (void) setCanGoForward: (BOOL)can
 {
 	[navigationControl setEnabled: can forSegment: 1];
 }
 
-- (BOOL) canGoForward;
+- (BOOL) canGoForward
 {
 	return [navigationControl isEnabledForSegment: 1];
 }
 
-- (void)windowDidBecomeMain: (NSNotification *)note;
+- (void)windowDidBecomeMain: (NSNotification *)note
 {
 	[(NetSurfApp *)NSApp setFrontTab: [[tabView selectedTabViewItem] identifier]];
 }
@@ -224,7 +215,7 @@
 #pragma mark -
 #pragma mark Tab bar delegate
 
-- (void) tabView: (NSTabView *)tabView didSelectTabViewItem: (NSTabViewItem *)tabViewItem;
+- (void) tabView: (NSTabView *)tabView didSelectTabViewItem: (NSTabViewItem *)tabViewItem
 {
 	[self setActiveBrowser: [tabViewItem identifier]];
 	if ([[self window] isMainWindow]) {
@@ -243,15 +234,15 @@
 	return YES;
 }
 
-- (PSMTabBarControl *)tabView:(NSTabView *)aTabView newTabBarForDraggedTabViewItem:(NSTabViewItem *)tabViewItem atPoint:(NSPoint)point;
+- (PSMTabBarControl *)tabView:(NSTabView *)aTabView newTabBarForDraggedTabViewItem:(NSTabViewItem *)tabViewItem atPoint:(NSPoint)point
 {
-	BrowserWindowController *newWindow = [[[BrowserWindowController alloc] init] autorelease];
+	BrowserWindowController *newWindow = [[BrowserWindowController alloc] init];
 	[[tabViewItem identifier] setWindowController: newWindow];
 	[[newWindow window] setFrameOrigin: point];
 	return newWindow->tabBar;
 }
 
-- (void) tabView: (NSTabView *)aTabView didCloseTabViewItem: (NSTabViewItem *)tabViewItem;
+- (void) tabView: (NSTabView *)aTabView didCloseTabViewItem: (NSTabViewItem *)tabViewItem
 {
 	[tabViewItem unbind: @"label"];
 	
diff --git a/frontends/cocoa/DownloadWindowController.m b/frontends/cocoa/DownloadWindowController.m
index b8cf09b18..7dc461bf0 100644
--- a/frontends/cocoa/DownloadWindowController.m
+++ b/frontends/cocoa/DownloadWindowController.m
@@ -66,15 +66,6 @@ static void cocoa_register_download( DownloadWindowController *download );
 - (void) dealloc
 {
         download_context_destroy( context );
-
-        [self setURL: nil];
-        [self setMIMEType: nil];
-        [self setSaveURL: nil];
-        [self setOutputFile: nil];
-        [self setSavedData: nil];
-        [self setStartDate: nil];
-
-        [super dealloc];
 }
 
 - (void) abort
@@ -99,7 +90,7 @@ static void cocoa_register_download( DownloadWindowController *download );
 {
         canClose = YES;
 
-        if (returnCode == NSCancelButton) {
+        if (returnCode == NSModalResponseCancel) {
                 [self abort];
                 return;
         }
@@ -115,7 +106,7 @@ static void cocoa_register_download( DownloadWindowController *download );
                                                                  url, (NSString *)kLSQuarantineDataURLKey,
                                                          (NSString *)kLSQuarantineTypeWebDownload, (NSString *)kLSQuarantineTypeKey,
                                                          nil];
-                LSSetItemAttribute( &ref, kLSRolesAll, kLSItemQuarantineProperties, (CFDictionaryRef)attributes );
+                LSSetItemAttribute( &ref, kLSRolesAll, kLSItemQuarantineProperties, (__bridge CFDictionaryRef)attributes );
                 LOG("Set quarantine attributes on file %s", [path UTF8String]);
         }
 
@@ -210,7 +201,7 @@ static void cocoa_register_download( DownloadWindowController *download );
 
 - (void) askCancelDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
 {
-        if (returnCode == NSOKButton) {
+        if (returnCode == NSModalResponseOK) {
                 [[NSUserDefaults standardUserDefaults]
                         setBool: [[alert suppressionButton] state] == NSOnState
                          forKey: kAlwaysCancelDownload];
@@ -334,12 +325,12 @@ static NSString *cocoa_time_string( unsigned seconds )
         return [NSSet setWithObjects: @"mimeType", @"URL", nil];
 }
 
-- (NSImage *) icon;
+- (NSImage *) icon
 {
-        NSString *type = [(NSString *)UTTypeCreatePreferredIdentifierForTag( kUTTagClassMIMEType, (CFStringRef)mimeType, NULL ) autorelease];
+        NSString *type = (__bridge_transfer NSString *)UTTypeCreatePreferredIdentifierForTag( kUTTagClassMIMEType, (__bridge CFStringRef)mimeType, NULL );
         if ([type hasPrefix: @"dyn."] || [type isEqualToString: (NSString *)kUTTypeData]) {
                 NSString *pathExt = [[url path] pathExtension];
-                type = [(NSString *)UTTypeCreatePreferredIdentifierForTag( kUTTagClassFilenameExtension, (CFStringRef)pathExt, NULL ) autorelease];
+                type = (__bridge_transfer NSString *)UTTypeCreatePreferredIdentifierForTag( kUTTagClassFilenameExtension, (__bridge CFStringRef)pathExt, NULL );
         }
         return [[NSWorkspace sharedWorkspace] iconForFileType: type];
 }
@@ -355,9 +346,8 @@ gui_download_window_create(download_context *ctx,
         DownloadWindowController * const window = [[DownloadWindowController alloc] initWithContext: ctx];
         cocoa_register_download( window );
         [window askForSave];
-        [window release];
 
-        return (struct gui_download_window *)window;
+        return (__bridge_retained struct gui_download_window *)window;
 }
 
 static nserror
@@ -365,7 +355,7 @@ gui_download_window_data(struct gui_download_window *dw,
                          const char *data,
                          unsigned int size)
 {
-        DownloadWindowController * const window = (DownloadWindowController *)dw;
+        DownloadWindowController * const window = (__bridge DownloadWindowController *)dw;
         return [window receivedData: [NSData dataWithBytes: data length: size]] ? NSERROR_OK : NSERROR_SAVE_FAILED;
 }
 
@@ -373,14 +363,14 @@ static void
 gui_download_window_error(struct gui_download_window *dw,
                           const char *error_msg)
 {
-        DownloadWindowController * const window = (DownloadWindowController *)dw;
+        DownloadWindowController * const window = (__bridge DownloadWindowController *)dw;
         [window showError: [NSString stringWithUTF8String: error_msg]];
 }
 
 static void
 gui_download_window_done(struct gui_download_window *dw)
 {
-        DownloadWindowController * const window = (DownloadWindowController *)dw;
+        DownloadWindowController * const window = (__bridge DownloadWindowController *)dw;
         [window downloadDone];
 }
 
diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index b7d168e0f..a29d00811 100644
--- a/frontends/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
@@ -25,16 +25,16 @@
 
 static inline NSRect cocoa_rect_for_control( struct browser_window *bw, struct form_control *control)
 {
-        struct rect r;
-        form_control_bounding_rect(control, &r);
-        return cocoa_scaled_rect(browser_window_get_scale(bw),
-                                 r.x0,
-                                 r.y0,
-                                 r.x1,
-                                 r.y1);
+    struct rect r;
+    form_control_bounding_rect(control, &r);
+    return cocoa_scaled_rect(browser_window_get_scale(bw),
+                             r.x0,
+                             r.y0,
+                             r.x1,
+                             r.y1);
 }
 
-@interface FormSelectMenu ()
+@interface FormSelectMenu () <NSMenuDelegate>
 
 - (void) itemSelected: (id) sender;
 
@@ -45,70 +45,61 @@ static inline NSRect cocoa_rect_for_control( struct browser_window *bw, struct f
 
 - (id) initWithControl: (struct form_control *) c forWindow: (struct browser_window *) w
 {
-        if ((self = [super init]) == nil) return nil;
-
-        control = c;
-        browser = w;
-
-        menu = [[NSMenu alloc] initWithTitle: @"Select"];
-        if (menu == nil) {
-                [self release];
-                return nil;
-        }
-
-        [menu addItemWithTitle: @"" action: NULL keyEquivalent: @""];
-
-        NSInteger currentItemIndex = 0;
-        struct form_option *opt;
-        for (opt = form_select_get_option(control, 0);
-             opt != NULL;
-             opt = opt->next) {
-                NSMenuItem *item = [[NSMenuItem alloc] initWithTitle: [NSString stringWithUTF8String: opt->text]
-                                                              action: @selector( itemSelected: )
-                                                       keyEquivalent: @""];
-                if (opt->selected) {
-                        [item setState: NSOnState];
-                }
-                [item setTarget: self];
-                [item setTag: currentItemIndex++];
-                [menu addItem: item];
-                [item release];
+    if ((self = [super init]) == nil) return nil;
+
+    control = c;
+    browser = w;
+
+    menu = [[NSMenu alloc] initWithTitle: @"Select"];
+    if (menu == nil) {
+        return nil;
+    }
+
+    [menu addItemWithTitle: @"" action: NULL keyEquivalent: @""];
+
+    NSInteger currentItemIndex = 0;
+    struct form_option *opt;
+    for (opt = form_select_get_option(control, 0);
+         opt != NULL;
+         opt = opt->next) {
+        NSMenuItem *item = [[NSMenuItem alloc] initWithTitle: [NSString stringWithUTF8String: opt->text]
+                                                      action: @selector( itemSelected: )
+                                               keyEquivalent: @""];
+        if (opt->selected) {
+            [item setState: NSOnState];
         }
+        [item setTarget: self];
+        [item setTag: currentItemIndex++];
+        [menu addItem: item];
+    }
 
-        [menu setDelegate: self];
+    [menu setDelegate: self];
 
-        return self;
+    return self;
 }
 
-- (void) dealloc
-{
-        [cell release];
-        [menu release];
-
-        [super dealloc];
-}
 
 - (void) runInView: (NSView *) view
 {
-        [self retain];
+    (void)(__bridge_retained void *)self;
 
-        cell = [[NSPopUpButtonCell alloc] initTextCell: @"" pullsDown: YES];
-        [cell setMenu: menu];
+    cell = [[NSPopUpButtonCell alloc] initTextCell: @"" pullsDown: YES];
+    [cell setMenu: menu];
 
-        const NSRect rect = cocoa_rect_for_control(browser, control);
+    const NSRect rect = cocoa_rect_for_control(browser, control);
 
-        [cell attachPopUpWithFrame: rect inView: view];
-        [cell performClickWithFrame: rect inView: view];
+    [cell attachPopUpWithFrame: rect inView: view];
+    [cell performClickWithFrame: rect inView: view];
 }
 
 - (void) itemSelected: (id) sender
 {
-        form_select_process_selection( control, [sender tag] );
+    form_select_process_selection( control, (int)[sender tag] );
 }
 
 - (void) menuDidClose: (NSMenu *) sender
 {
-        [self release];
+    (void)(__bridge_transfer id)((__bridge void *)self);
 }
 
 @end
diff --git a/frontends/cocoa/HistoryView.h b/frontends/cocoa/HistoryView.h
index 6ef061321..5e4b45447 100644
--- a/frontends/cocoa/HistoryView.h
+++ b/frontends/cocoa/HistoryView.h
@@ -23,11 +23,10 @@
 
 @interface HistoryView : NSView {
 	struct browser_window *browser;
-	BrowserView *browserView;
 	NSMutableArray *toolTips;
 }
 
-@property (readwrite, assign, nonatomic) BrowserView *browser;
+@property (readwrite, retain, nonatomic) BrowserView *browser;
 
 - (void) updateHistory;
 - (NSSize) size;
diff --git a/frontends/cocoa/HistoryView.m b/frontends/cocoa/HistoryView.m
index bead8dbed..00a7d4abc 100644
--- a/frontends/cocoa/HistoryView.m
+++ b/frontends/cocoa/HistoryView.m
@@ -30,14 +30,14 @@
 
 @synthesize browser = browserView;
 
-- (void) setBrowser: (BrowserView *) bw;
+- (void) setBrowser: (BrowserView *) bw
 {
 	browserView = bw;
 	browser = [bw browser];
 	[self updateHistory];
 }
 
-- (NSSize) size;
+- (NSSize) size
 {
 	int width, height;
 	browser_window_history_size( browser, &width, &height );
@@ -45,13 +45,13 @@
 	return cocoa_size( width, height );
 }
 
-- (void) updateHistory;
+- (void) updateHistory
 {
 	[self setFrameSize: [self size]];
 	[self setNeedsDisplay: YES];
 }
 
-- (void) drawRect: (NSRect)rect;
+- (void) drawRect: (NSRect)rect
 {
 	[[NSColor clearColor] set];
 	[NSBezierPath fillRect: rect];
@@ -67,10 +67,10 @@
 	browser_window_history_redraw( browser, &ctx );
 }
 
-- (void) mouseUp: (NSEvent *)theEvent;
+- (void) mouseUp: (NSEvent *)theEvent
 {
 	const NSPoint location = [self convertPoint: [theEvent locationInWindow] fromView: nil];
-	const bool newWindow = [theEvent modifierFlags] & NSCommandKeyMask;
+	const bool newWindow = [theEvent modifierFlags] & NSEventModifierFlagCommand;
 	if (browser_window_history_click( browser, 
 					   cocoa_pt_to_px( location.x ), cocoa_pt_to_px( location.y ),
 					   newWindow )) {
@@ -78,17 +78,17 @@
 	}
 }
 
-- (BOOL) isFlipped;
+- (BOOL) isFlipped
 {
 	return YES;
 }
 
-- (void) mouseEntered: (NSEvent *) event;
+- (void) mouseEntered: (NSEvent *) event
 {
 	[[NSCursor pointingHandCursor] set];
 }
 
-- (void) mouseExited: (NSEvent *) event;
+- (void) mouseExited: (NSEvent *) event
 {
 	[[NSCursor arrowCursor] set];
 }
@@ -96,7 +96,7 @@
 static bool cursor_rects_cb( const struct browser_window *bw, int x0, int y0, int x1, int y1, 
 							const struct history_entry *page, void *user_data )
 {
-	HistoryView *view = user_data;
+	HistoryView *view = (__bridge HistoryView *)user_data;
 	
 	NSRect rect = NSIntersectionRect( [view visibleRect], cocoa_rect( x0, y0, x1, y1 ) );
 	if (!NSIsEmptyRect( rect )) {
@@ -109,13 +109,12 @@ static bool cursor_rects_cb( const struct browser_window *bw, int x0, int y0, in
 															options: NSTrackingMouseEnteredAndExited | NSTrackingActiveInActiveApp
 															  owner: view userInfo: nil];
 		[view addTrackingArea: area];
-		[area release];
 	}
 	
 	return true;
 }
 
-- (NSToolTipTag)addToolTipRect: (NSRect) rect owner: (id) owner userData: (void *) userData;
+- (NSToolTipTag)addToolTipRect: (NSRect) rect owner: (id) owner userData: (void *) userData
 {
 	if (toolTips == nil) toolTips = [[NSMutableArray alloc] init];
 	[toolTips addObject: owner];
@@ -123,13 +122,13 @@ static bool cursor_rects_cb( const struct browser_window *bw, int x0, int y0, in
 	return [super addToolTipRect: rect owner: owner userData: userData];
 }
 
-- (void) removeAllToolTips;
+- (void) removeAllToolTips
 {
 	[super removeAllToolTips];
 	[toolTips removeAllObjects];
 }
 
-- (void) updateTrackingAreas;
+- (void) updateTrackingAreas
 {
 	[self removeAllToolTips];
 
@@ -137,15 +136,10 @@ static bool cursor_rects_cb( const struct browser_window *bw, int x0, int y0, in
 		[self removeTrackingArea: area];
 	}
 	
-	browser_window_history_enumerate( browser, cursor_rects_cb, self );
+	browser_window_history_enumerate( browser, cursor_rects_cb, (__bridge void *)self );
 	
 	[super updateTrackingAreas];
 }
 
-- (void) dealloc;
-{
-	[self removeAllToolTips];
-	[super dealloc];
-}
 
 @end
diff --git a/frontends/cocoa/HistoryWindowController.h b/frontends/cocoa/HistoryWindowController.h
index 30ba8049a..3b1d97679 100644
--- a/frontends/cocoa/HistoryWindowController.h
+++ b/frontends/cocoa/HistoryWindowController.h
@@ -23,9 +23,8 @@
 
 @interface HistoryWindowController : NSWindowController {
 	Tree *tree;
-	TreeView *view;
 }
 
-@property (readwrite, assign, nonatomic) IBOutlet TreeView *view;
+@property (readwrite, nonatomic) IBOutlet TreeView *view;
 
 @end
diff --git a/frontends/cocoa/HistoryWindowController.m b/frontends/cocoa/HistoryWindowController.m
index cae679b9d..aff85f2d5 100644
--- a/frontends/cocoa/HistoryWindowController.m
+++ b/frontends/cocoa/HistoryWindowController.m
@@ -26,7 +26,7 @@
 
 @synthesize view;
 
-- init;
+- (instancetype)init
 {
 	if ((self = [super initWithWindowNibName: @"HistoryWindow"]) == nil) return nil;
 	
@@ -35,15 +35,7 @@
 	return self;
 }
 
-- (void) dealloc;
-{
-	[tree release];
-	[self setView: nil];
-	
-	[super dealloc];
-}
-
-- (void)awakeFromNib;
+- (void)awakeFromNib
 {
 	[view setTree: tree];
 	[[self window] setExcludedFromWindowsMenu: YES];
diff --git a/frontends/cocoa/LocalHistoryController.h b/frontends/cocoa/LocalHistoryController.h
index 3e6d1775e..22a79c6ec 100644
--- a/frontends/cocoa/LocalHistoryController.h
+++ b/frontends/cocoa/LocalHistoryController.h
@@ -21,13 +21,10 @@
 @class HistoryView;
 @class BrowserView;
 
-@interface LocalHistoryController : NSWindowController {
-	HistoryView *history;
-	BrowserView *browser;
-}
+@interface LocalHistoryController : NSWindowController
 
-@property (readwrite, assign, nonatomic) BrowserView *browser;
-@property (readwrite, assign, nonatomic) IBOutlet HistoryView *history;
+@property (readwrite, nonatomic) BrowserView *browser;
+@property (readwrite, nonatomic) IBOutlet HistoryView *history;
 
 - (id)initWithBrowser: (BrowserView *) bw;
 
diff --git a/frontends/cocoa/LocalHistoryController.m b/frontends/cocoa/LocalHistoryController.m
index b3992b614..97c592d43 100644
--- a/frontends/cocoa/LocalHistoryController.m
+++ b/frontends/cocoa/LocalHistoryController.m
@@ -27,7 +27,7 @@
 @synthesize browser;
 @synthesize history;
 
-- initWithBrowser: (BrowserView *) bw;
+- (instancetype)initWithBrowser: (BrowserView *) bw
 {
 	if ((self = [super initWithWindowNibName: @"LocalHistoryPanel"]) == nil) return nil;
 	
@@ -36,7 +36,7 @@
 	return self;
 }
 
-- (void) attachToView: (NSView *) view;
+- (void) attachToView: (NSView *) view
 {
 	NSDisableScreenUpdates();
 	
@@ -87,22 +87,22 @@
 	NSEnableScreenUpdates();
 }
 
-- (void) detach;
+- (void) detach
 {
 	[(ArrowWindow *)[self window] detach];
 }
 
-- (void) windowDidLoad;
+- (void) windowDidLoad
 {
 	[history setBrowser: browser];
 }
 
-- (void) redraw;
+- (void) redraw
 {
 	[history setNeedsDisplay: YES];
 }
 
-- (void) keyDown: (NSEvent *)theEvent;
+- (void) keyDown: (NSEvent *)theEvent
 {
 	unichar key = [[theEvent characters] characterAtIndex: 0];
 	switch (key) {
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index 7c81a626d..c5d329b92 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -11,6 +11,12 @@ POSTEXES += NetSurf.app
 ifneq ($(shell test -d /opt/local && echo 'yes'),)
   LDFLAGS += -L/opt/local/lib
   CFLAGS += -I/opt/local/include
+else
+  # Check for homebrew installation of openssl
+  ifneq ($(shell test -d /usr/local/opt/openssl/lib && echo 'yes'),)
+    LDFLAGS += -L/usr/local/opt/openssl/lib
+    CFLAGS += -I/usr/local/opt/openssl/include
+  endif
 endif
 
 ifeq ($(SDK_VERSION),)
@@ -35,7 +41,7 @@ LDFLAGS += -L/usr/X11/lib
 LDFLAGS += -lm -lcurl
 LDFLAGS += -lssl -lcrypto
 
-CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -g -Os
+CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -g -Os -fobjc-arc
 
 CFLAGS += -I/usr/X11/include
 CFLAGS += -include cocoa/Prefix.pch
diff --git a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
index ef25d2f1a..94c82d65e 100644
--- a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
+++ b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
@@ -3,829 +3,1421 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
+/* Begin PBXBuildFile section */
+		263A28101EE40CCF005C52B9 /* NSString_AITruncation.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26131EE40BFC005C52B9 /* NSString_AITruncation.m */; };
+		263A28111EE40CCF005C52B9 /* PSMOverflowPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26151EE40BFC005C52B9 /* PSMOverflowPopUpButton.m */; };
+		263A28121EE40CCF005C52B9 /* PSMProgressIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26171EE40BFC005C52B9 /* PSMProgressIndicator.m */; };
+		263A28131EE40CCF005C52B9 /* PSMRolloverButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26191EE40BFC005C52B9 /* PSMRolloverButton.m */; };
+		263A28141EE40CCF005C52B9 /* PSMTabBarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A261B1EE40BFC005C52B9 /* PSMTabBarCell.m */; };
+		263A28151EE40CCF005C52B9 /* PSMTabBarControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A261D1EE40BFC005C52B9 /* PSMTabBarControl.m */; };
+		263A28161EE40CCF005C52B9 /* PSMTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A261F1EE40BFC005C52B9 /* PSMTabBarController.m */; };
+		263A28171EE40CCF005C52B9 /* PSMTabDragAssistant.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26211EE40BFC005C52B9 /* PSMTabDragAssistant.m */; };
+		263A28181EE40CCF005C52B9 /* PSMTabDragView.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26231EE40BFC005C52B9 /* PSMTabDragView.m */; };
+		263A28191EE40CCF005C52B9 /* PSMTabDragWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26251EE40BFC005C52B9 /* PSMTabDragWindow.m */; };
+		263A281A1EE40CCF005C52B9 /* PSMTabDragWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26271EE40BFC005C52B9 /* PSMTabDragWindowController.m */; };
+		263A281B1EE40CCF005C52B9 /* PSMUnifiedTabStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A262A1EE40BFC005C52B9 /* PSMUnifiedTabStyle.m */; };
+		263A281C1EE40CCF005C52B9 /* apple_image.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26821EE40BFC005C52B9 /* apple_image.m */; };
+		263A281D1EE40CCF005C52B9 /* ArrowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26831EE40BFC005C52B9 /* ArrowBox.m */; };
+		263A281E1EE40CCF005C52B9 /* ArrowWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26841EE40BFC005C52B9 /* ArrowWindow.m */; };
+		263A281F1EE40CCF005C52B9 /* bitmap.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26851EE40BFC005C52B9 /* bitmap.m */; };
+		263A28201EE40CCF005C52B9 /* BlackScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26861EE40BFC005C52B9 /* BlackScroller.m */; };
+		263A28211EE40CCF005C52B9 /* BookmarksController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26871EE40BFC005C52B9 /* BookmarksController.m */; };
+		263A28221EE40CCF005C52B9 /* BrowserView.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26881EE40BFC005C52B9 /* BrowserView.m */; };
+		263A28231EE40CCF005C52B9 /* BrowserViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26891EE40BFC005C52B9 /* BrowserViewController.m */; };
+		263A28241EE40CCF005C52B9 /* BrowserWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A268A1EE40BFC005C52B9 /* BrowserWindow.m */; };
+		263A28251EE40CCF005C52B9 /* BrowserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A268B1EE40BFC005C52B9 /* BrowserWindowController.m */; };
+		263A28261EE40CCF005C52B9 /* desktop-tree.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A268C1EE40BFC005C52B9 /* desktop-tree.m */; };
+		263A28271EE40CCF005C52B9 /* DownloadWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A268D1EE40BFC005C52B9 /* DownloadWindowController.m */; };
+		263A28281EE40CCF005C52B9 /* fetch.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A268E1EE40BFC005C52B9 /* fetch.m */; };
+		263A28291EE40CCF005C52B9 /* font.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A268F1EE40BFC005C52B9 /* font.m */; };
+		263A282A1EE40CCF005C52B9 /* FormSelectMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26901EE40BFC005C52B9 /* FormSelectMenu.m */; };
+		263A282B1EE40CCF005C52B9 /* gui.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26911EE40BFC005C52B9 /* gui.m */; };
+		263A282C1EE40CCF005C52B9 /* HistoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26921EE40BFC005C52B9 /* HistoryView.m */; };
+		263A282D1EE40CCF005C52B9 /* HistoryWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26931EE40BFC005C52B9 /* HistoryWindowController.m */; };
+		263A282E1EE40CCF005C52B9 /* LocalHistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26941EE40BFC005C52B9 /* LocalHistoryController.m */; };
+		263A282F1EE40CCF005C52B9 /* NetsurfApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26951EE40BFC005C52B9 /* NetsurfApp.m */; };
+		263A28301EE40CCF005C52B9 /* NetSurfAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26961EE40BFC005C52B9 /* NetSurfAppDelegate.m */; };
+		263A28311EE40CCF005C52B9 /* plotter.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26971EE40BFC005C52B9 /* plotter.m */; };
+		263A28321EE40CCF005C52B9 /* PreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26981EE40BFC005C52B9 /* PreferencesWindowController.m */; };
+		263A28331EE40CCF005C52B9 /* schedule.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26991EE40BFC005C52B9 /* schedule.m */; };
+		263A28341EE40CCF005C52B9 /* ScrollableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A269A1EE40BFC005C52B9 /* ScrollableView.m */; };
+		263A28351EE40CCF005C52B9 /* SearchWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A269B1EE40BFC005C52B9 /* SearchWindowController.m */; };
+		263A28361EE40CCF005C52B9 /* selection.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A269C1EE40BFC005C52B9 /* selection.m */; };
+		263A28371EE40CCF005C52B9 /* Tree.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A269D1EE40BFC005C52B9 /* Tree.m */; };
+		263A28381EE40CCF005C52B9 /* TreeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A269E1EE40BFC005C52B9 /* TreeView.m */; };
+		263A28391EE40CCF005C52B9 /* URLFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A269F1EE40BFC005C52B9 /* URLFieldCell.m */; };
+		263A283A1EE40CF2005C52B9 /* content.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26A31EE40C4A005C52B9 /* content.c */; };
+		263A283B1EE40CF2005C52B9 /* content_factory.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26A61EE40C4A005C52B9 /* content_factory.c */; };
+		263A283C1EE40CF2005C52B9 /* dirlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26A91EE40C4A005C52B9 /* dirlist.c */; };
+		263A283D1EE40CF2005C52B9 /* fetch.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26AB1EE40C4A005C52B9 /* fetch.c */; };
+		263A283E1EE40CF2005C52B9 /* about.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26AE1EE40C4A005C52B9 /* about.c */; };
+		263A283F1EE40CF2005C52B9 /* curl.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26B01EE40C4A005C52B9 /* curl.c */; };
+		263A28401EE40CF2005C52B9 /* data.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26B21EE40C4A005C52B9 /* data.c */; };
+		263A28411EE40CF2005C52B9 /* file.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26B41EE40C4A005C52B9 /* file.c */; };
+		263A28421EE40CF2005C52B9 /* resource.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26B71EE40C4A005C52B9 /* resource.c */; };
+		263A28431EE40CF2005C52B9 /* fs_backing_store.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26BA1EE40C4A005C52B9 /* fs_backing_store.c */; };
+		263A28441EE40CF2005C52B9 /* css.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26BD1EE40C4A005C52B9 /* css.c */; };
+		263A28451EE40CF2005C52B9 /* dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26BF1EE40C4A005C52B9 /* dump.c */; };
+		263A28461EE40CF2005C52B9 /* hints.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26C11EE40C4A005C52B9 /* hints.c */; };
+		263A28471EE40CF2005C52B9 /* internal.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26C31EE40C4A005C52B9 /* internal.c */; };
+		263A28481EE40CF2005C52B9 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26C61EE40C4A005C52B9 /* select.c */; };
+		263A28491EE40CF2005C52B9 /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26C81EE40C4A005C52B9 /* utils.c */; };
+		263A284A1EE40CF2005C52B9 /* bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26CB1EE40C4A005C52B9 /* bmp.c */; };
+		263A284B1EE40CF2005C52B9 /* gif.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26CD1EE40C4A005C52B9 /* gif.c */; };
+		263A284C1EE40CF2005C52B9 /* ico.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26CF1EE40C4A005C52B9 /* ico.c */; };
+		263A284D1EE40CF2005C52B9 /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26D11EE40C4A005C52B9 /* image.c */; };
+		263A284E1EE40CF2005C52B9 /* image_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A26D31EE40C4A005C52B9 /* image_cache.c */; };
+		263A285A1EE40CF2005C52B9 /* hlcache.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27371EE40C4B005C52B9 /* hlcache.c */; };
+		263A285B1EE40CF2005C52B9 /* llcache.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27391EE40C4B005C52B9 /* llcache.c */; };
+		263A285C1EE40CF2005C52B9 /* mimesniff.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A273C1EE40C4B005C52B9 /* mimesniff.c */; };
+		263A285D1EE40CF2005C52B9 /* no_backing_store.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A273E1EE40C4B005C52B9 /* no_backing_store.c */; };
+		263A285E1EE40CF2005C52B9 /* urldb.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A273F1EE40C4B005C52B9 /* urldb.c */; };
+		263A285F1EE40CFB005C52B9 /* browser.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27421EE40C4B005C52B9 /* browser.c */; };
+		263A28601EE40CFB005C52B9 /* browser_history.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27431EE40C4B005C52B9 /* browser_history.c */; };
+		263A28611EE40CFB005C52B9 /* cookie_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27461EE40C4B005C52B9 /* cookie_manager.c */; };
+		263A28621EE40CFB005C52B9 /* download.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27481EE40C4B005C52B9 /* download.c */; };
+		263A28631EE40CFB005C52B9 /* font_haru.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A274A1EE40C4B005C52B9 /* font_haru.c */; };
+		263A28641EE40CFB005C52B9 /* frames.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A274D1EE40C4B005C52B9 /* frames.c */; };
+		263A28651EE40CFB005C52B9 /* global_history.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A274F1EE40C4B005C52B9 /* global_history.c */; };
+		263A28661EE40CFB005C52B9 /* gui_factory.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27511EE40C4B005C52B9 /* gui_factory.c */; };
+		263A28671EE40CFB005C52B9 /* hotlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27541EE40C4B005C52B9 /* hotlist.c */; };
+		263A28681EE40CFB005C52B9 /* knockout.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27561EE40C4B005C52B9 /* knockout.c */; };
+		263A28691EE40CFB005C52B9 /* local_history.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27581EE40C4B005C52B9 /* local_history.c */; };
+		263A286A1EE40CFB005C52B9 /* mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A275B1EE40C4B005C52B9 /* mouse.c */; };
+		263A286B1EE40CFB005C52B9 /* netsurf.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A275C1EE40C4B005C52B9 /* netsurf.c */; };
+		263A286C1EE40CFB005C52B9 /* plot_style.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A275E1EE40C4B005C52B9 /* plot_style.c */; };
+		263A286D1EE40CFB005C52B9 /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A275F1EE40C4B005C52B9 /* print.c */; };
+		263A286E1EE40CFB005C52B9 /* save_complete.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27621EE40C4B005C52B9 /* save_complete.c */; };
+		263A286F1EE40CFB005C52B9 /* save_pdf.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27641EE40C4B005C52B9 /* save_pdf.c */; };
+		263A28701EE40CFB005C52B9 /* save_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27661EE40C4B005C52B9 /* save_text.c */; };
+		263A28711EE40CFB005C52B9 /* scrollbar.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27681EE40C4B005C52B9 /* scrollbar.c */; };
+		263A28721EE40CFB005C52B9 /* search.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A276A1EE40C4B005C52B9 /* search.c */; };
+		263A28731EE40CFB005C52B9 /* searchweb.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A276C1EE40C4B005C52B9 /* searchweb.c */; };
+		263A28741EE40CFB005C52B9 /* selection.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A276E1EE40C4B005C52B9 /* selection.c */; };
+		263A28751EE40CFB005C52B9 /* sslcert_viewer.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27701EE40C4B005C52B9 /* sslcert_viewer.c */; };
+		263A28761EE40CFB005C52B9 /* system_colour.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27721EE40C4B005C52B9 /* system_colour.c */; };
+		263A28771EE40CFB005C52B9 /* textarea.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27741EE40C4B005C52B9 /* textarea.c */; };
+		263A28781EE40CFB005C52B9 /* textinput.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27761EE40C4B005C52B9 /* textinput.c */; };
+		263A28791EE40CFB005C52B9 /* treeview.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27791EE40C4B005C52B9 /* treeview.c */; };
+		263A287A1EE40CFB005C52B9 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A277B1EE40C4B005C52B9 /* version.c */; };
+		263A287B1EE4120F005C52B9 /* idna.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27E41EE40C4B005C52B9 /* idna.c */; };
+		263A287C1EE4120F005C52B9 /* libdom.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27EA1EE40C4B005C52B9 /* libdom.c */; };
+		263A287D1EE4120F005C52B9 /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27EC1EE40C4B005C52B9 /* log.c */; };
+		263A287E1EE4120F005C52B9 /* messages.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27F11EE40C4B005C52B9 /* messages.c */; };
+		263A287F1EE4120F005C52B9 /* nsoption.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27F31EE40C4B005C52B9 /* nsoption.c */; };
+		263A28801EE4120F005C52B9 /* nsurl.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27F71EE40C4B005C52B9 /* nsurl.c */; };
+		263A28811EE4120F005C52B9 /* parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27F81EE40C4B005C52B9 /* parse.c */; };
+		263A28821EE4120F005C52B9 /* punycode.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27FB1EE40C4B005C52B9 /* punycode.c */; };
+		263A28831EE4120F005C52B9 /* talloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A28011EE40C4B005C52B9 /* talloc.c */; };
+		263A28841EE4120F005C52B9 /* time.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A28041EE40C4B005C52B9 /* time.c */; };
+		263A28851EE4120F005C52B9 /* url.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A28061EE40C4B005C52B9 /* url.c */; };
+		263A28861EE4120F005C52B9 /* useragent.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A28081EE40C4B005C52B9 /* useragent.c */; };
+		263A28871EE4120F005C52B9 /* utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A280A1EE40C4B005C52B9 /* utf8.c */; };
+		263A28881EE4120F005C52B9 /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A280C1EE40C4B005C52B9 /* utils.c */; };
+		263A28891EE41213005C52B9 /* challenge.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27D01EE40C4B005C52B9 /* challenge.c */; };
+		263A288A1EE41213005C52B9 /* content-disposition.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27D31EE40C4B005C52B9 /* content-disposition.c */; };
+		263A288B1EE41213005C52B9 /* content-type.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27D51EE40C4B005C52B9 /* content-type.c */; };
+		263A288C1EE41213005C52B9 /* generics.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27D71EE40C4B005C52B9 /* generics.c */; };
+		263A288D1EE41213005C52B9 /* parameter.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27DA1EE40C4B005C52B9 /* parameter.c */; };
+		263A288E1EE41213005C52B9 /* primitives.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27DD1EE40C4B005C52B9 /* primitives.c */; };
+		263A288F1EE41213005C52B9 /* www-authenticate.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27DF1EE40C4B005C52B9 /* www-authenticate.c */; };
+		263A28901EE41218005C52B9 /* bloom.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27BA1EE40C4B005C52B9 /* bloom.c */; };
+		263A28911EE41218005C52B9 /* corestrings.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27BE1EE40C4B005C52B9 /* corestrings.c */; };
+		263A28921EE41218005C52B9 /* file.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27C51EE40C4B005C52B9 /* file.c */; };
+		263A28931EE41218005C52B9 /* filename.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27C71EE40C4B005C52B9 /* filename.c */; };
+		263A28941EE41218005C52B9 /* filepath.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27C91EE40C4B005C52B9 /* filepath.c */; };
+		263A28951EE41218005C52B9 /* hashtable.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27CD1EE40C4B005C52B9 /* hashtable.c */; };
+		263A28961EE4121D005C52B9 /* box.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27981EE40C4B005C52B9 /* box.c */; };
+		263A28971EE4121D005C52B9 /* box_construct.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A279A1EE40C4B005C52B9 /* box_construct.c */; };
+		263A28981EE4121D005C52B9 /* box_normalise.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A279B1EE40C4B005C52B9 /* box_normalise.c */; };
+		263A28991EE4121D005C52B9 /* box_textarea.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A279C1EE40C4B005C52B9 /* box_textarea.c */; };
+		263A289A1EE4121D005C52B9 /* font.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A279E1EE40C4B005C52B9 /* font.c */; };
+		263A289B1EE4121D005C52B9 /* form.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27A01EE40C4B005C52B9 /* form.c */; };
+		263A289C1EE4121D005C52B9 /* html.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27A21EE40C4B005C52B9 /* html.c */; };
+		263A289D1EE4121D005C52B9 /* html_css.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27A41EE40C4B005C52B9 /* html_css.c */; };
+		263A289E1EE4121D005C52B9 /* html_css_fetcher.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27A51EE40C4B005C52B9 /* html_css_fetcher.c */; };
+		263A289F1EE4121D005C52B9 /* html_forms.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27A61EE40C4B005C52B9 /* html_forms.c */; };
+		263A28A01EE4121D005C52B9 /* html_interaction.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27A71EE40C4B005C52B9 /* html_interaction.c */; };
+		263A28A11EE4121D005C52B9 /* html_object.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27A91EE40C4B005C52B9 /* html_object.c */; };
+		263A28A21EE4121D005C52B9 /* html_redraw.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27AA1EE40C4B005C52B9 /* html_redraw.c */; };
+		263A28A31EE4121D005C52B9 /* html_redraw_border.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27AB1EE40C4B005C52B9 /* html_redraw_border.c */; };
+		263A28A41EE4121D005C52B9 /* html_script.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27AC1EE40C4B005C52B9 /* html_script.c */; };
+		263A28A51EE4121D005C52B9 /* imagemap.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27AD1EE40C4B005C52B9 /* imagemap.c */; };
+		263A28A61EE4121D005C52B9 /* layout.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27AF1EE40C4B005C52B9 /* layout.c */; };
+		263A28A71EE4121D005C52B9 /* search.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27B21EE40C4B005C52B9 /* search.c */; };
+		263A28A81EE4121D005C52B9 /* table.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27B41EE40C4B005C52B9 /* table.c */; };
+		263A28A91EE4121D005C52B9 /* textplain.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A27B61EE40C4B005C52B9 /* textplain.c */; };
+		263A28AC1EE41245005C52B9 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 263A28AB1EE41245005C52B9 /* libiconv.tbd */; };
+		263A28AE1EE41266005C52B9 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 263A28AD1EE41266005C52B9 /* libz.tbd */; };
+		263A29031EE412BE005C52B9 /* content.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A28B01EE412B4005C52B9 /* content.c */; };
+		263A29041EE412BE005C52B9 /* fetcher.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A28F31EE412B4005C52B9 /* fetcher.c */; };
+		263A29051EE412BE005C52B9 /* none.c in Sources */ = {isa = PBXBuildFile; fileRef = 263A28F91EE412B4005C52B9 /* none.c */; };
+		263A29071EE4196E005C52B9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 263A29061EE4196E005C52B9 /* Cocoa.framework */; };
+		263A29081EE41A75005C52B9 /* adblock.css in Resources */ = {isa = PBXBuildFile; fileRef = 263A262D1EE40BFC005C52B9 /* adblock.css */; };
+		263A29091EE41A7D005C52B9 /* BookmarksWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 263A262E1EE40BFC005C52B9 /* BookmarksWindow.xib */; };
+		263A290A1EE41A7D005C52B9 /* Browser.xib in Resources */ = {isa = PBXBuildFile; fileRef = 263A262F1EE40BFC005C52B9 /* Browser.xib */; };
+		263A290B1EE41A7D005C52B9 /* BrowserWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 263A26301EE40BFC005C52B9 /* BrowserWindow.xib */; };
+		263A290C1EE41A7D005C52B9 /* ca-bundle in Resources */ = {isa = PBXBuildFile; fileRef = 263A26311EE40BFC005C52B9 /* ca-bundle */; };
+		263A290D1EE41A8C005C52B9 /* BookmarksWindow.xib.strings in Resources */ = {isa = PBXBuildFile; fileRef = 263A26321EE40BFC005C52B9 /* BookmarksWindow.xib.strings */; };
+		263A290E1EE41A8C005C52B9 /* BrowserWindow.xib.strings in Resources */ = {isa = PBXBuildFile; fileRef = 263A26341EE40BFC005C52B9 /* BrowserWindow.xib.strings */; };
+		263A290F1EE41A8C005C52B9 /* DownloadWindow.xib.strings in Resources */ = {isa = PBXBuildFile; fileRef = 263A26361EE40BFC005C52B9 /* DownloadWindow.xib.strings */; };
+		263A29101EE41A8C005C52B9 /* HistoryWindow.xib.strings in Resources */ = {isa = PBXBuildFile; fileRef = 263A26381EE40BFC005C52B9 /* HistoryWindow.xib.strings */; };
+		263A29111EE41A8C005C52B9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 263A263A1EE40BFC005C52B9 /* Localizable.strings */; };
+		263A29121EE41A8F005C52B9 /* MainMenu.xib.strings in Resources */ = {isa = PBXBuildFile; fileRef = 263A263C1EE40BFC005C52B9 /* MainMenu.xib.strings */; };
+		263A29131EE41A96005C52B9 /* Messages in Resources */ = {isa = PBXBuildFile; fileRef = 263A263E1EE40BFC005C52B9 /* Messages */; };
+		263A29141EE41A96005C52B9 /* PreferencesWindow.xib.strings in Resources */ = {isa = PBXBuildFile; fileRef = 263A26401EE40BFC005C52B9 /* PreferencesWindow.xib.strings */; };
+		263A29151EE41A96005C52B9 /* SearchWindow.xib.strings in Resources */ = {isa = PBXBuildFile; fileRef = 263A26421EE40BFC005C52B9 /* SearchWindow.xib.strings */; };
+		263A29161EE41A9A005C52B9 /* default.css in Resources */ = {isa = PBXBuildFile; fileRef = 263A26441EE40BFC005C52B9 /* default.css */; };
+		263A29171EE41A9A005C52B9 /* DownloadWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 263A26451EE40BFC005C52B9 /* DownloadWindow.xib */; };
+		263A29181EE41A9A005C52B9 /* HistoryWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 263A264A1EE40BFC005C52B9 /* HistoryWindow.xib */; };
+		263A29191EE41A9A005C52B9 /* HomeTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 263A264B1EE40BFC005C52B9 /* HomeTemplate.pdf */; };
+		263A291A1EE41A9F005C52B9 /* arrow-l.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A264D1EE40BFC005C52B9 /* arrow-l.png */; };
+		263A291B1EE41A9F005C52B9 /* content.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A264E1EE40BFC005C52B9 /* content.png */; };
+		263A291C1EE41A9F005C52B9 /* directory.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A264F1EE40BFC005C52B9 /* directory.png */; };
+		263A291D1EE41A9F005C52B9 /* directory2.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26501EE40BFC005C52B9 /* directory2.png */; };
+		263A291E1EE41A9F005C52B9 /* hotlist-add.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26511EE40BFC005C52B9 /* hotlist-add.png */; };
+		263A291F1EE41A9F005C52B9 /* hotlist-rmv.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26521EE40BFC005C52B9 /* hotlist-rmv.png */; };
+		263A29201EE41A9F005C52B9 /* search.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26531EE40BFC005C52B9 /* search.png */; };
+		263A29211EE41AA4005C52B9 /* internal.css in Resources */ = {isa = PBXBuildFile; fileRef = 263A26541EE40BFC005C52B9 /* internal.css */; };
+		263A29221EE41AA4005C52B9 /* LocalHistoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 263A26571EE40BFC005C52B9 /* LocalHistoryPanel.xib */; };
+		263A29231EE41AA4005C52B9 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 263A26581EE40BFC005C52B9 /* MainMenu.xib */; };
+		263A29241EE41AA8005C52B9 /* NetSurf.icns in Resources */ = {isa = PBXBuildFile; fileRef = 263A265A1EE40BFC005C52B9 /* NetSurf.icns */; };
+		263A29251EE41AA8005C52B9 /* netsurf.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A265B1EE40BFC005C52B9 /* netsurf.png */; };
+		263A29261EE41AA8005C52B9 /* PreferencesWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 263A265E1EE40BFC005C52B9 /* PreferencesWindow.xib */; };
+		263A29271EE41AA8005C52B9 /* quirks.css in Resources */ = {isa = PBXBuildFile; fileRef = 263A265F1EE40BFC005C52B9 /* quirks.css */; };
+		263A29281EE41AA8005C52B9 /* SearchWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 263A26601EE40BFC005C52B9 /* SearchWindow.xib */; };
+		263A29291EE41B53005C52B9 /* AquaTabClose_Front.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26041EE40BFC005C52B9 /* AquaTabClose_Front.png */; };
+		263A292A1EE41B53005C52B9 /* AquaTabClose_Front_Pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26051EE40BFC005C52B9 /* AquaTabClose_Front_Pressed.png */; };
+		263A292B1EE41B53005C52B9 /* AquaTabClose_Front_Rollover.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26061EE40BFC005C52B9 /* AquaTabClose_Front_Rollover.png */; };
+		263A292C1EE41B53005C52B9 /* AquaTabCloseDirty_Front.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26071EE40BFC005C52B9 /* AquaTabCloseDirty_Front.png */; };
+		263A292D1EE41B53005C52B9 /* AquaTabCloseDirty_Front_Pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26081EE40BFC005C52B9 /* AquaTabCloseDirty_Front_Pressed.png */; };
+		263A292E1EE41B53005C52B9 /* AquaTabCloseDirty_Front_Rollover.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A26091EE40BFC005C52B9 /* AquaTabCloseDirty_Front_Rollover.png */; };
+		263A292F1EE41B53005C52B9 /* AquaTabNew.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A260A1EE40BFC005C52B9 /* AquaTabNew.png */; };
+		263A29301EE41B53005C52B9 /* AquaTabNewPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A260B1EE40BFC005C52B9 /* AquaTabNewPressed.png */; };
+		263A29311EE41B53005C52B9 /* AquaTabNewRollover.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A260C1EE40BFC005C52B9 /* AquaTabNewRollover.png */; };
+		263A29321EE41B53005C52B9 /* overflowImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A260D1EE40BFC005C52B9 /* overflowImage.png */; };
+		263A29331EE41B53005C52B9 /* overflowImagePressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A260E1EE40BFC005C52B9 /* overflowImagePressed.png */; };
+		263A29341EE41B53005C52B9 /* pi.png in Resources */ = {isa = PBXBuildFile; fileRef = 263A260F1EE40BFC005C52B9 /* pi.png */; };
+		263A29351EE41B5E005C52B9 /* NSBezierPath_AMShading.m in Sources */ = {isa = PBXBuildFile; fileRef = 263A26111EE40BFC005C52B9 /* NSBezierPath_AMShading.m */; };
+/* End PBXBuildFile section */
+
 /* Begin PBXFileReference section */
-		260F1F6312D620E800D9B07F /* content.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = content.c; sourceTree = "<group>"; };
-		260F1F6412D620E800D9B07F /* content.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content.h; sourceTree = "<group>"; };
-		260F1F6512D620E800D9B07F /* content_protected.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content_protected.h; sourceTree = "<group>"; };
-		260F1F6612D620E800D9B07F /* content_type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content_type.h; sourceTree = "<group>"; };
-		260F1F6712D620E800D9B07F /* dirlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dirlist.c; sourceTree = "<group>"; };
-		260F1F6812D620E800D9B07F /* dirlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dirlist.h; sourceTree = "<group>"; };
-		260F1F6912D620E800D9B07F /* fetch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fetch.c; sourceTree = "<group>"; };
-		260F1F6A12D620E800D9B07F /* fetch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fetch.h; sourceTree = "<group>"; };
-		260F1F6C12D620E800D9B07F /* curl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curl.c; sourceTree = "<group>"; };
-		260F1F6D12D620E800D9B07F /* curl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curl.h; sourceTree = "<group>"; };
-		260F1F6E12D620E800D9B07F /* data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = data.c; sourceTree = "<group>"; };
-		260F1F6F12D620E800D9B07F /* data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = data.h; sourceTree = "<group>"; };
-		260F1F7012D620E800D9B07F /* file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = file.c; sourceTree = "<group>"; };
-		260F1F7112D620E800D9B07F /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = "<group>"; };
-		260F1F7212D620E800D9B07F /* hlcache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hlcache.c; sourceTree = "<group>"; };
-		260F1F7312D620E800D9B07F /* hlcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hlcache.h; sourceTree = "<group>"; };
-		260F1F7412D620E800D9B07F /* llcache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = llcache.c; sourceTree = "<group>"; };
-		260F1F7512D620E800D9B07F /* llcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llcache.h; sourceTree = "<group>"; };
-		260F1F7612D620E800D9B07F /* urldb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = urldb.c; sourceTree = "<group>"; };
-		260F1F7712D620E800D9B07F /* urldb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = urldb.h; sourceTree = "<group>"; };
-		260F1F7912D620E800D9B07F /* css.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = css.c; sourceTree = "<group>"; };
-		260F1F7A12D620E800D9B07F /* css.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = css.h; sourceTree = "<group>"; };
-		260F1F7B12D620E800D9B07F /* dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dump.c; sourceTree = "<group>"; };
-		260F1F7C12D620E800D9B07F /* dump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dump.h; sourceTree = "<group>"; };
-		260F1F7D12D620E800D9B07F /* internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = internal.c; sourceTree = "<group>"; };
-		260F1F7E12D620E800D9B07F /* internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = internal.h; sourceTree = "<group>"; };
-		260F1F7F12D620E800D9B07F /* select.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = select.c; sourceTree = "<group>"; };
-		260F1F8012D620E800D9B07F /* select.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = select.h; sourceTree = "<group>"; };
-		260F1F8112D620E800D9B07F /* utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = "<group>"; };
-		260F1F8212D620E800D9B07F /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
-		260F1F8412D620E800D9B07F /* 401login.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 401login.h; sourceTree = "<group>"; };
-		260F1F8512D620E800D9B07F /* browser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = browser.c; sourceTree = "<group>"; };
-		260F1F8612D620E800D9B07F /* browser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browser.h; sourceTree = "<group>"; };
-		260F1F8712D620E800D9B07F /* cookies.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cookies.c; sourceTree = "<group>"; };
-		260F1F8812D620E800D9B07F /* cookies_old.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cookies_old.h; sourceTree = "<group>"; };
-		260F1F8912D620E800D9B07F /* download.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = download.c; sourceTree = "<group>"; };
-		260F1F8A12D620E800D9B07F /* download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = download.h; sourceTree = "<group>"; };
-		260F1F8B12D620E800D9B07F /* frames.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = frames.c; sourceTree = "<group>"; };
-		260F1F8C12D620E800D9B07F /* frames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frames.h; sourceTree = "<group>"; };
-		260F1F8D12D620E800D9B07F /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = "<group>"; };
-		260F1F8E12D620E800D9B07F /* local_history.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = local_history.c; sourceTree = "<group>"; };
-		260F1F8F12D620E800D9B07F /* local_history.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = local_history.h; sourceTree = "<group>"; };
-		260F1F9012D620E800D9B07F /* history_global_core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = history_global_core.c; sourceTree = "<group>"; };
-		260F1F9112D620E800D9B07F /* history_global_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = history_global_core.h; sourceTree = "<group>"; };
-		260F1F9212D620E800D9B07F /* hotlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hotlist.c; sourceTree = "<group>"; };
-		260F1F9312D620E800D9B07F /* hotlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotlist.h; sourceTree = "<group>"; };
-		260F1F9412D620E800D9B07F /* knockout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = knockout.c; sourceTree = "<group>"; };
-		260F1F9512D620E800D9B07F /* knockout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = knockout.h; sourceTree = "<group>"; };
-		260F1F9612D620E800D9B07F /* mouse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mouse.c; sourceTree = "<group>"; };
-		260F1F9712D620E800D9B07F /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mouse.h; sourceTree = "<group>"; };
-		260F1F9812D620E800D9B07F /* netsurf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = netsurf.c; sourceTree = "<group>"; };
-		260F1F9912D620E800D9B07F /* netsurf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = netsurf.h; sourceTree = "<group>"; };
-		260F1F9A12D620E800D9B07F /* options.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = options.c; sourceTree = "<group>"; };
-		260F1F9B12D620E800D9B07F /* options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = options.h; sourceTree = "<group>"; };
-		260F1F9C12D620E800D9B07F /* plot_style.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = plot_style.c; sourceTree = "<group>"; };
-		260F1F9D12D620E800D9B07F /* plot_style.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plot_style.h; sourceTree = "<group>"; };
-		260F1F9E12D620E800D9B07F /* plotters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plotters.h; sourceTree = "<group>"; };
-		260F1F9F12D620E800D9B07F /* print.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = print.c; sourceTree = "<group>"; };
-		260F1FA012D620E800D9B07F /* print.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = print.h; sourceTree = "<group>"; };
-		260F1FA112D620E800D9B07F /* printer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printer.h; sourceTree = "<group>"; };
-		260F1FA212D620E800D9B07F /* save_complete.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = save_complete.c; sourceTree = "<group>"; };
-		260F1FA312D620E800D9B07F /* save_complete.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = save_complete.h; sourceTree = "<group>"; };
-		260F1FA512D620E800D9B07F /* font_haru.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = font_haru.c; sourceTree = "<group>"; };
-		260F1FA612D620E800D9B07F /* font_haru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font_haru.h; sourceTree = "<group>"; };
-		260F1FA712D620E800D9B07F /* pdf_plotters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pdf_plotters.c; sourceTree = "<group>"; };
-		260F1FA812D620E800D9B07F /* pdf_plotters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pdf_plotters.h; sourceTree = "<group>"; };
-		260F1FAA12D620E800D9B07F /* save_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = save_text.c; sourceTree = "<group>"; };
-		260F1FAB12D620E800D9B07F /* save_text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = save_text.h; sourceTree = "<group>"; };
-		260F1FAC12D620E800D9B07F /* scroll.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scroll.c; sourceTree = "<group>"; };
-		260F1FAD12D620E800D9B07F /* scroll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scroll.h; sourceTree = "<group>"; };
-		260F1FAE12D620E800D9B07F /* search.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = search.c; sourceTree = "<group>"; };
-		260F1FAF12D620E800D9B07F /* search.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = search.h; sourceTree = "<group>"; };
-		260F1FB012D620E800D9B07F /* searchweb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = searchweb.c; sourceTree = "<group>"; };
-		260F1FB112D620E800D9B07F /* searchweb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = searchweb.h; sourceTree = "<group>"; };
-		260F1FB212D620E800D9B07F /* selection.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = selection.c; sourceTree = "<group>"; };
-		260F1FB312D620E800D9B07F /* selection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selection.h; sourceTree = "<group>"; };
-		260F1FB412D620E800D9B07F /* sslcert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sslcert.c; sourceTree = "<group>"; };
-		260F1FB512D620E800D9B07F /* sslcert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sslcert.h; sourceTree = "<group>"; };
-		260F1FB612D620E800D9B07F /* textarea.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = textarea.c; sourceTree = "<group>"; };
-		260F1FB712D620E800D9B07F /* textarea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textarea.h; sourceTree = "<group>"; };
-		260F1FB812D620E800D9B07F /* textinput.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = textinput.c; sourceTree = "<group>"; };
-		260F1FB912D620E800D9B07F /* textinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textinput.h; sourceTree = "<group>"; };
-		260F1FBA12D620E800D9B07F /* tree.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tree.c; sourceTree = "<group>"; };
-		260F1FBB12D620E800D9B07F /* tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tree.h; sourceTree = "<group>"; };
-		260F1FBC12D620E800D9B07F /* tree_url_node.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tree_url_node.c; sourceTree = "<group>"; };
-		260F1FBD12D620E800D9B07F /* tree_url_node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tree_url_node.h; sourceTree = "<group>"; };
-		260F1FBE12D620E800D9B07F /* version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = "<group>"; };
-		260F1FC712D620E800D9B07F /* box.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box.c; sourceTree = "<group>"; };
-		260F1FC812D620E800D9B07F /* box.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = box.h; sourceTree = "<group>"; };
-		260F1FC912D620E800D9B07F /* box_construct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_construct.c; sourceTree = "<group>"; };
-		260F1FCA12D620E800D9B07F /* box_normalise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_normalise.c; sourceTree = "<group>"; };
-		260F1FCB12D620E800D9B07F /* favicon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = favicon.c; sourceTree = "<group>"; };
-		260F1FCC12D620E800D9B07F /* favicon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = favicon.h; sourceTree = "<group>"; };
-		260F1FCD12D620E800D9B07F /* font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = font.c; sourceTree = "<group>"; };
-		260F1FCE12D620E800D9B07F /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		260F1FCF12D620E800D9B07F /* form.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = form.c; sourceTree = "<group>"; };
-		260F1FD012D620E800D9B07F /* form.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = form.h; sourceTree = "<group>"; };
-		260F1FD112D620E800D9B07F /* html.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html.c; sourceTree = "<group>"; };
-		260F1FD212D620E800D9B07F /* html.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = html.h; sourceTree = "<group>"; };
-		260F1FD312D620E800D9B07F /* html_interaction.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_interaction.c; sourceTree = "<group>"; };
-		260F1FD412D620E800D9B07F /* html_redraw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_redraw.c; sourceTree = "<group>"; };
-		260F1FD512D620E800D9B07F /* hubbub_binding.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hubbub_binding.c; sourceTree = "<group>"; };
-		260F1FD612D620E800D9B07F /* imagemap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imagemap.c; sourceTree = "<group>"; };
-		260F1FD712D620E800D9B07F /* imagemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imagemap.h; sourceTree = "<group>"; };
-		260F1FD812D620E800D9B07F /* layout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = layout.c; sourceTree = "<group>"; };
-		260F1FD912D620E800D9B07F /* layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = layout.h; sourceTree = "<group>"; };
-		260F1FDA12D620E800D9B07F /* list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = "<group>"; };
-		260F1FDB12D620E800D9B07F /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = "<group>"; };
-		260F1FDC12D620E800D9B07F /* parser_binding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parser_binding.h; sourceTree = "<group>"; };
-		260F1FDD12D620E800D9B07F /* table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = table.c; sourceTree = "<group>"; };
-		260F1FDE12D620E800D9B07F /* table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = table.h; sourceTree = "<group>"; };
-		260F1FE012D620E800D9B07F /* textplain.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = textplain.c; sourceTree = "<group>"; };
-		260F1FE112D620E800D9B07F /* textplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textplain.h; sourceTree = "<group>"; };
-		260F1FE312D620E800D9B07F /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base64.c; sourceTree = "<group>"; };
-		260F1FE412D620E800D9B07F /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base64.h; sourceTree = "<group>"; };
-		260F1FE512D620E800D9B07F /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		260F1FE612D620E800D9B07F /* container.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = container.c; sourceTree = "<group>"; };
-		260F1FE712D620E800D9B07F /* container.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = container.h; sourceTree = "<group>"; };
-		260F1FE812D620E800D9B07F /* errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = errors.h; sourceTree = "<group>"; };
-		260F1FE912D620E800D9B07F /* filename.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filename.c; sourceTree = "<group>"; };
-		260F1FEA12D620E800D9B07F /* filename.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filename.h; sourceTree = "<group>"; };
-		260F1FEB12D620E800D9B07F /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = resource.c; sourceTree = "<group>"; };
-		260F1FEC12D620E800D9B07F /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		260F1FED12D620E800D9B07F /* hashtable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hashtable.c; sourceTree = "<group>"; };
-		260F1FEE12D620E800D9B07F /* hashtable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hashtable.h; sourceTree = "<group>"; };
-		260F1FEF12D620E800D9B07F /* http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = http.c; sourceTree = "<group>"; };
-		260F1FF012D620E800D9B07F /* http.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http.h; sourceTree = "<group>"; };
-		260F1FF112D620E800D9B07F /* locale.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = locale.c; sourceTree = "<group>"; };
-		260F1FF212D620E800D9B07F /* locale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = locale.h; sourceTree = "<group>"; };
-		260F1FF312D620E800D9B07F /* log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = log.c; sourceTree = "<group>"; };
-		260F1FF412D620E800D9B07F /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = "<group>"; };
-		260F1FF612D620E800D9B07F /* memdebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memdebug.c; sourceTree = "<group>"; };
-		260F1FF712D620E800D9B07F /* memdebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memdebug.h; sourceTree = "<group>"; };
-		260F1FF812D620E800D9B07F /* messages.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = messages.c; sourceTree = "<group>"; };
-		260F1FF912D620E800D9B07F /* messages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = messages.h; sourceTree = "<group>"; };
-		260F1FFA12D620E800D9B07F /* ring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring.h; sourceTree = "<group>"; };
-		260F1FFB12D620E800D9B07F /* talloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = talloc.c; sourceTree = "<group>"; };
-		260F1FFC12D620E800D9B07F /* talloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = talloc.h; sourceTree = "<group>"; };
-		260F1FFF12D620E800D9B07F /* url.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = url.c; sourceTree = "<group>"; };
-		260F200012D620E800D9B07F /* url.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url.h; sourceTree = "<group>"; };
-		260F200112D620E800D9B07F /* useragent.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = useragent.c; sourceTree = "<group>"; };
-		260F200212D620E800D9B07F /* useragent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = useragent.h; sourceTree = "<group>"; };
-		260F200312D620E800D9B07F /* utf8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf8.c; sourceTree = "<group>"; };
-		260F200412D620E800D9B07F /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8.h; sourceTree = "<group>"; };
-		260F200512D620E800D9B07F /* utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = "<group>"; };
-		260F200612D620E800D9B07F /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
-		260F200712D620E800D9B07F /* utsname.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utsname.h; sourceTree = "<group>"; };
-		260FC03112D85ACE00079C00 /* bitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitmap.h; sourceTree = "<group>"; };
-		26121DA812D700B800E10F91 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
-		26121EAB12D70E0A00E10F91 /* Browser.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Browser.xib; sourceTree = "<group>"; };
-		26121EFB12D7132100E10F91 /* BrowserView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserView.h; sourceTree = "<group>"; };
-		26121EFC12D7132100E10F91 /* BrowserView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowserView.m; sourceTree = "<group>"; };
-		261223B712D77F9C00E10F91 /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		261223CB12D7805300E10F91 /* plotter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plotter.h; sourceTree = "<group>"; };
-		2612265712D7ACB500E10F91 /* default.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = default.css; sourceTree = "<group>"; };
-		2612265912D7ACB500E10F91 /* quirks.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = quirks.css; sourceTree = "<group>"; };
-		2612265D12D7AD6800E10F91 /* adblock.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = adblock.css; sourceTree = "<group>"; };
-		2612269012D7AE4100E10F91 /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = de; path = de.lproj/Messages; sourceTree = "<group>"; };
-		2612269312D7AE9B00E10F91 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text; name = nl; path = nl.lproj/Messages; sourceTree = "<group>"; };
-		2612269412D7AEA800E10F91 /* en */ = {isa = PBXFileReference; lastKnownFileType = text; name = en; path = en.lproj/Messages; sourceTree = "<group>"; };
-		2612269512D7AEB500E10F91 /* it */ = {isa = PBXFileReference; lastKnownFileType = text; name = it; path = it.lproj/Messages; sourceTree = "<group>"; };
-		2612269612D7AEBE00E10F91 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text; name = fr; path = fr.lproj/Messages; sourceTree = "<group>"; };
-		261DB22213180AFF00C59F12 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		261DB22613180B4F00C59F12 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
-		261DB23313180CD600C59F12 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
-		261DB23413180CE000C59F12 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
-		261DB23513180CEE00C59F12 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		261DB24F1318444F00C59F12 /* compile-xib.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "compile-xib.sh"; sourceTree = "<group>"; };
 		261DB2501318444F00C59F12 /* extract-strings.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "extract-strings.sh"; sourceTree = "<group>"; };
-		261DB29013185C0A00C59F12 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/BookmarksWindow.xib.strings; sourceTree = "<group>"; };
-		261DB29413185C0A00C59F12 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/BrowserWindow.xib.strings; sourceTree = "<group>"; };
-		261DB29613185C0A00C59F12 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/DownloadWindow.xib.strings; sourceTree = "<group>"; };
-		261DB29813185C0A00C59F12 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HistoryWindow.xib.strings; sourceTree = "<group>"; };
-		261DB29C13185C0A00C59F12 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainMenu.xib.strings; sourceTree = "<group>"; };
-		261DB29E13185C0A00C59F12 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PreferencesWindow.xib.strings; sourceTree = "<group>"; };
-		261DB2A013185C0A00C59F12 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SearchWindow.xib.strings; sourceTree = "<group>"; };
-		2622F1D512DCD84600CD5A62 /* TreeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeView.h; sourceTree = "<group>"; };
-		2622F1D612DCD84600CD5A62 /* TreeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TreeView.m; sourceTree = "<group>"; };
-		2625095012F72A8F0090D236 /* PreferencesWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PreferencesWindow.xib; sourceTree = "<group>"; };
-		2625095112F72AA70090D236 /* PreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesWindowController.h; sourceTree = "<group>"; };
-		2625095212F72AA70090D236 /* PreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesWindowController.m; sourceTree = "<group>"; };
-		2636299412F699250048542C /* NetSurf.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = NetSurf.app; path = ../NetSurf.app; sourceTree = SOURCE_ROOT; };
-		263629B312F69A290048542C /* Makefile.config */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; name = Makefile.config; path = ../Makefile.config; sourceTree = SOURCE_ROOT; };
-		263629B412F69A290048542C /* Makefile.defaults */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; name = Makefile.defaults; path = ../Makefile.defaults; sourceTree = SOURCE_ROOT; };
-		263629B512F69A290048542C /* Makefile.resources */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; name = Makefile.resources; path = ../Makefile.resources; sourceTree = SOURCE_ROOT; };
-		263629B612F69A290048542C /* Makefile.sources */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; name = Makefile.sources; path = ../Makefile.sources; sourceTree = SOURCE_ROOT; };
-		263629B712F69A3C0048542C /* Makefile.target */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.target; sourceTree = "<group>"; };
-		263629BC12F69A760048542C /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../Makefile; sourceTree = SOURCE_ROOT; };
-		263629C812F69B120048542C /* NetsurfApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetsurfApp.h; sourceTree = "<group>"; };
-		263629C912F69B120048542C /* NetsurfApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetsurfApp.m; sourceTree = "<group>"; };
-		263629CA12F69B120048542C /* system_colour.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = system_colour.m; sourceTree = "<group>"; };
-		263769A912F7EBE2000F45FE /* Tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tree.h; sourceTree = "<group>"; };
-		263769AA12F7EBE2000F45FE /* Tree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tree.m; sourceTree = "<group>"; };
-		26376A4112F7FA67000F45FE /* HistoryWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HistoryWindow.xib; sourceTree = "<group>"; };
-		26376A4312F7FA86000F45FE /* HistoryWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryWindowController.h; sourceTree = "<group>"; };
-		26376A4412F7FA86000F45FE /* HistoryWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryWindowController.m; sourceTree = "<group>"; };
-		26376A8A12F7FF57000F45FE /* BookmarksController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookmarksController.h; sourceTree = "<group>"; };
-		26376A8B12F7FF57000F45FE /* BookmarksController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookmarksController.m; sourceTree = "<group>"; };
-		26376BAC12F820D7000F45FE /* BookmarksWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksWindow.xib; sourceTree = "<group>"; };
-		2639E20512F2ADEE00699678 /* coordinates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coordinates.h; sourceTree = "<group>"; };
-		264C344112F0987E00D11246 /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = "<group>"; };
-		265F30A712D6637E0048B600 /* NetSurf-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "NetSurf-Info.plist"; sourceTree = "<group>"; };
-		265F30AB12D6637E0048B600 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
-		265F311912D663F50048B600 /* gui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = gui.m; sourceTree = "<group>"; };
-		265F314712D666660048B600 /* plotter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = plotter.m; sourceTree = "<group>"; };
-		265F316112D667E10048B600 /* schedule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = schedule.m; sourceTree = "<group>"; };
-		265F316612D668130048B600 /* thumbnail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = thumbnail.m; sourceTree = "<group>"; };
-		265F316F12D668790048B600 /* fetch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = fetch.m; sourceTree = "<group>"; };
-		265F319012D668DB0048B600 /* url.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = url.m; sourceTree = "<group>"; };
-		265F31C412D66A0D0048B600 /* save.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = save.m; sourceTree = "<group>"; };
-		265F31CA12D66A890048B600 /* bitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitmap.h; sourceTree = "<group>"; };
-		265F31CB12D66A890048B600 /* bmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bmp.c; sourceTree = "<group>"; };
-		265F31CC12D66A890048B600 /* bmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bmp.h; sourceTree = "<group>"; };
-		265F31CD12D66A890048B600 /* gif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gif.c; sourceTree = "<group>"; };
-		265F31CE12D66A890048B600 /* gif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gif.h; sourceTree = "<group>"; };
-		265F31CF12D66A890048B600 /* ico.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ico.c; sourceTree = "<group>"; };
-		265F31D012D66A890048B600 /* ico.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ico.h; sourceTree = "<group>"; };
-		265F31D112D66A890048B600 /* jpeg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jpeg.c; sourceTree = "<group>"; };
-		265F31D212D66A890048B600 /* jpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jpeg.h; sourceTree = "<group>"; };
-		265F31D312D66A890048B600 /* mng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mng.c; sourceTree = "<group>"; };
-		265F31D412D66A890048B600 /* mng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mng.h; sourceTree = "<group>"; };
-		265F31D512D66A890048B600 /* nssprite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nssprite.c; sourceTree = "<group>"; };
-		265F31D612D66A890048B600 /* nssprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nssprite.h; sourceTree = "<group>"; };
-		265F31D712D66A890048B600 /* png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = png.c; sourceTree = "<group>"; };
-		265F31D812D66A890048B600 /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = png.h; sourceTree = "<group>"; };
-		265F31D912D66A890048B600 /* rsvg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rsvg.c; sourceTree = "<group>"; };
-		265F31DA12D66A890048B600 /* rsvg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rsvg.h; sourceTree = "<group>"; };
-		265F31DB12D66A890048B600 /* svg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg.c; sourceTree = "<group>"; };
-		265F31DC12D66A890048B600 /* svg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svg.h; sourceTree = "<group>"; };
-		265F31DD12D66A890048B600 /* webp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webp.c; sourceTree = "<group>"; };
-		265F31DE12D66A890048B600 /* webp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = webp.h; sourceTree = "<group>"; };
-		265F31EB12D66B190048B600 /* bitmap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = bitmap.m; sourceTree = "<group>"; };
-		265F320512D66C200048B600 /* utf8.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = utf8.m; sourceTree = "<group>"; };
-		265F321312D66CD90048B600 /* utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = utils.m; sourceTree = "<group>"; };
-		265F321E12D66D510048B600 /* font.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = font.m; sourceTree = "<group>"; };
-		2666DC5B12F6D1770045E8B6 /* SearchWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchWindow.xib; sourceTree = "<group>"; };
-		2666DC5D12F6D2E70045E8B6 /* SearchWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchWindowController.h; sourceTree = "<group>"; };
-		2666DC5E12F6D2E70045E8B6 /* SearchWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchWindowController.m; sourceTree = "<group>"; };
-		2666DD5012F706BC0045E8B6 /* BrowserWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserWindow.h; sourceTree = "<group>"; };
-		2666DD5112F706BC0045E8B6 /* BrowserWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowserWindow.m; sourceTree = "<group>"; };
-		2684028E1301848100850DA2 /* HomeTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = HomeTemplate.pdf; sourceTree = "<group>"; };
-		26ABD61C12F02EB900407161 /* overflowImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = overflowImage.png; sourceTree = "<group>"; };
-		26ABD61D12F02EB900407161 /* overflowImagePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = overflowImagePressed.png; sourceTree = "<group>"; };
-		26ABD61E12F02EB900407161 /* pi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi.png; sourceTree = "<group>"; };
-		26AFE63E12DDEB0A005AD082 /* NetSurf.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = NetSurf.icns; sourceTree = "<group>"; };
-		26AFE8E212DF4200005AD082 /* ScrollableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollableView.h; sourceTree = "<group>"; };
-		26AFE8E312DF4200005AD082 /* ScrollableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScrollableView.m; sourceTree = "<group>"; };
-		26AFE97A12DF514C005AD082 /* NetSurfAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetSurfAppDelegate.h; sourceTree = "<group>"; };
-		26AFE97B12DF514C005AD082 /* NetSurfAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetSurfAppDelegate.m; sourceTree = "<group>"; };
-		26AFEAE912E04253005AD082 /* DownloadWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadWindowController.h; sourceTree = "<group>"; };
-		26AFEAEA12E04253005AD082 /* DownloadWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DownloadWindowController.m; sourceTree = "<group>"; };
-		26AFEAF012E042F9005AD082 /* DownloadWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DownloadWindow.xib; sourceTree = "<group>"; };
-		26AFED0312E09916005AD082 /* selection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = selection.m; sourceTree = "<group>"; };
-		26B4E91A130D351F0003B527 /* ArrowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrowBox.h; sourceTree = "<group>"; };
-		26B4E91B130D351F0003B527 /* ArrowBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArrowBox.m; sourceTree = "<group>"; };
-		26B4E91C130D351F0003B527 /* ArrowWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrowWindow.h; sourceTree = "<group>"; };
-		26B4E91D130D351F0003B527 /* ArrowWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArrowWindow.m; sourceTree = "<group>"; };
-		26B4E91E130D351F0003B527 /* BlackScroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlackScroller.h; sourceTree = "<group>"; };
-		26B4E91F130D351F0003B527 /* BlackScroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BlackScroller.m; sourceTree = "<group>"; };
-		26B4E926130D36A90003B527 /* LocalHistoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LocalHistoryPanel.xib; sourceTree = "<group>"; };
-		26B4E928130D37E50003B527 /* LocalHistoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalHistoryController.h; sourceTree = "<group>"; };
-		26B4E929130D37E50003B527 /* LocalHistoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocalHistoryController.m; sourceTree = "<group>"; };
-		26BA25AB1321653200AEC1DA /* apple_image.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = apple_image.m; sourceTree = "<group>"; };
-		26BA25AC1321653200AEC1DA /* apple_image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = apple_image.h; sourceTree = "<group>"; };
-		26CDCEB312E702D8004FC66B /* NSBezierPath_AMShading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSBezierPath_AMShading.h; sourceTree = "<group>"; };
-		26CDCEB412E702D8004FC66B /* NSBezierPath_AMShading.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSBezierPath_AMShading.m; sourceTree = "<group>"; };
-		26CDCEB512E702D8004FC66B /* NSString_AITruncation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSString_AITruncation.h; sourceTree = "<group>"; };
-		26CDCEB612E702D8004FC66B /* NSString_AITruncation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSString_AITruncation.m; sourceTree = "<group>"; };
-		26CDCEBD12E702D8004FC66B /* PSMOverflowPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMOverflowPopUpButton.h; sourceTree = "<group>"; };
-		26CDCEBE12E702D8004FC66B /* PSMOverflowPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMOverflowPopUpButton.m; sourceTree = "<group>"; };
-		26CDCEBF12E702D8004FC66B /* PSMProgressIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMProgressIndicator.h; sourceTree = "<group>"; };
-		26CDCEC012E702D8004FC66B /* PSMProgressIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMProgressIndicator.m; sourceTree = "<group>"; };
-		26CDCEC112E702D8004FC66B /* PSMRolloverButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMRolloverButton.h; sourceTree = "<group>"; };
-		26CDCEC212E702D8004FC66B /* PSMRolloverButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMRolloverButton.m; sourceTree = "<group>"; };
-		26CDCEC312E702D8004FC66B /* PSMTabBarCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabBarCell.h; sourceTree = "<group>"; };
-		26CDCEC412E702D8004FC66B /* PSMTabBarCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabBarCell.m; sourceTree = "<group>"; };
-		26CDCEC512E702D8004FC66B /* PSMTabBarControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabBarControl.h; sourceTree = "<group>"; };
-		26CDCEC612E702D8004FC66B /* PSMTabBarControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabBarControl.m; sourceTree = "<group>"; };
-		26CDCEC712E702D8004FC66B /* PSMTabBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabBarController.h; sourceTree = "<group>"; };
-		26CDCEC812E702D8004FC66B /* PSMTabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabBarController.m; sourceTree = "<group>"; };
-		26CDCEC912E702D8004FC66B /* PSMTabDragAssistant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabDragAssistant.h; sourceTree = "<group>"; };
-		26CDCECA12E702D8004FC66B /* PSMTabDragAssistant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabDragAssistant.m; sourceTree = "<group>"; };
-		26CDCECB12E702D8004FC66B /* PSMTabDragView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabDragView.h; sourceTree = "<group>"; };
-		26CDCECC12E702D8004FC66B /* PSMTabDragView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabDragView.m; sourceTree = "<group>"; };
-		26CDCECD12E702D8004FC66B /* PSMTabDragWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabDragWindow.h; sourceTree = "<group>"; };
-		26CDCECE12E702D8004FC66B /* PSMTabDragWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabDragWindow.m; sourceTree = "<group>"; };
-		26CDCECF12E702D8004FC66B /* PSMTabDragWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabDragWindowController.h; sourceTree = "<group>"; };
-		26CDCED012E702D8004FC66B /* PSMTabDragWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabDragWindowController.m; sourceTree = "<group>"; };
-		26CDCED112E702D8004FC66B /* PSMTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabStyle.h; sourceTree = "<group>"; };
-		26CDCED212E702D8004FC66B /* PSMUnifiedTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMUnifiedTabStyle.h; sourceTree = "<group>"; };
-		26CDCED312E702D8004FC66B /* PSMUnifiedTabStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMUnifiedTabStyle.m; sourceTree = "<group>"; };
-		26CDCFDC12E706FE004FC66B /* AquaTabClose_Front.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabClose_Front.png; sourceTree = "<group>"; };
-		26CDCFDD12E706FF004FC66B /* AquaTabClose_Front_Pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabClose_Front_Pressed.png; sourceTree = "<group>"; };
-		26CDCFDE12E706FF004FC66B /* AquaTabClose_Front_Rollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabClose_Front_Rollover.png; sourceTree = "<group>"; };
-		26CDCFDF12E706FF004FC66B /* AquaTabCloseDirty_Front.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabCloseDirty_Front.png; sourceTree = "<group>"; };
-		26CDCFE012E706FF004FC66B /* AquaTabCloseDirty_Front_Pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabCloseDirty_Front_Pressed.png; sourceTree = "<group>"; };
-		26CDCFE112E706FF004FC66B /* AquaTabCloseDirty_Front_Rollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabCloseDirty_Front_Rollover.png; sourceTree = "<group>"; };
-		26CDCFE212E706FF004FC66B /* AquaTabNew.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabNew.png; sourceTree = "<group>"; };
-		26CDCFE312E706FF004FC66B /* AquaTabNewPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabNewPressed.png; sourceTree = "<group>"; };
-		26CDCFE412E706FF004FC66B /* AquaTabNewRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabNewRollover.png; sourceTree = "<group>"; };
-		26CDCFF212E70AD1004FC66B /* BrowserWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BrowserWindow.xib; sourceTree = "<group>"; };
-		26CDD00112E70F56004FC66B /* BrowserWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserWindowController.h; sourceTree = "<group>"; };
-		26CDD00212E70F56004FC66B /* BrowserWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowserWindowController.m; sourceTree = "<group>"; };
-		26CDD0F412E726E0004FC66B /* BrowserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserViewController.h; sourceTree = "<group>"; };
-		26CDD0F512E726E0004FC66B /* BrowserViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowserViewController.m; sourceTree = "<group>"; };
-		26E7A22B131FEBA8005B5B6A /* about.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = about.c; sourceTree = "<group>"; };
-		26E7A22C131FEBA8005B5B6A /* about.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = about.h; sourceTree = "<group>"; };
-		26E7A22D131FEBA8005B5B6A /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = resource.c; sourceTree = "<group>"; };
-		26E7A22E131FEBA8005B5B6A /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		26EC3B6812ED62C0000A960C /* URLFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLFieldCell.h; sourceTree = "<group>"; };
-		26EC3B6912ED62C0000A960C /* URLFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLFieldCell.m; sourceTree = "<group>"; };
-		26EC3C4212ED8202000A960C /* HistoryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryView.h; sourceTree = "<group>"; };
-		26EC3C4312ED8202000A960C /* HistoryView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryView.m; sourceTree = "<group>"; };
-		26EC3F1612EF0CBD000A960C /* FormSelectMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormSelectMenu.h; sourceTree = "<group>"; };
-		26EC3F1712EF0CBD000A960C /* FormSelectMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FormSelectMenu.m; sourceTree = "<group>"; };
+		2636299412F699250048542C /* NetSurf.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = NetSurf.app; path = ../../NetSurf.app; sourceTree = SOURCE_ROOT; };
+		263A25EE1EE40BD6005C52B9 /* NetSurfBrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NetSurfBrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		263A26041EE40BFC005C52B9 /* AquaTabClose_Front.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabClose_Front.png; sourceTree = "<group>"; };
+		263A26051EE40BFC005C52B9 /* AquaTabClose_Front_Pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabClose_Front_Pressed.png; sourceTree = "<group>"; };
+		263A26061EE40BFC005C52B9 /* AquaTabClose_Front_Rollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabClose_Front_Rollover.png; sourceTree = "<group>"; };
+		263A26071EE40BFC005C52B9 /* AquaTabCloseDirty_Front.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabCloseDirty_Front.png; sourceTree = "<group>"; };
+		263A26081EE40BFC005C52B9 /* AquaTabCloseDirty_Front_Pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabCloseDirty_Front_Pressed.png; sourceTree = "<group>"; };
+		263A26091EE40BFC005C52B9 /* AquaTabCloseDirty_Front_Rollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabCloseDirty_Front_Rollover.png; sourceTree = "<group>"; };
+		263A260A1EE40BFC005C52B9 /* AquaTabNew.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabNew.png; sourceTree = "<group>"; };
+		263A260B1EE40BFC005C52B9 /* AquaTabNewPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabNewPressed.png; sourceTree = "<group>"; };
+		263A260C1EE40BFC005C52B9 /* AquaTabNewRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AquaTabNewRollover.png; sourceTree = "<group>"; };
+		263A260D1EE40BFC005C52B9 /* overflowImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = overflowImage.png; sourceTree = "<group>"; };
+		263A260E1EE40BFC005C52B9 /* overflowImagePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = overflowImagePressed.png; sourceTree = "<group>"; };
+		263A260F1EE40BFC005C52B9 /* pi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi.png; sourceTree = "<group>"; };
+		263A26101EE40BFC005C52B9 /* NSBezierPath_AMShading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSBezierPath_AMShading.h; sourceTree = "<group>"; };
+		263A26111EE40BFC005C52B9 /* NSBezierPath_AMShading.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSBezierPath_AMShading.m; sourceTree = "<group>"; };
+		263A26121EE40BFC005C52B9 /* NSString_AITruncation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSString_AITruncation.h; sourceTree = "<group>"; };
+		263A26131EE40BFC005C52B9 /* NSString_AITruncation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSString_AITruncation.m; sourceTree = "<group>"; };
+		263A26141EE40BFC005C52B9 /* PSMOverflowPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMOverflowPopUpButton.h; sourceTree = "<group>"; };
+		263A26151EE40BFC005C52B9 /* PSMOverflowPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMOverflowPopUpButton.m; sourceTree = "<group>"; };
+		263A26161EE40BFC005C52B9 /* PSMProgressIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMProgressIndicator.h; sourceTree = "<group>"; };
+		263A26171EE40BFC005C52B9 /* PSMProgressIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMProgressIndicator.m; sourceTree = "<group>"; };
+		263A26181EE40BFC005C52B9 /* PSMRolloverButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMRolloverButton.h; sourceTree = "<group>"; };
+		263A26191EE40BFC005C52B9 /* PSMRolloverButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMRolloverButton.m; sourceTree = "<group>"; };
+		263A261A1EE40BFC005C52B9 /* PSMTabBarCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabBarCell.h; sourceTree = "<group>"; };
+		263A261B1EE40BFC005C52B9 /* PSMTabBarCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabBarCell.m; sourceTree = "<group>"; };
+		263A261C1EE40BFC005C52B9 /* PSMTabBarControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabBarControl.h; sourceTree = "<group>"; };
+		263A261D1EE40BFC005C52B9 /* PSMTabBarControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabBarControl.m; sourceTree = "<group>"; };
+		263A261E1EE40BFC005C52B9 /* PSMTabBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabBarController.h; sourceTree = "<group>"; };
+		263A261F1EE40BFC005C52B9 /* PSMTabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabBarController.m; sourceTree = "<group>"; };
+		263A26201EE40BFC005C52B9 /* PSMTabDragAssistant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabDragAssistant.h; sourceTree = "<group>"; };
+		263A26211EE40BFC005C52B9 /* PSMTabDragAssistant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabDragAssistant.m; sourceTree = "<group>"; };
+		263A26221EE40BFC005C52B9 /* PSMTabDragView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabDragView.h; sourceTree = "<group>"; };
+		263A26231EE40BFC005C52B9 /* PSMTabDragView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabDragView.m; sourceTree = "<group>"; };
+		263A26241EE40BFC005C52B9 /* PSMTabDragWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabDragWindow.h; sourceTree = "<group>"; };
+		263A26251EE40BFC005C52B9 /* PSMTabDragWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabDragWindow.m; sourceTree = "<group>"; };
+		263A26261EE40BFC005C52B9 /* PSMTabDragWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabDragWindowController.h; sourceTree = "<group>"; };
+		263A26271EE40BFC005C52B9 /* PSMTabDragWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMTabDragWindowController.m; sourceTree = "<group>"; };
+		263A26281EE40BFC005C52B9 /* PSMTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMTabStyle.h; sourceTree = "<group>"; };
+		263A26291EE40BFC005C52B9 /* PSMUnifiedTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSMUnifiedTabStyle.h; sourceTree = "<group>"; };
+		263A262A1EE40BFC005C52B9 /* PSMUnifiedTabStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSMUnifiedTabStyle.m; sourceTree = "<group>"; };
+		263A262B1EE40BFC005C52B9 /* ReadMe.rtfd */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; path = ReadMe.rtfd; sourceTree = "<group>"; };
+		263A262D1EE40BFC005C52B9 /* adblock.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = adblock.css; sourceTree = "<group>"; };
+		263A262E1EE40BFC005C52B9 /* BookmarksWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BookmarksWindow.xib; sourceTree = "<group>"; };
+		263A262F1EE40BFC005C52B9 /* Browser.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Browser.xib; sourceTree = "<group>"; };
+		263A26301EE40BFC005C52B9 /* BrowserWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BrowserWindow.xib; sourceTree = "<group>"; };
+		263A26311EE40BFC005C52B9 /* ca-bundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "ca-bundle"; sourceTree = "<group>"; };
+		263A26331EE40BFC005C52B9 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/BookmarksWindow.xib.strings; sourceTree = "<group>"; };
+		263A26351EE40BFC005C52B9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/BrowserWindow.xib.strings; sourceTree = "<group>"; };
+		263A26371EE40BFC005C52B9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/DownloadWindow.xib.strings; sourceTree = "<group>"; };
+		263A26391EE40BFC005C52B9 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HistoryWindow.xib.strings; sourceTree = "<group>"; };
+		263A263B1EE40BFC005C52B9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		263A263D1EE40BFC005C52B9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainMenu.xib.strings; sourceTree = "<group>"; };
+		263A263F1EE40BFC005C52B9 /* de */ = {isa = PBXFileReference; lastKnownFileType = file; name = de; path = de.lproj/Messages; sourceTree = "<group>"; };
+		263A26411EE40BFC005C52B9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PreferencesWindow.xib.strings; sourceTree = "<group>"; };
+		263A26431EE40BFC005C52B9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SearchWindow.xib.strings; sourceTree = "<group>"; };
+		263A26441EE40BFC005C52B9 /* default.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = default.css; sourceTree = "<group>"; };
+		263A26451EE40BFC005C52B9 /* DownloadWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DownloadWindow.xib; sourceTree = "<group>"; };
+		263A26461EE40BFC005C52B9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		263A26471EE40BFC005C52B9 /* en */ = {isa = PBXFileReference; lastKnownFileType = file; name = en; path = en.lproj/Messages; sourceTree = "<group>"; };
+		263A26481EE40BFC005C52B9 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
+		263A26491EE40BFC005C52B9 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file; name = fr; path = fr.lproj/Messages; sourceTree = "<group>"; };
+		263A264A1EE40BFC005C52B9 /* HistoryWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryWindow.xib; sourceTree = "<group>"; };
+		263A264B1EE40BFC005C52B9 /* HomeTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = HomeTemplate.pdf; sourceTree = "<group>"; };
+		263A264D1EE40BFC005C52B9 /* arrow-l.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arrow-l.png"; sourceTree = "<group>"; };
+		263A264E1EE40BFC005C52B9 /* content.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = content.png; sourceTree = "<group>"; };
+		263A264F1EE40BFC005C52B9 /* directory.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = directory.png; sourceTree = "<group>"; };
+		263A26501EE40BFC005C52B9 /* directory2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = directory2.png; sourceTree = "<group>"; };
+		263A26511EE40BFC005C52B9 /* hotlist-add.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hotlist-add.png"; sourceTree = "<group>"; };
+		263A26521EE40BFC005C52B9 /* hotlist-rmv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hotlist-rmv.png"; sourceTree = "<group>"; };
+		263A26531EE40BFC005C52B9 /* search.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = search.png; sourceTree = "<group>"; };
+		263A26541EE40BFC005C52B9 /* internal.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = internal.css; sourceTree = "<group>"; };
+		263A26551EE40BFC005C52B9 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
+		263A26561EE40BFC005C52B9 /* it */ = {isa = PBXFileReference; lastKnownFileType = file; name = it; path = it.lproj/Messages; sourceTree = "<group>"; };
+		263A26571EE40BFC005C52B9 /* LocalHistoryPanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LocalHistoryPanel.xib; sourceTree = "<group>"; };
+		263A26581EE40BFC005C52B9 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
+		263A26591EE40BFC005C52B9 /* NetSurf-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "NetSurf-Info.plist"; sourceTree = "<group>"; };
+		263A265A1EE40BFC005C52B9 /* NetSurf.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = NetSurf.icns; sourceTree = "<group>"; };
+		263A265B1EE40BFC005C52B9 /* netsurf.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = netsurf.png; sourceTree = "<group>"; };
+		263A265C1EE40BFC005C52B9 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
+		263A265D1EE40BFC005C52B9 /* nl */ = {isa = PBXFileReference; lastKnownFileType = file; name = nl; path = nl.lproj/Messages; sourceTree = "<group>"; };
+		263A265E1EE40BFC005C52B9 /* PreferencesWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PreferencesWindow.xib; sourceTree = "<group>"; };
+		263A265F1EE40BFC005C52B9 /* quirks.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = quirks.css; sourceTree = "<group>"; };
+		263A26601EE40BFC005C52B9 /* SearchWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchWindow.xib; sourceTree = "<group>"; };
+		263A26611EE40BFC005C52B9 /* apple_image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = apple_image.h; sourceTree = SOURCE_ROOT; };
+		263A26621EE40BFC005C52B9 /* ArrowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrowBox.h; sourceTree = SOURCE_ROOT; };
+		263A26631EE40BFC005C52B9 /* ArrowWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrowWindow.h; sourceTree = SOURCE_ROOT; };
+		263A26641EE40BFC005C52B9 /* bitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitmap.h; sourceTree = SOURCE_ROOT; };
+		263A26651EE40BFC005C52B9 /* BlackScroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlackScroller.h; sourceTree = SOURCE_ROOT; };
+		263A26661EE40BFC005C52B9 /* BookmarksController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookmarksController.h; sourceTree = SOURCE_ROOT; };
+		263A26671EE40BFC005C52B9 /* BrowserView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserView.h; sourceTree = SOURCE_ROOT; };
+		263A26681EE40BFC005C52B9 /* BrowserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserViewController.h; sourceTree = SOURCE_ROOT; };
+		263A26691EE40BFC005C52B9 /* BrowserWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserWindow.h; sourceTree = SOURCE_ROOT; };
+		263A266A1EE40BFC005C52B9 /* BrowserWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserWindowController.h; sourceTree = SOURCE_ROOT; };
+		263A266B1EE40BFC005C52B9 /* coordinates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coordinates.h; sourceTree = SOURCE_ROOT; };
+		263A266C1EE40BFC005C52B9 /* desktop-tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "desktop-tree.h"; sourceTree = SOURCE_ROOT; };
+		263A266D1EE40BFC005C52B9 /* DownloadWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadWindowController.h; sourceTree = SOURCE_ROOT; };
+		263A266E1EE40BFC005C52B9 /* fetch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fetch.h; sourceTree = SOURCE_ROOT; };
+		263A266F1EE40BFC005C52B9 /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = SOURCE_ROOT; };
+		263A26701EE40BFC005C52B9 /* FormSelectMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormSelectMenu.h; sourceTree = SOURCE_ROOT; };
+		263A26711EE40BFC005C52B9 /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = SOURCE_ROOT; };
+		263A26721EE40BFC005C52B9 /* HistoryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryView.h; sourceTree = SOURCE_ROOT; };
+		263A26731EE40BFC005C52B9 /* HistoryWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryWindowController.h; sourceTree = SOURCE_ROOT; };
+		263A26741EE40BFC005C52B9 /* LocalHistoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalHistoryController.h; sourceTree = SOURCE_ROOT; };
+		263A26751EE40BFC005C52B9 /* NetsurfApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetsurfApp.h; sourceTree = SOURCE_ROOT; };
+		263A26761EE40BFC005C52B9 /* NetSurfAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetSurfAppDelegate.h; sourceTree = SOURCE_ROOT; };
+		263A26771EE40BFC005C52B9 /* plotter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plotter.h; sourceTree = SOURCE_ROOT; };
+		263A26781EE40BFC005C52B9 /* PreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesWindowController.h; sourceTree = SOURCE_ROOT; };
+		263A26791EE40BFC005C52B9 /* schedule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = schedule.h; sourceTree = SOURCE_ROOT; };
+		263A267A1EE40BFC005C52B9 /* ScrollableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollableView.h; sourceTree = SOURCE_ROOT; };
+		263A267B1EE40BFC005C52B9 /* SearchWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchWindowController.h; sourceTree = SOURCE_ROOT; };
+		263A267C1EE40BFC005C52B9 /* selection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selection.h; sourceTree = SOURCE_ROOT; };
+		263A267D1EE40BFC005C52B9 /* Tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tree.h; sourceTree = SOURCE_ROOT; };
+		263A267E1EE40BFC005C52B9 /* TreeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeView.h; sourceTree = SOURCE_ROOT; };
+		263A267F1EE40BFC005C52B9 /* URLFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLFieldCell.h; sourceTree = SOURCE_ROOT; };
+		263A26801EE40BFC005C52B9 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = SOURCE_ROOT; };
+		263A26811EE40BFC005C52B9 /* Makefile.defaults */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.defaults; sourceTree = SOURCE_ROOT; };
+		263A26821EE40BFC005C52B9 /* apple_image.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = apple_image.m; sourceTree = SOURCE_ROOT; };
+		263A26831EE40BFC005C52B9 /* ArrowBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArrowBox.m; sourceTree = SOURCE_ROOT; };
+		263A26841EE40BFC005C52B9 /* ArrowWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArrowWindow.m; sourceTree = SOURCE_ROOT; };
+		263A26851EE40BFC005C52B9 /* bitmap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = bitmap.m; sourceTree = SOURCE_ROOT; };
+		263A26861EE40BFC005C52B9 /* BlackScroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BlackScroller.m; sourceTree = SOURCE_ROOT; };
+		263A26871EE40BFC005C52B9 /* BookmarksController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookmarksController.m; sourceTree = SOURCE_ROOT; };
+		263A26881EE40BFC005C52B9 /* BrowserView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowserView.m; sourceTree = SOURCE_ROOT; };
+		263A26891EE40BFC005C52B9 /* BrowserViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowserViewController.m; sourceTree = SOURCE_ROOT; };
+		263A268A1EE40BFC005C52B9 /* BrowserWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowserWindow.m; sourceTree = SOURCE_ROOT; };
+		263A268B1EE40BFC005C52B9 /* BrowserWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowserWindowController.m; sourceTree = SOURCE_ROOT; };
+		263A268C1EE40BFC005C52B9 /* desktop-tree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "desktop-tree.m"; sourceTree = SOURCE_ROOT; };
+		263A268D1EE40BFC005C52B9 /* DownloadWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DownloadWindowController.m; sourceTree = SOURCE_ROOT; };
+		263A268E1EE40BFC005C52B9 /* fetch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = fetch.m; sourceTree = SOURCE_ROOT; };
+		263A268F1EE40BFC005C52B9 /* font.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = font.m; sourceTree = SOURCE_ROOT; };
+		263A26901EE40BFC005C52B9 /* FormSelectMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FormSelectMenu.m; sourceTree = SOURCE_ROOT; };
+		263A26911EE40BFC005C52B9 /* gui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = gui.m; sourceTree = SOURCE_ROOT; };
+		263A26921EE40BFC005C52B9 /* HistoryView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryView.m; sourceTree = SOURCE_ROOT; };
+		263A26931EE40BFC005C52B9 /* HistoryWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryWindowController.m; sourceTree = SOURCE_ROOT; };
+		263A26941EE40BFC005C52B9 /* LocalHistoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocalHistoryController.m; sourceTree = SOURCE_ROOT; };
+		263A26951EE40BFC005C52B9 /* NetsurfApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetsurfApp.m; sourceTree = SOURCE_ROOT; };
+		263A26961EE40BFC005C52B9 /* NetSurfAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetSurfAppDelegate.m; sourceTree = SOURCE_ROOT; };
+		263A26971EE40BFC005C52B9 /* plotter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = plotter.m; sourceTree = SOURCE_ROOT; };
+		263A26981EE40BFC005C52B9 /* PreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesWindowController.m; sourceTree = SOURCE_ROOT; };
+		263A26991EE40BFC005C52B9 /* schedule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = schedule.m; sourceTree = SOURCE_ROOT; };
+		263A269A1EE40BFC005C52B9 /* ScrollableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScrollableView.m; sourceTree = SOURCE_ROOT; };
+		263A269B1EE40BFC005C52B9 /* SearchWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchWindowController.m; sourceTree = SOURCE_ROOT; };
+		263A269C1EE40BFC005C52B9 /* selection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = selection.m; sourceTree = SOURCE_ROOT; };
+		263A269D1EE40BFC005C52B9 /* Tree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tree.m; sourceTree = SOURCE_ROOT; };
+		263A269E1EE40BFC005C52B9 /* TreeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TreeView.m; sourceTree = SOURCE_ROOT; };
+		263A269F1EE40BFC005C52B9 /* URLFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLFieldCell.m; sourceTree = SOURCE_ROOT; };
+		263A26A21EE40C4A005C52B9 /* backing_store.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = backing_store.h; sourceTree = "<group>"; };
+		263A26A31EE40C4A005C52B9 /* content.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = content.c; sourceTree = "<group>"; };
+		263A26A41EE40C4A005C52B9 /* content.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content.h; sourceTree = "<group>"; };
+		263A26A51EE40C4A005C52B9 /* content_debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content_debug.h; sourceTree = "<group>"; };
+		263A26A61EE40C4A005C52B9 /* content_factory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = content_factory.c; sourceTree = "<group>"; };
+		263A26A71EE40C4A005C52B9 /* content_factory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content_factory.h; sourceTree = "<group>"; };
+		263A26A81EE40C4A005C52B9 /* content_protected.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content_protected.h; sourceTree = "<group>"; };
+		263A26A91EE40C4A005C52B9 /* dirlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dirlist.c; sourceTree = "<group>"; };
+		263A26AA1EE40C4A005C52B9 /* dirlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dirlist.h; sourceTree = "<group>"; };
+		263A26AB1EE40C4A005C52B9 /* fetch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fetch.c; sourceTree = "<group>"; };
+		263A26AC1EE40C4A005C52B9 /* fetch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fetch.h; sourceTree = "<group>"; };
+		263A26AE1EE40C4A005C52B9 /* about.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = about.c; sourceTree = "<group>"; };
+		263A26AF1EE40C4A005C52B9 /* about.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = about.h; sourceTree = "<group>"; };
+		263A26B01EE40C4A005C52B9 /* curl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curl.c; sourceTree = "<group>"; };
+		263A26B11EE40C4A005C52B9 /* curl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curl.h; sourceTree = "<group>"; };
+		263A26B21EE40C4A005C52B9 /* data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = data.c; sourceTree = "<group>"; };
+		263A26B31EE40C4A005C52B9 /* data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = data.h; sourceTree = "<group>"; };
+		263A26B41EE40C4A005C52B9 /* file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = file.c; sourceTree = "<group>"; };
+		263A26B51EE40C4A005C52B9 /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = "<group>"; };
+		263A26B61EE40C4A005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A26B71EE40C4A005C52B9 /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = resource.c; sourceTree = "<group>"; };
+		263A26B81EE40C4A005C52B9 /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
+		263A26B91EE40C4A005C52B9 /* fetchers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fetchers.h; sourceTree = "<group>"; };
+		263A26BA1EE40C4A005C52B9 /* fs_backing_store.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fs_backing_store.c; sourceTree = "<group>"; };
+		263A26BD1EE40C4A005C52B9 /* css.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = css.c; sourceTree = "<group>"; };
+		263A26BE1EE40C4A005C52B9 /* css.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = css.h; sourceTree = "<group>"; };
+		263A26BF1EE40C4A005C52B9 /* dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dump.c; sourceTree = "<group>"; };
+		263A26C01EE40C4A005C52B9 /* dump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dump.h; sourceTree = "<group>"; };
+		263A26C11EE40C4A005C52B9 /* hints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hints.c; sourceTree = "<group>"; };
+		263A26C21EE40C4A005C52B9 /* hints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hints.h; sourceTree = "<group>"; };
+		263A26C31EE40C4A005C52B9 /* internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = internal.c; sourceTree = "<group>"; };
+		263A26C41EE40C4A005C52B9 /* internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = internal.h; sourceTree = "<group>"; };
+		263A26C51EE40C4A005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A26C61EE40C4A005C52B9 /* select.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = select.c; sourceTree = "<group>"; };
+		263A26C71EE40C4A005C52B9 /* select.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = select.h; sourceTree = "<group>"; };
+		263A26C81EE40C4A005C52B9 /* utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = "<group>"; };
+		263A26C91EE40C4A005C52B9 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
+		263A26CB1EE40C4A005C52B9 /* bmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bmp.c; sourceTree = "<group>"; };
+		263A26CC1EE40C4A005C52B9 /* bmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bmp.h; sourceTree = "<group>"; };
+		263A26CD1EE40C4A005C52B9 /* gif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gif.c; sourceTree = "<group>"; };
+		263A26CE1EE40C4A005C52B9 /* gif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gif.h; sourceTree = "<group>"; };
+		263A26CF1EE40C4A005C52B9 /* ico.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ico.c; sourceTree = "<group>"; };
+		263A26D01EE40C4A005C52B9 /* ico.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ico.h; sourceTree = "<group>"; };
+		263A26D11EE40C4A005C52B9 /* image.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = image.c; sourceTree = "<group>"; };
+		263A26D21EE40C4A005C52B9 /* image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image.h; sourceTree = "<group>"; };
+		263A26D31EE40C4A005C52B9 /* image_cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = image_cache.c; sourceTree = "<group>"; };
+		263A26D41EE40C4A005C52B9 /* image_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image_cache.h; sourceTree = "<group>"; };
+		263A26D61EE40C4A005C52B9 /* jpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jpeg.h; sourceTree = "<group>"; };
+		263A26D71EE40C4A005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A26D91EE40C4A005C52B9 /* nssprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nssprite.h; sourceTree = "<group>"; };
+		263A26DB1EE40C4A005C52B9 /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = png.h; sourceTree = "<group>"; };
+		263A26DD1EE40C4A005C52B9 /* rsvg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rsvg.h; sourceTree = "<group>"; };
+		263A26DF1EE40C4A005C52B9 /* svg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svg.h; sourceTree = "<group>"; };
+		263A26E11EE40C4A005C52B9 /* video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = video.h; sourceTree = "<group>"; };
+		263A27361EE40C4B005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A27371EE40C4B005C52B9 /* hlcache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hlcache.c; sourceTree = "<group>"; };
+		263A27381EE40C4B005C52B9 /* hlcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hlcache.h; sourceTree = "<group>"; };
+		263A27391EE40C4B005C52B9 /* llcache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = llcache.c; sourceTree = "<group>"; };
+		263A273A1EE40C4B005C52B9 /* llcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llcache.h; sourceTree = "<group>"; };
+		263A273B1EE40C4B005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A273C1EE40C4B005C52B9 /* mimesniff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mimesniff.c; sourceTree = "<group>"; };
+		263A273D1EE40C4B005C52B9 /* mimesniff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mimesniff.h; sourceTree = "<group>"; };
+		263A273E1EE40C4B005C52B9 /* no_backing_store.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = no_backing_store.c; sourceTree = "<group>"; };
+		263A273F1EE40C4B005C52B9 /* urldb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = urldb.c; sourceTree = "<group>"; };
+		263A27401EE40C4B005C52B9 /* urldb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = urldb.h; sourceTree = "<group>"; };
+		263A27421EE40C4B005C52B9 /* browser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = browser.c; sourceTree = "<group>"; };
+		263A27431EE40C4B005C52B9 /* browser_history.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = browser_history.c; sourceTree = "<group>"; };
+		263A27441EE40C4B005C52B9 /* browser_history.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browser_history.h; sourceTree = "<group>"; };
+		263A27451EE40C4B005C52B9 /* browser_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browser_private.h; sourceTree = "<group>"; };
+		263A27461EE40C4B005C52B9 /* cookie_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cookie_manager.c; sourceTree = "<group>"; };
+		263A27471EE40C4B005C52B9 /* cookie_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cookie_manager.h; sourceTree = "<group>"; };
+		263A27481EE40C4B005C52B9 /* download.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = download.c; sourceTree = "<group>"; };
+		263A27491EE40C4B005C52B9 /* download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = download.h; sourceTree = "<group>"; };
+		263A274A1EE40C4B005C52B9 /* font_haru.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = font_haru.c; sourceTree = "<group>"; };
+		263A274B1EE40C4B005C52B9 /* font_haru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font_haru.h; sourceTree = "<group>"; };
+		263A274C1EE40C4B005C52B9 /* frame_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frame_types.h; sourceTree = "<group>"; };
+		263A274D1EE40C4B005C52B9 /* frames.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = frames.c; sourceTree = "<group>"; };
+		263A274E1EE40C4B005C52B9 /* frames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frames.h; sourceTree = "<group>"; };
+		263A274F1EE40C4B005C52B9 /* global_history.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = global_history.c; sourceTree = "<group>"; };
+		263A27501EE40C4B005C52B9 /* global_history.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = global_history.h; sourceTree = "<group>"; };
+		263A27511EE40C4B005C52B9 /* gui_factory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gui_factory.c; sourceTree = "<group>"; };
+		263A27521EE40C4B005C52B9 /* gui_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui_internal.h; sourceTree = "<group>"; };
+		263A27531EE40C4B005C52B9 /* gui_table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui_table.h; sourceTree = "<group>"; };
+		263A27541EE40C4B005C52B9 /* hotlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hotlist.c; sourceTree = "<group>"; };
+		263A27551EE40C4B005C52B9 /* hotlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotlist.h; sourceTree = "<group>"; };
+		263A27561EE40C4B005C52B9 /* knockout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = knockout.c; sourceTree = "<group>"; };
+		263A27571EE40C4B005C52B9 /* knockout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = knockout.h; sourceTree = "<group>"; };
+		263A27581EE40C4B005C52B9 /* local_history.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = local_history.c; sourceTree = "<group>"; };
+		263A27591EE40C4B005C52B9 /* local_history.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = local_history.h; sourceTree = "<group>"; };
+		263A275A1EE40C4B005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A275B1EE40C4B005C52B9 /* mouse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mouse.c; sourceTree = "<group>"; };
+		263A275C1EE40C4B005C52B9 /* netsurf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = netsurf.c; sourceTree = "<group>"; };
+		263A275D1EE40C4B005C52B9 /* options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = options.h; sourceTree = "<group>"; };
+		263A275E1EE40C4B005C52B9 /* plot_style.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = plot_style.c; sourceTree = "<group>"; };
+		263A275F1EE40C4B005C52B9 /* print.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = print.c; sourceTree = "<group>"; };
+		263A27601EE40C4B005C52B9 /* print.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = print.h; sourceTree = "<group>"; };
+		263A27611EE40C4B005C52B9 /* printer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printer.h; sourceTree = "<group>"; };
+		263A27621EE40C4B005C52B9 /* save_complete.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = save_complete.c; sourceTree = "<group>"; };
+		263A27631EE40C4B005C52B9 /* save_complete.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = save_complete.h; sourceTree = "<group>"; };
+		263A27641EE40C4B005C52B9 /* save_pdf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = save_pdf.c; sourceTree = "<group>"; };
+		263A27651EE40C4B005C52B9 /* save_pdf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = save_pdf.h; sourceTree = "<group>"; };
+		263A27661EE40C4B005C52B9 /* save_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = save_text.c; sourceTree = "<group>"; };
+		263A27671EE40C4B005C52B9 /* save_text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = save_text.h; sourceTree = "<group>"; };
+		263A27681EE40C4B005C52B9 /* scrollbar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scrollbar.c; sourceTree = "<group>"; };
+		263A27691EE40C4B005C52B9 /* scrollbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scrollbar.h; sourceTree = "<group>"; };
+		263A276A1EE40C4B005C52B9 /* search.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = search.c; sourceTree = "<group>"; };
+		263A276B1EE40C4B005C52B9 /* search.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = search.h; sourceTree = "<group>"; };
+		263A276C1EE40C4B005C52B9 /* searchweb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = searchweb.c; sourceTree = "<group>"; };
+		263A276D1EE40C4B005C52B9 /* searchweb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = searchweb.h; sourceTree = "<group>"; };
+		263A276E1EE40C4B005C52B9 /* selection.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = selection.c; sourceTree = "<group>"; };
+		263A276F1EE40C4B005C52B9 /* selection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selection.h; sourceTree = "<group>"; };
+		263A27701EE40C4B005C52B9 /* sslcert_viewer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sslcert_viewer.c; sourceTree = "<group>"; };
+		263A27711EE40C4B005C52B9 /* sslcert_viewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sslcert_viewer.h; sourceTree = "<group>"; };
+		263A27721EE40C4B005C52B9 /* system_colour.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = system_colour.c; sourceTree = "<group>"; };
+		263A27731EE40C4B005C52B9 /* system_colour.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = system_colour.h; sourceTree = "<group>"; };
+		263A27741EE40C4B005C52B9 /* textarea.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = textarea.c; sourceTree = "<group>"; };
+		263A27751EE40C4B005C52B9 /* textarea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textarea.h; sourceTree = "<group>"; };
+		263A27761EE40C4B005C52B9 /* textinput.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = textinput.c; sourceTree = "<group>"; };
+		263A27771EE40C4B005C52B9 /* textinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textinput.h; sourceTree = "<group>"; };
+		263A27781EE40C4B005C52B9 /* theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = theme.h; sourceTree = "<group>"; };
+		263A27791EE40C4B005C52B9 /* treeview.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = treeview.c; sourceTree = "<group>"; };
+		263A277A1EE40C4B005C52B9 /* treeview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = treeview.h; sourceTree = "<group>"; };
+		263A277B1EE40C4B005C52B9 /* version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = "<group>"; };
+		263A277C1EE40C4B005C52B9 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
+		263A277F1EE40C4B005C52B9 /* bitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitmap.h; sourceTree = "<group>"; };
+		263A27801EE40C4B005C52B9 /* browser_window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browser_window.h; sourceTree = "<group>"; };
+		263A27811EE40C4B005C52B9 /* clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = clipboard.h; sourceTree = "<group>"; };
+		263A27821EE40C4B005C52B9 /* content.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content.h; sourceTree = "<group>"; };
+		263A27831EE40C4B005C52B9 /* content_type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content_type.h; sourceTree = "<group>"; };
+		263A27841EE40C4B005C52B9 /* cookie_db.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cookie_db.h; sourceTree = "<group>"; };
+		263A27851EE40C4B005C52B9 /* core_window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core_window.h; sourceTree = "<group>"; };
+		263A27861EE40C4B005C52B9 /* css.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = css.h; sourceTree = "<group>"; };
+		263A27871EE40C4B005C52B9 /* download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = download.h; sourceTree = "<group>"; };
+		263A27881EE40C4B005C52B9 /* fetch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fetch.h; sourceTree = "<group>"; };
+		263A27891EE40C4B005C52B9 /* form.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = form.h; sourceTree = "<group>"; };
+		263A278A1EE40C4B005C52B9 /* inttypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inttypes.h; sourceTree = "<group>"; };
+		263A278B1EE40C4B005C52B9 /* keypress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keypress.h; sourceTree = "<group>"; };
+		263A278C1EE40C4B005C52B9 /* layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = layout.h; sourceTree = "<group>"; };
+		263A278D1EE40C4B005C52B9 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = "<group>"; };
+		263A278E1EE40C4B005C52B9 /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mouse.h; sourceTree = "<group>"; };
+		263A278F1EE40C4B005C52B9 /* netsurf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = netsurf.h; sourceTree = "<group>"; };
+		263A27901EE40C4B005C52B9 /* plot_style.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plot_style.h; sourceTree = "<group>"; };
+		263A27911EE40C4B005C52B9 /* plotters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plotters.h; sourceTree = "<group>"; };
+		263A27921EE40C4B005C52B9 /* search.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = search.h; sourceTree = "<group>"; };
+		263A27931EE40C4B005C52B9 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
+		263A27941EE40C4B005C52B9 /* url_db.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url_db.h; sourceTree = "<group>"; };
+		263A27951EE40C4B005C52B9 /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8.h; sourceTree = "<group>"; };
+		263A27961EE40C4B005C52B9 /* window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = "<group>"; };
+		263A27981EE40C4B005C52B9 /* box.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box.c; sourceTree = "<group>"; };
+		263A27991EE40C4B005C52B9 /* box.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = box.h; sourceTree = "<group>"; };
+		263A279A1EE40C4B005C52B9 /* box_construct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_construct.c; sourceTree = "<group>"; };
+		263A279B1EE40C4B005C52B9 /* box_normalise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_normalise.c; sourceTree = "<group>"; };
+		263A279C1EE40C4B005C52B9 /* box_textarea.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_textarea.c; sourceTree = "<group>"; };
+		263A279D1EE40C4B005C52B9 /* box_textarea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = box_textarea.h; sourceTree = "<group>"; };
+		263A279E1EE40C4B005C52B9 /* font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = font.c; sourceTree = "<group>"; };
+		263A279F1EE40C4B005C52B9 /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
+		263A27A01EE40C4B005C52B9 /* form.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = form.c; sourceTree = "<group>"; };
+		263A27A11EE40C4B005C52B9 /* form_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = form_internal.h; sourceTree = "<group>"; };
+		263A27A21EE40C4B005C52B9 /* html.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html.c; sourceTree = "<group>"; };
+		263A27A31EE40C4B005C52B9 /* html.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = html.h; sourceTree = "<group>"; };
+		263A27A41EE40C4B005C52B9 /* html_css.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_css.c; sourceTree = "<group>"; };
+		263A27A51EE40C4B005C52B9 /* html_css_fetcher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_css_fetcher.c; sourceTree = "<group>"; };
+		263A27A61EE40C4B005C52B9 /* html_forms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_forms.c; sourceTree = "<group>"; };
+		263A27A71EE40C4B005C52B9 /* html_interaction.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_interaction.c; sourceTree = "<group>"; };
+		263A27A81EE40C4B005C52B9 /* html_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = html_internal.h; sourceTree = "<group>"; };
+		263A27A91EE40C4B005C52B9 /* html_object.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_object.c; sourceTree = "<group>"; };
+		263A27AA1EE40C4B005C52B9 /* html_redraw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_redraw.c; sourceTree = "<group>"; };
+		263A27AB1EE40C4B005C52B9 /* html_redraw_border.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_redraw_border.c; sourceTree = "<group>"; };
+		263A27AC1EE40C4B005C52B9 /* html_script.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_script.c; sourceTree = "<group>"; };
+		263A27AD1EE40C4B005C52B9 /* imagemap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imagemap.c; sourceTree = "<group>"; };
+		263A27AE1EE40C4B005C52B9 /* imagemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imagemap.h; sourceTree = "<group>"; };
+		263A27AF1EE40C4B005C52B9 /* layout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = layout.c; sourceTree = "<group>"; };
+		263A27B01EE40C4B005C52B9 /* layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = layout.h; sourceTree = "<group>"; };
+		263A27B11EE40C4B005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A27B21EE40C4B005C52B9 /* search.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = search.c; sourceTree = "<group>"; };
+		263A27B31EE40C4B005C52B9 /* search.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = search.h; sourceTree = "<group>"; };
+		263A27B41EE40C4B005C52B9 /* table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = table.c; sourceTree = "<group>"; };
+		263A27B51EE40C4B005C52B9 /* table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = table.h; sourceTree = "<group>"; };
+		263A27B61EE40C4B005C52B9 /* textplain.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = textplain.c; sourceTree = "<group>"; };
+		263A27B71EE40C4B005C52B9 /* textplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textplain.h; sourceTree = "<group>"; };
+		263A27B91EE40C4B005C52B9 /* ascii.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ascii.h; sourceTree = "<group>"; };
+		263A27BA1EE40C4B005C52B9 /* bloom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bloom.c; sourceTree = "<group>"; };
+		263A27BB1EE40C4B005C52B9 /* bloom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bloom.h; sourceTree = "<group>"; };
+		263A27BC1EE40C4B005C52B9 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+		263A27BD1EE40C4B005C52B9 /* corestringlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = corestringlist.h; sourceTree = "<group>"; };
+		263A27BE1EE40C4B005C52B9 /* corestrings.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = corestrings.c; sourceTree = "<group>"; };
+		263A27BF1EE40C4B005C52B9 /* corestrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = corestrings.h; sourceTree = "<group>"; };
+		263A27C01EE40C4B005C52B9 /* coverity-build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "coverity-build.sh"; sourceTree = "<group>"; };
+		263A27C11EE40C4B005C52B9 /* DerivedJoiningType.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DerivedJoiningType.txt; sourceTree = "<group>"; };
+		263A27C21EE40C4B005C52B9 /* dirent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dirent.h; sourceTree = "<group>"; };
+		263A27C31EE40C4B005C52B9 /* errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = errors.h; sourceTree = "<group>"; };
+		263A27C41EE40C4B005C52B9 /* fetch-transifex.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "fetch-transifex.pl"; sourceTree = "<group>"; };
+		263A27C51EE40C4B005C52B9 /* file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = file.c; sourceTree = "<group>"; };
+		263A27C61EE40C4B005C52B9 /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = "<group>"; };
+		263A27C71EE40C4B005C52B9 /* filename.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filename.c; sourceTree = "<group>"; };
+		263A27C81EE40C4B005C52B9 /* filename.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filename.h; sourceTree = "<group>"; };
+		263A27C91EE40C4B005C52B9 /* filepath.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filepath.c; sourceTree = "<group>"; };
+		263A27CA1EE40C4B005C52B9 /* filepath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filepath.h; sourceTree = "<group>"; };
+		263A27CB1EE40C4B005C52B9 /* git-date.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "git-date.sh"; sourceTree = "<group>"; };
+		263A27CC1EE40C4B005C52B9 /* git-testament.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "git-testament.pl"; sourceTree = "<group>"; };
+		263A27CD1EE40C4B005C52B9 /* hashtable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hashtable.c; sourceTree = "<group>"; };
+		263A27CE1EE40C4B005C52B9 /* hashtable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hashtable.h; sourceTree = "<group>"; };
+		263A27D01EE40C4B005C52B9 /* challenge.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = challenge.c; sourceTree = "<group>"; };
+		263A27D11EE40C4B005C52B9 /* challenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = challenge.h; sourceTree = "<group>"; };
+		263A27D21EE40C4B005C52B9 /* challenge_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = challenge_internal.h; sourceTree = "<group>"; };
+		263A27D31EE40C4B005C52B9 /* content-disposition.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "content-disposition.c"; sourceTree = "<group>"; };
+		263A27D41EE40C4B005C52B9 /* content-disposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "content-disposition.h"; sourceTree = "<group>"; };
+		263A27D51EE40C4B005C52B9 /* content-type.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "content-type.c"; sourceTree = "<group>"; };
+		263A27D61EE40C4B005C52B9 /* content-type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "content-type.h"; sourceTree = "<group>"; };
+		263A27D71EE40C4B005C52B9 /* generics.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = generics.c; sourceTree = "<group>"; };
+		263A27D81EE40C4B005C52B9 /* generics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generics.h; sourceTree = "<group>"; };
+		263A27D91EE40C4B005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A27DA1EE40C4B005C52B9 /* parameter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parameter.c; sourceTree = "<group>"; };
+		263A27DB1EE40C4B005C52B9 /* parameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parameter.h; sourceTree = "<group>"; };
+		263A27DC1EE40C4B005C52B9 /* parameter_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parameter_internal.h; sourceTree = "<group>"; };
+		263A27DD1EE40C4B005C52B9 /* primitives.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = primitives.c; sourceTree = "<group>"; };
+		263A27DE1EE40C4B005C52B9 /* primitives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = primitives.h; sourceTree = "<group>"; };
+		263A27DF1EE40C4B005C52B9 /* www-authenticate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "www-authenticate.c"; sourceTree = "<group>"; };
+		263A27E01EE40C4B005C52B9 /* www-authenticate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "www-authenticate.h"; sourceTree = "<group>"; };
+		263A27E11EE40C4B005C52B9 /* http.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http.h; sourceTree = "<group>"; };
+		263A27E21EE40C4B005C52B9 /* idna-derived-props-gen.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "idna-derived-props-gen.pl"; sourceTree = "<group>"; };
+		263A27E31EE40C4B005C52B9 /* idna-tables-5.2.0-properties.csv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "idna-tables-5.2.0-properties.csv"; sourceTree = "<group>"; };
+		263A27E41EE40C4B005C52B9 /* idna.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = idna.c; sourceTree = "<group>"; };
+		263A27E51EE40C4B005C52B9 /* idna.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idna.h; sourceTree = "<group>"; };
+		263A27E61EE40C4B005C52B9 /* idna_props.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idna_props.h; sourceTree = "<group>"; };
+		263A27E71EE40C4B005C52B9 /* import-messages.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "import-messages.pl"; sourceTree = "<group>"; };
+		263A27E81EE40C4B005C52B9 /* inet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inet.h; sourceTree = "<group>"; };
+		263A27E91EE40C4B005C52B9 /* jenkins-build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "jenkins-build.sh"; sourceTree = "<group>"; };
+		263A27EA1EE40C4B005C52B9 /* libdom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libdom.c; sourceTree = "<group>"; };
+		263A27EB1EE40C4B005C52B9 /* libdom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libdom.h; sourceTree = "<group>"; };
+		263A27EC1EE40C4B005C52B9 /* log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = log.c; sourceTree = "<group>"; };
+		263A27ED1EE40C4B005C52B9 /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = "<group>"; };
+		263A27EE1EE40C4B005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A27EF1EE40C4B005C52B9 /* memanalyze.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = memanalyze.pl; sourceTree = "<group>"; };
+		263A27F01EE40C4B005C52B9 /* merge-messages.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "merge-messages.lua"; sourceTree = "<group>"; };
+		263A27F11EE40C4B005C52B9 /* messages.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = messages.c; sourceTree = "<group>"; };
+		263A27F21EE40C4B005C52B9 /* messages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = messages.h; sourceTree = "<group>"; };
+		263A27F31EE40C4B005C52B9 /* nsoption.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nsoption.c; sourceTree = "<group>"; };
+		263A27F41EE40C4B005C52B9 /* nsoption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nsoption.h; sourceTree = "<group>"; };
+		263A27F61EE40C4B005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A27F71EE40C4B005C52B9 /* nsurl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nsurl.c; sourceTree = "<group>"; };
+		263A27F81EE40C4B005C52B9 /* parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parse.c; sourceTree = "<group>"; };
+		263A27F91EE40C4B005C52B9 /* private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = private.h; sourceTree = "<group>"; };
+		263A27FA1EE40C4B005C52B9 /* nsurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nsurl.h; sourceTree = "<group>"; };
+		263A27FB1EE40C4B005C52B9 /* punycode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = punycode.c; sourceTree = "<group>"; };
+		263A27FC1EE40C4B005C52B9 /* punycode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = punycode.h; sourceTree = "<group>"; };
+		263A27FD1EE40C4B005C52B9 /* ring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring.h; sourceTree = "<group>"; };
+		263A27FE1EE40C4B005C52B9 /* split-messages.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "split-messages.pl"; sourceTree = "<group>"; };
+		263A27FF1EE40C4B005C52B9 /* string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = string.h; sourceTree = "<group>"; };
+		263A28001EE40C4B005C52B9 /* sys_time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sys_time.h; sourceTree = "<group>"; };
+		263A28011EE40C4B005C52B9 /* talloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = talloc.c; sourceTree = "<group>"; };
+		263A28021EE40C4B005C52B9 /* talloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = talloc.h; sourceTree = "<group>"; };
+		263A28031EE40C4B005C52B9 /* test-netsurf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "test-netsurf"; sourceTree = "<group>"; };
+		263A28041EE40C4B005C52B9 /* time.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = time.c; sourceTree = "<group>"; };
+		263A28051EE40C4B005C52B9 /* time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time.h; sourceTree = "<group>"; };
+		263A28061EE40C4B005C52B9 /* url.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = url.c; sourceTree = "<group>"; };
+		263A28071EE40C4B005C52B9 /* url.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url.h; sourceTree = "<group>"; };
+		263A28081EE40C4B005C52B9 /* useragent.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = useragent.c; sourceTree = "<group>"; };
+		263A28091EE40C4B005C52B9 /* useragent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = useragent.h; sourceTree = "<group>"; };
+		263A280A1EE40C4B005C52B9 /* utf8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf8.c; sourceTree = "<group>"; };
+		263A280B1EE40C4B005C52B9 /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8.h; sourceTree = "<group>"; };
+		263A280C1EE40C4B005C52B9 /* utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = "<group>"; };
+		263A280D1EE40C4B005C52B9 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
+		263A280E1EE40C4B005C52B9 /* utsname.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utsname.h; sourceTree = "<group>"; };
+		263A280F1EE40C4B005C52B9 /* valgrind.supp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = valgrind.supp; sourceTree = "<group>"; };
+		263A28AB1EE41245005C52B9 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
+		263A28AD1EE41266005C52B9 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		263A28B01EE412B4005C52B9 /* content.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = content.c; sourceTree = "<group>"; };
+		263A28B11EE412B4005C52B9 /* content.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content.h; sourceTree = "<group>"; };
+		263A28B31EE412B4005C52B9 /* Console.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Console.bnd; sourceTree = "<group>"; };
+		263A28B41EE412B4005C52B9 /* Document.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Document.bnd; sourceTree = "<group>"; };
+		263A28B51EE412B4005C52B9 /* duk_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = duk_config.h; sourceTree = "<group>"; };
+		263A28B61EE412B4005C52B9 /* duk_custom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = duk_custom.h; sourceTree = "<group>"; };
+		263A28B71EE412B4005C52B9 /* dukky.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dukky.c; sourceTree = "<group>"; };
+		263A28B81EE412B4005C52B9 /* dukky.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dukky.h; sourceTree = "<group>"; };
+		263A28B91EE412B4005C52B9 /* duktape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = duktape.c; sourceTree = "<group>"; };
+		263A28BA1EE412B4005C52B9 /* duktape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = duktape.h; sourceTree = "<group>"; };
+		263A28BB1EE412B4005C52B9 /* Element.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Element.bnd; sourceTree = "<group>"; };
+		263A28BC1EE412B4005C52B9 /* Event.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Event.bnd; sourceTree = "<group>"; };
+		263A28BD1EE412B4005C52B9 /* EventTarget.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventTarget.bnd; sourceTree = "<group>"; };
+		263A28BE1EE412B4005C52B9 /* HTMLAnchorElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLAnchorElement.bnd; sourceTree = "<group>"; };
+		263A28BF1EE412B4005C52B9 /* HTMLAppletElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLAppletElement.bnd; sourceTree = "<group>"; };
+		263A28C01EE412B4005C52B9 /* HTMLAreaElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLAreaElement.bnd; sourceTree = "<group>"; };
+		263A28C11EE412B4005C52B9 /* HTMLBaseElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLBaseElement.bnd; sourceTree = "<group>"; };
+		263A28C21EE412B4005C52B9 /* HTMLBodyElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLBodyElement.bnd; sourceTree = "<group>"; };
+		263A28C31EE412B4005C52B9 /* HTMLBRElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLBRElement.bnd; sourceTree = "<group>"; };
+		263A28C41EE412B4005C52B9 /* HTMLButtonElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLButtonElement.bnd; sourceTree = "<group>"; };
+		263A28C51EE412B4005C52B9 /* HTMLCollection.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLCollection.bnd; sourceTree = "<group>"; };
+		263A28C61EE412B4005C52B9 /* HTMLDivElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLDivElement.bnd; sourceTree = "<group>"; };
+		263A28C71EE412B4005C52B9 /* HTMLElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLElement.bnd; sourceTree = "<group>"; };
+		263A28C81EE412B4005C52B9 /* HTMLFontElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLFontElement.bnd; sourceTree = "<group>"; };
+		263A28C91EE412B4005C52B9 /* HTMLFormElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLFormElement.bnd; sourceTree = "<group>"; };
+		263A28CA1EE412B4005C52B9 /* HTMLFrameElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLFrameElement.bnd; sourceTree = "<group>"; };
+		263A28CB1EE412B4005C52B9 /* HTMLFrameSetElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLFrameSetElement.bnd; sourceTree = "<group>"; };
+		263A28CC1EE412B4005C52B9 /* HTMLHeadingElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLHeadingElement.bnd; sourceTree = "<group>"; };
+		263A28CD1EE412B4005C52B9 /* HTMLHRElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLHRElement.bnd; sourceTree = "<group>"; };
+		263A28CE1EE412B4005C52B9 /* HTMLHTMLElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLHTMLElement.bnd; sourceTree = "<group>"; };
+		263A28CF1EE412B4005C52B9 /* HTMLIFrameElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLIFrameElement.bnd; sourceTree = "<group>"; };
+		263A28D01EE412B4005C52B9 /* HTMLImageElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLImageElement.bnd; sourceTree = "<group>"; };
+		263A28D11EE412B4005C52B9 /* HTMLInputElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLInputElement.bnd; sourceTree = "<group>"; };
+		263A28D21EE412B4005C52B9 /* HTMLLabelElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLLabelElement.bnd; sourceTree = "<group>"; };
+		263A28D31EE412B4005C52B9 /* HTMLLegendElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLLegendElement.bnd; sourceTree = "<group>"; };
+		263A28D41EE412B4005C52B9 /* HTMLLIElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLLIElement.bnd; sourceTree = "<group>"; };
+		263A28D51EE412B4005C52B9 /* HTMLLinkElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLLinkElement.bnd; sourceTree = "<group>"; };
+		263A28D61EE412B4005C52B9 /* HTMLMapElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMapElement.bnd; sourceTree = "<group>"; };
+		263A28D71EE412B4005C52B9 /* HTMLMarqueeElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMarqueeElement.bnd; sourceTree = "<group>"; };
+		263A28D81EE412B4005C52B9 /* HTMLMenuElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMenuElement.bnd; sourceTree = "<group>"; };
+		263A28D91EE412B4005C52B9 /* HTMLMetaElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMetaElement.bnd; sourceTree = "<group>"; };
+		263A28DA1EE412B4005C52B9 /* HTMLObjectElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLObjectElement.bnd; sourceTree = "<group>"; };
+		263A28DB1EE412B4005C52B9 /* HTMLOListElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLOListElement.bnd; sourceTree = "<group>"; };
+		263A28DC1EE412B4005C52B9 /* HTMLOptionElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLOptionElement.bnd; sourceTree = "<group>"; };
+		263A28DD1EE412B4005C52B9 /* HTMLParagraphElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLParagraphElement.bnd; sourceTree = "<group>"; };
+		263A28DE1EE412B4005C52B9 /* HTMLParamElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLParamElement.bnd; sourceTree = "<group>"; };
+		263A28DF1EE412B4005C52B9 /* HTMLPreElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLPreElement.bnd; sourceTree = "<group>"; };
+		263A28E01EE412B4005C52B9 /* HTMLQuoteElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLQuoteElement.bnd; sourceTree = "<group>"; };
+		263A28E11EE412B4005C52B9 /* HTMLScriptElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLScriptElement.bnd; sourceTree = "<group>"; };
+		263A28E21EE412B4005C52B9 /* HTMLSelectElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLSelectElement.bnd; sourceTree = "<group>"; };
+		263A28E31EE412B4005C52B9 /* HTMLStyleElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLStyleElement.bnd; sourceTree = "<group>"; };
+		263A28E41EE412B4005C52B9 /* HTMLTableCaptionElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTableCaptionElement.bnd; sourceTree = "<group>"; };
+		263A28E51EE412B4005C52B9 /* HTMLTableCellElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTableCellElement.bnd; sourceTree = "<group>"; };
+		263A28E61EE412B4005C52B9 /* HTMLTableColElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTableColElement.bnd; sourceTree = "<group>"; };
+		263A28E71EE412B4005C52B9 /* HTMLTableElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTableElement.bnd; sourceTree = "<group>"; };
+		263A28E81EE412B4005C52B9 /* HTMLTableRowElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTableRowElement.bnd; sourceTree = "<group>"; };
+		263A28E91EE412B4005C52B9 /* HTMLTableSectionElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTableSectionElement.bnd; sourceTree = "<group>"; };
+		263A28EA1EE412B4005C52B9 /* HTMLTextAreaElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTextAreaElement.bnd; sourceTree = "<group>"; };
+		263A28EB1EE412B4005C52B9 /* HTMLTitleElement.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTitleElement.bnd; sourceTree = "<group>"; };
+		263A28EC1EE412B4005C52B9 /* Location.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Location.bnd; sourceTree = "<group>"; };
+		263A28ED1EE412B4005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A28EE1EE412B4005C52B9 /* Navigator.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Navigator.bnd; sourceTree = "<group>"; };
+		263A28EF1EE412B4005C52B9 /* netsurf.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = netsurf.bnd; sourceTree = "<group>"; };
+		263A28F01EE412B4005C52B9 /* Node.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Node.bnd; sourceTree = "<group>"; };
+		263A28F11EE412B4005C52B9 /* NodeList.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NodeList.bnd; sourceTree = "<group>"; };
+		263A28F21EE412B4005C52B9 /* Window.bnd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Window.bnd; sourceTree = "<group>"; };
+		263A28F31EE412B4005C52B9 /* fetcher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fetcher.c; sourceTree = "<group>"; };
+		263A28F41EE412B4005C52B9 /* fetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fetcher.h; sourceTree = "<group>"; };
+		263A28F51EE412B4005C52B9 /* js.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js.h; sourceTree = "<group>"; };
+		263A28F61EE412B4005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A28F81EE412B4005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A28F91EE412B4005C52B9 /* none.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = none.c; sourceTree = "<group>"; };
+		263A28FB1EE412B4005C52B9 /* console.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = console.idl; sourceTree = "<group>"; };
+		263A28FC1EE412B4005C52B9 /* cssom.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cssom.idl; sourceTree = "<group>"; };
+		263A28FD1EE412B4005C52B9 /* dom-parsing.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "dom-parsing.idl"; sourceTree = "<group>"; };
+		263A28FE1EE412B4005C52B9 /* dom.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dom.idl; sourceTree = "<group>"; };
+		263A28FF1EE412B4005C52B9 /* html.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html.idl; sourceTree = "<group>"; };
+		263A29001EE412B4005C52B9 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		263A29011EE412B4005C52B9 /* uievents.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = uievents.idl; sourceTree = "<group>"; };
+		263A29021EE412B4005C52B9 /* urlutils.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = urlutils.idl; sourceTree = "<group>"; };
+		263A29061EE4196E005C52B9 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		2689BB2D1EE543E20090B679 /* PSMTabBarControl+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PSMTabBarControl+Private.h"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
+/* Begin PBXFrameworksBuildPhase section */
+		263A25EB1EE40BD6005C52B9 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				263A29071EE4196E005C52B9 /* Cocoa.framework in Frameworks */,
+				263A28AE1EE41266005C52B9 /* libz.tbd in Frameworks */,
+				263A28AC1EE41245005C52B9 /* libiconv.tbd in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
 /* Begin PBXGroup section */
 		19C28FACFE9D520D11CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
 				2636299412F699250048542C /* NetSurf.app */,
+				263A25EE1EE40BD6005C52B9 /* NetSurfBrowser.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		260F1F6212D620E800D9B07F /* content */ = {
+		261DB24E1318443500C59F12 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
-				260F1F6312D620E800D9B07F /* content.c */,
-				260F1F6412D620E800D9B07F /* content.h */,
-				260F1F6512D620E800D9B07F /* content_protected.h */,
-				260F1F6612D620E800D9B07F /* content_type.h */,
-				260F1F6712D620E800D9B07F /* dirlist.c */,
-				260F1F6812D620E800D9B07F /* dirlist.h */,
-				260F1F6912D620E800D9B07F /* fetch.c */,
-				260F1F6A12D620E800D9B07F /* fetch.h */,
-				260F1F6B12D620E800D9B07F /* fetchers */,
-				260F1F7212D620E800D9B07F /* hlcache.c */,
-				260F1F7312D620E800D9B07F /* hlcache.h */,
-				260F1F7412D620E800D9B07F /* llcache.c */,
-				260F1F7512D620E800D9B07F /* llcache.h */,
-				260F1F7612D620E800D9B07F /* urldb.c */,
-				260F1F7712D620E800D9B07F /* urldb.h */,
+				261DB24F1318444F00C59F12 /* compile-xib.sh */,
+				261DB2501318444F00C59F12 /* extract-strings.sh */,
 			);
-			name = content;
-			path = ../content;
-			sourceTree = SOURCE_ROOT;
+			name = Tools;
+			sourceTree = "<group>";
 		};
-		260F1F6B12D620E800D9B07F /* fetchers */ = {
+		263A25EF1EE40BD6005C52B9 /* Cocoa */ = {
 			isa = PBXGroup;
 			children = (
-				26E7A22B131FEBA8005B5B6A /* about.c */,
-				26E7A22C131FEBA8005B5B6A /* about.h */,
-				26E7A22D131FEBA8005B5B6A /* resource.c */,
-				26E7A22E131FEBA8005B5B6A /* resource.h */,
-				260F1F6C12D620E800D9B07F /* curl.c */,
-				260F1F6D12D620E800D9B07F /* curl.h */,
-				260F1F6E12D620E800D9B07F /* data.c */,
-				260F1F6F12D620E800D9B07F /* data.h */,
-				260F1F7012D620E800D9B07F /* file.c */,
-				260F1F7112D620E800D9B07F /* file.h */,
+				263A26021EE40BFC005C52B9 /* PSMTabBarControl */,
+				263A262C1EE40BFC005C52B9 /* res */,
+				263A26611EE40BFC005C52B9 /* apple_image.h */,
+				263A26621EE40BFC005C52B9 /* ArrowBox.h */,
+				263A26631EE40BFC005C52B9 /* ArrowWindow.h */,
+				263A26641EE40BFC005C52B9 /* bitmap.h */,
+				263A26651EE40BFC005C52B9 /* BlackScroller.h */,
+				263A26661EE40BFC005C52B9 /* BookmarksController.h */,
+				263A26671EE40BFC005C52B9 /* BrowserView.h */,
+				263A26681EE40BFC005C52B9 /* BrowserViewController.h */,
+				263A26691EE40BFC005C52B9 /* BrowserWindow.h */,
+				263A266A1EE40BFC005C52B9 /* BrowserWindowController.h */,
+				263A266B1EE40BFC005C52B9 /* coordinates.h */,
+				263A266C1EE40BFC005C52B9 /* desktop-tree.h */,
+				263A266D1EE40BFC005C52B9 /* DownloadWindowController.h */,
+				263A266E1EE40BFC005C52B9 /* fetch.h */,
+				263A266F1EE40BFC005C52B9 /* font.h */,
+				263A26701EE40BFC005C52B9 /* FormSelectMenu.h */,
+				263A26711EE40BFC005C52B9 /* gui.h */,
+				263A26721EE40BFC005C52B9 /* HistoryView.h */,
+				263A26731EE40BFC005C52B9 /* HistoryWindowController.h */,
+				263A26741EE40BFC005C52B9 /* LocalHistoryController.h */,
+				263A26751EE40BFC005C52B9 /* NetsurfApp.h */,
+				263A26761EE40BFC005C52B9 /* NetSurfAppDelegate.h */,
+				263A26771EE40BFC005C52B9 /* plotter.h */,
+				263A26781EE40BFC005C52B9 /* PreferencesWindowController.h */,
+				263A26791EE40BFC005C52B9 /* schedule.h */,
+				263A267A1EE40BFC005C52B9 /* ScrollableView.h */,
+				263A267B1EE40BFC005C52B9 /* SearchWindowController.h */,
+				263A267C1EE40BFC005C52B9 /* selection.h */,
+				263A267D1EE40BFC005C52B9 /* Tree.h */,
+				263A267E1EE40BFC005C52B9 /* TreeView.h */,
+				263A267F1EE40BFC005C52B9 /* URLFieldCell.h */,
+				263A26801EE40BFC005C52B9 /* Prefix.pch */,
+				263A26811EE40BFC005C52B9 /* Makefile.defaults */,
+				263A26821EE40BFC005C52B9 /* apple_image.m */,
+				263A26831EE40BFC005C52B9 /* ArrowBox.m */,
+				263A26841EE40BFC005C52B9 /* ArrowWindow.m */,
+				263A26851EE40BFC005C52B9 /* bitmap.m */,
+				263A26861EE40BFC005C52B9 /* BlackScroller.m */,
+				263A26871EE40BFC005C52B9 /* BookmarksController.m */,
+				263A26881EE40BFC005C52B9 /* BrowserView.m */,
+				263A26891EE40BFC005C52B9 /* BrowserViewController.m */,
+				263A268A1EE40BFC005C52B9 /* BrowserWindow.m */,
+				263A268B1EE40BFC005C52B9 /* BrowserWindowController.m */,
+				263A268C1EE40BFC005C52B9 /* desktop-tree.m */,
+				263A268D1EE40BFC005C52B9 /* DownloadWindowController.m */,
+				263A268E1EE40BFC005C52B9 /* fetch.m */,
+				263A268F1EE40BFC005C52B9 /* font.m */,
+				263A26901EE40BFC005C52B9 /* FormSelectMenu.m */,
+				263A26911EE40BFC005C52B9 /* gui.m */,
+				263A26921EE40BFC005C52B9 /* HistoryView.m */,
+				263A26931EE40BFC005C52B9 /* HistoryWindowController.m */,
+				263A26941EE40BFC005C52B9 /* LocalHistoryController.m */,
+				263A26951EE40BFC005C52B9 /* NetsurfApp.m */,
+				263A26961EE40BFC005C52B9 /* NetSurfAppDelegate.m */,
+				263A26971EE40BFC005C52B9 /* plotter.m */,
+				263A26981EE40BFC005C52B9 /* PreferencesWindowController.m */,
+				263A26991EE40BFC005C52B9 /* schedule.m */,
+				263A269A1EE40BFC005C52B9 /* ScrollableView.m */,
+				263A269B1EE40BFC005C52B9 /* SearchWindowController.m */,
+				263A269C1EE40BFC005C52B9 /* selection.m */,
+				263A269D1EE40BFC005C52B9 /* Tree.m */,
+				263A269E1EE40BFC005C52B9 /* TreeView.m */,
+				263A269F1EE40BFC005C52B9 /* URLFieldCell.m */,
 			);
-			path = fetchers;
+			name = Cocoa;
+			path = NetSurfBrowser;
 			sourceTree = "<group>";
 		};
-		260F1F7812D620E800D9B07F /* css */ = {
+		263A26021EE40BFC005C52B9 /* PSMTabBarControl */ = {
 			isa = PBXGroup;
 			children = (
-				260F1F7912D620E800D9B07F /* css.c */,
-				260F1F7A12D620E800D9B07F /* css.h */,
-				260F1F7B12D620E800D9B07F /* dump.c */,
-				260F1F7C12D620E800D9B07F /* dump.h */,
-				260F1F7D12D620E800D9B07F /* internal.c */,
-				260F1F7E12D620E800D9B07F /* internal.h */,
-				260F1F7F12D620E800D9B07F /* select.c */,
-				260F1F8012D620E800D9B07F /* select.h */,
-				260F1F8112D620E800D9B07F /* utils.c */,
-				260F1F8212D620E800D9B07F /* utils.h */,
-			);
-			name = css;
-			path = ../css;
+				263A26031EE40BFC005C52B9 /* Images */,
+				263A26101EE40BFC005C52B9 /* NSBezierPath_AMShading.h */,
+				263A26111EE40BFC005C52B9 /* NSBezierPath_AMShading.m */,
+				263A26121EE40BFC005C52B9 /* NSString_AITruncation.h */,
+				263A26131EE40BFC005C52B9 /* NSString_AITruncation.m */,
+				263A26141EE40BFC005C52B9 /* PSMOverflowPopUpButton.h */,
+				263A26151EE40BFC005C52B9 /* PSMOverflowPopUpButton.m */,
+				263A26161EE40BFC005C52B9 /* PSMProgressIndicator.h */,
+				263A26171EE40BFC005C52B9 /* PSMProgressIndicator.m */,
+				263A26181EE40BFC005C52B9 /* PSMRolloverButton.h */,
+				263A26191EE40BFC005C52B9 /* PSMRolloverButton.m */,
+				263A261A1EE40BFC005C52B9 /* PSMTabBarCell.h */,
+				263A261B1EE40BFC005C52B9 /* PSMTabBarCell.m */,
+				263A261C1EE40BFC005C52B9 /* PSMTabBarControl.h */,
+				263A261D1EE40BFC005C52B9 /* PSMTabBarControl.m */,
+				263A261E1EE40BFC005C52B9 /* PSMTabBarController.h */,
+				263A261F1EE40BFC005C52B9 /* PSMTabBarController.m */,
+				263A26201EE40BFC005C52B9 /* PSMTabDragAssistant.h */,
+				263A26211EE40BFC005C52B9 /* PSMTabDragAssistant.m */,
+				263A26221EE40BFC005C52B9 /* PSMTabDragView.h */,
+				263A26231EE40BFC005C52B9 /* PSMTabDragView.m */,
+				263A26241EE40BFC005C52B9 /* PSMTabDragWindow.h */,
+				263A26251EE40BFC005C52B9 /* PSMTabDragWindow.m */,
+				263A26261EE40BFC005C52B9 /* PSMTabDragWindowController.h */,
+				263A26271EE40BFC005C52B9 /* PSMTabDragWindowController.m */,
+				263A26281EE40BFC005C52B9 /* PSMTabStyle.h */,
+				263A26291EE40BFC005C52B9 /* PSMUnifiedTabStyle.h */,
+				263A262A1EE40BFC005C52B9 /* PSMUnifiedTabStyle.m */,
+				263A262B1EE40BFC005C52B9 /* ReadMe.rtfd */,
+				2689BB2D1EE543E20090B679 /* PSMTabBarControl+Private.h */,
+			);
+			path = PSMTabBarControl;
 			sourceTree = SOURCE_ROOT;
 		};
-		260F1F8312D620E800D9B07F /* desktop */ = {
+		263A26031EE40BFC005C52B9 /* Images */ = {
 			isa = PBXGroup;
 			children = (
-				260F1F8412D620E800D9B07F /* 401login.h */,
-				260F1F8512D620E800D9B07F /* browser.c */,
-				260F1F8612D620E800D9B07F /* browser.h */,
-				260F1F8712D620E800D9B07F /* cookies.c */,
-				260F1F8812D620E800D9B07F /* cookies_old.h */,
-				260F1F8912D620E800D9B07F /* download.c */,
-				260F1F8A12D620E800D9B07F /* download.h */,
-				260F1F8B12D620E800D9B07F /* frames.c */,
-				260F1F8C12D620E800D9B07F /* frames.h */,
-				260F1F8D12D620E800D9B07F /* gui.h */,
-				260F1F8E12D620E800D9B07F /* local_history.c */,
-				260F1F8F12D620E800D9B07F /* local_history.h */,
-				260F1F9012D620E800D9B07F /* history_global_core.c */,
-				260F1F9112D620E800D9B07F /* history_global_core.h */,
-				260F1F9212D620E800D9B07F /* hotlist.c */,
-				260F1F9312D620E800D9B07F /* hotlist.h */,
-				260F1F9412D620E800D9B07F /* knockout.c */,
-				260F1F9512D620E800D9B07F /* knockout.h */,
-				260F1F9612D620E800D9B07F /* mouse.c */,
-				260F1F9712D620E800D9B07F /* mouse.h */,
-				260F1F9812D620E800D9B07F /* netsurf.c */,
-				260F1F9912D620E800D9B07F /* netsurf.h */,
-				260F1F9A12D620E800D9B07F /* options.c */,
-				260F1F9B12D620E800D9B07F /* options.h */,
-				260F1F9C12D620E800D9B07F /* plot_style.c */,
-				260F1F9D12D620E800D9B07F /* plot_style.h */,
-				260F1F9E12D620E800D9B07F /* plotters.h */,
-				260F1F9F12D620E800D9B07F /* print.c */,
-				260F1FA012D620E800D9B07F /* print.h */,
-				260F1FA112D620E800D9B07F /* printer.h */,
-				260F1FA212D620E800D9B07F /* save_complete.c */,
-				260F1FA312D620E800D9B07F /* save_complete.h */,
-				260F1FA412D620E800D9B07F /* save_pdf */,
-				260F1FAA12D620E800D9B07F /* save_text.c */,
-				260F1FAB12D620E800D9B07F /* save_text.h */,
-				260F1FAC12D620E800D9B07F /* scroll.c */,
-				260F1FAD12D620E800D9B07F /* scroll.h */,
-				260F1FAE12D620E800D9B07F /* search.c */,
-				260F1FAF12D620E800D9B07F /* search.h */,
-				260F1FB012D620E800D9B07F /* searchweb.c */,
-				260F1FB112D620E800D9B07F /* searchweb.h */,
-				260F1FB212D620E800D9B07F /* selection.c */,
-				260F1FB312D620E800D9B07F /* selection.h */,
-				260F1FB412D620E800D9B07F /* sslcert.c */,
-				260F1FB512D620E800D9B07F /* sslcert.h */,
-				260F1FB612D620E800D9B07F /* textarea.c */,
-				260F1FB712D620E800D9B07F /* textarea.h */,
-				260F1FB812D620E800D9B07F /* textinput.c */,
-				260F1FB912D620E800D9B07F /* textinput.h */,
-				260F1FBA12D620E800D9B07F /* tree.c */,
-				260F1FBB12D620E800D9B07F /* tree.h */,
-				260F1FBC12D620E800D9B07F /* tree_url_node.c */,
-				260F1FBD12D620E800D9B07F /* tree_url_node.h */,
-				260F1FBE12D620E800D9B07F /* version.c */,
+				263A26041EE40BFC005C52B9 /* AquaTabClose_Front.png */,
+				263A26051EE40BFC005C52B9 /* AquaTabClose_Front_Pressed.png */,
+				263A26061EE40BFC005C52B9 /* AquaTabClose_Front_Rollover.png */,
+				263A26071EE40BFC005C52B9 /* AquaTabCloseDirty_Front.png */,
+				263A26081EE40BFC005C52B9 /* AquaTabCloseDirty_Front_Pressed.png */,
+				263A26091EE40BFC005C52B9 /* AquaTabCloseDirty_Front_Rollover.png */,
+				263A260A1EE40BFC005C52B9 /* AquaTabNew.png */,
+				263A260B1EE40BFC005C52B9 /* AquaTabNewPressed.png */,
+				263A260C1EE40BFC005C52B9 /* AquaTabNewRollover.png */,
+				263A260D1EE40BFC005C52B9 /* overflowImage.png */,
+				263A260E1EE40BFC005C52B9 /* overflowImagePressed.png */,
+				263A260F1EE40BFC005C52B9 /* pi.png */,
 			);
-			name = desktop;
-			path = ../desktop;
+			path = Images;
+			sourceTree = "<group>";
+		};
+		263A262C1EE40BFC005C52B9 /* res */ = {
+			isa = PBXGroup;
+			children = (
+				263A262D1EE40BFC005C52B9 /* adblock.css */,
+				263A262E1EE40BFC005C52B9 /* BookmarksWindow.xib */,
+				263A262F1EE40BFC005C52B9 /* Browser.xib */,
+				263A26301EE40BFC005C52B9 /* BrowserWindow.xib */,
+				263A26311EE40BFC005C52B9 /* ca-bundle */,
+				263A26321EE40BFC005C52B9 /* BookmarksWindow.xib.strings */,
+				263A26341EE40BFC005C52B9 /* BrowserWindow.xib.strings */,
+				263A26361EE40BFC005C52B9 /* DownloadWindow.xib.strings */,
+				263A26381EE40BFC005C52B9 /* HistoryWindow.xib.strings */,
+				263A263A1EE40BFC005C52B9 /* Localizable.strings */,
+				263A263C1EE40BFC005C52B9 /* MainMenu.xib.strings */,
+				263A263E1EE40BFC005C52B9 /* Messages */,
+				263A26401EE40BFC005C52B9 /* PreferencesWindow.xib.strings */,
+				263A26421EE40BFC005C52B9 /* SearchWindow.xib.strings */,
+				263A26441EE40BFC005C52B9 /* default.css */,
+				263A26451EE40BFC005C52B9 /* DownloadWindow.xib */,
+				263A264A1EE40BFC005C52B9 /* HistoryWindow.xib */,
+				263A264B1EE40BFC005C52B9 /* HomeTemplate.pdf */,
+				263A264C1EE40BFC005C52B9 /* Icons */,
+				263A26541EE40BFC005C52B9 /* internal.css */,
+				263A26571EE40BFC005C52B9 /* LocalHistoryPanel.xib */,
+				263A26581EE40BFC005C52B9 /* MainMenu.xib */,
+				263A26591EE40BFC005C52B9 /* NetSurf-Info.plist */,
+				263A265A1EE40BFC005C52B9 /* NetSurf.icns */,
+				263A265B1EE40BFC005C52B9 /* netsurf.png */,
+				263A265E1EE40BFC005C52B9 /* PreferencesWindow.xib */,
+				263A265F1EE40BFC005C52B9 /* quirks.css */,
+				263A26601EE40BFC005C52B9 /* SearchWindow.xib */,
+			);
+			path = res;
 			sourceTree = SOURCE_ROOT;
 		};
-		260F1FA412D620E800D9B07F /* save_pdf */ = {
+		263A264C1EE40BFC005C52B9 /* Icons */ = {
 			isa = PBXGroup;
 			children = (
-				260F1FA512D620E800D9B07F /* font_haru.c */,
-				260F1FA612D620E800D9B07F /* font_haru.h */,
-				260F1FA712D620E800D9B07F /* pdf_plotters.c */,
-				260F1FA812D620E800D9B07F /* pdf_plotters.h */,
+				263A264D1EE40BFC005C52B9 /* arrow-l.png */,
+				263A264E1EE40BFC005C52B9 /* content.png */,
+				263A264F1EE40BFC005C52B9 /* directory.png */,
+				263A26501EE40BFC005C52B9 /* directory2.png */,
+				263A26511EE40BFC005C52B9 /* hotlist-add.png */,
+				263A26521EE40BFC005C52B9 /* hotlist-rmv.png */,
+				263A26531EE40BFC005C52B9 /* search.png */,
 			);
-			path = save_pdf;
+			path = Icons;
 			sourceTree = "<group>";
 		};
-		260F1FC612D620E800D9B07F /* render */ = {
+		263A26A01EE40C1E005C52B9 /* Engine */ = {
 			isa = PBXGroup;
 			children = (
-				260F1FC712D620E800D9B07F /* box.c */,
-				260F1FC812D620E800D9B07F /* box.h */,
-				260F1FC912D620E800D9B07F /* box_construct.c */,
-				260F1FCA12D620E800D9B07F /* box_normalise.c */,
-				260F1FCB12D620E800D9B07F /* favicon.c */,
-				260F1FCC12D620E800D9B07F /* favicon.h */,
-				260F1FCD12D620E800D9B07F /* font.c */,
-				260F1FCE12D620E800D9B07F /* font.h */,
-				260F1FCF12D620E800D9B07F /* form.c */,
-				260F1FD012D620E800D9B07F /* form.h */,
-				260F1FD112D620E800D9B07F /* html.c */,
-				260F1FD212D620E800D9B07F /* html.h */,
-				260F1FD312D620E800D9B07F /* html_interaction.c */,
-				260F1FD412D620E800D9B07F /* html_redraw.c */,
-				260F1FD512D620E800D9B07F /* hubbub_binding.c */,
-				260F1FD612D620E800D9B07F /* imagemap.c */,
-				260F1FD712D620E800D9B07F /* imagemap.h */,
-				260F1FD812D620E800D9B07F /* layout.c */,
-				260F1FD912D620E800D9B07F /* layout.h */,
-				260F1FDA12D620E800D9B07F /* list.c */,
-				260F1FDB12D620E800D9B07F /* list.h */,
-				260F1FDC12D620E800D9B07F /* parser_binding.h */,
-				260F1FDD12D620E800D9B07F /* table.c */,
-				260F1FDE12D620E800D9B07F /* table.h */,
-				260F1FE012D620E800D9B07F /* textplain.c */,
-				260F1FE112D620E800D9B07F /* textplain.h */,
+				263A26A11EE40C4A005C52B9 /* content */,
+				263A27411EE40C4B005C52B9 /* desktop */,
+				263A277D1EE40C4B005C52B9 /* include */,
+				263A27971EE40C4B005C52B9 /* render */,
+				263A27B81EE40C4B005C52B9 /* utils */,
 			);
-			name = render;
-			path = ../render;
-			sourceTree = SOURCE_ROOT;
+			name = Engine;
+			sourceTree = "<group>";
 		};
-		260F1FE212D620E800D9B07F /* utils */ = {
+		263A26A11EE40C4A005C52B9 /* content */ = {
 			isa = PBXGroup;
 			children = (
-				260F1FE312D620E800D9B07F /* base64.c */,
-				260F1FE412D620E800D9B07F /* base64.h */,
-				260F1FE512D620E800D9B07F /* config.h */,
-				260F1FE612D620E800D9B07F /* container.c */,
-				260F1FE712D620E800D9B07F /* container.h */,
-				260F1FE812D620E800D9B07F /* errors.h */,
-				260F1FE912D620E800D9B07F /* filename.c */,
-				260F1FEA12D620E800D9B07F /* filename.h */,
-				260F1FEB12D620E800D9B07F /* resource.c */,
-				260F1FEC12D620E800D9B07F /* resource.h */,
-				260F1FED12D620E800D9B07F /* hashtable.c */,
-				260F1FEE12D620E800D9B07F /* hashtable.h */,
-				260F1FEF12D620E800D9B07F /* http.c */,
-				260F1FF012D620E800D9B07F /* http.h */,
-				260F1FF112D620E800D9B07F /* locale.c */,
-				260F1FF212D620E800D9B07F /* locale.h */,
-				260F1FF312D620E800D9B07F /* log.c */,
-				260F1FF412D620E800D9B07F /* log.h */,
-				260F1FF612D620E800D9B07F /* memdebug.c */,
-				260F1FF712D620E800D9B07F /* memdebug.h */,
-				260F1FF812D620E800D9B07F /* messages.c */,
-				260F1FF912D620E800D9B07F /* messages.h */,
-				260F1FFA12D620E800D9B07F /* ring.h */,
-				260F1FFB12D620E800D9B07F /* talloc.c */,
-				260F1FFC12D620E800D9B07F /* talloc.h */,
-				260F1FFF12D620E800D9B07F /* url.c */,
-				260F200012D620E800D9B07F /* url.h */,
-				260F200112D620E800D9B07F /* useragent.c */,
-				260F200212D620E800D9B07F /* useragent.h */,
-				260F200312D620E800D9B07F /* utf8.c */,
-				260F200412D620E800D9B07F /* utf8.h */,
-				260F200512D620E800D9B07F /* utils.c */,
-				260F200612D620E800D9B07F /* utils.h */,
-				260F200712D620E800D9B07F /* utsname.h */,
+				263A26A21EE40C4A005C52B9 /* backing_store.h */,
+				263A26A31EE40C4A005C52B9 /* content.c */,
+				263A26A41EE40C4A005C52B9 /* content.h */,
+				263A26A51EE40C4A005C52B9 /* content_debug.h */,
+				263A26A61EE40C4A005C52B9 /* content_factory.c */,
+				263A26A71EE40C4A005C52B9 /* content_factory.h */,
+				263A26A81EE40C4A005C52B9 /* content_protected.h */,
+				263A26A91EE40C4A005C52B9 /* dirlist.c */,
+				263A26AA1EE40C4A005C52B9 /* dirlist.h */,
+				263A26AB1EE40C4A005C52B9 /* fetch.c */,
+				263A26AC1EE40C4A005C52B9 /* fetch.h */,
+				263A26AD1EE40C4A005C52B9 /* fetchers */,
+				263A26B91EE40C4A005C52B9 /* fetchers.h */,
+				263A26BA1EE40C4A005C52B9 /* fs_backing_store.c */,
+				263A26BB1EE40C4A005C52B9 /* handlers */,
+				263A27371EE40C4B005C52B9 /* hlcache.c */,
+				263A27381EE40C4B005C52B9 /* hlcache.h */,
+				263A27391EE40C4B005C52B9 /* llcache.c */,
+				263A273A1EE40C4B005C52B9 /* llcache.h */,
+				263A273B1EE40C4B005C52B9 /* Makefile */,
+				263A273C1EE40C4B005C52B9 /* mimesniff.c */,
+				263A273D1EE40C4B005C52B9 /* mimesniff.h */,
+				263A273E1EE40C4B005C52B9 /* no_backing_store.c */,
+				263A273F1EE40C4B005C52B9 /* urldb.c */,
+				263A27401EE40C4B005C52B9 /* urldb.h */,
 			);
-			name = utils;
-			path = ../utils;
-			sourceTree = SOURCE_ROOT;
+			name = content;
+			path = ../../content;
+			sourceTree = "<group>";
 		};
-		261DB24E1318443500C59F12 /* Tools */ = {
+		263A26AD1EE40C4A005C52B9 /* fetchers */ = {
 			isa = PBXGroup;
 			children = (
-				261DB24F1318444F00C59F12 /* compile-xib.sh */,
-				261DB2501318444F00C59F12 /* extract-strings.sh */,
+				263A26AE1EE40C4A005C52B9 /* about.c */,
+				263A26AF1EE40C4A005C52B9 /* about.h */,
+				263A26B01EE40C4A005C52B9 /* curl.c */,
+				263A26B11EE40C4A005C52B9 /* curl.h */,
+				263A26B21EE40C4A005C52B9 /* data.c */,
+				263A26B31EE40C4A005C52B9 /* data.h */,
+				263A26B41EE40C4A005C52B9 /* file.c */,
+				263A26B51EE40C4A005C52B9 /* file.h */,
+				263A26B61EE40C4A005C52B9 /* Makefile */,
+				263A26B71EE40C4A005C52B9 /* resource.c */,
+				263A26B81EE40C4A005C52B9 /* resource.h */,
 			);
-			name = Tools;
+			path = fetchers;
 			sourceTree = "<group>";
 		};
-		263629B212F69A080048542C /* Makefiles */ = {
+		263A26BB1EE40C4A005C52B9 /* handlers */ = {
 			isa = PBXGroup;
 			children = (
-				263629BC12F69A760048542C /* Makefile */,
-				263629B712F69A3C0048542C /* Makefile.target */,
-				263629B312F69A290048542C /* Makefile.config */,
-				263629B412F69A290048542C /* Makefile.defaults */,
-				263629B512F69A290048542C /* Makefile.resources */,
-				263629B612F69A290048542C /* Makefile.sources */,
+				263A28AF1EE412B4005C52B9 /* javascript */,
+				263A26BC1EE40C4A005C52B9 /* css */,
+				263A26CA1EE40C4A005C52B9 /* image */,
+				263A27361EE40C4B005C52B9 /* Makefile */,
 			);
-			name = Makefiles;
+			path = handlers;
 			sourceTree = "<group>";
 		};
-		263769A812F7EBC3000F45FE /* Tree View */ = {
+		263A26BC1EE40C4A005C52B9 /* css */ = {
 			isa = PBXGroup;
 			children = (
-				2622F1D512DCD84600CD5A62 /* TreeView.h */,
-				2622F1D612DCD84600CD5A62 /* TreeView.m */,
-				263769A912F7EBE2000F45FE /* Tree.h */,
-				263769AA12F7EBE2000F45FE /* Tree.m */,
+				263A26BD1EE40C4A005C52B9 /* css.c */,
+				263A26BE1EE40C4A005C52B9 /* css.h */,
+				263A26BF1EE40C4A005C52B9 /* dump.c */,
+				263A26C01EE40C4A005C52B9 /* dump.h */,
+				263A26C11EE40C4A005C52B9 /* hints.c */,
+				263A26C21EE40C4A005C52B9 /* hints.h */,
+				263A26C31EE40C4A005C52B9 /* internal.c */,
+				263A26C41EE40C4A005C52B9 /* internal.h */,
+				263A26C51EE40C4A005C52B9 /* Makefile */,
+				263A26C61EE40C4A005C52B9 /* select.c */,
+				263A26C71EE40C4A005C52B9 /* select.h */,
+				263A26C81EE40C4A005C52B9 /* utils.c */,
+				263A26C91EE40C4A005C52B9 /* utils.h */,
 			);
-			name = "Tree View";
+			path = css;
 			sourceTree = "<group>";
 		};
-		26376A8C12F7FF5A000F45FE /* Bookmarks */ = {
+		263A26CA1EE40C4A005C52B9 /* image */ = {
 			isa = PBXGroup;
 			children = (
-				26376A8A12F7FF57000F45FE /* BookmarksController.h */,
-				26376A8B12F7FF57000F45FE /* BookmarksController.m */,
+				263A26CB1EE40C4A005C52B9 /* bmp.c */,
+				263A26CC1EE40C4A005C52B9 /* bmp.h */,
+				263A26CD1EE40C4A005C52B9 /* gif.c */,
+				263A26CE1EE40C4A005C52B9 /* gif.h */,
+				263A26CF1EE40C4A005C52B9 /* ico.c */,
+				263A26D01EE40C4A005C52B9 /* ico.h */,
+				263A26D11EE40C4A005C52B9 /* image.c */,
+				263A26D21EE40C4A005C52B9 /* image.h */,
+				263A26D31EE40C4A005C52B9 /* image_cache.c */,
+				263A26D41EE40C4A005C52B9 /* image_cache.h */,
+				263A26D61EE40C4A005C52B9 /* jpeg.h */,
+				263A26D71EE40C4A005C52B9 /* Makefile */,
+				263A26D91EE40C4A005C52B9 /* nssprite.h */,
+				263A26DB1EE40C4A005C52B9 /* png.h */,
+				263A26DD1EE40C4A005C52B9 /* rsvg.h */,
+				263A26DF1EE40C4A005C52B9 /* svg.h */,
+				263A26E11EE40C4A005C52B9 /* video.h */,
 			);
-			name = Bookmarks;
+			path = image;
 			sourceTree = "<group>";
 		};
-		265F303F12D6637E0048B600 /* Cocoa Frontend */ = {
+		263A27411EE40C4B005C52B9 /* desktop */ = {
 			isa = PBXGroup;
 			children = (
-				26BA25AB1321653200AEC1DA /* apple_image.m */,
-				26BA25AC1321653200AEC1DA /* apple_image.h */,
-				26CDD26512E74402004FC66B /* Browser */,
-				26CDD26712E74453004FC66B /* Download */,
-				26CDD26612E7441E004FC66B /* Views */,
-				263769A812F7EBC3000F45FE /* Tree View */,
-				26376A8C12F7FF5A000F45FE /* Bookmarks */,
-				26CDD26812E74461004FC66B /* NSApplication */,
-				26CDD26912E7446E004FC66B /* Platform Interface */,
-				265F310F12D663C20048B600 /* Resources */,
-				26CDCEB212E702D8004FC66B /* PSMTabBarControl */,
-				265F30AB12D6637E0048B600 /* Prefix.pch */,
-				2625095112F72AA70090D236 /* PreferencesWindowController.h */,
-				2625095212F72AA70090D236 /* PreferencesWindowController.m */,
-				26376A4312F7FA86000F45FE /* HistoryWindowController.h */,
-				26376A4412F7FA86000F45FE /* HistoryWindowController.m */,
-			);
-			name = "Cocoa Frontend";
-			sourceTree = "<group>";
-		};
-		265F310F12D663C20048B600 /* Resources */ = {
+				263A27421EE40C4B005C52B9 /* browser.c */,
+				263A27431EE40C4B005C52B9 /* browser_history.c */,
+				263A27441EE40C4B005C52B9 /* browser_history.h */,
+				263A27451EE40C4B005C52B9 /* browser_private.h */,
+				263A27461EE40C4B005C52B9 /* cookie_manager.c */,
+				263A27471EE40C4B005C52B9 /* cookie_manager.h */,
+				263A27481EE40C4B005C52B9 /* download.c */,
+				263A27491EE40C4B005C52B9 /* download.h */,
+				263A274A1EE40C4B005C52B9 /* font_haru.c */,
+				263A274B1EE40C4B005C52B9 /* font_haru.h */,
+				263A274C1EE40C4B005C52B9 /* frame_types.h */,
+				263A274D1EE40C4B005C52B9 /* frames.c */,
+				263A274E1EE40C4B005C52B9 /* frames.h */,
+				263A274F1EE40C4B005C52B9 /* global_history.c */,
+				263A27501EE40C4B005C52B9 /* global_history.h */,
+				263A27511EE40C4B005C52B9 /* gui_factory.c */,
+				263A27521EE40C4B005C52B9 /* gui_internal.h */,
+				263A27531EE40C4B005C52B9 /* gui_table.h */,
+				263A27541EE40C4B005C52B9 /* hotlist.c */,
+				263A27551EE40C4B005C52B9 /* hotlist.h */,
+				263A27561EE40C4B005C52B9 /* knockout.c */,
+				263A27571EE40C4B005C52B9 /* knockout.h */,
+				263A27581EE40C4B005C52B9 /* local_history.c */,
+				263A27591EE40C4B005C52B9 /* local_history.h */,
+				263A275A1EE40C4B005C52B9 /* Makefile */,
+				263A275B1EE40C4B005C52B9 /* mouse.c */,
+				263A275C1EE40C4B005C52B9 /* netsurf.c */,
+				263A275D1EE40C4B005C52B9 /* options.h */,
+				263A275E1EE40C4B005C52B9 /* plot_style.c */,
+				263A275F1EE40C4B005C52B9 /* print.c */,
+				263A27601EE40C4B005C52B9 /* print.h */,
+				263A27611EE40C4B005C52B9 /* printer.h */,
+				263A27621EE40C4B005C52B9 /* save_complete.c */,
+				263A27631EE40C4B005C52B9 /* save_complete.h */,
+				263A27641EE40C4B005C52B9 /* save_pdf.c */,
+				263A27651EE40C4B005C52B9 /* save_pdf.h */,
+				263A27661EE40C4B005C52B9 /* save_text.c */,
+				263A27671EE40C4B005C52B9 /* save_text.h */,
+				263A27681EE40C4B005C52B9 /* scrollbar.c */,
+				263A27691EE40C4B005C52B9 /* scrollbar.h */,
+				263A276A1EE40C4B005C52B9 /* search.c */,
+				263A276B1EE40C4B005C52B9 /* search.h */,
+				263A276C1EE40C4B005C52B9 /* searchweb.c */,
+				263A276D1EE40C4B005C52B9 /* searchweb.h */,
+				263A276E1EE40C4B005C52B9 /* selection.c */,
+				263A276F1EE40C4B005C52B9 /* selection.h */,
+				263A27701EE40C4B005C52B9 /* sslcert_viewer.c */,
+				263A27711EE40C4B005C52B9 /* sslcert_viewer.h */,
+				263A27721EE40C4B005C52B9 /* system_colour.c */,
+				263A27731EE40C4B005C52B9 /* system_colour.h */,
+				263A27741EE40C4B005C52B9 /* textarea.c */,
+				263A27751EE40C4B005C52B9 /* textarea.h */,
+				263A27761EE40C4B005C52B9 /* textinput.c */,
+				263A27771EE40C4B005C52B9 /* textinput.h */,
+				263A27781EE40C4B005C52B9 /* theme.h */,
+				263A27791EE40C4B005C52B9 /* treeview.c */,
+				263A277A1EE40C4B005C52B9 /* treeview.h */,
+				263A277B1EE40C4B005C52B9 /* version.c */,
+				263A277C1EE40C4B005C52B9 /* version.h */,
+			);
+			name = desktop;
+			path = ../../desktop;
+			sourceTree = "<group>";
+		};
+		263A277D1EE40C4B005C52B9 /* include */ = {
 			isa = PBXGroup;
 			children = (
-				261DB28F13185C0A00C59F12 /* BookmarksWindow.xib.strings */,
-				261DB29313185C0A00C59F12 /* BrowserWindow.xib.strings */,
-				261DB29513185C0A00C59F12 /* DownloadWindow.xib.strings */,
-				261DB29713185C0A00C59F12 /* HistoryWindow.xib.strings */,
-				261DB29B13185C0A00C59F12 /* MainMenu.xib.strings */,
-				261DB29D13185C0A00C59F12 /* PreferencesWindow.xib.strings */,
-				261DB29F13185C0A00C59F12 /* SearchWindow.xib.strings */,
-				261DB22113180AFF00C59F12 /* Localizable.strings */,
-				2684028E1301848100850DA2 /* HomeTemplate.pdf */,
-				26AFE63E12DDEB0A005AD082 /* NetSurf.icns */,
-				2612268F12D7AE4100E10F91 /* Messages */,
-				2612265D12D7AD6800E10F91 /* adblock.css */,
-				2612265712D7ACB500E10F91 /* default.css */,
-				2612265912D7ACB500E10F91 /* quirks.css */,
-				265F30A712D6637E0048B600 /* NetSurf-Info.plist */,
-				26121DA812D700B800E10F91 /* MainMenu.xib */,
-				26121EAB12D70E0A00E10F91 /* Browser.xib */,
-				26AFEAF012E042F9005AD082 /* DownloadWindow.xib */,
-				26CDCFF212E70AD1004FC66B /* BrowserWindow.xib */,
-				2666DC5B12F6D1770045E8B6 /* SearchWindow.xib */,
-				2625095012F72A8F0090D236 /* PreferencesWindow.xib */,
-				26376A4112F7FA67000F45FE /* HistoryWindow.xib */,
-				26376BAC12F820D7000F45FE /* BookmarksWindow.xib */,
-				26B4E926130D36A90003B527 /* LocalHistoryPanel.xib */,
-			);
-			name = Resources;
-			path = res;
+				263A277E1EE40C4B005C52B9 /* netsurf */,
+			);
+			name = include;
+			path = ../../include;
 			sourceTree = "<group>";
 		};
-		265F31C912D66A890048B600 /* image */ = {
+		263A277E1EE40C4B005C52B9 /* netsurf */ = {
 			isa = PBXGroup;
 			children = (
-				265F31CA12D66A890048B600 /* bitmap.h */,
-				265F31CB12D66A890048B600 /* bmp.c */,
-				265F31CC12D66A890048B600 /* bmp.h */,
-				265F31CD12D66A890048B600 /* gif.c */,
-				265F31CE12D66A890048B600 /* gif.h */,
-				265F31CF12D66A890048B600 /* ico.c */,
-				265F31D012D66A890048B600 /* ico.h */,
-				265F31D112D66A890048B600 /* jpeg.c */,
-				265F31D212D66A890048B600 /* jpeg.h */,
-				265F31D312D66A890048B600 /* mng.c */,
-				265F31D412D66A890048B600 /* mng.h */,
-				265F31D512D66A890048B600 /* nssprite.c */,
-				265F31D612D66A890048B600 /* nssprite.h */,
-				265F31D712D66A890048B600 /* png.c */,
-				265F31D812D66A890048B600 /* png.h */,
-				265F31D912D66A890048B600 /* rsvg.c */,
-				265F31DA12D66A890048B600 /* rsvg.h */,
-				265F31DB12D66A890048B600 /* svg.c */,
-				265F31DC12D66A890048B600 /* svg.h */,
-				265F31DD12D66A890048B600 /* webp.c */,
-				265F31DE12D66A890048B600 /* webp.h */,
-			);
-			name = image;
-			path = ../image;
-			sourceTree = SOURCE_ROOT;
+				263A277F1EE40C4B005C52B9 /* bitmap.h */,
+				263A27801EE40C4B005C52B9 /* browser_window.h */,
+				263A27811EE40C4B005C52B9 /* clipboard.h */,
+				263A27821EE40C4B005C52B9 /* content.h */,
+				263A27831EE40C4B005C52B9 /* content_type.h */,
+				263A27841EE40C4B005C52B9 /* cookie_db.h */,
+				263A27851EE40C4B005C52B9 /* core_window.h */,
+				263A27861EE40C4B005C52B9 /* css.h */,
+				263A27871EE40C4B005C52B9 /* download.h */,
+				263A27881EE40C4B005C52B9 /* fetch.h */,
+				263A27891EE40C4B005C52B9 /* form.h */,
+				263A278A1EE40C4B005C52B9 /* inttypes.h */,
+				263A278B1EE40C4B005C52B9 /* keypress.h */,
+				263A278C1EE40C4B005C52B9 /* layout.h */,
+				263A278D1EE40C4B005C52B9 /* misc.h */,
+				263A278E1EE40C4B005C52B9 /* mouse.h */,
+				263A278F1EE40C4B005C52B9 /* netsurf.h */,
+				263A27901EE40C4B005C52B9 /* plot_style.h */,
+				263A27911EE40C4B005C52B9 /* plotters.h */,
+				263A27921EE40C4B005C52B9 /* search.h */,
+				263A27931EE40C4B005C52B9 /* types.h */,
+				263A27941EE40C4B005C52B9 /* url_db.h */,
+				263A27951EE40C4B005C52B9 /* utf8.h */,
+				263A27961EE40C4B005C52B9 /* window.h */,
+			);
+			path = netsurf;
+			sourceTree = "<group>";
 		};
-		26CDCEB212E702D8004FC66B /* PSMTabBarControl */ = {
+		263A27971EE40C4B005C52B9 /* render */ = {
 			isa = PBXGroup;
 			children = (
-				26CDCFDB12E706FE004FC66B /* Images */,
-				26CDCEB312E702D8004FC66B /* NSBezierPath_AMShading.h */,
-				26CDCEB412E702D8004FC66B /* NSBezierPath_AMShading.m */,
-				26CDCEB512E702D8004FC66B /* NSString_AITruncation.h */,
-				26CDCEB612E702D8004FC66B /* NSString_AITruncation.m */,
-				26CDCEBD12E702D8004FC66B /* PSMOverflowPopUpButton.h */,
-				26CDCEBE12E702D8004FC66B /* PSMOverflowPopUpButton.m */,
-				26CDCEBF12E702D8004FC66B /* PSMProgressIndicator.h */,
-				26CDCEC012E702D8004FC66B /* PSMProgressIndicator.m */,
-				26CDCEC112E702D8004FC66B /* PSMRolloverButton.h */,
-				26CDCEC212E702D8004FC66B /* PSMRolloverButton.m */,
-				26CDCEC312E702D8004FC66B /* PSMTabBarCell.h */,
-				26CDCEC412E702D8004FC66B /* PSMTabBarCell.m */,
-				26CDCEC512E702D8004FC66B /* PSMTabBarControl.h */,
-				26CDCEC612E702D8004FC66B /* PSMTabBarControl.m */,
-				26CDCEC712E702D8004FC66B /* PSMTabBarController.h */,
-				26CDCEC812E702D8004FC66B /* PSMTabBarController.m */,
-				26CDCEC912E702D8004FC66B /* PSMTabDragAssistant.h */,
-				26CDCECA12E702D8004FC66B /* PSMTabDragAssistant.m */,
-				26CDCECB12E702D8004FC66B /* PSMTabDragView.h */,
-				26CDCECC12E702D8004FC66B /* PSMTabDragView.m */,
-				26CDCECD12E702D8004FC66B /* PSMTabDragWindow.h */,
-				26CDCECE12E702D8004FC66B /* PSMTabDragWindow.m */,
-				26CDCECF12E702D8004FC66B /* PSMTabDragWindowController.h */,
-				26CDCED012E702D8004FC66B /* PSMTabDragWindowController.m */,
-				26CDCED112E702D8004FC66B /* PSMTabStyle.h */,
-				26CDCED212E702D8004FC66B /* PSMUnifiedTabStyle.h */,
-				26CDCED312E702D8004FC66B /* PSMUnifiedTabStyle.m */,
+				263A27981EE40C4B005C52B9 /* box.c */,
+				263A27991EE40C4B005C52B9 /* box.h */,
+				263A279A1EE40C4B005C52B9 /* box_construct.c */,
+				263A279B1EE40C4B005C52B9 /* box_normalise.c */,
+				263A279C1EE40C4B005C52B9 /* box_textarea.c */,
+				263A279D1EE40C4B005C52B9 /* box_textarea.h */,
+				263A279E1EE40C4B005C52B9 /* font.c */,
+				263A279F1EE40C4B005C52B9 /* font.h */,
+				263A27A01EE40C4B005C52B9 /* form.c */,
+				263A27A11EE40C4B005C52B9 /* form_internal.h */,
+				263A27A21EE40C4B005C52B9 /* html.c */,
+				263A27A31EE40C4B005C52B9 /* html.h */,
+				263A27A41EE40C4B005C52B9 /* html_css.c */,
+				263A27A51EE40C4B005C52B9 /* html_css_fetcher.c */,
+				263A27A61EE40C4B005C52B9 /* html_forms.c */,
+				263A27A71EE40C4B005C52B9 /* html_interaction.c */,
+				263A27A81EE40C4B005C52B9 /* html_internal.h */,
+				263A27A91EE40C4B005C52B9 /* html_object.c */,
+				263A27AA1EE40C4B005C52B9 /* html_redraw.c */,
+				263A27AB1EE40C4B005C52B9 /* html_redraw_border.c */,
+				263A27AC1EE40C4B005C52B9 /* html_script.c */,
+				263A27AD1EE40C4B005C52B9 /* imagemap.c */,
+				263A27AE1EE40C4B005C52B9 /* imagemap.h */,
+				263A27AF1EE40C4B005C52B9 /* layout.c */,
+				263A27B01EE40C4B005C52B9 /* layout.h */,
+				263A27B11EE40C4B005C52B9 /* Makefile */,
+				263A27B21EE40C4B005C52B9 /* search.c */,
+				263A27B31EE40C4B005C52B9 /* search.h */,
+				263A27B41EE40C4B005C52B9 /* table.c */,
+				263A27B51EE40C4B005C52B9 /* table.h */,
+				263A27B61EE40C4B005C52B9 /* textplain.c */,
+				263A27B71EE40C4B005C52B9 /* textplain.h */,
 			);
-			path = PSMTabBarControl;
+			name = render;
+			path = ../../render;
 			sourceTree = "<group>";
 		};
-		26CDCFDB12E706FE004FC66B /* Images */ = {
+		263A27B81EE40C4B005C52B9 /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				26ABD61C12F02EB900407161 /* overflowImage.png */,
-				26ABD61D12F02EB900407161 /* overflowImagePressed.png */,
-				26ABD61E12F02EB900407161 /* pi.png */,
-				26CDCFDC12E706FE004FC66B /* AquaTabClose_Front.png */,
-				26CDCFDD12E706FF004FC66B /* AquaTabClose_Front_Pressed.png */,
-				26CDCFDE12E706FF004FC66B /* AquaTabClose_Front_Rollover.png */,
-				26CDCFDF12E706FF004FC66B /* AquaTabCloseDirty_Front.png */,
-				26CDCFE012E706FF004FC66B /* AquaTabCloseDirty_Front_Pressed.png */,
-				26CDCFE112E706FF004FC66B /* AquaTabCloseDirty_Front_Rollover.png */,
-				26CDCFE212E706FF004FC66B /* AquaTabNew.png */,
-				26CDCFE312E706FF004FC66B /* AquaTabNewPressed.png */,
-				26CDCFE412E706FF004FC66B /* AquaTabNewRollover.png */,
+				263A27B91EE40C4B005C52B9 /* ascii.h */,
+				263A27BA1EE40C4B005C52B9 /* bloom.c */,
+				263A27BB1EE40C4B005C52B9 /* bloom.h */,
+				263A27BC1EE40C4B005C52B9 /* config.h */,
+				263A27BD1EE40C4B005C52B9 /* corestringlist.h */,
+				263A27BE1EE40C4B005C52B9 /* corestrings.c */,
+				263A27BF1EE40C4B005C52B9 /* corestrings.h */,
+				263A27C01EE40C4B005C52B9 /* coverity-build.sh */,
+				263A27C11EE40C4B005C52B9 /* DerivedJoiningType.txt */,
+				263A27C21EE40C4B005C52B9 /* dirent.h */,
+				263A27C31EE40C4B005C52B9 /* errors.h */,
+				263A27C41EE40C4B005C52B9 /* fetch-transifex.pl */,
+				263A27C51EE40C4B005C52B9 /* file.c */,
+				263A27C61EE40C4B005C52B9 /* file.h */,
+				263A27C71EE40C4B005C52B9 /* filename.c */,
+				263A27C81EE40C4B005C52B9 /* filename.h */,
+				263A27C91EE40C4B005C52B9 /* filepath.c */,
+				263A27CA1EE40C4B005C52B9 /* filepath.h */,
+				263A27CB1EE40C4B005C52B9 /* git-date.sh */,
+				263A27CC1EE40C4B005C52B9 /* git-testament.pl */,
+				263A27CD1EE40C4B005C52B9 /* hashtable.c */,
+				263A27CE1EE40C4B005C52B9 /* hashtable.h */,
+				263A27CF1EE40C4B005C52B9 /* http */,
+				263A27E11EE40C4B005C52B9 /* http.h */,
+				263A27E21EE40C4B005C52B9 /* idna-derived-props-gen.pl */,
+				263A27E31EE40C4B005C52B9 /* idna-tables-5.2.0-properties.csv */,
+				263A27E41EE40C4B005C52B9 /* idna.c */,
+				263A27E51EE40C4B005C52B9 /* idna.h */,
+				263A27E61EE40C4B005C52B9 /* idna_props.h */,
+				263A27E71EE40C4B005C52B9 /* import-messages.pl */,
+				263A27E81EE40C4B005C52B9 /* inet.h */,
+				263A27E91EE40C4B005C52B9 /* jenkins-build.sh */,
+				263A27EA1EE40C4B005C52B9 /* libdom.c */,
+				263A27EB1EE40C4B005C52B9 /* libdom.h */,
+				263A27EC1EE40C4B005C52B9 /* log.c */,
+				263A27ED1EE40C4B005C52B9 /* log.h */,
+				263A27EE1EE40C4B005C52B9 /* Makefile */,
+				263A27EF1EE40C4B005C52B9 /* memanalyze.pl */,
+				263A27F01EE40C4B005C52B9 /* merge-messages.lua */,
+				263A27F11EE40C4B005C52B9 /* messages.c */,
+				263A27F21EE40C4B005C52B9 /* messages.h */,
+				263A27F31EE40C4B005C52B9 /* nsoption.c */,
+				263A27F41EE40C4B005C52B9 /* nsoption.h */,
+				263A27F51EE40C4B005C52B9 /* nsurl */,
+				263A27FA1EE40C4B005C52B9 /* nsurl.h */,
+				263A27FB1EE40C4B005C52B9 /* punycode.c */,
+				263A27FC1EE40C4B005C52B9 /* punycode.h */,
+				263A27FD1EE40C4B005C52B9 /* ring.h */,
+				263A27FE1EE40C4B005C52B9 /* split-messages.pl */,
+				263A27FF1EE40C4B005C52B9 /* string.h */,
+				263A28001EE40C4B005C52B9 /* sys_time.h */,
+				263A28011EE40C4B005C52B9 /* talloc.c */,
+				263A28021EE40C4B005C52B9 /* talloc.h */,
+				263A28031EE40C4B005C52B9 /* test-netsurf */,
+				263A28041EE40C4B005C52B9 /* time.c */,
+				263A28051EE40C4B005C52B9 /* time.h */,
+				263A28061EE40C4B005C52B9 /* url.c */,
+				263A28071EE40C4B005C52B9 /* url.h */,
+				263A28081EE40C4B005C52B9 /* useragent.c */,
+				263A28091EE40C4B005C52B9 /* useragent.h */,
+				263A280A1EE40C4B005C52B9 /* utf8.c */,
+				263A280B1EE40C4B005C52B9 /* utf8.h */,
+				263A280C1EE40C4B005C52B9 /* utils.c */,
+				263A280D1EE40C4B005C52B9 /* utils.h */,
+				263A280E1EE40C4B005C52B9 /* utsname.h */,
+				263A280F1EE40C4B005C52B9 /* valgrind.supp */,
 			);
-			path = Images;
+			name = utils;
+			path = ../../utils;
 			sourceTree = "<group>";
 		};
-		26CDD23E12E743A3004FC66B /* NetSurf */ = {
+		263A27CF1EE40C4B005C52B9 /* http */ = {
 			isa = PBXGroup;
 			children = (
-				260F1F6212D620E800D9B07F /* content */,
-				260F1F7812D620E800D9B07F /* css */,
-				260F1F8312D620E800D9B07F /* desktop */,
-				260F1FC612D620E800D9B07F /* render */,
-				265F31C912D66A890048B600 /* image */,
-				260F1FE212D620E800D9B07F /* utils */,
+				263A27D01EE40C4B005C52B9 /* challenge.c */,
+				263A27D11EE40C4B005C52B9 /* challenge.h */,
+				263A27D21EE40C4B005C52B9 /* challenge_internal.h */,
+				263A27D31EE40C4B005C52B9 /* content-disposition.c */,
+				263A27D41EE40C4B005C52B9 /* content-disposition.h */,
+				263A27D51EE40C4B005C52B9 /* content-type.c */,
+				263A27D61EE40C4B005C52B9 /* content-type.h */,
+				263A27D71EE40C4B005C52B9 /* generics.c */,
+				263A27D81EE40C4B005C52B9 /* generics.h */,
+				263A27D91EE40C4B005C52B9 /* Makefile */,
+				263A27DA1EE40C4B005C52B9 /* parameter.c */,
+				263A27DB1EE40C4B005C52B9 /* parameter.h */,
+				263A27DC1EE40C4B005C52B9 /* parameter_internal.h */,
+				263A27DD1EE40C4B005C52B9 /* primitives.c */,
+				263A27DE1EE40C4B005C52B9 /* primitives.h */,
+				263A27DF1EE40C4B005C52B9 /* www-authenticate.c */,
+				263A27E01EE40C4B005C52B9 /* www-authenticate.h */,
 			);
-			name = NetSurf;
+			path = http;
 			sourceTree = "<group>";
 		};
-		26CDD26512E74402004FC66B /* Browser */ = {
+		263A27F51EE40C4B005C52B9 /* nsurl */ = {
 			isa = PBXGroup;
 			children = (
-				26121EFB12D7132100E10F91 /* BrowserView.h */,
-				26121EFC12D7132100E10F91 /* BrowserView.m */,
-				26CDD00112E70F56004FC66B /* BrowserWindowController.h */,
-				26CDD00212E70F56004FC66B /* BrowserWindowController.m */,
-				26CDD0F412E726E0004FC66B /* BrowserViewController.h */,
-				26CDD0F512E726E0004FC66B /* BrowserViewController.m */,
-				2666DC5D12F6D2E70045E8B6 /* SearchWindowController.h */,
-				2666DC5E12F6D2E70045E8B6 /* SearchWindowController.m */,
-				2666DD5012F706BC0045E8B6 /* BrowserWindow.h */,
-				2666DD5112F706BC0045E8B6 /* BrowserWindow.m */,
-				26B4E928130D37E50003B527 /* LocalHistoryController.h */,
-				26B4E929130D37E50003B527 /* LocalHistoryController.m */,
+				263A27F61EE40C4B005C52B9 /* Makefile */,
+				263A27F71EE40C4B005C52B9 /* nsurl.c */,
+				263A27F81EE40C4B005C52B9 /* parse.c */,
+				263A27F91EE40C4B005C52B9 /* private.h */,
 			);
-			name = Browser;
+			path = nsurl;
 			sourceTree = "<group>";
 		};
-		26CDD26612E7441E004FC66B /* Views */ = {
+		263A28AA1EE41245005C52B9 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				26B4E91A130D351F0003B527 /* ArrowBox.h */,
-				26B4E91B130D351F0003B527 /* ArrowBox.m */,
-				26B4E91C130D351F0003B527 /* ArrowWindow.h */,
-				26B4E91D130D351F0003B527 /* ArrowWindow.m */,
-				26B4E91E130D351F0003B527 /* BlackScroller.h */,
-				26B4E91F130D351F0003B527 /* BlackScroller.m */,
-				26AFE8E212DF4200005AD082 /* ScrollableView.h */,
-				26AFE8E312DF4200005AD082 /* ScrollableView.m */,
-				26EC3B6812ED62C0000A960C /* URLFieldCell.h */,
-				26EC3B6912ED62C0000A960C /* URLFieldCell.m */,
-				26EC3C4212ED8202000A960C /* HistoryView.h */,
-				26EC3C4312ED8202000A960C /* HistoryView.m */,
-				26EC3F1612EF0CBD000A960C /* FormSelectMenu.h */,
-				26EC3F1712EF0CBD000A960C /* FormSelectMenu.m */,
-			);
-			name = Views;
-			sourceTree = "<group>";
-		};
-		26CDD26712E74453004FC66B /* Download */ = {
+				263A29061EE4196E005C52B9 /* Cocoa.framework */,
+				263A28AD1EE41266005C52B9 /* libz.tbd */,
+				263A28AB1EE41245005C52B9 /* libiconv.tbd */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		263A28AF1EE412B4005C52B9 /* javascript */ = {
 			isa = PBXGroup;
 			children = (
-				26AFEAE912E04253005AD082 /* DownloadWindowController.h */,
-				26AFEAEA12E04253005AD082 /* DownloadWindowController.m */,
+				263A28B01EE412B4005C52B9 /* content.c */,
+				263A28B11EE412B4005C52B9 /* content.h */,
+				263A28B21EE412B4005C52B9 /* duktape */,
+				263A28F31EE412B4005C52B9 /* fetcher.c */,
+				263A28F41EE412B4005C52B9 /* fetcher.h */,
+				263A28F51EE412B4005C52B9 /* js.h */,
+				263A28F61EE412B4005C52B9 /* Makefile */,
+				263A28F71EE412B4005C52B9 /* none */,
+				263A28FA1EE412B4005C52B9 /* WebIDL */,
 			);
-			name = Download;
+			path = javascript;
 			sourceTree = "<group>";
 		};
-		26CDD26812E74461004FC66B /* NSApplication */ = {
+		263A28B21EE412B4005C52B9 /* duktape */ = {
 			isa = PBXGroup;
 			children = (
-				263629C812F69B120048542C /* NetsurfApp.h */,
-				263629C912F69B120048542C /* NetsurfApp.m */,
-				26AFE97A12DF514C005AD082 /* NetSurfAppDelegate.h */,
-				26AFE97B12DF514C005AD082 /* NetSurfAppDelegate.m */,
+				263A28B31EE412B4005C52B9 /* Console.bnd */,
+				263A28B41EE412B4005C52B9 /* Document.bnd */,
+				263A28B51EE412B4005C52B9 /* duk_config.h */,
+				263A28B61EE412B4005C52B9 /* duk_custom.h */,
+				263A28B71EE412B4005C52B9 /* dukky.c */,
+				263A28B81EE412B4005C52B9 /* dukky.h */,
+				263A28B91EE412B4005C52B9 /* duktape.c */,
+				263A28BA1EE412B4005C52B9 /* duktape.h */,
+				263A28BB1EE412B4005C52B9 /* Element.bnd */,
+				263A28BC1EE412B4005C52B9 /* Event.bnd */,
+				263A28BD1EE412B4005C52B9 /* EventTarget.bnd */,
+				263A28BE1EE412B4005C52B9 /* HTMLAnchorElement.bnd */,
+				263A28BF1EE412B4005C52B9 /* HTMLAppletElement.bnd */,
+				263A28C01EE412B4005C52B9 /* HTMLAreaElement.bnd */,
+				263A28C11EE412B4005C52B9 /* HTMLBaseElement.bnd */,
+				263A28C21EE412B4005C52B9 /* HTMLBodyElement.bnd */,
+				263A28C31EE412B4005C52B9 /* HTMLBRElement.bnd */,
+				263A28C41EE412B4005C52B9 /* HTMLButtonElement.bnd */,
+				263A28C51EE412B4005C52B9 /* HTMLCollection.bnd */,
+				263A28C61EE412B4005C52B9 /* HTMLDivElement.bnd */,
+				263A28C71EE412B4005C52B9 /* HTMLElement.bnd */,
+				263A28C81EE412B4005C52B9 /* HTMLFontElement.bnd */,
+				263A28C91EE412B4005C52B9 /* HTMLFormElement.bnd */,
+				263A28CA1EE412B4005C52B9 /* HTMLFrameElement.bnd */,
+				263A28CB1EE412B4005C52B9 /* HTMLFrameSetElement.bnd */,
+				263A28CC1EE412B4005C52B9 /* HTMLHeadingElement.bnd */,
+				263A28CD1EE412B4005C52B9 /* HTMLHRElement.bnd */,
+				263A28CE1EE412B4005C52B9 /* HTMLHTMLElement.bnd */,
+				263A28CF1EE412B4005C52B9 /* HTMLIFrameElement.bnd */,
+				263A28D01EE412B4005C52B9 /* HTMLImageElement.bnd */,
+				263A28D11EE412B4005C52B9 /* HTMLInputElement.bnd */,
+				263A28D21EE412B4005C52B9 /* HTMLLabelElement.bnd */,
+				263A28D31EE412B4005C52B9 /* HTMLLegendElement.bnd */,
+				263A28D41EE412B4005C52B9 /* HTMLLIElement.bnd */,
+				263A28D51EE412B4005C52B9 /* HTMLLinkElement.bnd */,
+				263A28D61EE412B4005C52B9 /* HTMLMapElement.bnd */,
+				263A28D71EE412B4005C52B9 /* HTMLMarqueeElement.bnd */,
+				263A28D81EE412B4005C52B9 /* HTMLMenuElement.bnd */,
+				263A28D91EE412B4005C52B9 /* HTMLMetaElement.bnd */,
+				263A28DA1EE412B4005C52B9 /* HTMLObjectElement.bnd */,
+				263A28DB1EE412B4005C52B9 /* HTMLOListElement.bnd */,
+				263A28DC1EE412B4005C52B9 /* HTMLOptionElement.bnd */,
+				263A28DD1EE412B4005C52B9 /* HTMLParagraphElement.bnd */,
+				263A28DE1EE412B4005C52B9 /* HTMLParamElement.bnd */,
+				263A28DF1EE412B4005C52B9 /* HTMLPreElement.bnd */,
+				263A28E01EE412B4005C52B9 /* HTMLQuoteElement.bnd */,
+				263A28E11EE412B4005C52B9 /* HTMLScriptElement.bnd */,
+				263A28E21EE412B4005C52B9 /* HTMLSelectElement.bnd */,
+				263A28E31EE412B4005C52B9 /* HTMLStyleElement.bnd */,
+				263A28E41EE412B4005C52B9 /* HTMLTableCaptionElement.bnd */,
+				263A28E51EE412B4005C52B9 /* HTMLTableCellElement.bnd */,
+				263A28E61EE412B4005C52B9 /* HTMLTableColElement.bnd */,
+				263A28E71EE412B4005C52B9 /* HTMLTableElement.bnd */,
+				263A28E81EE412B4005C52B9 /* HTMLTableRowElement.bnd */,
+				263A28E91EE412B4005C52B9 /* HTMLTableSectionElement.bnd */,
+				263A28EA1EE412B4005C52B9 /* HTMLTextAreaElement.bnd */,
+				263A28EB1EE412B4005C52B9 /* HTMLTitleElement.bnd */,
+				263A28EC1EE412B4005C52B9 /* Location.bnd */,
+				263A28ED1EE412B4005C52B9 /* Makefile */,
+				263A28EE1EE412B4005C52B9 /* Navigator.bnd */,
+				263A28EF1EE412B4005C52B9 /* netsurf.bnd */,
+				263A28F01EE412B4005C52B9 /* Node.bnd */,
+				263A28F11EE412B4005C52B9 /* NodeList.bnd */,
+				263A28F21EE412B4005C52B9 /* Window.bnd */,
 			);
-			name = NSApplication;
+			path = duktape;
 			sourceTree = "<group>";
 		};
-		26CDD26912E7446E004FC66B /* Platform Interface */ = {
+		263A28F71EE412B4005C52B9 /* none */ = {
 			isa = PBXGroup;
 			children = (
-				263629CA12F69B120048542C /* system_colour.m */,
-				264C344112F0987E00D11246 /* gui.h */,
-				265F311912D663F50048B600 /* gui.m */,
-				261223CB12D7805300E10F91 /* plotter.h */,
-				265F314712D666660048B600 /* plotter.m */,
-				265F316112D667E10048B600 /* schedule.m */,
-				265F316612D668130048B600 /* thumbnail.m */,
-				265F316F12D668790048B600 /* fetch.m */,
-				265F319012D668DB0048B600 /* url.m */,
-				265F31C412D66A0D0048B600 /* save.m */,
-				260FC03112D85ACE00079C00 /* bitmap.h */,
-				265F31EB12D66B190048B600 /* bitmap.m */,
-				265F320512D66C200048B600 /* utf8.m */,
-				265F321312D66CD90048B600 /* utils.m */,
-				261223B712D77F9C00E10F91 /* font.h */,
-				265F321E12D66D510048B600 /* font.m */,
-				26AFED0312E09916005AD082 /* selection.m */,
-				2639E20512F2ADEE00699678 /* coordinates.h */,
-			);
-			name = "Platform Interface";
+				263A28F81EE412B4005C52B9 /* Makefile */,
+				263A28F91EE412B4005C52B9 /* none.c */,
+			);
+			path = none;
+			sourceTree = "<group>";
+		};
+		263A28FA1EE412B4005C52B9 /* WebIDL */ = {
+			isa = PBXGroup;
+			children = (
+				263A28FB1EE412B4005C52B9 /* console.idl */,
+				263A28FC1EE412B4005C52B9 /* cssom.idl */,
+				263A28FD1EE412B4005C52B9 /* dom-parsing.idl */,
+				263A28FE1EE412B4005C52B9 /* dom.idl */,
+				263A28FF1EE412B4005C52B9 /* html.idl */,
+				263A29001EE412B4005C52B9 /* Makefile */,
+				263A29011EE412B4005C52B9 /* uievents.idl */,
+				263A29021EE412B4005C52B9 /* urlutils.idl */,
+			);
+			path = WebIDL;
 			sourceTree = "<group>";
 		};
 		29B97314FDCFA39411CA2CEA /* Untitled */ = {
 			isa = PBXGroup;
 			children = (
-				265F303F12D6637E0048B600 /* Cocoa Frontend */,
-				26CDD23E12E743A3004FC66B /* NetSurf */,
-				263629B212F69A080048542C /* Makefiles */,
+				263A26A01EE40C1E005C52B9 /* Engine */,
 				261DB24E1318443500C59F12 /* Tools */,
+				263A25EF1EE40BD6005C52B9 /* Cocoa */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
+				263A28AA1EE41245005C52B9 /* Frameworks */,
 			);
 			name = Untitled;
 			sourceTree = "<group>";
@@ -835,12 +1427,12 @@
 /* Begin PBXLegacyTarget section */
 		2636298F12F698E00048542C /* NetSurf */ = {
 			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(ACTION) MKDIR=\"mkdir -p\"";
+			buildArgumentsString = "PREFIX=../build TARGET=cocoa SDKROOT= VARIANT=debug $(ACTION)";
 			buildConfigurationList = 2636299512F699250048542C /* Build configuration list for PBXLegacyTarget "NetSurf" */;
 			buildPhases = (
 			);
-			buildToolPath = /usr/bin/make;
-			buildWorkingDirectory = "$(SRCROOT)/..";
+			buildToolPath = make;
+			buildWorkingDirectory = "$(SRCROOT)/../..";
 			dependencies = (
 			);
 			name = NetSurf;
@@ -849,14 +1441,41 @@
 		};
 /* End PBXLegacyTarget section */
 
+/* Begin PBXNativeTarget section */
+		263A25ED1EE40BD6005C52B9 /* NetSurfBrowser */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 263A25FF1EE40BD6005C52B9 /* Build configuration list for PBXNativeTarget "NetSurfBrowser" */;
+			buildPhases = (
+				263A25EA1EE40BD6005C52B9 /* Sources */,
+				263A25EB1EE40BD6005C52B9 /* Frameworks */,
+				263A25EC1EE40BD6005C52B9 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = NetSurfBrowser;
+			productName = NetSurfBrowser;
+			productReference = 263A25EE1EE40BD6005C52B9 /* NetSurfBrowser.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 0830;
+				TargetAttributes = {
+					263A25ED1EE40BD6005C52B9 = {
+						CreatedOnToolsVersion = 8.3.2;
+						ProvisioningStyle = Automatic;
+					};
+				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "NetSurf" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -869,93 +1488,307 @@
 				fr,
 				it,
 				nl,
+				Base,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* Untitled */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
 				2636298F12F698E00048542C /* NetSurf */,
+				263A25ED1EE40BD6005C52B9 /* NetSurfBrowser */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXResourcesBuildPhase section */
+		263A25EC1EE40BD6005C52B9 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				263A292D1EE41B53005C52B9 /* AquaTabCloseDirty_Front_Pressed.png in Resources */,
+				263A29281EE41AA8005C52B9 /* SearchWindow.xib in Resources */,
+				263A29271EE41AA8005C52B9 /* quirks.css in Resources */,
+				263A292C1EE41B53005C52B9 /* AquaTabCloseDirty_Front.png in Resources */,
+				263A29131EE41A96005C52B9 /* Messages in Resources */,
+				263A290A1EE41A7D005C52B9 /* Browser.xib in Resources */,
+				263A29211EE41AA4005C52B9 /* internal.css in Resources */,
+				263A292E1EE41B53005C52B9 /* AquaTabCloseDirty_Front_Rollover.png in Resources */,
+				263A29241EE41AA8005C52B9 /* NetSurf.icns in Resources */,
+				263A290D1EE41A8C005C52B9 /* BookmarksWindow.xib.strings in Resources */,
+				263A29251EE41AA8005C52B9 /* netsurf.png in Resources */,
+				263A29291EE41B53005C52B9 /* AquaTabClose_Front.png in Resources */,
+				263A291A1EE41A9F005C52B9 /* arrow-l.png in Resources */,
+				263A29171EE41A9A005C52B9 /* DownloadWindow.xib in Resources */,
+				263A29201EE41A9F005C52B9 /* search.png in Resources */,
+				263A290C1EE41A7D005C52B9 /* ca-bundle in Resources */,
+				263A29101EE41A8C005C52B9 /* HistoryWindow.xib.strings in Resources */,
+				263A29301EE41B53005C52B9 /* AquaTabNewPressed.png in Resources */,
+				263A290F1EE41A8C005C52B9 /* DownloadWindow.xib.strings in Resources */,
+				263A291E1EE41A9F005C52B9 /* hotlist-add.png in Resources */,
+				263A29341EE41B53005C52B9 /* pi.png in Resources */,
+				263A29261EE41AA8005C52B9 /* PreferencesWindow.xib in Resources */,
+				263A291D1EE41A9F005C52B9 /* directory2.png in Resources */,
+				263A29121EE41A8F005C52B9 /* MainMenu.xib.strings in Resources */,
+				263A29111EE41A8C005C52B9 /* Localizable.strings in Resources */,
+				263A29081EE41A75005C52B9 /* adblock.css in Resources */,
+				263A290B1EE41A7D005C52B9 /* BrowserWindow.xib in Resources */,
+				263A29141EE41A96005C52B9 /* PreferencesWindow.xib.strings in Resources */,
+				263A292F1EE41B53005C52B9 /* AquaTabNew.png in Resources */,
+				263A291B1EE41A9F005C52B9 /* content.png in Resources */,
+				263A29321EE41B53005C52B9 /* overflowImage.png in Resources */,
+				263A29151EE41A96005C52B9 /* SearchWindow.xib.strings in Resources */,
+				263A29231EE41AA4005C52B9 /* MainMenu.xib in Resources */,
+				263A292A1EE41B53005C52B9 /* AquaTabClose_Front_Pressed.png in Resources */,
+				263A29181EE41A9A005C52B9 /* HistoryWindow.xib in Resources */,
+				263A29091EE41A7D005C52B9 /* BookmarksWindow.xib in Resources */,
+				263A29221EE41AA4005C52B9 /* LocalHistoryPanel.xib in Resources */,
+				263A29331EE41B53005C52B9 /* overflowImagePressed.png in Resources */,
+				263A291F1EE41A9F005C52B9 /* hotlist-rmv.png in Resources */,
+				263A292B1EE41B53005C52B9 /* AquaTabClose_Front_Rollover.png in Resources */,
+				263A29311EE41B53005C52B9 /* AquaTabNewRollover.png in Resources */,
+				263A290E1EE41A8C005C52B9 /* BrowserWindow.xib.strings in Resources */,
+				263A291C1EE41A9F005C52B9 /* directory.png in Resources */,
+				263A29161EE41A9A005C52B9 /* default.css in Resources */,
+				263A29191EE41A9A005C52B9 /* HomeTemplate.pdf in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		263A25EA1EE40BD6005C52B9 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				263A289C1EE4121D005C52B9 /* html.c in Sources */,
+				263A287D1EE4120F005C52B9 /* log.c in Sources */,
+				263A28471EE40CF2005C52B9 /* internal.c in Sources */,
+				263A28671EE40CFB005C52B9 /* hotlist.c in Sources */,
+				263A28291EE40CCF005C52B9 /* font.m in Sources */,
+				263A286F1EE40CFB005C52B9 /* save_pdf.c in Sources */,
+				263A281F1EE40CCF005C52B9 /* bitmap.m in Sources */,
+				263A28381EE40CCF005C52B9 /* TreeView.m in Sources */,
+				263A289E1EE4121D005C52B9 /* html_css_fetcher.c in Sources */,
+				263A282E1EE40CCF005C52B9 /* LocalHistoryController.m in Sources */,
+				263A28941EE41218005C52B9 /* filepath.c in Sources */,
+				263A28731EE40CFB005C52B9 /* searchweb.c in Sources */,
+				263A285C1EE40CF2005C52B9 /* mimesniff.c in Sources */,
+				263A288B1EE41213005C52B9 /* content-type.c in Sources */,
+				263A285B1EE40CF2005C52B9 /* llcache.c in Sources */,
+				263A28871EE4120F005C52B9 /* utf8.c in Sources */,
+				263A28851EE4120F005C52B9 /* url.c in Sources */,
+				263A282A1EE40CCF005C52B9 /* FormSelectMenu.m in Sources */,
+				263A28441EE40CF2005C52B9 /* css.c in Sources */,
+				263A28711EE40CFB005C52B9 /* scrollbar.c in Sources */,
+				263A289F1EE4121D005C52B9 /* html_forms.c in Sources */,
+				263A29041EE412BE005C52B9 /* fetcher.c in Sources */,
+				263A28A01EE4121D005C52B9 /* html_interaction.c in Sources */,
+				263A288D1EE41213005C52B9 /* parameter.c in Sources */,
+				263A28191EE40CCF005C52B9 /* PSMTabDragWindow.m in Sources */,
+				263A28431EE40CF2005C52B9 /* fs_backing_store.c in Sources */,
+				263A28841EE4120F005C52B9 /* time.c in Sources */,
+				263A285A1EE40CF2005C52B9 /* hlcache.c in Sources */,
+				263A28611EE40CFB005C52B9 /* cookie_manager.c in Sources */,
+				263A281A1EE40CCF005C52B9 /* PSMTabDragWindowController.m in Sources */,
+				263A284C1EE40CF2005C52B9 /* ico.c in Sources */,
+				263A288F1EE41213005C52B9 /* www-authenticate.c in Sources */,
+				263A28161EE40CCF005C52B9 /* PSMTabBarController.m in Sources */,
+				263A28891EE41213005C52B9 /* challenge.c in Sources */,
+				263A287C1EE4120F005C52B9 /* libdom.c in Sources */,
+				263A29051EE412BE005C52B9 /* none.c in Sources */,
+				263A28261EE40CCF005C52B9 /* desktop-tree.m in Sources */,
+				263A281B1EE40CCF005C52B9 /* PSMUnifiedTabStyle.m in Sources */,
+				263A285D1EE40CF2005C52B9 /* no_backing_store.c in Sources */,
+				263A286B1EE40CFB005C52B9 /* netsurf.c in Sources */,
+				263A284E1EE40CF2005C52B9 /* image_cache.c in Sources */,
+				263A286D1EE40CFB005C52B9 /* print.c in Sources */,
+				263A28391EE40CCF005C52B9 /* URLFieldCell.m in Sources */,
+				263A28121EE40CCF005C52B9 /* PSMProgressIndicator.m in Sources */,
+				263A28251EE40CCF005C52B9 /* BrowserWindowController.m in Sources */,
+				263A288A1EE41213005C52B9 /* content-disposition.c in Sources */,
+				263A29351EE41B5E005C52B9 /* NSBezierPath_AMShading.m in Sources */,
+				263A28461EE40CF2005C52B9 /* hints.c in Sources */,
+				263A28631EE40CFB005C52B9 /* font_haru.c in Sources */,
+				263A283F1EE40CF2005C52B9 /* curl.c in Sources */,
+				263A28481EE40CF2005C52B9 /* select.c in Sources */,
+				263A287E1EE4120F005C52B9 /* messages.c in Sources */,
+				263A28801EE4120F005C52B9 /* nsurl.c in Sources */,
+				263A28361EE40CCF005C52B9 /* selection.m in Sources */,
+				263A28A41EE4121D005C52B9 /* html_script.c in Sources */,
+				263A28A31EE4121D005C52B9 /* html_redraw_border.c in Sources */,
+				263A28241EE40CCF005C52B9 /* BrowserWindow.m in Sources */,
+				263A289B1EE4121D005C52B9 /* form.c in Sources */,
+				263A285E1EE40CF2005C52B9 /* urldb.c in Sources */,
+				263A28221EE40CCF005C52B9 /* BrowserView.m in Sources */,
+				263A282D1EE40CCF005C52B9 /* HistoryWindowController.m in Sources */,
+				263A28101EE40CCF005C52B9 /* NSString_AITruncation.m in Sources */,
+				263A28761EE40CFB005C52B9 /* system_colour.c in Sources */,
+				263A28931EE41218005C52B9 /* filename.c in Sources */,
+				263A287F1EE4120F005C52B9 /* nsoption.c in Sources */,
+				263A28791EE40CFB005C52B9 /* treeview.c in Sources */,
+				263A28A71EE4121D005C52B9 /* search.c in Sources */,
+				263A28811EE4120F005C52B9 /* parse.c in Sources */,
+				263A28911EE41218005C52B9 /* corestrings.c in Sources */,
+				263A282F1EE40CCF005C52B9 /* NetsurfApp.m in Sources */,
+				263A28151EE40CCF005C52B9 /* PSMTabBarControl.m in Sources */,
+				263A28451EE40CF2005C52B9 /* dump.c in Sources */,
+				263A28321EE40CCF005C52B9 /* PreferencesWindowController.m in Sources */,
+				263A28341EE40CCF005C52B9 /* ScrollableView.m in Sources */,
+				263A281D1EE40CCF005C52B9 /* ArrowBox.m in Sources */,
+				263A28831EE4120F005C52B9 /* talloc.c in Sources */,
+				263A28771EE40CFB005C52B9 /* textarea.c in Sources */,
+				263A28A81EE4121D005C52B9 /* table.c in Sources */,
+				263A286E1EE40CFB005C52B9 /* save_complete.c in Sources */,
+				263A287B1EE4120F005C52B9 /* idna.c in Sources */,
+				263A284D1EE40CF2005C52B9 /* image.c in Sources */,
+				263A28621EE40CFB005C52B9 /* download.c in Sources */,
+				263A28681EE40CFB005C52B9 /* knockout.c in Sources */,
+				263A28861EE4120F005C52B9 /* useragent.c in Sources */,
+				263A288C1EE41213005C52B9 /* generics.c in Sources */,
+				263A28211EE40CCF005C52B9 /* BookmarksController.m in Sources */,
+				263A28881EE4120F005C52B9 /* utils.c in Sources */,
+				263A28641EE40CFB005C52B9 /* frames.c in Sources */,
+				263A28901EE41218005C52B9 /* bloom.c in Sources */,
+				263A28951EE41218005C52B9 /* hashtable.c in Sources */,
+				263A289A1EE4121D005C52B9 /* font.c in Sources */,
+				263A283B1EE40CF2005C52B9 /* content_factory.c in Sources */,
+				263A283C1EE40CF2005C52B9 /* dirlist.c in Sources */,
+				263A282C1EE40CCF005C52B9 /* HistoryView.m in Sources */,
+				263A28A21EE4121D005C52B9 /* html_redraw.c in Sources */,
+				263A28751EE40CFB005C52B9 /* sslcert_viewer.c in Sources */,
+				263A285F1EE40CFB005C52B9 /* browser.c in Sources */,
+				263A28961EE4121D005C52B9 /* box.c in Sources */,
+				263A28821EE4120F005C52B9 /* punycode.c in Sources */,
+				263A28111EE40CCF005C52B9 /* PSMOverflowPopUpButton.m in Sources */,
+				263A28A91EE4121D005C52B9 /* textplain.c in Sources */,
+				263A28781EE40CFB005C52B9 /* textinput.c in Sources */,
+				263A28601EE40CFB005C52B9 /* browser_history.c in Sources */,
+				263A28721EE40CFB005C52B9 /* search.c in Sources */,
+				263A28281EE40CCF005C52B9 /* fetch.m in Sources */,
+				263A28691EE40CFB005C52B9 /* local_history.c in Sources */,
+				263A284B1EE40CF2005C52B9 /* gif.c in Sources */,
+				263A28371EE40CCF005C52B9 /* Tree.m in Sources */,
+				263A28651EE40CFB005C52B9 /* global_history.c in Sources */,
+				263A283D1EE40CF2005C52B9 /* fetch.c in Sources */,
+				263A281E1EE40CCF005C52B9 /* ArrowWindow.m in Sources */,
+				263A289D1EE4121D005C52B9 /* html_css.c in Sources */,
+				263A28661EE40CFB005C52B9 /* gui_factory.c in Sources */,
+				263A283E1EE40CF2005C52B9 /* about.c in Sources */,
+				263A281C1EE40CCF005C52B9 /* apple_image.m in Sources */,
+				263A28921EE41218005C52B9 /* file.c in Sources */,
+				263A28491EE40CF2005C52B9 /* utils.c in Sources */,
+				263A286A1EE40CFB005C52B9 /* mouse.c in Sources */,
+				263A28421EE40CF2005C52B9 /* resource.c in Sources */,
+				263A28311EE40CCF005C52B9 /* plotter.m in Sources */,
+				263A29031EE412BE005C52B9 /* content.c in Sources */,
+				263A28271EE40CCF005C52B9 /* DownloadWindowController.m in Sources */,
+				263A282B1EE40CCF005C52B9 /* gui.m in Sources */,
+				263A283A1EE40CF2005C52B9 /* content.c in Sources */,
+				263A28131EE40CCF005C52B9 /* PSMRolloverButton.m in Sources */,
+				263A28991EE4121D005C52B9 /* box_textarea.c in Sources */,
+				263A28141EE40CCF005C52B9 /* PSMTabBarCell.m in Sources */,
+				263A284A1EE40CF2005C52B9 /* bmp.c in Sources */,
+				263A28331EE40CCF005C52B9 /* schedule.m in Sources */,
+				263A28181EE40CCF005C52B9 /* PSMTabDragView.m in Sources */,
+				263A28401EE40CF2005C52B9 /* data.c in Sources */,
+				263A288E1EE41213005C52B9 /* primitives.c in Sources */,
+				263A28A11EE4121D005C52B9 /* html_object.c in Sources */,
+				263A28351EE40CCF005C52B9 /* SearchWindowController.m in Sources */,
+				263A286C1EE40CFB005C52B9 /* plot_style.c in Sources */,
+				263A28411EE40CF2005C52B9 /* file.c in Sources */,
+				263A28231EE40CCF005C52B9 /* BrowserViewController.m in Sources */,
+				263A28981EE4121D005C52B9 /* box_normalise.c in Sources */,
+				263A28701EE40CFB005C52B9 /* save_text.c in Sources */,
+				263A28A51EE4121D005C52B9 /* imagemap.c in Sources */,
+				263A28971EE4121D005C52B9 /* box_construct.c in Sources */,
+				263A28301EE40CCF005C52B9 /* NetSurfAppDelegate.m in Sources */,
+				263A28A61EE4121D005C52B9 /* layout.c in Sources */,
+				263A28171EE40CCF005C52B9 /* PSMTabDragAssistant.m in Sources */,
+				263A287A1EE40CFB005C52B9 /* version.c in Sources */,
+				263A28741EE40CFB005C52B9 /* selection.c in Sources */,
+				263A28201EE40CCF005C52B9 /* BlackScroller.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
 /* Begin PBXVariantGroup section */
-		2612268F12D7AE4100E10F91 /* Messages */ = {
+		263A26321EE40BFC005C52B9 /* BookmarksWindow.xib.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				2612269012D7AE4100E10F91 /* de */,
-				2612269312D7AE9B00E10F91 /* nl */,
-				2612269412D7AEA800E10F91 /* en */,
-				2612269512D7AEB500E10F91 /* it */,
-				2612269612D7AEBE00E10F91 /* fr */,
+				263A26331EE40BFC005C52B9 /* de */,
 			);
-			name = Messages;
+			name = BookmarksWindow.xib.strings;
 			sourceTree = "<group>";
 		};
-		261DB22113180AFF00C59F12 /* Localizable.strings */ = {
+		263A26341EE40BFC005C52B9 /* BrowserWindow.xib.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				261DB22213180AFF00C59F12 /* en */,
-				261DB22613180B4F00C59F12 /* de */,
-				261DB23313180CD600C59F12 /* fr */,
-				261DB23413180CE000C59F12 /* it */,
-				261DB23513180CEE00C59F12 /* nl */,
+				263A26351EE40BFC005C52B9 /* de */,
 			);
-			name = Localizable.strings;
+			name = BrowserWindow.xib.strings;
 			sourceTree = "<group>";
 		};
-		261DB28F13185C0A00C59F12 /* BookmarksWindow.xib.strings */ = {
+		263A26361EE40BFC005C52B9 /* DownloadWindow.xib.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				261DB29013185C0A00C59F12 /* de */,
+				263A26371EE40BFC005C52B9 /* de */,
 			);
-			name = BookmarksWindow.xib.strings;
+			name = DownloadWindow.xib.strings;
 			sourceTree = "<group>";
 		};
-		261DB29313185C0A00C59F12 /* BrowserWindow.xib.strings */ = {
+		263A26381EE40BFC005C52B9 /* HistoryWindow.xib.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				261DB29413185C0A00C59F12 /* de */,
+				263A26391EE40BFC005C52B9 /* de */,
 			);
-			name = BrowserWindow.xib.strings;
+			name = HistoryWindow.xib.strings;
 			sourceTree = "<group>";
 		};
-		261DB29513185C0A00C59F12 /* DownloadWindow.xib.strings */ = {
+		263A263A1EE40BFC005C52B9 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				261DB29613185C0A00C59F12 /* de */,
+				263A263B1EE40BFC005C52B9 /* de */,
+				263A26461EE40BFC005C52B9 /* en */,
+				263A26481EE40BFC005C52B9 /* fr */,
+				263A26551EE40BFC005C52B9 /* it */,
+				263A265C1EE40BFC005C52B9 /* nl */,
 			);
-			name = DownloadWindow.xib.strings;
+			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
-		261DB29713185C0A00C59F12 /* HistoryWindow.xib.strings */ = {
+		263A263C1EE40BFC005C52B9 /* MainMenu.xib.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				261DB29813185C0A00C59F12 /* de */,
+				263A263D1EE40BFC005C52B9 /* de */,
 			);
-			name = HistoryWindow.xib.strings;
+			name = MainMenu.xib.strings;
 			sourceTree = "<group>";
 		};
-		261DB29B13185C0A00C59F12 /* MainMenu.xib.strings */ = {
+		263A263E1EE40BFC005C52B9 /* Messages */ = {
 			isa = PBXVariantGroup;
 			children = (
-				261DB29C13185C0A00C59F12 /* de */,
+				263A263F1EE40BFC005C52B9 /* de */,
+				263A26471EE40BFC005C52B9 /* en */,
+				263A26491EE40BFC005C52B9 /* fr */,
+				263A26561EE40BFC005C52B9 /* it */,
+				263A265D1EE40BFC005C52B9 /* nl */,
 			);
-			name = MainMenu.xib.strings;
+			name = Messages;
 			sourceTree = "<group>";
 		};
-		261DB29D13185C0A00C59F12 /* PreferencesWindow.xib.strings */ = {
+		263A26401EE40BFC005C52B9 /* PreferencesWindow.xib.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				261DB29E13185C0A00C59F12 /* de */,
+				263A26411EE40BFC005C52B9 /* de */,
 			);
 			name = PreferencesWindow.xib.strings;
 			sourceTree = "<group>";
 		};
-		261DB29F13185C0A00C59F12 /* SearchWindow.xib.strings */ = {
+		263A26421EE40BFC005C52B9 /* SearchWindow.xib.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				261DB2A013185C0A00C59F12 /* de */,
+				263A26431EE40BFC005C52B9 /* de */,
 			);
 			name = SearchWindow.xib.strings;
 			sourceTree = "<group>";
@@ -966,6 +1799,8 @@
 		2636299012F698E10048542C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				MKDIR = "mkdir -p";
+				PKG_CONFIG_PATH = /Users/sven/Projekte/NetSurf/build/lib/pkgconfig;
 				PRODUCT_NAME = NetSurf;
 			};
 			name = Debug;
@@ -974,25 +1809,230 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				MKDIR = "mkdir -p";
+				PKG_CONFIG_PATH = /Users/sven/Projekte/NetSurf/build/lib/pkgconfig;
 				PRODUCT_NAME = NetSurf;
 			};
 			name = Release;
 		};
+		263A26001EE40BD6005C52B9 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_ENABLE_MODULES = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+					"'NETSURF_HOMEPAGE=\"about:welcome\"'",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/..",
+					"$(NETSURF_ROOT)",
+					"$(NETSURF_LIB_PREFIX)/include",
+					"$(NETSURF_ROOT)/include",
+					"$(OPENSSL_PREFIX)/include",
+					"$(NETSURF_ROOT)/content/handlers",
+				);
+				INFOPLIST_FILE = "$(SRCROOT)/res/NetSurf-Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(OPENSSL_PREFIX)/lib",
+					"$(NETSURF_LIB_PREFIX)/lib",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_CFLAGS = (
+					"-Dnscocoa",
+					"-DWITH_CURL",
+				);
+				OTHER_LDFLAGS = (
+					"-lcss",
+					"-ldom",
+					"-lhubbub",
+					"-lnsbmp",
+					"-lnsgif",
+					"-lnslayout",
+					"-lnspsl",
+					"-lnsutils",
+					"-lparserutils",
+					"-lsvgtiny",
+					"-lutf8proc",
+					"-lwapcaplet",
+					"-lssl",
+					"-lcurl",
+					"-lcrypto",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.netsurf-browser.NetSurfBrowser";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		263A26011EE40BD6005C52B9 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_ENABLE_MODULES = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_NO_COMMON_BLOCKS = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"'NETSURF_HOMEPAGE=\"about:welcome\"'",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/..",
+					"$(NETSURF_ROOT)",
+					"$(NETSURF_LIB_PREFIX)/include",
+					"$(NETSURF_ROOT)/include",
+					"$(OPENSSL_PREFIX)/include",
+					"$(NETSURF_ROOT)/content/handlers",
+				);
+				INFOPLIST_FILE = "$(SRCROOT)/res/NetSurf-Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(OPENSSL_PREFIX)/lib",
+					"$(NETSURF_LIB_PREFIX)/lib",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_CFLAGS = (
+					"-Dnscocoa",
+					"-DWITH_CURL",
+				);
+				OTHER_LDFLAGS = (
+					"-lcss",
+					"-ldom",
+					"-lhubbub",
+					"-lnsbmp",
+					"-lnsgif",
+					"-lnslayout",
+					"-lnspsl",
+					"-lnsutils",
+					"-lparserutils",
+					"-lsvgtiny",
+					"-lutf8proc",
+					"-lwapcaplet",
+					"-lssl",
+					"-lcurl",
+					"-lcrypto",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.netsurf-browser.NetSurfBrowser";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				NETSURF_LIB_PREFIX = "$(NETSURF_ROOT)/../build";
+				NETSURF_ROOT = "$(SRCROOT)/../..";
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx10.5;
+				OPENSSL_PREFIX = /usr/local/opt/openssl;
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				NETSURF_LIB_PREFIX = "$(NETSURF_ROOT)/../build";
+				NETSURF_ROOT = "$(SRCROOT)/../..";
 				ONLY_ACTIVE_ARCH = NO;
-				SDKROOT = macosx10.5;
+				OPENSSL_PREFIX = /usr/local/opt/openssl;
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};
@@ -1008,6 +2048,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		263A25FF1EE40BD6005C52B9 /* Build configuration list for PBXNativeTarget "NetSurfBrowser" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				263A26001EE40BD6005C52B9 /* Debug */,
+				263A26011EE40BD6005C52B9 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "NetSurf" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/frontends/cocoa/NetSurf.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/frontends/cocoa/NetSurf.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..919434a62
--- /dev/null
+++ b/frontends/cocoa/NetSurf.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/frontends/cocoa/NetSurfAppDelegate.m b/frontends/cocoa/NetSurfAppDelegate.m
index 0939a1149..e9e5b4376 100644
--- a/frontends/cocoa/NetSurfAppDelegate.m
+++ b/frontends/cocoa/NetSurfAppDelegate.m
@@ -42,7 +42,7 @@
 @synthesize search;
 @synthesize preferences;
 
-- (void) newDocument: (id) sender;
+- (void) newDocument: (id) sender
 {
 	nsurl *url;
 	nserror error;
@@ -66,14 +66,14 @@
 	}
 }
 
-- (void) openDocument: (id) sender;
+- (void) openDocument: (id) sender
 {
 	nsurl *u;
 	nserror error;
 
 	NSOpenPanel *openPanel = [NSOpenPanel openPanel];
 	[openPanel setAllowsMultipleSelection: YES];
-	if ([openPanel runModalForTypes: nil] == NSOKButton) {
+	if ([openPanel runModalForTypes: nil] == NSModalResponseOK) {
 		for (NSURL *url in [openPanel URLs]) {
                         error = nsurl_create([[url absoluteString] UTF8String], &u);
                         if (error == NSERROR_OK) {
@@ -111,25 +111,25 @@
 	}
 }
 
-- (IBAction) showSearchWindow: (id) sender;
+- (IBAction) showSearchWindow: (id) sender
 {
 	if (search == nil) {
-		[self setSearch: [[[SearchWindowController alloc] init] autorelease]];
+		[self setSearch: [[SearchWindowController alloc] init]];
 	}
 	[[search window] makeKeyAndOrderFront: self];
 }
 
-- (IBAction) searchForward: (id) sender;
+- (IBAction) searchForward: (id) sender
 {
 	[search search: SearchForward];
 }
 
-- (IBAction) searchBackward: (id) sender;
+- (IBAction) searchBackward: (id) sender
 {
 	[search search: SearchBackward];
 }
 
-- (BOOL) validateMenuItem: (id) item;
+- (BOOL) validateMenuItem: (id) item
 {
 	SEL action = [item action];
 	
@@ -142,25 +142,25 @@
 	return YES;
 }
 
-- (IBAction) showPreferences: (id) sender;
+- (IBAction) showPreferences: (id) sender
 {
 	if (preferences == nil) {
-		[self setPreferences: [[[PreferencesWindowController alloc] init] autorelease]];
+		[self setPreferences: [[PreferencesWindowController alloc] init]];
 	}
 	[preferences showWindow: sender];
 }
 
-- (IBAction) showGlobalHistory: (id) sender;
+- (IBAction) showGlobalHistory: (id) sender
 {
 	if (history == nil) {
-		[self setHistory: [[[HistoryWindowController alloc] init] autorelease]];
+		[self setHistory: [[HistoryWindowController alloc] init] ];
 	}
 	[history showWindow: sender];
 }
 
 // Application delegate methods
 
-- (BOOL) applicationOpenUntitledFile: (NSApplication *)sender;
+- (BOOL) applicationOpenUntitledFile: (NSApplication *)sender
 {
 	[self newDocument: self];
 	return YES;
diff --git a/frontends/cocoa/NetsurfApp.h b/frontends/cocoa/NetsurfApp.h
index 330f33826..ea2802aee 100644
--- a/frontends/cocoa/NetsurfApp.h
+++ b/frontends/cocoa/NetsurfApp.h
@@ -20,11 +20,9 @@
 
 @class BrowserViewController;
 
-@interface NetSurfApp : NSApplication {
-	BrowserViewController *frontTab;
-}
+@interface NetSurfApp : NSApplication
 
-@property (readwrite, assign, nonatomic) BrowserViewController *frontTab;
+@property (readwrite, nonatomic) BrowserViewController *frontTab;
 
 @end
 
diff --git a/frontends/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m
index 7d49e0b51..1ecdc51a7 100644
--- a/frontends/cocoa/NetsurfApp.m
+++ b/frontends/cocoa/NetsurfApp.m
@@ -98,18 +98,22 @@ static void die(const char * const error)
 
 - (void) run
 {
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    @autoreleasepool {
+
+
+        @autoreleasepool {
 
         [self finishLaunching];
 
         [self loadOptions];
+        }
 
         while (!cocoa_done) {
-                [pool release];
-                pool = [[NSAutoreleasePool alloc] init];
+            @autoreleasepool {
+
 
                 NSEvent *event =
-                        [self nextEventMatchingMask: NSAnyEventMask
+                        [self nextEventMatchingMask: NSEventMaskAny
                                           untilDate: [NSDate distantFuture]
                                              inMode: NSDefaultRunLoopMode
                                             dequeue: YES];
@@ -117,12 +121,13 @@ static void die(const char * const error)
                         [self sendEvent: event];
                         [self updateWindows];
                 }
+            }
 
         }
 
         [self saveOptions];
 
-        [pool release];
+    }
 }
 
 -(void) terminate: (id)sender
@@ -130,7 +135,7 @@ static void die(const char * const error)
         [[NSNotificationCenter defaultCenter] postNotificationName:NSApplicationWillTerminateNotification object:self];
 
         cocoa_done = true;
-        [self postEvent: [NSEvent otherEventWithType: NSApplicationDefined
+        [self postEvent: [NSEvent otherEventWithType: NSEventTypeApplicationDefined
                                             location: NSZeroPoint
                                        modifierFlags: 0
                                            timestamp: 0
@@ -204,7 +209,6 @@ static NSApplication *cocoa_prepare_app( void )
         NSString *mainNibName = [infoDictionary objectForKey:@"NSMainNibFile"];
         NSNib *mainNib = [[NSNib alloc] initWithNibNamed:mainNibName bundle:[NSBundle mainBundle]];
         [mainNib instantiateNibWithOwner:NSApp topLevelObjects:nil];
-        [mainNib release];
 
         return NSApp;
 }
diff --git a/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.m b/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.m
index 1a54502e5..a5865cb8a 100644
--- a/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.m
+++ b/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.m
@@ -23,7 +23,7 @@
 		returnString = [[self substringToIndex:length - 1] stringByAppendingString:[NSString ellipsis]];
 	} else {
 		//We don't need to truncate, so don't append an ellipsis
-		returnString = [[self copy] autorelease];
+		returnString = [self copy];
 	}
 
 	return returnString;
diff --git a/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m
index c316f6973..8b71b7703 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m
@@ -6,6 +6,7 @@
 //  Copyright 2005 Positive Spin Media. All rights reserved.
 //
 
+#import <math.h>
 #import "PSMOverflowPopUpButton.h"
 #import "PSMTabBarControl.h"
 
@@ -27,12 +28,6 @@
 	return self;
 }
 
-- (void)dealloc {
-	[_PSMTabBarOverflowPopUpImage release];
-	[_PSMTabBarOverflowDownPopUpImage release];
-	[super dealloc];
-}
-
 - (void)drawRect:(NSRect)rect {
 	if(_PSMTabBarOverflowPopUpImage == nil) {
 		[super drawRect:rect];
@@ -49,7 +44,7 @@
 		drawPoint.y += imageSize.height;
 	}
 
-	[image compositeToPoint:drawPoint operation:NSCompositeSourceOver fraction:(_animatingAlternateImage ? 0.7f : 1.0f)];
+    [image drawAtPoint:drawPoint fromRect: CGRectZero operation:NSCompositingOperationSourceOver fraction:(_animatingAlternateImage ? 0.7f : 1.0f)];
 
 	if(_animatingAlternateImage) {
 		NSImage *alternateImage = [self alternateImage];
@@ -60,7 +55,7 @@
 			drawPoint.y += altImageSize.height;
 		}
 
-		[[self alternateImage] compositeToPoint:drawPoint operation:NSCompositeSourceOver fraction:sin(_animationValue * M_PI)];
+        [[self alternateImage] drawAtPoint:drawPoint fromRect: CGRectZero operation:NSCompositingOperationSourceOver fraction:sin(_animationValue * M_PI)];
 	}
 }
 
@@ -111,7 +106,7 @@
 	}
 }
 
-- (BOOL)animatingAlternateImage;
+- (BOOL)animatingAlternateImage
 {
 	return _animatingAlternateImage;
 }
@@ -141,8 +136,9 @@
 - (id)initWithCoder:(NSCoder *)aDecoder {
 	if((self = [super initWithCoder:aDecoder])) {
 		if([aDecoder allowsKeyedCoding]) {
-			_PSMTabBarOverflowPopUpImage = [[aDecoder decodeObjectForKey:@"PSMTabBarOverflowPopUpImage"] retain];
-			_PSMTabBarOverflowDownPopUpImage = [[aDecoder decodeObjectForKey:@"PSMTabBarOverflowDownPopUpImage"] retain];
+			_PSMTabBarOverflowPopUpImage =
+            [aDecoder decodeObjectForKey:@"PSMTabBarOverflowPopUpImage"];
+			_PSMTabBarOverflowDownPopUpImage = [aDecoder decodeObjectForKey:@"PSMTabBarOverflowDownPopUpImage"];
 			[self setAnimatingAlternateImage:[aDecoder decodeBoolForKey:@"PSMTabBarOverflowAnimatingAlternateImage"]];
 		}
 	}
diff --git a/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.m b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.m
index 983609bbc..afc727d7a 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.m
@@ -17,10 +17,10 @@
 
 @implementation PSMProgressIndicator
 
-- (id) initWithFrame: (NSRect)frameRect;
+- (id) initWithFrame: (NSRect)frameRect
 {
 	if ((self = [super initWithFrame: frameRect]) == nil) return nil;
-	[self setControlSize: NSSmallControlSize];
+	[self setControlSize: NSControlSizeSmall];
 	return self;
 }
 
diff --git a/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.m b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.m
index 8886560c7..1da82c0db 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.m
@@ -29,14 +29,10 @@
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 
 	[self removeTrackingRect];
-
-	[super dealloc];
 }
 
 // the regular image
 - (void)setUsualImage:(NSImage *)newImage {
-	[newImage retain];
-	[_usualImage release];
 	_usualImage = newImage;
 
 	[self setImage:_usualImage];
@@ -47,8 +43,6 @@
 }
 
 - (void)setRolloverImage:(NSImage *)newImage {
-	[newImage retain];
-	[_rolloverImage release];
 	_rolloverImage = newImage;
 }
 
@@ -88,8 +82,7 @@
 - (void)addTrackingRect {
 	// assign a tracking rect to watch for mouse enter/exit
 	NSRect trackRect = [self bounds];
-	NSPoint localPoint = [self convertPoint:[[self window] convertScreenToBase:[NSEvent mouseLocation]]
-						  fromView:nil];
+    NSPoint localPoint = [self convertPoint: NSPointFromCGPoint([self.window convertRectFromScreen: (NSRect){.origin = NSEvent.mouseLocation, .size = CGSizeMake(1, 1)}].origin) fromView: nil];
 	BOOL mouseInside = NSPointInRect(localPoint, trackRect);
 
 	_myTrackingRectTag = [self addTrackingRect:trackRect owner:self userData:nil assumeInside:mouseInside];
@@ -110,7 +103,7 @@
 }
 
 // override for rollover effect
-- (void)mouseEntered:(NSEvent *)theEvent;
+- (void)mouseEntered:(NSEvent *)theEvent
 {
 	// set rollover image
 	[self setImage:_rolloverImage];
@@ -118,7 +111,7 @@
 	[super mouseEntered:theEvent];
 }
 
-- (void)mouseExited:(NSEvent *)theEvent;
+- (void)mouseExited:(NSEvent *)theEvent
 {
 	// restore usual image
 	[self setImage:_usualImage];
@@ -158,8 +151,8 @@
 	self = [super initWithCoder:aDecoder];
 	if(self) {
 		if([aDecoder allowsKeyedCoding]) {
-			_rolloverImage = [[aDecoder decodeObjectForKey:@"rolloverImage"] retain];
-			_usualImage = [[aDecoder decodeObjectForKey:@"usualImage"] retain];
+			_rolloverImage = [aDecoder decodeObjectForKey:@"rolloverImage"] ;
+			_usualImage = [aDecoder decodeObjectForKey:@"usualImage"] ;
 			_myTrackingRectTag = [aDecoder decodeInt64ForKey:@"myTrackingRectTag"];
 		}
 	}
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.m b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.m
index f7a04f202..0f21fe5c3 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.m
@@ -11,10 +11,7 @@
 #import "PSMTabStyle.h"
 #import "PSMProgressIndicator.h"
 #import "PSMTabDragAssistant.h"
-
-@interface PSMTabBarControl (Private)
-- (void)update;
-@end
+#import "PSMTabBarControl+Private.h"
 
 @implementation PSMTabBarCell
 
@@ -73,12 +70,9 @@
 }
 
 - (void)dealloc {
-	[_countColor release];
 
 	[_indicator removeFromSuperviewWithoutNeedingDisplay];
 
-	[_indicator release];
-	[super dealloc];
 }
 
 #pragma mark -
@@ -138,7 +132,7 @@
 }
 
 - (NSAttributedString *)attributedStringValue {
-	return [(id < PSMTabStyle >)[_controlView style] attributedStringValueForTabCell:self];
+	return [(id < PSMTabStyle >)[(PSMTabBarControl *)_controlView style] attributedStringValueForTabCell:self];
 }
 
 - (NSInteger)tabState {
@@ -175,7 +169,7 @@
 }
 
 - (BOOL)closeButtonOver {
-	return(_closeButtonOver && ([_controlView allowsBackgroundTabClosing] || ([self tabState] & PSMTab_SelectedMask) || [[NSApp currentEvent] modifierFlags] & NSCommandKeyMask));
+	return(_closeButtonOver && ([_controlView allowsBackgroundTabClosing] || ([self tabState] & PSMTab_SelectedMask) || [[NSApp currentEvent] modifierFlags] & NSEventModifierFlagCommand));
 }
 
 - (void)setCloseButtonOver:(BOOL)value {
@@ -186,17 +180,17 @@
 	return _hasCloseButton;
 }
 
-- (void)setHasCloseButton:(BOOL)set;
+- (void)setHasCloseButton:(BOOL)set
 {
 	_hasCloseButton = set;
 }
 
-- (void)setCloseButtonSuppressed:(BOOL)suppress;
+- (void)setCloseButtonSuppressed:(BOOL)suppress
 {
 	_isCloseButtonSuppressed = suppress;
 }
 
-- (BOOL)isCloseButtonSuppressed;
+- (BOOL)isCloseButtonSuppressed
 {
 	return _isCloseButtonSuppressed;
 }
@@ -233,15 +227,14 @@
 }
 
 - (void)setCountColor:(NSColor *)color {
-	[_countColor release];
-	_countColor = [color retain];
+	_countColor = color;
 }
 
 - (BOOL)isPlaceholder {
 	return _isPlaceholder;
 }
 
-- (void)setIsPlaceholder:(BOOL)value;
+- (void)setIsPlaceholder:(BOOL)value
 {
 	_isPlaceholder = value;
 }
@@ -285,19 +278,19 @@
 #pragma mark Component Attributes
 
 - (NSRect)indicatorRectForFrame:(NSRect)cellFrame {
-	return [(id < PSMTabStyle >)[_controlView style] indicatorRectForTabCell:self];
+	return [(id < PSMTabStyle >)[(PSMTabBarControl *)_controlView style] indicatorRectForTabCell:self];
 }
 
 - (NSRect)closeButtonRectForFrame:(NSRect)cellFrame {
-	return [(id < PSMTabStyle >)[_controlView style] closeButtonRectForTabCell:self withFrame:cellFrame];
+	return [(id < PSMTabStyle >)[(PSMTabBarControl *)_controlView style] closeButtonRectForTabCell:self withFrame:cellFrame];
 }
 
 - (CGFloat)minimumWidthOfCell {
-	return [(id < PSMTabStyle >)[_controlView style] minimumWidthOfTabCell:self];
+	return [(id < PSMTabStyle >)[(PSMTabBarControl *)_controlView style] minimumWidthOfTabCell:self];
 }
 
 - (CGFloat)desiredWidthOfCell {
-	return [(id < PSMTabStyle >)[_controlView style] desiredWidthOfTabCell:self];
+	return [(id < PSMTabStyle >)[(PSMTabBarControl *)_controlView style] desiredWidthOfTabCell:self];
 }
 
 #pragma mark -
@@ -306,11 +299,11 @@
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
 	if(_isPlaceholder) {
 		[[NSColor colorWithCalibratedWhite:0.0 alpha:0.2] set];
-		NSRectFillUsingOperation(cellFrame, NSCompositeSourceAtop);
+		NSRectFillUsingOperation(cellFrame, NSCompositingOperationSourceAtop);
 		return;
 	}
 
-	[(id < PSMTabStyle >)[_controlView style] drawTabCell:self];
+	[(id < PSMTabStyle >)[(PSMTabBarControl *)_controlView style] drawTabCell:self];
 }
 
 #pragma mark -
@@ -327,7 +320,7 @@
 	}
 
 	// scrubtastic
-	if([_controlView allowsScrubbing] && ([theEvent modifierFlags] & NSAlternateKeyMask)) {
+	if([_controlView allowsScrubbing] && ([theEvent modifierFlags] & NSEventModifierFlagOption)) {
 		[_controlView performSelector:@selector(tabClick:) withObject:self];
 	}
 
@@ -358,21 +351,20 @@
 	//NSRect cellFrame = [self frame];
 
 	[_controlView lockFocus];
-	NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect:cellFrame] autorelease];
+	NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initWithFocusedViewRect:cellFrame] ;
 	[_controlView unlockFocus];
-	NSImage *image = [[[NSImage alloc] initWithSize:[rep size]] autorelease];
+	NSImage *image = [[NSImage alloc] initWithSize:[rep size]];
 	[image addRepresentation:rep];
-	NSImage *returnImage = [[[NSImage alloc] initWithSize:[rep size]] autorelease];
+	NSImage *returnImage = [[NSImage alloc] initWithSize:[rep size]];
 	[returnImage lockFocus];
-	[image compositeToPoint:NSMakePoint(0.0, 0.0) operation:NSCompositeSourceOver fraction:1.0];
+    [image drawAtPoint:NSMakePoint(0.0, 0.0) fromRect: NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
 	[returnImage unlockFocus];
 	if(![[self indicator] isHidden]) {
 		NSImage *pi = [[NSImage alloc] initByReferencingFile:[[PSMTabBarControl bundle] pathForImageResource:@"pi"]];
 		[returnImage lockFocus];
 		NSPoint indicatorPoint = NSMakePoint([self frame].size.width - MARGIN_X - kPSMTabBarIndicatorWidth, MARGIN_Y);
-		[pi compositeToPoint:indicatorPoint operation:NSCompositeSourceOver fraction:1.0];
+        [pi drawAtPoint:indicatorPoint fromRect: NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
 		[returnImage unlockFocus];
-		[pi release];
 	}
 	return returnImage;
 }
@@ -416,7 +408,7 @@
 			_cellTrackingTag = [aDecoder decodeIntegerForKey:@"cellTrackingTag"];
 			_closeButtonOver = [aDecoder decodeBoolForKey:@"closeButtonOver"];
 			_closeButtonPressed = [aDecoder decodeBoolForKey:@"closeButtonPressed"];
-			_indicator = [[aDecoder decodeObjectForKey:@"indicator"] retain];
+			_indicator = [aDecoder decodeObjectForKey:@"indicator"];
 			_isInOverflowMenu = [aDecoder decodeBoolForKey:@"isInOverflowMenu"];
 			_hasCloseButton = [aDecoder decodeBoolForKey:@"hasCloseButton"];
 			_isCloseButtonSuppressed = [aDecoder decodeBoolForKey:@"isCloseButtonSuppressed"];
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabBarControl+Private.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl+Private.h
new file mode 100644
index 000000000..8df3fd368
--- /dev/null
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl+Private.h
@@ -0,0 +1,49 @@
+#import "PSMTabBarControl.h"
+
+@interface PSMTabBarControl (Private)
+
+// constructor/destructor
+- (void)initAddedProperties;
+
+// accessors
+- (NSEvent *)lastMouseDownEvent;
+- (void)setLastMouseDownEvent:(NSEvent *)event;
+
+// contents
+- (void)addTabViewItem:(NSTabViewItem *)item;
+- (void)removeTabForCell:(PSMTabBarCell *)cell;
+
+// draw
+- (void)update;
+- (void)update:(BOOL)animate;
+- (void)_setupTrackingRectsForCell:(PSMTabBarCell *)cell;
+- (void)_positionOverflowMenu;
+- (void)_checkWindowFrame;
+
+// actions
+- (void)overflowMenuAction:(id)sender;
+- (void)closeTabClick:(id)sender;
+- (void)tabClick:(id)sender;
+- (void)tabNothing:(id)sender;
+
+// notification handlers
+- (void)frameDidChange:(NSNotification *)notification;
+- (void)windowDidMove:(NSNotification *)aNotification;
+- (void)windowDidUpdate:(NSNotification *)notification;
+
+// NSTabView delegate
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem;
+- (BOOL)tabView:(NSTabView *)tabView shouldSelectTabViewItem:(NSTabViewItem *)tabViewItem;
+- (void)tabView:(NSTabView *)tabView willSelectTabViewItem:(NSTabViewItem *)tabViewItem;
+- (void)tabViewDidChangeNumberOfTabViewItems:(NSTabView *)tabView;
+
+// archiving
+- (void)encodeWithCoder:(NSCoder *)aCoder;
+- (id)initWithCoder:(NSCoder *)aDecoder;
+
+// convenience
+- (void)_bindPropertiesForCell:(PSMTabBarCell *)cell andTabViewItem:(NSTabViewItem *)item;
+- (id)cellForPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame;
+
+- (void)_animateCells:(NSTimer *)timer;
+@end
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.m b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.m
index cb0e0342c..01df769f1 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.m
@@ -17,52 +17,15 @@
 #import "PSMTabDragAssistant.h"
 #import "PSMTabBarController.h"
 
-@interface PSMTabBarControl (Private)
-
-// constructor/destructor
-- (void)initAddedProperties;
-
-// accessors
-- (NSEvent *)lastMouseDownEvent;
-- (void)setLastMouseDownEvent:(NSEvent *)event;
-
-// contents
-- (void)addTabViewItem:(NSTabViewItem *)item;
-- (void)removeTabForCell:(PSMTabBarCell *)cell;
-
-// draw
-- (void)update;
-- (void)update:(BOOL)animate;
-- (void)_setupTrackingRectsForCell:(PSMTabBarCell *)cell;
-- (void)_positionOverflowMenu;
-- (void)_checkWindowFrame;
-
-// actions
-- (void)overflowMenuAction:(id)sender;
-- (void)closeTabClick:(id)sender;
-- (void)tabClick:(id)sender;
-- (void)tabNothing:(id)sender;
-
-// notification handlers
-- (void)frameDidChange:(NSNotification *)notification;
-- (void)windowDidMove:(NSNotification *)aNotification;
-- (void)windowDidUpdate:(NSNotification *)notification;
-
-// NSTabView delegate
-- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem;
-- (BOOL)tabView:(NSTabView *)tabView shouldSelectTabViewItem:(NSTabViewItem *)tabViewItem;
-- (void)tabView:(NSTabView *)tabView willSelectTabViewItem:(NSTabViewItem *)tabViewItem;
-- (void)tabViewDidChangeNumberOfTabViewItems:(NSTabView *)tabView;
-
-// archiving
-- (void)encodeWithCoder:(NSCoder *)aCoder;
-- (id)initWithCoder:(NSCoder *)aDecoder;
-
-// convenience
-- (void)_bindPropertiesForCell:(PSMTabBarCell *)cell andTabViewItem:(NSTabViewItem *)item;
-- (id)cellForPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame;
-
-- (void)_animateCells:(NSTimer *)timer;
+#import "PSMTabBarControl+Private.h"
+
+@protocol PSMTabBarItem
+@optional
+- (BOOL)isProcessing;
+
+@optional
+- (int)objectCount;
+
 @end
 
 @implementation PSMTabBarControl
@@ -202,36 +165,22 @@
 
 	//stop any animations that may be running
 	[_animationTimer invalidate];
-	[_animationTimer release]; _animationTimer = nil;
 
 	[_showHideAnimationTimer invalidate];
-	[_showHideAnimationTimer release]; _showHideAnimationTimer = nil;
 
 	//Also unwind the spring, if it's wound.
 	[_springTimer invalidate];
-	[_springTimer release]; _springTimer = nil;
 
 	//unbind all the items to prevent crashing
 	//not sure if this is necessary or not
 	// http://code.google.com/p/maccode/issues/detail?id=35
-	NSEnumerator *enumerator = [[[_cells copy] autorelease] objectEnumerator];
+	NSEnumerator *enumerator = [[_cells copy] objectEnumerator];
 	PSMTabBarCell *nextCell;
 	while((nextCell = [enumerator nextObject])) {
 		[self removeTabForCell:nextCell];
 	}
 
-	[_overflowPopUpButton release];
-	[_cells release];
-	[_controller release];
-	[tabView release];
-	[_addTabButton release];
-	[partnerView release];
-	[_lastMouseDownEvent release];
-	[style release];
-
 	[self unregisterDraggedTypes];
-
-	[super dealloc];
 }
 
 - (void)awakeFromNib {
@@ -256,7 +205,7 @@
 
 	if(_showHideAnimationTimer) {
 		[_showHideAnimationTimer invalidate];
-		[_showHideAnimationTimer release]; _showHideAnimationTimer = nil;
+		_showHideAnimationTimer = nil;
 	}
 
 	if(aWindow) {
@@ -283,8 +232,6 @@
 }
 
 - (void)setLastMouseDownEvent:(NSEvent *)event {
-	[event retain];
-	[_lastMouseDownEvent release];
 	_lastMouseDownEvent = event;
 }
 
@@ -310,8 +257,6 @@
 }
 
 - (void)setTabView:(NSTabView *)view {
-	[view retain];
-	[tabView release];
 	tabView = view;
 }
 
@@ -325,8 +270,6 @@
 
 - (void)setStyle:(id <PSMTabStyle>)newStyle {
 	if(style != newStyle) {
-		[style autorelease];
-		style = [newStyle retain];
 
 		// restyle add tab button
 		if(_addTabButton) {
@@ -359,7 +302,6 @@
 
 	id <PSMTabStyle> newStyle = [[styleClass alloc] init];
 	[self setStyle:newStyle];
-	[newStyle release];
 }
 
 - (PSMTabBarOrientation)orientation {
@@ -568,7 +510,6 @@
 
 	// add to collection
 	[_cells addObject:cell];
-	[cell release];
 	if([_cells count] == (NSUInteger)[tabView numberOfTabViewItems]) {
 		[self update]; // don't update unless all are accounted for!
 	}
@@ -822,9 +763,8 @@
 	NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithDouble:myOriginalOrigin], @"myOriginalOrigin", [NSNumber numberWithDouble:partnerOriginalOrigin], @"partnerOriginalOrigin", [NSNumber numberWithDouble:myOriginalSize], @"myOriginalSize", [NSNumber numberWithDouble:partnerOriginalSize], @"partnerOriginalSize", [NSNumber numberWithDouble:myTargetOrigin], @"myTargetOrigin", [NSNumber numberWithDouble:partnerTargetOrigin], @"partnerTargetOrigin", [NSNumber numberWithDouble:myTargetSize], @"myTargetSize", [NSNumber numberWithDouble:partnerTargetSize], @"partnerTargetSize", nil];
 	if(_showHideAnimationTimer) {
 		[_showHideAnimationTimer invalidate];
-		[_showHideAnimationTimer release];
 	}
-	_showHideAnimationTimer = [[NSTimer scheduledTimerWithTimeInterval:(1.0 / 30.0) target:self selector:@selector(animateShowHide:) userInfo:userInfo repeats:YES] retain];
+	_showHideAnimationTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / 30.0) target:self selector:@selector(animateShowHide:) userInfo:userInfo repeats:YES];
 }
 
 - (void)animateShowHide:(NSTimer *)timer {
@@ -888,7 +828,7 @@
 		}
 
 		[_showHideAnimationTimer invalidate];
-		[_showHideAnimationTimer release]; _showHideAnimationTimer = nil;
+		_showHideAnimationTimer = nil;
 	}
 	[[self window] display];
 }
@@ -906,8 +846,6 @@
 }
 
 - (void)setPartnerView:(id)view {
-	[partnerView release];
-	[view retain];
 	partnerView = view;
 }
 
@@ -949,10 +887,8 @@
 	[_overflowPopUpButton setHidden:(overflowMenu == nil)];
 	[_overflowPopUpButton setMenu:overflowMenu];
 
-	if(_animationTimer) {
 		[_animationTimer invalidate];
-		[_animationTimer release]; _animationTimer = nil;
-	}
+		_animationTimer = nil;
 
 	if(animate) {
 		NSMutableArray *targetFrames = [NSMutableArray arrayWithCapacity:[_cells count]];
@@ -969,12 +905,11 @@
 		NSAnimation *animation = [[NSAnimation alloc] initWithDuration:0.50 animationCurve:NSAnimationEaseInOut];
 		[animation setAnimationBlockingMode:NSAnimationNonblocking];
 		[animation startAnimation];
-		_animationTimer = [[NSTimer scheduledTimerWithTimeInterval:1.0 / 30.0
+		_animationTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 / 30.0
 							target:self
 							selector:@selector(_animateCells:)
 							userInfo:[NSArray arrayWithObjects:targetFrames, animation, nil]
-							repeats:YES] retain];
-		[animation release];
+							repeats:YES];
 		[[NSRunLoop currentRunLoop] addTimer:_animationTimer forMode:NSEventTrackingRunLoopMode];
 		[self _animateCells:_animationTimer];
 	} else {
@@ -1067,7 +1002,7 @@
 		}
 
 		[_animationTimer invalidate];
-		[_animationTimer release]; _animationTimer = nil;
+		_animationTimer = nil;
 
 		for(NSUInteger i = 0; i < cellCount; i++) {
 			currentCell = [_cells objectAtIndex:i];
@@ -1143,7 +1078,7 @@
 
 		if([window showsResizeIndicator] && NSIntersectsRect([self frame], resizeWidgetFrame)) {
 			//the resize widgets are larger on metal windows
-			_resizeAreaCompensation = [window styleMask] & NSTexturedBackgroundWindowMask ? 20 : 8;
+			_resizeAreaCompensation = [window styleMask] & NSWindowStyleMaskTexturedBackground ? 20 : 8;
 		} else {
 			_resizeAreaCompensation = 0;
 		}
@@ -1183,7 +1118,7 @@
 		if(overClose &&
 		   ![self disableTabClose] &&
 		   ![cell isCloseButtonSuppressed] &&
-		   ([self allowsBackgroundTabClosing] || [[cell representedObject] isEqualTo:[tabView selectedTabViewItem]] || [theEvent modifierFlags] & NSCommandKeyMask)) {
+		   ([self allowsBackgroundTabClosing] || [[cell representedObject] isEqualTo:[tabView selectedTabViewItem]] || [theEvent modifierFlags] & NSEventModifierFlagCommand)) {
 			[cell setCloseButtonOver:NO];
 			[cell setCloseButtonPressed:YES];
 			_closeClicked = YES;
@@ -1269,9 +1204,9 @@
 			NSRect iconRect = [mouseDownCell closeButtonRectForFrame:mouseDownCellFrame];
 
 			if((NSMouseInRect(mousePt, iconRect, [self isFlipped])) && ![self disableTabClose] && ![cell isCloseButtonSuppressed] && [mouseDownCell closeButtonPressed]) {
-				if(([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) {
+				if(([[NSApp currentEvent] modifierFlags] & NSEventModifierFlagOption) != 0) {
 					//If the user is holding Option, close all other tabs
-					NSEnumerator    *enumerator = [[[[self cells] copy] autorelease] objectEnumerator];
+					NSEnumerator    *enumerator = [[[self cells] copy] objectEnumerator];
 					PSMTabBarCell   *otherCell;
 
 					while((otherCell = [enumerator nextObject])) {
@@ -1386,18 +1321,18 @@
 		//If the user has dragged to a different tab, reset the timer.
 		if(_tabViewItemWithSpring != [cell representedObject]) {
 			[_springTimer invalidate];
-			[_springTimer release]; _springTimer = nil;
+			_springTimer = nil;
 			_tabViewItemWithSpring = [cell representedObject];
 		}
 		if(!_springTimer) {
 			//Finder's default delay time, as of Tiger, is 668 ms. If the user has never changed it, there's no setting in its defaults, so we default to that amount.
-			NSNumber *delayNumber = [(NSNumber *)CFPreferencesCopyAppValue((CFStringRef)@"SpringingDelayMilliseconds", (CFStringRef)@"com.apple.finder") autorelease];
+			NSNumber *delayNumber = (__bridge_transfer NSNumber *)CFPreferencesCopyAppValue((CFStringRef)@"SpringingDelayMilliseconds", (CFStringRef)@"com.apple.finder");
 			NSTimeInterval delaySeconds = delayNumber ?[delayNumber doubleValue] / 1000.0 : 0.668;
-			_springTimer = [[NSTimer scheduledTimerWithTimeInterval:delaySeconds
+			_springTimer = [NSTimer scheduledTimerWithTimeInterval:delaySeconds
 							 target:self
 							 selector:@selector(fireSpring:)
 							 userInfo:sender
-							 repeats:NO] retain];
+							 repeats:NO];
 		}
 		return NSDragOperationCopy;
 	}
@@ -1407,7 +1342,7 @@
 
 - (void)draggingExited:(id <NSDraggingInfo>)sender {
 	[_springTimer invalidate];
-	[_springTimer release]; _springTimer = nil;
+	_springTimer = nil;
 
 	[[PSMTabDragAssistant sharedDragAssistant] draggingExitedTabBar:self];
 }
@@ -1447,7 +1382,7 @@
 
 	_tabViewItemWithSpring = nil;
 	[_springTimer invalidate];
-	[_springTimer release]; _springTimer = nil;
+	_springTimer = nil;
 }
 
 #pragma mark -
@@ -1460,7 +1395,6 @@
 
 - (void)closeTabClick:(id)sender {
 	NSTabViewItem *item = [sender representedObject];
-	[sender retain];
 	if(([_cells count] == 1) && (![self canCloseOnlyTab])) {
 		return;
 	}
@@ -1473,11 +1407,8 @@
 		}
 	}
 
-	[item retain];
 
 	[tabView removeTabViewItem:item];
-	[item release];
-	[sender release];
 }
 
 - (void)tabClick:(id)sender {
@@ -1633,16 +1564,12 @@
 			[aTabView setDelegate:nil];
 
 			// move it all around first
-			[tabViewItem retain];
-			[thisCell retain];
 			[aTabView removeTabViewItem:tabViewItem];
 			[aTabView insertTabViewItem:tabViewItem atIndex:0];
 			[_cells removeObjectAtIndex:tabIndex];
 			[_cells insertObject:thisCell atIndex:0];
 			[thisCell setIsInOverflowMenu:NO];                  //very important else we get a fun recursive loop going
 			[[_cells objectAtIndex:[_cells count] - 1] setIsInOverflowMenu:YES];             //these 2 lines are pretty uncool and this logic needs to be updated
-			[thisCell release];
-			[tabViewItem release];
 
 			[aTabView setDelegate:tempDelegate];
 
@@ -1677,7 +1604,7 @@
 - (void)tabViewDidChangeNumberOfTabViewItems:(NSTabView *)aTabView {
 	NSArray *tabItems = [tabView tabViewItems];
 	// go through cells, remove any whose representedObjects are not in [tabView tabViewItems]
-	NSEnumerator *e = [[[_cells copy] autorelease] objectEnumerator];
+	NSEnumerator *e = [[_cells copy]  objectEnumerator];
 	PSMTabBarCell *cell;
 	while((cell = [e nextObject])) {
 		//remove the observer binding
@@ -1769,11 +1696,11 @@
 		[self setPostsFrameChangedNotifications:YES];
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(frameDidChange:) name:NSViewFrameDidChangeNotification object:self];
 		if ([aDecoder allowsKeyedCoding]) {
-			_cells = [[aDecoder decodeObjectForKey:@"PSMcells"] retain];
-			tabView = [[aDecoder decodeObjectForKey:@"PSMtabView"] retain];
-			_overflowPopUpButton = [[aDecoder decodeObjectForKey:@"PSMoverflowPopUpButton"] retain];
-			_addTabButton = [[aDecoder decodeObjectForKey:@"PSMaddTabButton"] retain];
-			style = [[aDecoder decodeObjectForKey:@"PSMstyle"] retain];
+			_cells = [aDecoder decodeObjectForKey:@"PSMcells"] ;
+			tabView = [aDecoder decodeObjectForKey:@"PSMtabView"] ;
+			_overflowPopUpButton = [aDecoder decodeObjectForKey:@"PSMoverflowPopUpButton"] ;
+			_addTabButton = [aDecoder decodeObjectForKey:@"PSMaddTabButton"] ;
+			style = [aDecoder decodeObjectForKey:@"PSMstyle"] ;
 			_orientation = (PSMTabBarOrientation)[aDecoder decodeIntegerForKey:@"PSMorientation"];
 			_canCloseOnlyTab = [aDecoder decodeBoolForKey:@"PSMcanCloseOnlyTab"];
 			_disableTabClose = [aDecoder decodeBoolForKey:@"PSMdisableTabClose"];
@@ -1788,13 +1715,13 @@
 			_cellOptimumWidth = [aDecoder decodeIntegerForKey:@"PSMcellOptimumWidth"];
 			_currentStep = [aDecoder decodeIntegerForKey:@"PSMcurrentStep"];
 			_isHidden = [aDecoder decodeBoolForKey:@"PSMisHidden"];
-			partnerView = [[aDecoder decodeObjectForKey:@"PSMpartnerView"] retain];
+			partnerView = [aDecoder decodeObjectForKey:@"PSMpartnerView"] ;
 			_awakenedFromNib = [aDecoder decodeBoolForKey:@"PSMawakenedFromNib"];
-			_lastMouseDownEvent = [[aDecoder decodeObjectForKey:@"PSMlastMouseDownEvent"] retain];
+			_lastMouseDownEvent = [aDecoder decodeObjectForKey:@"PSMlastMouseDownEvent"] ;
 			_useOverflowMenu = [aDecoder decodeBoolForKey:@"PSMuseOverflowMenu"];
 			_automaticallyAnimates = [aDecoder decodeBoolForKey:@"PSMautomaticallyAnimates"];
 			_alwaysShowActiveTab = [aDecoder decodeBoolForKey:@"PSMalwaysShowActiveTab"];
-			delegate = [[aDecoder decodeObjectForKey:@"PSMdelegate"] retain];
+			delegate = [aDecoder decodeObjectForKey:@"PSMdelegate"] ;
 		}
 	}
 	[self setTarget:self];
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabBarController.m b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.m
index 68e1bc498..ea3f5baa3 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabBarController.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.m
@@ -11,6 +11,7 @@
 #import "PSMTabBarCell.h"
 #import "PSMTabStyle.h"
 #import "NSString_AITruncation.h"
+#import "PSMRolloverButton.h"
 
 #define MAX_OVERFLOW_MENUITEM_TITLE_LENGTH      60
 
@@ -41,13 +42,6 @@
 	return self;
 }
 
-- (void)dealloc {
-	[_cellTrackingRects release];
-	[_closeButtonTrackingRects release];
-	[_cellFrames release];
-	[super dealloc];
-}
-
 /*!
     @method     addButtonRect
     @abstract   Returns the position for the add tab button.
@@ -507,7 +501,7 @@ static NSInteger potentialMinimumForArray(NSArray *array, NSInteger minimum){
 	NSTabViewItem *selectedTabViewItem = [[_control tabView] selectedTabViewItem];
 	NSMenuItem *menuItem;
 
-	[_overflowMenu release], _overflowMenu = nil;
+	_overflowMenu = nil;
 
 	for(i = 0; i < cellCount; i++) {
 		cell = [cells objectAtIndex:i];
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.m
index 4542e8d02..1e3e3684e 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.m
@@ -10,6 +10,8 @@
 #import "PSMTabBarCell.h"
 #import "PSMTabStyle.h"
 #import "PSMTabDragWindowController.h"
+#import "PSMOverflowPopUpButton.h"
+#import "PSMRolloverButton.h"
 
 #define PI 3.1417
 
@@ -53,16 +55,6 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 	return self;
 }
 
-- (void)dealloc {
-	[_sourceTabBar release];
-	[_destinationTabBar release];
-	[_participatingTabBars release];
-	[_draggedCell release];
-	[_animationTimer release];
-	[_sineCurveWidths release];
-	[_targetCell release];
-	[super dealloc];
-}
 
 #pragma mark -
 #pragma mark Accessors
@@ -72,8 +64,6 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 }
 
 - (void)setSourceTabBar:(PSMTabBarControl *)tabBar {
-	[tabBar retain];
-	[_sourceTabBar release];
 	_sourceTabBar = tabBar;
 }
 
@@ -82,8 +72,6 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 }
 
 - (void)setDestinationTabBar:(PSMTabBarControl *)tabBar {
-	[tabBar retain];
-	[_destinationTabBar release];
 	_destinationTabBar = tabBar;
 }
 
@@ -92,8 +80,6 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 }
 
 - (void)setDraggedCell:(PSMTabBarCell *)cell {
-	[cell retain];
-	[_draggedCell release];
 	_draggedCell = cell;
 }
 
@@ -126,8 +112,6 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 }
 
 - (void)setTargetCell:(PSMTabBarCell *)cell {
-	[cell retain];
-	[_targetCell release];
 	_targetCell = cell;
 }
 
@@ -175,20 +159,18 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 	[[NSNotificationCenter defaultCenter] postNotificationName:PSMTabDragDidBeginNotification object:nil];
 
 	//retain the control in case the drag operation causes the control to be released
-	[control retain];
 
 	if([control delegate] && [[control delegate] respondsToSelector:@selector(tabView:shouldDropTabViewItem:inTabBar:)] &&
 	   [[control delegate] tabView:[control tabView] shouldDropTabViewItem:[[self draggedCell] representedObject] inTabBar:nil]) {
 		_currentTearOffStyle = [control tearOffStyle];
-		_draggedTab = [[PSMTabDragWindowController alloc] initWithImage:dragImage styleMask:NSBorderlessWindowMask tearOffStyle:_currentTearOffStyle];
+		_draggedTab = [[PSMTabDragWindowController alloc] initWithImage:dragImage styleMask:NSWindowStyleMaskBorderless tearOffStyle:_currentTearOffStyle];
 
 		cellFrame.origin.y -= cellFrame.size.height;
-		[control dragImage:[[[NSImage alloc] initWithSize:NSMakeSize(1, 1)] autorelease] at:cellFrame.origin offset:offset event:event pasteboard:pboard source:control slideBack:NO];
+		[control dragImage:[[NSImage alloc] initWithSize:NSMakeSize(1, 1)] at:cellFrame.origin offset:offset event:event pasteboard:pboard source:control slideBack:NO];
 	} else {
 		[control dragImage:dragImage at:cellFrame.origin offset:offset event:event pasteboard:pboard source:control slideBack:YES];
 	}
 
-	[control release];
 }
 
 - (void)draggingEnteredTabBar:(PSMTabBarControl *)control atPoint:(NSPoint)mouseLoc {
@@ -360,7 +342,6 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 		//temporarily disable the delegate in order to move the tab to a different index
 		id tempDelegate = [tabView delegate];
 		[tabView setDelegate:nil];
-		[item retain];
 		[tabView removeTabViewItem:item];
 		[tabView insertTabViewItem:item atIndex:index];
 		if(reselect) {
@@ -440,13 +421,11 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 
 	if(_draggedTab) {
 		[[_draggedTab window] orderOut:nil];
-		[_draggedTab release];
 		_draggedTab = nil;
 	}
 
 	if(_draggedView) {
 		[[_draggedView window] orderOut:nil];
-		[_draggedView release];
 		_draggedView = nil;
 	}
 
@@ -548,7 +527,7 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 	NSImage *viewImage = nil;
 
 	if(outMask) {
-		*outMask = NSBorderlessWindowMask;
+		*outMask = NSWindowStyleMaskBorderless;
 	}
 
 	if([control delegate] && [[control delegate] respondsToSelector:@selector(tabView:imageForTabViewItem:offset:styleMask:)]) {
@@ -569,19 +548,19 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 			drawPoint.x += [control frame].size.width - [tabImage size].width;
 		}
 
-		[tabImage compositeToPoint:drawPoint operation:NSCompositeSourceOver];
+        [tabImage drawAtPoint:drawPoint fromRect: NSZeroRect operation:NSCompositingOperationSourceOver fraction: 1.0];
 
 		[viewImage unlockFocus];
 	} else {
 		//the delegate doesn't give a custom image, so use an image of the view
 		NSView *tabView = [[cell representedObject] view];
-		viewImage = [[[NSImage alloc] initWithSize:[tabView frame].size] autorelease];
+		viewImage = [[NSImage alloc] initWithSize:[tabView frame].size] ;
 		[viewImage lockFocus];
 		[tabView drawRect:[tabView bounds]];
 		[viewImage unlockFocus];
 	}
 
-	if(*outMask | NSBorderlessWindowMask) {
+	if(*outMask | NSWindowStyleMaskBorderless) {
 		_dragWindowOffset.height += 22;
 	}
 
@@ -590,7 +569,7 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 
 - (NSImage *)_miniwindowImageOfWindow:(NSWindow *)window {
 	NSRect rect = [window frame];
-	NSImage *image = [[[NSImage alloc] initWithSize:rect.size] autorelease];
+	NSImage *image = [[NSImage alloc] initWithSize:rect.size] ;
 	[image lockFocus];
 	rect.origin = NSZeroPoint;
 	CGContextCopyWindowCaptureContentsToRect([[NSGraphicsContext currentContext] graphicsPort], *(CGRect *)&rect, [NSApp contextID], [window windowNumber], 0);
@@ -637,7 +616,6 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 
 	if(![animation isAnimating]) {
 		[timer invalidate];
-		[animation release];
 	}
 }
 
@@ -645,7 +623,7 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 #pragma mark Animation
 
 - (void)animateDrag:(NSTimer *)timer {
-	NSEnumerator *e = [[[_participatingTabBars copy] autorelease] objectEnumerator];
+	NSEnumerator *e = [[_participatingTabBars copy] objectEnumerator];
 	PSMTabBarControl *tabBar;
 	while((tabBar = [e nextObject])) {
 		[self calculateDragAnimationForTabBar:tabBar];
@@ -754,7 +732,7 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 
 	// replace dragged cell with a placeholder, and clean up surrounding cells
 	NSInteger cellIndex = [cells indexOfObject:cell];
-	PSMTabBarCell *pc = [[[PSMTabBarCell alloc] initPlaceholderWithFrame:[[self draggedCell] frame] expanded:YES inControlView:control] autorelease];
+	PSMTabBarCell *pc = [[PSMTabBarCell alloc] initPlaceholderWithFrame:[[self draggedCell] frame] expanded:YES inControlView:control] ;
 	[cells replaceObjectAtIndex:cellIndex withObject:pc];
 	[cells removeObjectAtIndex:(cellIndex + 1)];
 	[cells removeObjectAtIndex:(cellIndex - 1)];
@@ -768,11 +746,11 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 - (void)distributePlaceholdersInTabBar:(PSMTabBarControl *)control {
 	NSUInteger i, numVisibleTabs = [control numberOfVisibleTabs];
 	for(i = 0; i < numVisibleTabs; i++) {
-		PSMTabBarCell *pc = [[[PSMTabBarCell alloc] initPlaceholderWithFrame:[[self draggedCell] frame] expanded:NO inControlView:control] autorelease];
+		PSMTabBarCell *pc = [[PSMTabBarCell alloc] initPlaceholderWithFrame:[[self draggedCell] frame] expanded:NO inControlView:control] ;
 		[[control cells] insertObject:pc atIndex:(2 * i)];
 	}
 
-	PSMTabBarCell *pc = [[[PSMTabBarCell alloc] initPlaceholderWithFrame:[[self draggedCell] frame] expanded:NO inControlView:control] autorelease];
+	PSMTabBarCell *pc = [[PSMTabBarCell alloc] initPlaceholderWithFrame:[[self draggedCell] frame] expanded:NO inControlView:control] ;
 	if([[control cells] count] > (2 * numVisibleTabs)) {
 		[[control cells] insertObject:pc atIndex:(2 * numVisibleTabs)];
 	} else {
@@ -815,16 +793,16 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
 	//self = [super initWithCoder:aDecoder];
 	//if (self) {
 	if([aDecoder allowsKeyedCoding]) {
-		_sourceTabBar = [[aDecoder decodeObjectForKey:@"sourceTabBar"] retain];
-		_destinationTabBar = [[aDecoder decodeObjectForKey:@"destinationTabBar"] retain];
-		_participatingTabBars = [[aDecoder decodeObjectForKey:@"participatingTabBars"] retain];
-		_draggedCell = [[aDecoder decodeObjectForKey:@"draggedCell"] retain];
+		_sourceTabBar = [aDecoder decodeObjectForKey:@"sourceTabBar"] ;
+		_destinationTabBar = [aDecoder decodeObjectForKey:@"destinationTabBar"] ;
+		_participatingTabBars = [aDecoder decodeObjectForKey:@"participatingTabBars"] ;
+		_draggedCell = [aDecoder decodeObjectForKey:@"draggedCell"] ;
 		_draggedCellIndex = [aDecoder decodeIntegerForKey:@"draggedCellIndex"];
 		_isDragging = [aDecoder decodeBoolForKey:@"isDragging"];
-		_animationTimer = [[aDecoder decodeObjectForKey:@"animationTimer"] retain];
-		_sineCurveWidths = [[aDecoder decodeObjectForKey:@"sineCurveWidths"] retain];
+		_animationTimer = [aDecoder decodeObjectForKey:@"animationTimer"] ;
+		_sineCurveWidths = [aDecoder decodeObjectForKey:@"sineCurveWidths"] ;
 		_currentMouseLoc = [aDecoder decodePointForKey:@"currentMouseLoc"];
-		_targetCell = [[aDecoder decodeObjectForKey:@"targetCell"] retain];
+		_targetCell = [aDecoder decodeObjectForKey:@"targetCell"] ;
 	}
 	//}
 	return self;
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabDragView.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.m
index 2c9781dbc..8f901646c 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabDragView.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.m
@@ -18,12 +18,6 @@
 	return self;
 }
 
-- (void)dealloc {
-	[_image release];
-	[_alternateImage release];
-	[super dealloc];
-}
-
 - (void)drawRect:(NSRect)rect {
 	//1.0 fade means show the primary image
 	//0.0 fade means show the secondary image
@@ -32,9 +26,9 @@
 	srcRect.origin = NSZeroPoint;
 	srcRect.size = [_image size];
 
-	[_image drawInRect:[self bounds] fromRect:srcRect operation:NSCompositeSourceOver fraction:primaryAlpha];
+	[_image drawInRect:[self bounds] fromRect:srcRect operation:NSCompositingOperationSourceOver fraction:primaryAlpha];
 	srcRect.size = [_alternateImage size];
-	[_alternateImage drawInRect:[self bounds] fromRect:srcRect operation:NSCompositeSourceOver fraction:alternateAlpha];
+	[_alternateImage drawInRect:[self bounds] fromRect:srcRect operation:NSCompositingOperationSourceOver fraction:alternateAlpha];
 }
 
 - (void)setFadeValue:(CGFloat)value {
@@ -46,8 +40,7 @@
 }
 
 - (void)setImage:(NSImage *)image {
-	[_image release];
-	_image = [image retain];
+    _image = image;
 }
 
 - (NSImage *)alternateImage {
@@ -55,8 +48,7 @@
 }
 
 - (void)setAlternateImage:(NSImage *)image {
-	[_alternateImage release];
-	_alternateImage = [image retain];
+    _alternateImage = image;
 }
 
 @end
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.m
index d6fcc95a3..8bf51f6dd 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.m
@@ -12,14 +12,14 @@
 @implementation PSMTabDragWindow
 
 + (PSMTabDragWindow *)dragWindowWithImage:(NSImage *)image styleMask:(NSUInteger)styleMask {
-	return [[[PSMTabDragWindow alloc] initWithImage:image styleMask:styleMask] autorelease];
+	return [[PSMTabDragWindow alloc] initWithImage:image styleMask:styleMask] ;
 }
 
 - (id)initWithImage:(NSImage *)image styleMask:(NSUInteger)styleMask {
 	NSSize size = [image size];
 
 	if((self = [super initWithContentRect:NSMakeRect(0, 0, size.width, size.height) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO])) {
-		_dragView = [[[PSMTabDragView alloc] initWithFrame:NSMakeRect(0, 0, size.width, size.height)] autorelease];
+		_dragView = [[PSMTabDragView alloc] initWithFrame:NSMakeRect(0, 0, size.width, size.height)] ;
 		[self setContentView:_dragView];
 		[self setLevel:NSStatusWindowLevel];
 		[self setIgnoresMouseEvents:YES];
@@ -32,7 +32,7 @@
 		windowFrame.origin.y += windowFrame.size.height - size.height;
 		windowFrame.size = size;
 
-		if(styleMask | NSBorderlessWindowMask) {
+		if(styleMask | NSWindowStyleMaskBorderless) {
 			windowFrame.size.height += 22;
 		}
 
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.m
index 3a6e8c663..59e52deb7 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.m
@@ -15,7 +15,7 @@
 - (id)initWithImage:(NSImage *)image styleMask:(NSUInteger)styleMask tearOffStyle:(PSMTabBarTearOffStyle)tearOffStyle {
 	PSMTabDragWindow *window = [PSMTabDragWindow dragWindowWithImage:image styleMask:styleMask];
 	if((self = [super initWithWindow:window])) {
-		_view = [[window dragView] retain];
+		_view = [window dragView] ;
 		_tearOffStyle = tearOffStyle;
 
 		if(tearOffStyle == PSMTabBarTearOffMiniwindow) {
@@ -29,16 +29,8 @@
 }
 
 - (void)dealloc {
-	if(_timer) {
 		[_timer invalidate];
-	}
-
-	if(_animation) {
-		[_animation release];
-	}
 
-	[_view release];
-	[super dealloc];
 }
 
 - (NSImage *)image {
@@ -69,7 +61,6 @@
 		//An animation already exists, get the current progress
 		progress = 1.0f - [_animation currentProgress];
 		[_animation stopAnimation];
-		[_animation release];
 	}
 
 	//begin animating
@@ -102,7 +93,7 @@
 	[[self window] setFrame:frame display:YES];
 
 	if(![_animation isAnimating]) {
-		[_animation release], _animation = nil;
+		_animation = nil;
 		[timer invalidate];
 		_timer = nil;
 	}
diff --git a/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m
index 77be601be..98bf6c1e4 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m
@@ -50,21 +50,6 @@
 	return self;
 }
 
-- (void)dealloc {
-	[unifiedCloseButton release];
-	[unifiedCloseButtonDown release];
-	[unifiedCloseButtonOver release];
-	[unifiedCloseDirtyButton release];
-	[unifiedCloseDirtyButtonDown release];
-	[unifiedCloseDirtyButtonOver release];
-	[_addTabButtonImage release];
-	[_addTabButtonPressedImage release];
-	[_addTabButtonRolloverImage release];
-
-	[_objectCountStringAttributes release];
-
-	[super dealloc];
-}
 
 #pragma mark -
 #pragma mark Control Specific
@@ -264,13 +249,13 @@
 
 - (NSAttributedString *)attributedObjectCountValueForTabCell:(PSMTabBarCell *)cell {
 	NSString *contents = [NSString stringWithFormat:@"%lu", (unsigned long)[cell count]];
-	return [[[NSMutableAttributedString alloc] initWithString:contents attributes:_objectCountStringAttributes] autorelease];
+	return [[NSMutableAttributedString alloc] initWithString:contents attributes:_objectCountStringAttributes] ;
 }
 
 - (NSAttributedString *)attributedStringValueForTabCell:(PSMTabBarCell *)cell {
 	NSMutableAttributedString *attrStr;
 	NSString * contents = [cell stringValue];
-	attrStr = [[[NSMutableAttributedString alloc] initWithString:contents] autorelease];
+	attrStr = [[NSMutableAttributedString alloc] initWithString:contents] ;
 	NSRange range = NSMakeRange(0, [contents length]);
 
 	[attrStr addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:11.0] range:range];
@@ -278,7 +263,7 @@
 	// Paragraph Style for Truncating Long Text
 	static NSMutableParagraphStyle *TruncatingTailParagraphStyle = nil;
 	if(!TruncatingTailParagraphStyle) {
-		TruncatingTailParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+		TruncatingTailParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy] ;
 		[TruncatingTailParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
 	}
 	[attrStr addAttribute:NSParagraphStyleAttributeName value:TruncatingTailParagraphStyle range:range];
@@ -353,7 +338,7 @@
 		// rollover
 		if([cell isHighlighted]) {
 			[[NSColor colorWithCalibratedWhite:0.0 alpha:0.1] set];
-			NSRectFillUsingOperation(aRect, NSCompositeSourceAtop);
+			NSRectFillUsingOperation(aRect, NSCompositingOperationSourceAtop);
 		}
 
 		// frame
@@ -412,7 +397,7 @@
 			closeButtonRect.origin.y += closeButtonRect.size.height;
 		}
 
-		[closeButton compositeToPoint:closeButtonRect.origin operation:NSCompositeSourceOver fraction:1.0];
+        [closeButton drawAtPoint: closeButtonRect.origin fromRect: CGRectZero operation:NSCompositingOperationSourceOver fraction:1.0];
 
 		// scoot label over
 		labelPosition += closeButtonSize.width + kPSMTabBarCellPadding;
@@ -434,7 +419,7 @@
 			iconRect.origin.y -= (kPSMTabBarIconWidth - [icon size].height) / 2.0;
 		}
 
-		[icon compositeToPoint:iconRect.origin operation:NSCompositeSourceOver fraction:1.0];
+        [icon drawAtPoint:iconRect.origin fromRect: NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
 
 		// scoot label over
 		labelPosition += iconRect.size.width + kPSMTabBarCellPadding;
@@ -511,13 +496,13 @@
 		labelRect.origin.y += 4.0;
 		NSMutableAttributedString *attrStr;
 		NSString *contents = @"PSMTabBarControl";
-		attrStr = [[[NSMutableAttributedString alloc] initWithString:contents] autorelease];
+		attrStr = [[NSMutableAttributedString alloc] initWithString:contents] ;
 		NSRange range = NSMakeRange(0, [contents length]);
 		[attrStr addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:11.0] range:range];
 		NSMutableParagraphStyle *centeredParagraphStyle = nil;
 		if(!centeredParagraphStyle) {
-			centeredParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
-			[centeredParagraphStyle setAlignment:NSCenterTextAlignment];
+			centeredParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy] ;
+			[centeredParagraphStyle setAlignment: NSTextAlignmentCenter];
 		}
 		[attrStr addAttribute:NSParagraphStyleAttributeName value:centeredParagraphStyle range:range];
 		[attrStr drawInRect:labelRect];
@@ -556,15 +541,15 @@
 	// self = [super initWithCoder:aDecoder];
 	//if (self) {
 	if([aDecoder allowsKeyedCoding]) {
-		unifiedCloseButton = [[aDecoder decodeObjectForKey:@"unifiedCloseButton"] retain];
-		unifiedCloseButtonDown = [[aDecoder decodeObjectForKey:@"unifiedCloseButtonDown"] retain];
-		unifiedCloseButtonOver = [[aDecoder decodeObjectForKey:@"unifiedCloseButtonOver"] retain];
-		unifiedCloseDirtyButton = [[aDecoder decodeObjectForKey:@"unifiedCloseDirtyButton"] retain];
-		unifiedCloseDirtyButtonDown = [[aDecoder decodeObjectForKey:@"unifiedCloseDirtyButtonDown"] retain];
-		unifiedCloseDirtyButtonOver = [[aDecoder decodeObjectForKey:@"unifiedCloseDirtyButtonOver"] retain];
-		_addTabButtonImage = [[aDecoder decodeObjectForKey:@"addTabButtonImage"] retain];
-		_addTabButtonPressedImage = [[aDecoder decodeObjectForKey:@"addTabButtonPressedImage"] retain];
-		_addTabButtonRolloverImage = [[aDecoder decodeObjectForKey:@"addTabButtonRolloverImage"] retain];
+		unifiedCloseButton = [aDecoder decodeObjectForKey:@"unifiedCloseButton"] ;
+		unifiedCloseButtonDown = [aDecoder decodeObjectForKey:@"unifiedCloseButtonDown"] ;
+		unifiedCloseButtonOver = [aDecoder decodeObjectForKey:@"unifiedCloseButtonOver"];
+		unifiedCloseDirtyButton = [aDecoder decodeObjectForKey:@"unifiedCloseDirtyButton"] ;
+		unifiedCloseDirtyButtonDown = [aDecoder decodeObjectForKey:@"unifiedCloseDirtyButtonDown"] ;
+		unifiedCloseDirtyButtonOver = [aDecoder decodeObjectForKey:@"unifiedCloseDirtyButtonOver"] ;
+		_addTabButtonImage = [aDecoder decodeObjectForKey:@"addTabButtonImage"];
+		_addTabButtonPressedImage = [aDecoder decodeObjectForKey:@"addTabButtonPressedImage"] ;
+		_addTabButtonRolloverImage = [aDecoder decodeObjectForKey:@"addTabButtonRolloverImage"] ;
 	}
 	//}
 	return self;
diff --git a/frontends/cocoa/PreferencesWindowController.m b/frontends/cocoa/PreferencesWindowController.m
index 590a96818..47b71ba8b 100644
--- a/frontends/cocoa/PreferencesWindowController.m
+++ b/frontends/cocoa/PreferencesWindowController.m
@@ -27,28 +27,28 @@
 
 @implementation PreferencesWindowController
 
-- init;
+- (instancetype)init
 {
 	if ((self = [super initWithWindowNibName: @"PreferencesWindow"]) == nil) return nil;
 	
 	return self;
 }
 
-- (IBAction) useCurrentPageAsHomepage: (id) sender;
+- (IBAction) useCurrentPageAsHomepage: (id) sender
 {
 	struct browser_window *bw = [[(NetSurfApp *)NSApp frontTab] browser];
 	const char *url = nsurl_access(browser_window_get_url(bw));
 	[self setHomepageURL: [NSString stringWithUTF8String: url]];
 }
 
-- (void) setHomepageURL: (NSString *) newUrl;
+- (void) setHomepageURL: (NSString *) newUrl
 {
 	nsoption_set_charp(homepage_url, strdup( [newUrl UTF8String] ));
 	[[NSUserDefaults standardUserDefaults] setObject: newUrl forKey: kHomepageURLOption];
 	[[NSUserDefaults standardUserDefaults] synchronize];
 }
 
-- (NSString *) homepageURL;
+- (NSString *) homepageURL
 {
 	return [NSString stringWithUTF8String: nsoption_charp(homepage_url)];
 }
diff --git a/frontends/cocoa/SearchWindowController.h b/frontends/cocoa/SearchWindowController.h
index 7ce8c00c9..9d7b5b290 100644
--- a/frontends/cocoa/SearchWindowController.h
+++ b/frontends/cocoa/SearchWindowController.h
@@ -32,15 +32,14 @@ typedef enum {
 	BOOL canGoBack;
 	BOOL canGoForward;
 	NSString *searchString;
-	BrowserViewController *browser;
 }
 
-@property (readwrite, assign, nonatomic) BOOL caseSensitive;
-@property (readwrite, assign, nonatomic) BOOL selectAll;
-@property (readwrite, assign, nonatomic) BOOL canGoBack;
-@property (readwrite, assign, nonatomic) BOOL canGoForward;
+@property (readwrite,  nonatomic) BOOL caseSensitive;
+@property (readwrite,  nonatomic) BOOL selectAll;
+@property (readwrite,  nonatomic) BOOL canGoBack;
+@property (readwrite,  nonatomic) BOOL canGoForward;
 @property (readwrite, copy, nonatomic) NSString *searchString;
-@property (readwrite, assign, nonatomic) BrowserViewController *browser;
+@property (readwrite, nonatomic) BrowserViewController *browser;
 
 - (IBAction) searchNext: (id) sender;
 - (IBAction) searchPrevious: (id) sender;
@@ -51,4 +50,4 @@ typedef enum {
 
 @end
 
-struct gui_search_table *cocoa_search_table;
+extern struct gui_search_table *cocoa_search_table;
diff --git a/frontends/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m
index 95372fc19..bbde827bf 100644
--- a/frontends/cocoa/SearchWindowController.m
+++ b/frontends/cocoa/SearchWindowController.m
@@ -43,7 +43,7 @@ struct gui_search_table *cocoa_search_table = &search_table;
 @synthesize searchString;
 @synthesize browser;
 
-- init;
+- (instancetype)init
 {
 	if ((self = [super initWithWindowNibName: @"SearchWindow"]) == nil) return nil;
 	
@@ -53,33 +53,32 @@ struct gui_search_table *cocoa_search_table = &search_table;
 	return self;
 }
 
-- (void) dealloc;
+- (void) dealloc
 {
 	[self unbind: @"browser"];
-	[super dealloc];
 }
 
-- (IBAction) searchNext: (id) sender;
+- (IBAction) searchNext: (id) sender
 {
 	[self search: SearchForward];
 }
 
-- (IBAction) searchPrevious: (id) sender;
+- (IBAction) searchPrevious: (id) sender
 {
 	[self search: SearchBackward];
 }
 
-- (void) search: (SearchDirection)direction;
+- (void) search: (SearchDirection)direction
 {
 	search_flags_t flags = (direction == SearchForward) ? SEARCH_FLAG_FORWARDS : 0;
 	if (caseSensitive) flags |= SEARCH_FLAG_CASE_SENSITIVE;
 	if (selectAll) flags |= SEARCH_FLAG_SHOWALL;
 
 	struct browser_window *bw = [browser browser];
-	browser_window_search( bw, self, flags, [searchString UTF8String] );
+	browser_window_search( bw, (__bridge void *)self, flags, [searchString UTF8String] );
 }
 
-- (IBAction) searchStringDidChange: (id) sender;
+- (IBAction) searchStringDidChange: (id) sender
 {
 	struct browser_window *bw = [browser browser];
 	browser_window_search_clear( bw );
@@ -88,7 +87,7 @@ struct gui_search_table *cocoa_search_table = &search_table;
 	[self setCanGoForward: YES];
 }
 
-- (void) setCaseSensitive: (BOOL) newValue;
+- (void) setCaseSensitive: (BOOL) newValue
 {
 	if (caseSensitive != newValue) {
 		caseSensitive = newValue;
@@ -97,7 +96,7 @@ struct gui_search_table *cocoa_search_table = &search_table;
 	}
 }
 
-- (void) setSelectAll: (BOOL) newValue;
+- (void) setSelectAll: (BOOL) newValue
 {
 	if (selectAll != newValue) {
 		selectAll = newValue;
@@ -108,12 +107,12 @@ struct gui_search_table *cocoa_search_table = &search_table;
 
 static void cocoa_search_set_back( bool active, void *p )
 {
-	[(SearchWindowController *)p setCanGoBack: active];
+	[(__bridge SearchWindowController *)p setCanGoBack: active];
 }
 
 static void cocoa_search_set_forward( bool active, void *p )
 {
-	[(SearchWindowController *)p setCanGoForward: active];
+	[(__bridge SearchWindowController *)p setCanGoForward: active];
 }
 
 @end
diff --git a/frontends/cocoa/Tree.h b/frontends/cocoa/Tree.h
index 25c93b709..2143a704b 100644
--- a/frontends/cocoa/Tree.h
+++ b/frontends/cocoa/Tree.h
@@ -33,15 +33,15 @@
 
 
 @interface Tree : NSObject {
-  id <TreeDelegate> delegate;
   struct tree *tree;
 }
 
-@property (readwrite, assign, nonatomic) id <TreeDelegate> delegate;
+@property (readwrite, weak, nonatomic) id <TreeDelegate> delegate;
 
 - (id)initWithFlags: (unsigned int) flags;
 
 - (struct tree *) tree;
+- (void) setRedrawing: (BOOL) newRedrawing;
 
 @end
 
diff --git a/frontends/cocoa/Tree.m b/frontends/cocoa/Tree.m
index b5d4a3f06..c8ab39501 100644
--- a/frontends/cocoa/Tree.m
+++ b/frontends/cocoa/Tree.m
@@ -21,6 +21,7 @@
 #import "cocoa/font.h"
 #import "cocoa/plotter.h"
 
+#import "utils/errors.h"
 #import "netsurf/plotters.h"
 #import "cocoa/desktop-tree.h"
 
@@ -44,9 +45,8 @@ static const struct treeview_table cocoa_tree_callbacks = {
 {
         if ((self = [super init]) == nil) return nil;
 
-        tree = tree_create( flags, &cocoa_tree_callbacks, self );
+        tree = tree_create( flags, &cocoa_tree_callbacks, (__bridge void *)self );
         if (tree == NULL) {
-                [self release];
                 return nil;
         }
 
@@ -57,7 +57,6 @@ static const struct treeview_table cocoa_tree_callbacks = {
 - (void) dealloc
 {
         tree_delete( tree );
-        [super dealloc];
 }
 
 - (struct tree *) tree
@@ -79,28 +78,28 @@ static const struct treeview_table cocoa_tree_callbacks = {
 
 static void tree_redraw_request( int x, int y, int w, int h, void *data )
 {
-        id <TreeDelegate> delegate = ((Tree *)data)->delegate;
-        [delegate tree: (Tree *)data requestedRedrawInRect: cocoa_rect_wh( x, y, w, h )];
+        id <TreeDelegate> delegate = ((__bridge Tree *)data)->delegate;
+        [delegate tree: (__bridge Tree *)data requestedRedrawInRect: cocoa_rect_wh( x, y, w, h )];
 }
 
 static void tree_resized( struct tree *tree, int w, int h, void *data )
 {
-        id <TreeDelegate> delegate = ((Tree *)data)->delegate;
-        [delegate tree: (Tree *)data resized: cocoa_size( w, h )];
+        id <TreeDelegate> delegate = ((__bridge Tree *)data)->delegate;
+        [delegate tree: (__bridge Tree *)data resized: cocoa_size( w, h )];
 }
 
 static void tree_scroll_visible( int y, int height, void *data )
 {
-        id <TreeDelegate> delegate = ((Tree *)data)->delegate;
-        [delegate tree: (Tree *)data scrollPoint: cocoa_point( 0, y )];
+        id <TreeDelegate> delegate = ((__bridge Tree *)data)->delegate;
+        [delegate tree: (__bridge Tree *)data scrollPoint: cocoa_point( 0, y )];
 }
 
 static void tree_get_window_dimensions( int *width, int *height, void *data )
 {
-        id <TreeDelegate> delegate = ((Tree *)data)->delegate;
+        id <TreeDelegate> delegate = ((__bridge Tree *)data)->delegate;
         if (delegate == nil) return;
 
-        NSSize size = [delegate treeWindowSize: (Tree *)data];
+        NSSize size = [delegate treeWindowSize: (__bridge Tree *)data];
 
         if (width != NULL) *width = cocoa_pt_to_px( size.width );
         if (height != NULL) *height = cocoa_pt_to_px( size.height );
@@ -139,7 +138,7 @@ static void tree_get_window_dimensions( int *width, int *height, void *data )
                       cocoa_pt_to_px( p1.x ), cocoa_pt_to_px( p1.y ));
 }
 
-- (void) keyPress: (uint32_t) key;
+- (void) keyPress: (uint32_t) key
 {
         tree_keypress( tree, key );
 }
diff --git a/frontends/cocoa/TreeView.m b/frontends/cocoa/TreeView.m
index 949c3c228..6731d9f60 100644
--- a/frontends/cocoa/TreeView.m
+++ b/frontends/cocoa/TreeView.m
@@ -19,8 +19,11 @@
 #import "cocoa/TreeView.h"
 #import "cocoa/Tree.h"
 
+#import "utils/errors.h"
+
 #import "netsurf/plotters.h"
 #import "netsurf/keypress.h"
+#import "Tree.h"
 
 @interface TreeView () <TreeDelegate>
 @end
@@ -47,7 +50,6 @@
 - (void) dealloc
 {
         [self setTree: nil];
-        [super dealloc];
 }
 
 - (void) setTree: (Tree *)newTree
@@ -55,9 +57,8 @@
         if (tree != newTree) {
                 [tree setRedrawing: NO];
                 [tree setDelegate: nil];
-                [tree release];
 
-                tree = [newTree retain];
+                tree = newTree ;
                 [tree setDelegate: self];
                 [tree setRedrawing: YES];
 
diff --git a/frontends/cocoa/URLFieldCell.m b/frontends/cocoa/URLFieldCell.m
index e9e66476e..e08ba3efc 100644
--- a/frontends/cocoa/URLFieldCell.m
+++ b/frontends/cocoa/URLFieldCell.m
@@ -36,11 +36,10 @@
 
 @synthesize favicon;
 
-- (void) setFavicon: (NSImage *)newIcon;
+- (void) setFavicon: (NSImage *)newIcon
 {
 	if (favicon != newIcon) {
-		[favicon release];
-		favicon = [newIcon retain];
+		favicon = newIcon ;
 		[[self controlView] setNeedsDisplay: YES];
 	}
 }
@@ -48,10 +47,10 @@
 #define BUTTON_SIZE 32
 #define PADDING 2
 
-- (void) drawInteriorWithFrame: (NSRect)cellFrame inView: (NSView *)controlView;
+- (void) drawInteriorWithFrame: (NSRect)cellFrame inView: (NSView *)controlView
 {
 	[favicon drawInRect: [self iconFrame: cellFrame] fromRect: NSZeroRect 
-			  operation: NSCompositeSourceOver fraction: 1.0];
+			  operation: NSCompositingOperationSourceOver fraction: 1.0];
 
 	[super drawInteriorWithFrame: [self urlFrame: cellFrame] inView: controlView];
 
@@ -60,7 +59,7 @@
 }
 
 - (void) selectWithFrame: (NSRect)aRect inView: (NSView *)controlView editor: (NSText *)textObj 
-				delegate: (id)anObject start: (NSInteger)selStart length: (NSInteger)selLength;
+				delegate: (id)anObject start: (NSInteger)selStart length: (NSInteger)selLength
 {
 	const NSRect textFrame = [self urlFrame: aRect];
 	[super selectWithFrame: textFrame inView: controlView editor: textObj 
@@ -68,14 +67,14 @@
 }
 
 - (void) editWithFrame: (NSRect)aRect inView: (NSView *)controlView editor: (NSText *)textObj 
-			  delegate: (id)anObject event: (NSEvent *)theEvent;
+			  delegate: (id)anObject event: (NSEvent *)theEvent
 {
 	const NSRect textFrame = [self urlFrame: aRect];
 	[super editWithFrame: textFrame inView: controlView editor: textObj 
 				delegate: anObject event: theEvent];
 }
 
-- (void) startDragURLAt: (NSPoint) point inView: (NSView *) view;
+- (void) startDragURLAt: (NSPoint) point inView: (NSView *) view
 {
 	NSString *url = [self stringValue];
 	NSString *title = url;
@@ -106,7 +105,7 @@
 	
 	[image lockFocus];
 	[favicon drawInRect: NSMakeRect( urlBounds.origin.x, urlBounds.origin.y, urlBounds.size.height, urlBounds.size.height )
-			   fromRect: NSZeroRect operation: NSCompositeCopy fraction: 1.0];
+			   fromRect: NSZeroRect operation: NSCompositingOperationCopy fraction: 1.0];
 	urlBounds.origin.x += urlBounds.size.height + 2;
 	[title drawInRect: urlBounds withAttributes: nil];
 	[image unlockFocus];
@@ -116,8 +115,6 @@
 	
 	[view dragImage: image at: point offset: NSZeroSize event: [NSApp currentEvent] 
 		 pasteboard: pb source: self slideBack: YES];
-	
-	[image release];
 }
 
 - (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal
@@ -125,7 +122,7 @@
 	return NSDragOperationCopy | NSDragOperationGeneric;
 }
 
-- (BOOL) trackMouse: (NSEvent *)theEvent inRect: (NSRect)cellFrame ofView: (NSView *)controlView untilMouseUp: (BOOL)flag;
+- (BOOL) trackMouse: (NSEvent *)theEvent inRect: (NSRect)cellFrame ofView: (NSView *)controlView untilMouseUp: (BOOL)flag
 {
 	const NSPoint point = [controlView convertPoint: [theEvent locationInWindow] fromView: nil];
 	const NSRect buttonRect = [self buttonFrame: cellFrame];
@@ -141,14 +138,8 @@
 	}
 }
 
-- (void) dealloc;
-{
-	[refreshCell release];
-
-	[super dealloc];
-}
 
-- (NSRect) buttonFrame: (NSRect) cellFrame;
+- (NSRect) buttonFrame: (NSRect) cellFrame
 {
 	NSRect buttonRect = cellFrame;
 	buttonRect.origin.x = NSMaxX( cellFrame ) - BUTTON_SIZE;
@@ -156,7 +147,7 @@
 	return buttonRect;
 }
 
-- (NSRect) urlFrame: (NSRect) cellFrame;
+- (NSRect) urlFrame: (NSRect) cellFrame
 {
 	NSRect textFrame = cellFrame;
 	textFrame.origin.x += cellFrame.size.height;
@@ -164,7 +155,7 @@
 	return textFrame;
 }
 
-- (NSRect) iconFrame: (NSRect)cellFrame;
+- (NSRect) iconFrame: (NSRect)cellFrame
 {
 	NSRect iconFrame = {
 		.origin = {
@@ -176,7 +167,7 @@
 	return NSInsetRect( iconFrame, 2 * PADDING, 2 * PADDING );
 }
 
-- (NSButtonCell *) refreshCell;
+- (NSButtonCell *) refreshCell
 {
 	if (nil == refreshCell) {
 		refreshCell = [[NSButtonCell alloc] initImageCell: [NSImage imageNamed: NSImageNameRefreshTemplate]];
@@ -186,22 +177,22 @@
 	return refreshCell;
 }
 
-- (void) setRefreshTarget: (id) newTarget;
+- (void) setRefreshTarget: (id) newTarget
 {
 	[[self refreshCell] setTarget: newTarget];
 }
 
-- (id) refreshTarget;
+- (id) refreshTarget
 {
 	return [[self refreshCell] target];
 }
 
-- (void) setRefreshAction: (SEL) newAction;
+- (void) setRefreshAction: (SEL) newAction
 {
 	[[self refreshCell] setAction: newAction];
 }
 
-- (SEL) refreshAction;
+- (SEL) refreshAction
 {
 	return [[self refreshCell] action];
 }
diff --git a/frontends/cocoa/apple_image.m b/frontends/cocoa/apple_image.m
index 0bbaabd10..a14cd10e5 100644
--- a/frontends/cocoa/apple_image.m
+++ b/frontends/cocoa/apple_image.m
@@ -45,7 +45,6 @@ typedef struct apple_image_content {
 static void *apple_image_get_internal(const struct content *c, void *context)
 {
 	apple_image_content *ai_c = (apple_image_content *)c;
-
 	return ai_c->bitmap;
 }
 
@@ -80,7 +79,7 @@ static void animate_image_cb( void *ptr )
 	++ai->currentFrame;
 	if (ai->currentFrame >= ai->frames) ai->currentFrame = 0;
 
-	[(NSBitmapImageRep *)ai->bitmap setProperty: NSImageCurrentFrame withValue: [NSNumber numberWithUnsignedInteger: ai->currentFrame]];
+	[(__bridge NSBitmapImageRep *)ai->bitmap setProperty: NSImageCurrentFrame withValue: [NSNumber numberWithUnsignedInteger: ai->currentFrame]];
 	cocoa_bitmap_modified( ai->bitmap );
 
 	union content_msg_data data;
@@ -105,7 +104,7 @@ static bool apple_image_convert(struct content *c)
 	const char *bytes = content__get_source_data(c, &size);
 
 	NSData *data = [NSData dataWithBytesNoCopy: (char *)bytes length: size freeWhenDone: NO];
-	NSBitmapImageRep *image = [[NSBitmapImageRep imageRepWithData: data] retain];
+	NSBitmapImageRep *image = [NSBitmapImageRep imageRepWithData: data];
 
 	if (image == nil) {
 		union content_msg_data msg_data;
@@ -116,7 +115,7 @@ static bool apple_image_convert(struct content *c)
 
 	c->width = [image pixelsWide];
 	c->height = [image pixelsHigh];
-	ai_c->bitmap = (void *)image;
+	ai_c->bitmap = (__bridge_retained void *)image;
 
 	NSString *url = [NSString stringWithUTF8String: nsurl_access(llcache_handle_get_url( content_get_llcache_handle( c )) )];
 	NSString *title = [NSString stringWithFormat: @"%@ (%dx%d)", [url lastPathComponent], c->width, c->height];
@@ -148,7 +147,9 @@ static void apple_image_destroy(struct content *c)
 {
 	apple_image_content *ai_c = (apple_image_content *)c;
 
-	[(id)ai_c->bitmap release];
+	id bitmap = (__bridge_transfer id)ai_c->bitmap;
+    bitmap = nil;
+    
 	ai_c->bitmap = NULL;
 	cocoa_schedule(-1, animate_image_cb, c );
 }
@@ -174,7 +175,7 @@ static nserror apple_image_clone(const struct content *old, struct content **new
 		old->status == CONTENT_STATUS_DONE) {
 		ai->base.width = old->width;
 		ai->base.height = old->height;
-		ai->bitmap = (void *)[(id)ai_old->bitmap retain];
+		ai->bitmap = (__bridge_retained void *)((__bridge id)ai_old->bitmap);
 	}
 
 	*newc = (struct content *) ai;
@@ -201,8 +202,8 @@ static bool apple_image_redraw(struct content *c, struct content_redraw_data *da
 	if (data->repeat_y)
 		flags |= BITMAPF_REPEAT_Y;
 
-	return ctx->plot->bitmap(data->x, data->y, data->width, data->height,
-			ai_c->bitmap, data->background_colour, flags);
+	return ctx->plot->bitmap(ctx, ai_c->bitmap, data->x, data->y, data->width, data->height,
+			data->background_colour, flags);
 }
 
 static const content_handler apple_image_content_handler = {
@@ -236,7 +237,7 @@ nserror apple_image_init(void)
 {
 	NSArray *utis = [NSBitmapImageRep imageTypes];
 	for (NSString *uti in utis) {
-		NSDictionary *declaration = [(NSDictionary *)UTTypeCopyDeclaration( (CFStringRef)uti ) autorelease];
+		NSDictionary *declaration = (__bridge_transfer NSDictionary *)UTTypeCopyDeclaration( (__bridge CFStringRef)uti );
 		id mimeTypes = [[declaration objectForKey: (NSString *)kUTTypeTagSpecificationKey] objectForKey: (NSString *)kUTTagClassMIMEType];
 
 		if (mimeTypes == nil) continue;
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index fe611f118..30127e360 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -55,21 +55,21 @@ static inline NSMapTable *cocoa_get_bitmap_cache( void )
 static int bitmap_get_width(void *bitmap)
 {
 	NSCParameterAssert( NULL != bitmap );
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
-	return [bmp pixelsWide];
+	NSBitmapImageRep *bmp = (__bridge NSBitmapImageRep *)bitmap;
+	return (int)[bmp pixelsWide];
 }
 
 static int bitmap_get_height(void *bitmap)
 {
 	NSCParameterAssert( NULL != bitmap );
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
-	return [bmp pixelsHigh];
+	NSBitmapImageRep *bmp = (__bridge NSBitmapImageRep *)bitmap;
+	return (int)[bmp pixelsHigh];
 }
 
 static bool bitmap_get_opaque(void *bitmap)
 {
 	NSCParameterAssert( NULL != bitmap );
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
+	NSBitmapImageRep *bmp = (__bridge NSBitmapImageRep *)bitmap;
 	return [bmp isOpaque];
 }
 
@@ -84,8 +84,8 @@ static void bitmap_destroy(void *bitmap)
 		NSMapRemove( cache, bitmap );
 	}
 
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
-	[bmp release];
+	NSBitmapImageRep *bmp = (__bridge_transfer NSBitmapImageRep *)bitmap;
+    bmp = nil;
 }
 
 static void *bitmap_create(int width, int height, unsigned int state)
@@ -103,34 +103,34 @@ static void *bitmap_create(int width, int height, unsigned int state)
 						     bytesPerRow: BYTES_PER_PIXEL * width
 						    bitsPerPixel: BITS_PER_PIXEL];
 
-	return bmp;
+	return (__bridge_retained void *)bmp;
 }
 
 static void bitmap_set_opaque(void *bitmap, bool opaque)
 {
 	NSCParameterAssert( NULL != bitmap );
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
+	NSBitmapImageRep *bmp = (__bridge NSBitmapImageRep *)bitmap;
 	[bmp setOpaque: opaque ? YES : NO];
 }
 
 static unsigned char *bitmap_get_buffer(void *bitmap)
 {
 	NSCParameterAssert( NULL != bitmap );
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
+	NSBitmapImageRep *bmp = (__bridge NSBitmapImageRep *)bitmap;
 	return [bmp bitmapData];
 }
 
 static size_t bitmap_get_rowstride(void *bitmap)
 {
 	NSCParameterAssert( NULL != bitmap );
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
+	NSBitmapImageRep *bmp = (__bridge NSBitmapImageRep *)bitmap;
 	return [bmp bytesPerRow];
 }
 
 static size_t bitmap_get_bpp(void *bitmap)
 {
 	NSCParameterAssert( NULL != bitmap );
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
+	NSBitmapImageRep *bmp = (__bridge NSBitmapImageRep *)bitmap;
 	return [bmp bitsPerPixel] / 8;
 }
 
@@ -159,7 +159,7 @@ static bool bitmap_test_opaque(void *bitmap)
 static bool bitmap_save(void *bitmap, const char *path, unsigned flags)
 {
 	NSCParameterAssert( NULL != bitmap );
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
+	NSBitmapImageRep *bmp = (__bridge NSBitmapImageRep *)bitmap;
 
 	NSData *tiff = [bmp TIFFRepresentation];
 	return [tiff writeToFile: [NSString stringWithUTF8String: path] atomically: YES];
@@ -193,7 +193,7 @@ static CGImageRef cocoa_prepare_bitmap( void *bitmap )
 {
 	NSCParameterAssert( NULL != bitmap );
 
-	NSBitmapImageRep *bmp = (NSBitmapImageRep *)bitmap;
+	NSBitmapImageRep *bmp = (__bridge NSBitmapImageRep *)bitmap;
 
 	size_t w = [bmp pixelsWide];
 	size_t h = [bmp pixelsHigh];
@@ -245,8 +245,8 @@ static nserror bitmap_render(struct bitmap *bitmap, struct hlcache_handle *conte
 							    cspace, kCGImageAlphaNoneSkipLast );
 	CGColorSpaceRelease( cspace );
 
-	size_t width = MIN( content_get_width( content ), 1024 );
-	size_t height = ((width * bheight) + bwidth / 2) / bwidth;
+	int width = MIN( content_get_width( content ), 1024 );
+	int height = ((width * bheight) + bwidth / 2) / bwidth;
 
 	CGContextTranslateCTM( bitmapContext, 0, bheight );
 	CGContextScaleCTM( bitmapContext, (CGFloat)bwidth / width, -(CGFloat)bheight / height );
diff --git a/frontends/cocoa/desktop-tree.m b/frontends/cocoa/desktop-tree.m
index a010c6fdc..30af768a7 100644
--- a/frontends/cocoa/desktop-tree.m
+++ b/frontends/cocoa/desktop-tree.m
@@ -56,7 +56,7 @@ struct tree {
 struct sslcert_session_data *ssl_current_session = NULL;
 const char *tree_hotlist_path = NULL;
 
-static void treeview_test_redraw_request(struct core_window *cw,
+static nserror treeview_test_redraw_request(struct core_window *cw,
 		const struct rect *r)
 {
 	struct tree *tree = (struct tree *)cw;
@@ -64,6 +64,8 @@ static void treeview_test_redraw_request(struct core_window *cw,
 	tree->callbacks->redraw_request(r->x0, r->y0,
 			r->x1 - r->x0, r->y1 - r->y0,
 			tree->client_data);
+
+    return NSERROR_OK;
 }
 
 static void treeview_test_update_size(struct core_window *cw,
@@ -116,7 +118,7 @@ static void treeview_test_drag_status(struct core_window *cw,
 }
 
 struct core_window_callback_table cw_t = {
-	.redraw_request = treeview_test_redraw_request,
+	.invalidate = treeview_test_redraw_request,
 	.update_size = treeview_test_update_size,
 	.scroll_visible = treeview_test_scroll_visible,
 	.get_window_dimensions = treeview_test_get_window_dimensions,
diff --git a/frontends/cocoa/fetch.m b/frontends/cocoa/fetch.m
index 0bbce09f6..8760d68e3 100644
--- a/frontends/cocoa/fetch.m
+++ b/frontends/cocoa/fetch.m
@@ -27,8 +27,8 @@
 static char cocoafiletype[200];
 
 static const struct mimemap_s {
-	const char const *extension;
-	const char const *mimetype;
+	const char * const extension;
+	const char * const mimetype;
 } cocoamimemap[] = {
 	{ "css", "text/css" },
 	{ "f79", "text/css" },
@@ -52,7 +52,7 @@ static const char *fetch_filetype(const char *unix_path)
 	uti = [[NSWorkspace sharedWorkspace] typeOfFile: [NSString stringWithUTF8String: unix_path] error:&utiError];
 	if (nil != uti) {
 		LOG("Looking for mimetype from uti \"%s\"", [uti UTF8String] );
-		mimeType = (NSString *)UTTypeCopyPreferredTagWithClass( (CFStringRef)uti, kUTTagClassMIMEType );
+		mimeType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass( (__bridge CFStringRef)uti, kUTTagClassMIMEType );
 	} else {
 		NSAlert *utiAlert = [NSAlert alertWithError:utiError];
 		[utiAlert runModal]; // Ignore return value.
@@ -65,13 +65,12 @@ static const char *fetch_filetype(const char *unix_path)
 
 	if (nil != mimeType) {
 		strncpy(cocoafiletype, [mimeType UTF8String], sizeof(cocoafiletype));
-		[mimeType release];
 	} else {
 		const char *extension;
 
 		LOG("mimetype from uti failed");
 
-		extension = [(NSString *)UTTypeCopyPreferredTagWithClass( (CFStringRef)uti, kUTTagClassFilenameExtension) UTF8String];
+		extension = [(__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass( (__bridge CFStringRef)uti, kUTTagClassFilenameExtension) UTF8String];
 
 		if (extension == NULL) {
 			/* give up and go with default */
diff --git a/frontends/cocoa/font.m b/frontends/cocoa/font.m
index 17212fff9..66ee5d090 100644
--- a/frontends/cocoa/font.m
+++ b/frontends/cocoa/font.m
@@ -168,7 +168,7 @@ static NSLayoutManager *cocoa_prepare_layout_manager( const char *bytes, size_t
 {
 	if (NULL == bytes || 0 == length) return nil;
 
-	NSString *string = [[[NSString alloc] initWithBytes: bytes length:length encoding:NSUTF8StringEncoding] autorelease];
+	NSString *string = [[NSString alloc] initWithBytes: bytes length:length encoding:NSUTF8StringEncoding] ;
 	if (string == nil) return nil;
 
 	static NSLayoutManager *layout = nil;
@@ -189,17 +189,14 @@ static NSLayoutManager *cocoa_prepare_layout_manager( const char *bytes, size_t
 		return layout;
 	}
 	
-	[oldString release]; 
 	oldString = [string copy];
 	oldStyle = *style;
 	
 	static NSDictionary *attributes = nil;
 	if (styleChanged || attributes == nil) {
-		[attributes release];
-		attributes = [cocoa_font_attributes( style ) retain];
+		attributes = cocoa_font_attributes( style ) ;
 	}
 
-	[cocoa_text_storage release];
 	cocoa_text_storage = [[NSTextStorage alloc] initWithString: string attributes: attributes];
 	[cocoa_text_storage addLayoutManager: layout];
 
diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m
index 1bf191ffc..72f8e7afb 100644
--- a/frontends/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
@@ -75,58 +75,60 @@ gui_window_create(struct browser_window *bw,
 
 	browser_window_set_scale(bw, (float)nsoption_int(scale) / 100, false);
 	if (existing != NULL) {
-		window = [(BrowserViewController *)(existing) windowController];
+		window = [(__bridge BrowserViewController *)(existing) windowController];
 	}
 
         result = [[BrowserViewController alloc] initWithBrowser: bw];
 
 	if (!(flags & GW_CREATE_TAB) || nil == window) {
-		window = [[[BrowserWindowController alloc] init] autorelease];
+		window = [[BrowserWindowController alloc] init] ;
 		[[window window] makeKeyAndOrderFront: nil];
 	}
 	[window addTab: result];
 	
-	return (struct gui_window *)result;
+	return (__bridge_retained struct gui_window *)result;
 }
 
 static void gui_window_destroy(struct gui_window *g)
 {
-	BrowserViewController *vc = (BrowserViewController *)g;
-	[vc release];
+	BrowserViewController *vc = (__bridge_transfer BrowserViewController *)g;
+    vc = nil;
 }
 
 static void gui_window_set_title(struct gui_window *g, const char *title)
 {
-	[(BrowserViewController *)g setTitle: [NSString stringWithUTF8String: title]];
+	[(__bridge BrowserViewController *)g setTitle: [NSString stringWithUTF8String: title]];
 }
 
-static void gui_window_redraw_window(struct gui_window *g)
+static nserror gui_window_update_box(struct gui_window *g, const struct rect *rect)
 {
-	[[(BrowserViewController *)g browserView] setNeedsDisplay: YES];
-}
+    if (rect == NULL) {
+        [[(__bridge BrowserViewController *)g browserView] setNeedsDisplay: YES];
+        return NSERROR_OK;
 
-static void gui_window_update_box(struct gui_window *g, const struct rect *rect)
-{
+    }
 	const NSRect nsrect = cocoa_scaled_rect_wh( 
-		browser_window_get_scale([(BrowserViewController *)g browser]),
+		browser_window_get_scale([(__bridge BrowserViewController *)g browser]),
 		rect->x0, rect->y0, 
 		rect->x1 - rect->x0, rect->y1 - rect->y0 );
-	[[(BrowserViewController *)g browserView] setNeedsDisplayInRect: nsrect];
+	[[(__bridge BrowserViewController *)g browserView] setNeedsDisplayInRect: nsrect];
+  return NSERROR_OK;
 }
 
 static bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy)
 {
 	NSCParameterAssert( g != NULL && sx != NULL && sy != NULL );
 	
-	NSRect visible = [[(BrowserViewController *)g browserView] visibleRect];
+	NSRect visible = [[(__bridge BrowserViewController *)g browserView] visibleRect];
 	*sx = cocoa_pt_to_px( NSMinX( visible ) );
 	*sy = cocoa_pt_to_px( NSMinY( visible ) );
 	return true;
 }
 
-static void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
+static nserror gui_window_set_scroll(struct gui_window *g, const struct rect *rect)
 {
-	[[(BrowserViewController *)g browserView] scrollPoint: cocoa_point( sx, sy )];
+	[[(__bridge BrowserViewController *)g browserView] scrollPoint: cocoa_point( rect->x0, rect->y0 )];
+  return 0;
 }
 
 
@@ -134,7 +136,7 @@ static void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
 /**
  * Find the current dimensions of a cocoa browser window content area.
  *
- * \param gw The gui window to measure content area of.
+ * \param g The gui window to measure content area of.
  * \param width receives width of window
  * \param height receives height of window
  * \param scaled whether to return scaled values
@@ -147,9 +149,9 @@ static nserror gui_window_get_dimensions(struct gui_window *g,
 {
 	NSCParameterAssert( width != NULL && height != NULL );
 	
-	NSRect frame = [[[(BrowserViewController *)g browserView] superview] frame];
+	NSRect frame = [[[(__bridge BrowserViewController *)g browserView] superview] frame];
 	if (scaled) {
-        	const CGFloat scale = browser_window_get_scale([(BrowserViewController *)g browser]);
+        	const CGFloat scale = browser_window_get_scale([(__bridge BrowserViewController *)g browser]);
 		frame.size.width /= scale;
 		frame.size.height /= scale;
 	}
@@ -161,7 +163,7 @@ static nserror gui_window_get_dimensions(struct gui_window *g,
 
 static void gui_window_update_extent(struct gui_window *g)
 {
-	BrowserViewController * const window = (BrowserViewController *)g;
+	BrowserViewController * const window = (__bridge BrowserViewController *)g;
         int width;
         int height;
 	struct browser_window *browser = [window browser];
@@ -174,7 +176,7 @@ static void gui_window_update_extent(struct gui_window *g)
 
 static void gui_window_set_status(struct gui_window *g, const char *text)
 {
-	[(BrowserViewController *)g setStatus: [NSString stringWithUTF8String: text]];
+	[(__bridge BrowserViewController *)g setStatus: [NSString stringWithUTF8String: text]];
 }
 
 static void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
@@ -212,20 +214,20 @@ static void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape
 
 static nserror gui_window_set_url(struct gui_window *g, struct nsurl *url)
 {
-        [(BrowserViewController *)g setUrl: [NSString stringWithUTF8String: nsurl_access(url)]];
+        [(__bridge BrowserViewController *)g setUrl: [NSString stringWithUTF8String: nsurl_access(url)]];
         return NSERROR_OK;
 }
 
 static void gui_window_start_throbber(struct gui_window *g)
 {
-	[(BrowserViewController *)g setIsProcessing: YES];
-	[(BrowserViewController *)g updateBackForward];
+	[(__bridge BrowserViewController *)g setIsProcessing: YES];
+	[(__bridge BrowserViewController *)g updateBackForward];
 }
 
 static void gui_window_stop_throbber(struct gui_window *g)
 {
-	[(BrowserViewController *)g setIsProcessing: NO];
-	[(BrowserViewController *)g updateBackForward];
+	[(__bridge BrowserViewController *)g setIsProcessing: NO];
+	[(__bridge BrowserViewController *)g updateBackForward];
 }
 
 static void gui_window_set_icon(struct gui_window *g, struct hlcache_handle *icon)
@@ -234,7 +236,7 @@ static void gui_window_set_icon(struct gui_window *g, struct hlcache_handle *ico
 	NSImage *image = nil;
 
 	if (icon != NULL) {
-		bmp = (NSBitmapImageRep *)content_get_bitmap( icon );
+		bmp = (__bridge NSBitmapImageRep *)content_get_bitmap( icon );
 	}
 
 	if (bmp != nil) {
@@ -245,39 +247,37 @@ static void gui_window_set_icon(struct gui_window *g, struct hlcache_handle *ico
 	}
 	[image setFlipped: YES];
 
-	[(BrowserViewController *)g setFavicon: image];
-	[image release];
+	[(__bridge BrowserViewController *)g setFavicon: image];
 }
 
 static void
 gui_window_place_caret(struct gui_window *g, int x, int y, int height,
                        const struct rect *clip)
 {
-	[[(BrowserViewController *)g browserView]
+	[[(__bridge BrowserViewController *)g browserView]
                 addCaretAt: cocoa_point( x, y )
                     height: cocoa_px_to_pt( height )];
 }
 
 static void gui_window_remove_caret(struct gui_window *g)
 {
-	[[(BrowserViewController *)g browserView] removeCaret];
+	[[(__bridge BrowserViewController *)g browserView] removeCaret];
 }
 
 static void gui_window_new_content(struct gui_window *g)
 {
-	[(BrowserViewController *)g contentUpdated];
+	[(__bridge BrowserViewController *)g contentUpdated];
 }
 
 
 static void gui_create_form_select_menu(struct gui_window *g,
                                         struct form_control *control)
 {
-	BrowserViewController * const window = (BrowserViewController *)g;
+	BrowserViewController * const window = (__bridge BrowserViewController *)g;
 	FormSelectMenu *menu = [[FormSelectMenu alloc]
                                         initWithControl: control
                                               forWindow: [window browser]];
 	[menu runInView: [window browserView]];
-	[menu release];
 }
 
 static nserror gui_launch_url(nsurl *url)
@@ -301,8 +301,7 @@ gui_cert_verify(nsurl *url,
 static struct gui_window_table window_table = {
 	.create = gui_window_create,
 	.destroy = gui_window_destroy,
-	.redraw = gui_window_redraw_window,
-	.update = gui_window_update_box,
+	.invalidate = gui_window_update_box,
 	.get_scroll = gui_window_get_scroll,
 	.set_scroll = gui_window_set_scroll,
 	.get_dimensions = gui_window_get_dimensions,
diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m
index dea3245bb..e4659ef80 100644
--- a/frontends/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
@@ -74,7 +74,7 @@ static void cocoa_plot_path_set_stroke_pattern(NSBezierPath *path,const plot_sty
 	[path setLineWidth: cocoa_px_to_pt( pstyle->stroke_width > 0 ? pstyle->stroke_width : 1 )];
 }
 
-static bool plot_line(int x0, int y0, int x1, int y1, const plot_style_t *pstyle)
+static nserror plot_line(const struct redraw_context *ctx, const plot_style_t *pstyle, const struct rect *line)
 {
 	if (pstyle->stroke_type == PLOT_OP_TYPE_NONE) return true;
 	
@@ -82,12 +82,12 @@ static bool plot_line(int x0, int y0, int x1, int y1, const plot_style_t *pstyle
 	[NSBezierPath clipRect: cocoa_plot_clip_rect];
 	
 	NSBezierPath *path = [NSBezierPath bezierPath];
-	[path moveToPoint: cocoa_point( x0, y0 )];
-	[path lineToPoint: cocoa_point( x1, y1 )];
+	[path moveToPoint: cocoa_point( line->x0, line->y0 )];
+	[path lineToPoint: cocoa_point( line->x1, line->y1 )];
 	cocoa_plot_path_set_stroke_pattern( path, pstyle );
 	
 	const bool horizontal = y0 == y1;
-	const bool vertical = x0 == x1;
+	const bool vertical = line->x0 == line->x1;
 	const bool oddThickness = pstyle->stroke_width != 0 ? (pstyle->stroke_width % 2) != 0 : true;
 	
 	if (oddThickness) cocoa_center_pixel( !horizontal, !vertical );
@@ -97,20 +97,19 @@ static bool plot_line(int x0, int y0, int x1, int y1, const plot_style_t *pstyle
 	
 	[NSGraphicsContext restoreGraphicsState];
 	
-	return true;
+	return NSERROR_OK;
 }
 
-static bool plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *pstyle)
+static nserror plot_rectangle(const struct redraw_context *ctx, const plot_style_t *pstyle, const struct rect *r)
 {
-	NSRect rect = cocoa_rect( x0, y0, x1, y1 );
+	NSRect rect = cocoa_rect( r->x0, r->y0, r->x1, r->y1 );
 	NSBezierPath *path = [NSBezierPath bezierPathWithRect: rect];
 	cocoa_plot_render_path( path, pstyle );
 	
-	return true;
+	return NSERROR_OK;
 }
 
-static bool plot_text(int x, int y, const char *text, size_t length,
-			 const plot_font_style_t *fstyle)
+static nserror plot_text(const struct redraw_context *ctx, const plot_font_style_t *fstyle, int x, int y, const char *text, size_t length)
 {
 	[NSGraphicsContext saveGraphicsState];
 	[NSBezierPath clipRect: cocoa_plot_clip_rect];
@@ -119,7 +118,7 @@ static bool plot_text(int x, int y, const char *text, size_t length,
 	
 	[NSGraphicsContext restoreGraphicsState];
 	
-	return true;
+	return NSERROR_OK;
 }
 
 void cocoa_set_clip( NSRect rect )
@@ -127,10 +126,10 @@ void cocoa_set_clip( NSRect rect )
 	cocoa_plot_clip_rect = rect;
 }
 
-static bool plot_clip(const struct rect *clip)
+static nserror plot_clip(const struct redraw_context *ctx, const struct rect *clip)
 {
 	cocoa_plot_clip_rect = cocoa_rect( clip->x0, clip->y0, clip->x1, clip->y1 );
-	return true;
+	return NSERROR_OK;
 }
 
 void cocoa_plot_render_path(NSBezierPath *path,const plot_style_t *pstyle) 
@@ -156,7 +155,7 @@ void cocoa_plot_render_path(NSBezierPath *path,const plot_style_t *pstyle)
 	[NSGraphicsContext restoreGraphicsState];
 }
 
-static bool plot_arc(int x, int y, int radius, int angle1, int angle2, const plot_style_t *pstyle)
+static nserror plot_arc(const struct redraw_context *ctx, const plot_style_t *pstyle, int x, int y, int radius, int angle1, int angle2)
 {
 	NSBezierPath *path = [NSBezierPath bezierPath];
 	[path appendBezierPathWithArcWithCenter: NSMakePoint( x, y ) radius: radius 
@@ -165,22 +164,22 @@ static bool plot_arc(int x, int y, int radius, int angle1, int angle2, const plo
 	
 	cocoa_plot_render_path( path, pstyle);
 	
-	return true;
+	return NSERROR_OK;
 }
 
-static bool plot_disc(int x, int y, int radius, const plot_style_t *pstyle)
+static nserror plot_disc(const struct redraw_context *ctx, const plot_style_t *pstyle, int x, int y, int radius)
 {
 	NSBezierPath *path  = [NSBezierPath bezierPathWithOvalInRect: 
 						   NSMakeRect( x - radius, y-radius, 2*radius, 2*radius )];
 	
 	cocoa_plot_render_path( path, pstyle );
 	
-	return true;
+	return NSERROR_OK;
 }
 
-static bool plot_polygon(const int *p, unsigned int n, const plot_style_t *pstyle)
+static nserror plot_polygon(const struct redraw_context *ctx, const plot_style_t *pstyle, const int *p, unsigned int n)
 {
-	if (n <= 1) return true;
+	if (n <= 1) return NSERROR_OK;
 	
 	NSBezierPath *path = [NSBezierPath bezierPath];
 	[path moveToPoint: cocoa_point( p[0], p[1] )];
@@ -191,23 +190,22 @@ static bool plot_polygon(const int *p, unsigned int n, const plot_style_t *pstyl
 	
 	cocoa_plot_render_path( path, pstyle );
 	
-	return true;
+	return NSERROR_OK;
 }
 
 /* complex path (for SVG) */
-static bool plot_path(const float *p, unsigned int n, colour fill, float width,
-			 colour c, const float transform[6])
+static nserror plot_path(const struct redraw_context *ctx, const plot_style_t *pstyle, const float *p, unsigned int n, float width, const float transform[6])
 {
-	if (n == 0) return true;
+	if (n == 0) return NSERROR_OK;
 	
 	if (*p != PLOTTER_PATH_MOVE) {
 		LOG("Path does not start with move");
-		return false;
+		return NSERROR_INVALID;
 	}
 	
 	NSBezierPath *path = [NSBezierPath bezierPath];
 
-#define NEXT_POINT() NSMakePoint( *p++, *p++ )
+#define NEXT_POINT() ({ const float *c = p; p += 2; NSMakePoint( c[0], c[1] ); })
 	
 	while (n--) {
 		switch ((int)*p++) {
@@ -237,7 +235,7 @@ static bool plot_path(const float *p, unsigned int n, colour fill, float width,
 				
 			default:
 				LOG("Invalid path");
-				return false;
+				return NSERROR_INVALID;
 		}
 	}
 	
@@ -253,14 +251,14 @@ static bool plot_path(const float *p, unsigned int n, colour fill, float width,
 	CGContextConcatCTM( context, CGAffineTransformMake( transform[0], transform[1], transform[2], 
 													    transform[3], transform[4], transform[5] ) );
 	
-	if (fill != NS_TRANSPARENT) {
-		[cocoa_convert_colour( fill ) setFill];
+	if (pstyle->fill_colour != NS_TRANSPARENT) {
+		[cocoa_convert_colour(pstyle->fill_colour) setFill];
 		[path fill];
 	}
 
-	if (c != NS_TRANSPARENT) {
+	if (pstyle->stroke_colour != NS_TRANSPARENT) {
 		cocoa_center_pixel( true, true );
-		[cocoa_convert_colour( c ) set];
+		[cocoa_convert_colour( pstyle->stroke_colour ) set];
 		[path stroke];
 	}
 	
@@ -270,9 +268,7 @@ static bool plot_path(const float *p, unsigned int n, colour fill, float width,
 }
 
 /* Image */
-static bool plot_bitmap(int x, int y, int width, int height,
-			   struct bitmap *bitmap, colour bg,
-			   bitmap_flags_t flags)
+static nserror plot_bitmap(const struct redraw_context *ctx, struct bitmap *bitmap, int x, int y, int width, int height, colour bg, bitmap_flags_t flags)
 {
 	CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
 	CGContextSaveGState( context );
@@ -294,7 +290,7 @@ static bool plot_bitmap(int x, int y, int width, int height,
 	
 	CGContextRestoreGState( context );
 	
-	return true;
+	return NSERROR_OK;
 }
 
 const struct plotter_table cocoa_plotters = {
@@ -321,7 +317,7 @@ static CGFloat cocoa_half_pixel;
 
 void cocoa_update_scale_factor( void )
 {
-	const CGFloat scale = [[NSScreen mainScreen] userSpaceScaleFactor];
+	const CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];
 	cocoa_scale_factor = scale == 1.0 ? 1.0 : 1.0 / scale;
 	cocoa_half_pixel = 0.5 * cocoa_scale_factor;
         browser_set_dpi( points_per_inch * scale );
diff --git a/frontends/cocoa/res/BookmarksWindow.xib b/frontends/cocoa/res/BookmarksWindow.xib
index b038e6ca1..ddae5a0bf 100644
--- a/frontends/cocoa/res/BookmarksWindow.xib
+++ b/frontends/cocoa/res/BookmarksWindow.xib
@@ -1,610 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10J567</string>
-		<string key="IBDocument.InterfaceBuilderVersion">804</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
-		<string key="IBDocument.HIToolboxVersion">462.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">804</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">BookmarksController</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 80}, {350, 400}}</string>
-				<int key="NSWTFlags">1618477056</int>
-				<string key="NSWindowTitle">Bookmarks</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<string key="NSWindowContentMinSize">{200, 100}</string>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSScrollView" id="79136560">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">274</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSClipView" id="286793088">
-									<reference key="NSNextResponder" ref="79136560"/>
-									<int key="NSvFlags">2304</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSCustomView" id="347174519">
-											<reference key="NSNextResponder" ref="286793088"/>
-											<int key="NSvFlags">274</int>
-											<string key="NSFrameSize">{350, 360}</string>
-											<reference key="NSSuperview" ref="286793088"/>
-											<string key="NSClassName">TreeView</string>
-										</object>
-									</object>
-									<string key="NSFrame">{{1, 1}, {350, 360}}</string>
-									<reference key="NSSuperview" ref="79136560"/>
-									<reference key="NSNextKeyView" ref="347174519"/>
-									<reference key="NSDocView" ref="347174519"/>
-									<object class="NSColor" key="NSBGColor">
-										<int key="NSColorSpace">6</int>
-										<string key="NSCatalogName">System</string>
-										<string key="NSColorName">controlColor</string>
-										<object class="NSColor" key="NSColor">
-											<int key="NSColorSpace">3</int>
-											<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-										</object>
-									</object>
-									<int key="NScvFlags">4</int>
-								</object>
-								<object class="NSScroller" id="343618412">
-									<reference key="NSNextResponder" ref="79136560"/>
-									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{353, 1}, {15, 313}}</string>
-									<reference key="NSSuperview" ref="79136560"/>
-									<reference key="NSTarget" ref="79136560"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSCurValue">1</double>
-									<double key="NSPercent">0.96363627910614014</double>
-								</object>
-								<object class="NSScroller" id="885399726">
-									<reference key="NSNextResponder" ref="79136560"/>
-									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{1, 314}, {352, 15}}</string>
-									<reference key="NSSuperview" ref="79136560"/>
-									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="79136560"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.50602412223815918</double>
-								</object>
-							</object>
-							<string key="NSFrame">{{-1, 39}, {352, 362}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSNextKeyView" ref="286793088"/>
-							<int key="NSsFlags">562</int>
-							<reference key="NSVScroller" ref="343618412"/>
-							<reference key="NSHScroller" ref="885399726"/>
-							<reference key="NSContentView" ref="286793088"/>
-						</object>
-						<object class="NSButton" id="1013386414">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{7, 7}, {29, 25}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="1030859690">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents"/>
-								<object class="NSFont" key="NSSupport" id="1037042855">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<reference key="NSControlView" ref="1013386414"/>
-								<int key="NSButtonFlags">-2033958657</int>
-								<int key="NSButtonFlags2">163</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSAddTemplate</string>
-								</object>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="812276353">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{43, 7}, {29, 25}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="142633288">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="1037042855"/>
-								<reference key="NSControlView" ref="812276353"/>
-								<int key="NSButtonFlags">-2033958657</int>
-								<int key="NSButtonFlags2">163</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSRemoveTemplate</string>
-								</object>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="482147213">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{80, 7}, {38, 25}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="586666285">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Edit</string>
-								<reference key="NSSupport" ref="1037042855"/>
-								<reference key="NSControlView" ref="482147213"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{350, 400}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMinSize">{200, 122}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<bool key="NSAutorecalculatesContentBorderThicknessMinY">NO</bool>
-				<double key="NSContentBorderThicknessMinY">39</double>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="347174519"/>
-					</object>
-					<int key="connectionID">8</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addFolder:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1013386414"/>
-					</object>
-					<int key="connectionID">17</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">deleteSelected:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="812276353"/>
-					</object>
-					<int key="connectionID">18</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">editSelected:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="482147213"/>
-					</object>
-					<int key="connectionID">19</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">initialFirstResponder</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="347174519"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1006"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="79136560"/>
-							<reference ref="1013386414"/>
-							<reference ref="812276353"/>
-							<reference ref="482147213"/>
-						</object>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="79136560"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="343618412"/>
-							<reference ref="885399726"/>
-							<reference ref="347174519"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="343618412"/>
-						<reference key="parent" ref="79136560"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="885399726"/>
-						<reference key="parent" ref="79136560"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="347174519"/>
-						<reference key="parent" ref="79136560"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="1013386414"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1030859690"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="1030859690"/>
-						<reference key="parent" ref="1013386414"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="812276353"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="142633288"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="142633288"/>
-						<reference key="parent" ref="812276353"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="482147213"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="586666285"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="586666285"/>
-						<reference key="parent" ref="482147213"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>1.IBEditorWindowLastContentRect</string>
-					<string>1.IBPluginDependency</string>
-					<string>1.IBWindowTemplateEditedContentRect</string>
-					<string>1.NSWindowTemplate.visibleAtLaunch</string>
-					<string>1.WindowOrigin</string>
-					<string>1.editorWindowContentRectSynchronizationRect</string>
-					<string>1.windowTemplate.hasMinSize</string>
-					<string>1.windowTemplate.minSize</string>
-					<string>11.IBPluginDependency</string>
-					<string>11.IBViewBoundsToFrameTransform</string>
-					<string>12.IBPluginDependency</string>
-					<string>13.IBPluginDependency</string>
-					<string>13.IBViewBoundsToFrameTransform</string>
-					<string>14.IBPluginDependency</string>
-					<string>15.IBPluginDependency</string>
-					<string>15.IBViewBoundsToFrameTransform</string>
-					<string>16.IBPluginDependency</string>
-					<string>2.IBPluginDependency</string>
-					<string>4.IBPluginDependency</string>
-					<string>4.IBViewBoundsToFrameTransform</string>
-					<string>5.IBPluginDependency</string>
-					<string>6.IBPluginDependency</string>
-					<string>7.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>{{226, 417}, {350, 400}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{226, 417}, {350, 400}}</string>
-					<integer value="1"/>
-					<string>{196, 240}</string>
-					<string>{{202, 428}, {480, 270}}</string>
-					<boolean value="YES"/>
-					<string>{200, 100}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABAwAAAwfAAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCJAAAwfAAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCmAAAwfAAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAAC/gAAAw7eAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">20</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">BookmarksController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addBookmark:</string>
-							<string>addFolder:</string>
-							<string>deleteSelected:</string>
-							<string>editSelected:</string>
-							<string>openBookmarkURL:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addBookmark:</string>
-							<string>addFolder:</string>
-							<string>deleteSelected:</string>
-							<string>editSelected:</string>
-							<string>openBookmarkURL:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">addBookmark:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addFolder:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">deleteSelected:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">editSelected:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openBookmarkURL:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>defaultMenu</string>
-							<string>view</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSMenu</string>
-							<string>TreeView</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>defaultMenu</string>
-							<string>view</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">defaultMenu</string>
-								<string key="candidateClassName">NSMenu</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">view</string>
-								<string key="candidateClassName">TreeView</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">BookmarksController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">PSMTabBarControl/PSMTabDragAssistant.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">PSMTabBarControl/PSMTabBarCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">PSMTabBarControl/PSMTabBarControl.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ScrollableView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">ScrollableView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TreeView</string>
-					<string key="superclassName">ScrollableView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">TreeView.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../NetSurf.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSAddTemplate</string>
-				<string>NSRemoveTemplate</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{8, 8}</string>
-				<string>{8, 8}</string>
-			</object>
-		</object>
-	</data>
-</archive>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12120"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="BookmarksController">
+            <connections>
+                <outlet property="view" destination="7" id="8"/>
+                <outlet property="window" destination="1" id="3"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <window title="Bookmarks" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="1">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="80" width="350" height="400"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
+            <value key="minSize" type="size" width="200" height="100"/>
+            <view key="contentView" id="2">
+                <rect key="frame" x="0.0" y="0.0" width="350" height="400"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="4">
+                        <rect key="frame" x="-1" y="39" width="352" height="362"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <clipView key="contentView" id="wPU-ql-jqi">
+                            <rect key="frame" x="1" y="1" width="350" height="360"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <customView id="7" customClass="TreeView">
+                                    <rect key="frame" x="0.0" y="0.0" width="350" height="360"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                </customView>
+                            </subviews>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="6">
+                            <rect key="frame" x="1" y="314" width="352" height="15"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="5">
+                            <rect key="frame" x="353" y="1" width="15" height="313"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                    </scrollView>
+                    <button verticalHuggingPriority="750" imageHugsTitle="YES" id="11">
+                        <rect key="frame" x="7" y="7" width="29" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSAddTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="12">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="addFolder:" target="-2" id="17"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" imageHugsTitle="YES" id="13">
+                        <rect key="frame" x="43" y="7" width="29" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSRemoveTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="14">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="deleteSelected:" target="-2" id="18"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" imageHugsTitle="YES" id="15">
+                        <rect key="frame" x="80" y="7" width="38" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="roundTextured" title="Edit" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="16">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="editSelected:" target="-2" id="19"/>
+                        </connections>
+                    </button>
+                </subviews>
+            </view>
+            <contentBorderThickness minY="39"/>
+            <connections>
+                <outlet property="initialFirstResponder" destination="7" id="20"/>
+            </connections>
+        </window>
+    </objects>
+    <resources>
+        <image name="NSAddTemplate" width="11" height="11"/>
+        <image name="NSRemoveTemplate" width="11" height="11"/>
+    </resources>
+</document>
diff --git a/frontends/cocoa/res/SearchWindow.xib b/frontends/cocoa/res/SearchWindow.xib
index 8e9315b51..8bf2d2bd1 100644
--- a/frontends/cocoa/res/SearchWindow.xib
+++ b/frontends/cocoa/res/SearchWindow.xib
@@ -1,614 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">9L31a</string>
-		<string key="IBDocument.InterfaceBuilderVersion">680</string>
-		<string key="IBDocument.AppKitVersion">949.54</string>
-		<string key="IBDocument.HIToolboxVersion">353.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="2"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">SearchWindowController</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">7</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 354}, {480, 156}}</string>
-				<int key="NSWTFlags">1618477056</int>
-				<string key="NSWindowTitle">Search</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="656125083">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{67, 114}, {393, 22}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="175732045">
-								<int key="NSCellFlags">-1803944383</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents"/>
-								<object class="NSFont" key="NSSupport" id="926601808">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">1.300000e+01</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<reference key="NSControlView" ref="656125083"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<object class="NSColor" key="NSBackgroundColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textBackgroundColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MQA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textColor</string>
-									<object class="NSColor" key="NSColor" id="92132461">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MAA</bytes>
-									</object>
-								</object>
-							</object>
-						</object>
-						<object class="NSTextField" id="90768291">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 116}, {45, 14}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="874604921">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">71435264</int>
-								<string key="NSContents">Find:</string>
-								<object class="NSFont" key="NSSupport">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">1.100000e+01</double>
-									<int key="NSfFlags">3100</int>
-								</object>
-								<reference key="NSControlView" ref="90768291"/>
-								<object class="NSColor" key="NSBackgroundColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlTextColor</string>
-									<reference key="NSColor" ref="92132461"/>
-								</object>
-							</object>
-						</object>
-						<object class="NSButton" id="1016680565">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{370, 12}, {96, 32}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="567819516">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Next</string>
-								<reference key="NSSupport" ref="926601808"/>
-								<reference key="NSControlView" ref="1016680565"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">129</int>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSButton" id="88766619">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{274, 12}, {96, 32}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="450885469">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Previous</string>
-								<reference key="NSSupport" ref="926601808"/>
-								<reference key="NSControlView" ref="88766619"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">129</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSButton" id="650505141">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{139, 90}, {323, 18}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="657985060">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Case sensitive</string>
-								<reference key="NSSupport" ref="926601808"/>
-								<reference key="NSControlView" ref="650505141"/>
-								<int key="NSButtonFlags">1211912703</int>
-								<int key="NSButtonFlags2">2</int>
-								<object class="NSCustomResource" key="NSNormalImage" id="312987126">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSSwitch</string>
-								</object>
-								<object class="NSButtonImageSource" key="NSAlternateImage" id="973359313">
-									<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="NSButton" id="331870754">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{139, 70}, {323, 18}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="239506938">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Select all</string>
-								<reference key="NSSupport" ref="926601808"/>
-								<reference key="NSControlView" ref="331870754"/>
-								<int key="NSButtonFlags">1211912703</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSNormalImage" ref="312987126"/>
-								<reference key="NSAlternateImage" ref="973359313"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{480, 156}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">searchNext:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1016680565"/>
-					</object>
-					<int key="connectionID">15</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">searchPrevious:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="88766619"/>
-					</object>
-					<int key="connectionID">16</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canGoForward</string>
-						<reference key="source" ref="1016680565"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1016680565"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: canGoForward</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canGoForward</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">17</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canGoBack</string>
-						<reference key="source" ref="88766619"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="88766619"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: canGoBack</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canGoBack</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">18</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">searchStringDidChange:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="656125083"/>
-					</object>
-					<int key="connectionID">22</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: searchString</string>
-						<reference key="source" ref="656125083"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="656125083"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: searchString</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">searchString</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">24</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: caseSensitive</string>
-						<reference key="source" ref="650505141"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="650505141"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: caseSensitive</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">caseSensitive</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">25</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selectAll</string>
-						<reference key="source" ref="331870754"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="331870754"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: selectAll</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selectAll</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">27</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="729119712">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="729119712"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="729119712"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="729119712"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1006"/>
-						</object>
-						<reference key="parent" ref="729119712"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="656125083"/>
-							<reference ref="90768291"/>
-							<reference ref="1016680565"/>
-							<reference ref="88766619"/>
-							<reference ref="331870754"/>
-							<reference ref="650505141"/>
-						</object>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3</int>
-						<reference key="object" ref="656125083"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="175732045"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="175732045"/>
-						<reference key="parent" ref="656125083"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="90768291"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="874604921"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="874604921"/>
-						<reference key="parent" ref="90768291"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="1016680565"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="567819516"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="567819516"/>
-						<reference key="parent" ref="1016680565"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="88766619"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="450885469"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="450885469"/>
-						<reference key="parent" ref="88766619"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="650505141"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="657985060"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="657985060"/>
-						<reference key="parent" ref="650505141"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="331870754"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="239506938"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="239506938"/>
-						<reference key="parent" ref="331870754"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>1.IBEditorWindowLastContentRect</string>
-					<string>1.IBPluginDependency</string>
-					<string>1.IBWindowTemplateEditedContentRect</string>
-					<string>1.NSWindowTemplate.visibleAtLaunch</string>
-					<string>1.WindowOrigin</string>
-					<string>1.editorWindowContentRectSynchronizationRect</string>
-					<string>10.IBPluginDependency</string>
-					<string>11.IBPluginDependency</string>
-					<string>11.IBViewBoundsToFrameTransform</string>
-					<string>12.IBPluginDependency</string>
-					<string>13.IBPluginDependency</string>
-					<string>13.IBViewBoundsToFrameTransform</string>
-					<string>14.IBPluginDependency</string>
-					<string>2.IBPluginDependency</string>
-					<string>3.IBPluginDependency</string>
-					<string>4.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>5.IBViewBoundsToFrameTransform</string>
-					<string>6.IBPluginDependency</string>
-					<string>7.IBPluginDependency</string>
-					<string>7.IBViewBoundsToFrameTransform</string>
-					<string>8.IBPluginDependency</string>
-					<string>9.IBPluginDependency</string>
-					<string>9.IBViewBoundsToFrameTransform</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>{{185, 223}, {480, 156}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{185, 223}, {480, 156}}</string>
-					<boolean value="NO"/>
-					<string>{196, 240}</string>
-					<string>{{202, 428}, {480, 270}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDCwAAwpQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDk4AAwpQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAw3IAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDuQAAwigAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDiQAAwigAAA</bytes>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">27</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">PSMTabBarControl/PSMTabDragAssistant.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">PSMTabBarControl/PSMTabBarCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">PSMTabBarControl/PSMTabBarControl.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SearchWindowController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>searchNext:</string>
-							<string>searchPrevious:</string>
-							<string>searchStringDidChange:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">SearchWindowController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../NetSurf.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12120"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="SearchWindowController">
+            <connections>
+                <outlet property="window" destination="1" id="23"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <window title="Search" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="354" width="480" height="156"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
+            <view key="contentView" id="2">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="156"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" id="3">
+                        <rect key="frame" x="67" y="114" width="393" height="22"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="4">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <action selector="searchStringDidChange:" target="-2" id="22"/>
+                            <binding destination="-2" name="value" keyPath="searchString" id="24"/>
+                        </connections>
+                    </textField>
+                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" id="5">
+                        <rect key="frame" x="17" y="116" width="45" height="14"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Find:" id="6">
+                            <font key="font" metaFont="smallSystem"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button verticalHuggingPriority="750" imageHugsTitle="YES" id="7">
+                        <rect key="frame" x="370" y="12" width="96" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="Next" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="searchNext:" target="-2" id="15"/>
+                            <binding destination="-2" name="enabled" keyPath="canGoForward" id="17"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" imageHugsTitle="YES" id="9">
+                        <rect key="frame" x="274" y="12" width="96" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="Previous" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="10">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="searchPrevious:" target="-2" id="16"/>
+                            <binding destination="-2" name="enabled" keyPath="canGoBack" id="18"/>
+                        </connections>
+                    </button>
+                    <button imageHugsTitle="YES" id="11">
+                        <rect key="frame" x="139" y="90" width="323" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="Case sensitive" bezelStyle="regularSquare" imagePosition="leading" alignment="left" state="on" inset="2" id="12">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <binding destination="-2" name="value" keyPath="caseSensitive" id="25"/>
+                        </connections>
+                    </button>
+                    <button imageHugsTitle="YES" id="13">
+                        <rect key="frame" x="139" y="70" width="323" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="Select all" bezelStyle="regularSquare" imagePosition="leading" alignment="left" state="on" inset="2" id="14">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <binding destination="-2" name="value" keyPath="selectAll" id="27"/>
+                        </connections>
+                    </button>
+                </subviews>
+            </view>
+        </window>
+    </objects>
+</document>
diff --git a/frontends/cocoa/schedule.m b/frontends/cocoa/schedule.m
index f0896bd9d..65ca7f15d 100644
--- a/frontends/cocoa/schedule.m
+++ b/frontends/cocoa/schedule.m
@@ -27,14 +27,14 @@
 	void *userData;
 }
 
-- initWithCallback: (void (*)(void *))cb userData: (void *)ud;
+- (instancetype)initWithCallback: (void (*)(void *))cb userData: (void *)ud;
 - (void) schedule: (NSTimeInterval) ti;
 
 @end
 
 @implementation ScheduledCallback
 
-- initWithCallback: (void (*)(void *))cb userData: (void *)ud;
+- (instancetype)initWithCallback: (void (*)(void *))cb userData: (void *)ud
 {
 	callback = cb;
 	userData = ud;
@@ -44,7 +44,7 @@
 
 static NSMutableSet *timerSet = nil;
 
-- (void) schedule: (NSTimeInterval) ti;
+- (void) schedule: (NSTimeInterval) ti
 {
 	if (nil == timerSet) {
 		timerSet = [[NSMutableSet alloc] init];
@@ -54,7 +54,7 @@ static NSMutableSet *timerSet = nil;
 	[timerSet addObject: self];
 }
 
-- (void) timerFired;
+- (void) timerFired
 {
 	if ([timerSet containsObject: self]) {
 		[timerSet removeObject: self];
@@ -69,7 +69,7 @@ static NSMutableSet *timerSet = nil;
 	return ((ScheduledCallback *)object)->callback == callback &&	((ScheduledCallback *)object)->userData == userData;
 }
 
-- (NSUInteger) hash;
+- (NSUInteger) hash
 {
 	return (NSUInteger)callback + (NSUInteger)userData;
 }
@@ -84,7 +84,6 @@ nserror cocoa_schedule(int t, void (*callback)(void *p), void *p)
         if (t >= 0) {
           [cb schedule: (NSTimeInterval)t / 1000];
         }
-	[cb release];
 
         return NSERROR_OK;
 }
diff --git a/frontends/cocoa/selection.m b/frontends/cocoa/selection.m
index 37562bc07..38dc9cf9f 100644
--- a/frontends/cocoa/selection.m
+++ b/frontends/cocoa/selection.m
@@ -72,14 +72,12 @@ static void gui_set_clipboard(const char *buffer, size_t length,
 		[cocoa_clipboard_string setString: @""];
 	}
 
-	/* Add text to clipboard string */
-	if (nil == cocoa_clipboard_string) return;
 	
-	[cocoa_clipboard_string appendString: [[[NSString alloc] 
+	[cocoa_clipboard_string appendString: [[NSString alloc]
 				initWithBytes: buffer
 				length: length
 				encoding: NSUTF8StringEncoding] 
-				autorelease]];
+				];
 	
 	/* Stick it on the pasteboard */
 	NSPasteboard *pb = [NSPasteboard generalPasteboard];