diff --git a/installer/osx/Controller.mm b/installer/osx/Controller.mm
index 3c27cdf3c..1950473ea 100644
--- a/installer/osx/Controller.mm
+++ b/installer/osx/Controller.mm
@@ -100,8 +100,8 @@ -(void)dealloc
 
     if (temporaryDirectory)
     {
-        [[NSFileManager defaultManager] 
-            removeFileAtPath:temporaryDirectory handler:nil];
+        [[NSFileManager defaultManager]
+            removeItemAtPath:temporaryDirectory error:nil];
         [temporaryDirectory release];
     }
 
@@ -662,7 +662,7 @@ -(void)applicationDidFinishLaunching:(NSNotification *) notif
         // Remove the update file as soon as possible, so that if the installation
         // fails the application will still start. We can always fetch the update
         // later.
-        [[NSFileManager defaultManager] removeFileAtPath:updateFile handler:nil];
+        [[NSFileManager defaultManager] removeItemAtPath:updateFile error:nil];
     }
 
     std::string tempDir = FileUtils::GetTempDirectory();
diff --git a/kroll b/kroll
index 72112e8a7..963951975 160000
--- a/kroll
+++ b/kroll
@@ -1 +1 @@
-Subproject commit 72112e8a709ef70d940f2eb64f8c01065c431021
+Subproject commit 96395197504910513a0061f44dc65b7ad1a61602
diff --git a/modules/ti.Filesystem/File.cpp b/modules/ti.Filesystem/File.cpp
index 16c3844e0..078774efd 100644
--- a/modules/ti.Filesystem/File.cpp
+++ b/modules/ti.Filesystem/File.cpp
@@ -598,7 +598,7 @@ void File::GetSpaceAvailable(const ValueList& args, KValueRef result)
 
 #ifdef OS_OSX
     NSString *p = [NSString stringWithCString:this->filename.c_str() encoding:NSUTF8StringEncoding];
-    unsigned long avail = [[[[NSFileManager defaultManager] fileSystemAttributesAtPath:p] objectForKey:NSFileSystemFreeSize] longValue];
+    unsigned long avail = [[[[NSFileManager defaultManager] attributesOfFileSystemForPath:p error:nil] objectForKey:NSFileSystemFreeSize] longValue];
     diskSize = (double)avail;
 #elif defined(OS_WIN32)
     unsigned __int64 i64FreeBytesToCaller;
diff --git a/modules/ti.UI/SConscript b/modules/ti.UI/SConscript
index 3854d23f2..759fec190 100644
--- a/modules/ti.UI/SConscript
+++ b/modules/ti.UI/SConscript
@@ -9,6 +9,13 @@ build.add_thirdparty(env, 'poco')
 build.add_thirdparty(env, 'webkit')
 env.Append(LIBS=['tiappmodule'])
 
+# If we are on Mac use the system installed WebKit.
+# Otherwise use our build of WebKit on all other platforms.
+if build.is_osx():
+    env.Append(FRAMEWORKS=['WebKit', 'JavaScriptCore'])
+else:
+    build.add_thirdparty(env, 'webkit')
+
 sources = Glob('*.cpp') + ['url/URLUtils.cpp']
 if build.is_linux():
     sources = sources + Glob('gtk/*.cpp')
diff --git a/modules/ti.UI/ScriptEvaluator.cpp b/modules/ti.UI/ScriptEvaluator.cpp
deleted file mode 100644
index c9707ad22..000000000
--- a/modules/ti.UI/ScriptEvaluator.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2009-2010 Appcelerator, Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ScriptEvaluator.h"
-
-#include <algorithm>
-#include <cstring>
-
-#include <kroll/javascript/javascript_module.h>
-
-namespace Titanium {
-
-/*static*/
-void ScriptEvaluator::Initialize()
-{
-    static AutoPtr<ScriptEvaluator> instance(new ScriptEvaluator());
-#if defined(OS_OSX)
-    [WebScriptElement addScriptEvaluator:[[OSXScriptEvaluator alloc]
-        initWithEvaluator:instance.get()]];
-#elif defined(OS_WIN32)
-    addScriptEvaluator(instance.get());
-#elif defined(OS_LINUX)
-    webkit_titanium_add_script_evaluator(instance.get());
-#endif
-}
-
-} // namespace Titanium
-
-#if defined(OS_OSX)
-@implementation OSXScriptEvaluator
--(OSXScriptEvaluator*) initWithEvaluator:(Titanium::ScriptEvaluator*)evaluator
-{
-    self = [self init];
-    delegate = evaluator;
-    return self;
-}
-
--(BOOL) matchesMimeType:(NSString*)mimeType
-{
-    return kroll::Script::GetInstance()->CanEvaluate([mimeType UTF8String]);
-}
-
--(void) evaluate:(NSString *)mimeType sourceCode:(NSString*)sourceCode context:(void *)context
-{
-    // TODO get source name from webkit
-    try
-    {
-        Script::GetInstance()->Evaluate([mimeType UTF8String], "<script>",
-            [sourceCode UTF8String], JSContextToKrollContext(context));
-    }
-    catch (ValueException& exception)
-    {
-        Logger::Get("UI.ScriptEvaluator")->Error("Script evaluation failed: %s",
-            exception.ToString().c_str());
-    }
-}
-@end
-#endif
diff --git a/modules/ti.UI/ScriptEvaluator.h b/modules/ti.UI/ScriptEvaluator.h
deleted file mode 100644
index 978edd550..000000000
--- a/modules/ti.UI/ScriptEvaluator.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2009-2010 Appcelerator, Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ScriptEvaluator_h
-#define ScriptEvaluator_h
-
-#include <kroll/kroll.h>
-#include <Poco/URI.h>
-
-#if defined(OS_OSX)
-#   import <WebKit/WebKit.h>
-#   import <WebKit/WebViewPrivate.h>
-#   import <WebKit/WebInspector.h>
-#   import <WebKit/WebScriptDebugDelegate.h>
-#   import <WebKit/WebScriptObject.h>
-#   import <WebKit/WebPreferencesPrivate.h>
-#   import <WebKit/WebScriptElement.h>
-#elif defined(OS_LINUX)
-#   include <webkit/webkit.h>
-#   include <webkit/webkittitanium.h>
-#else
-#   include <WebKit/WebKit.h>
-#   include <WebKit/WebKitCOMAPI.h>
-#   include <WebKit/WebKitTitanium.h>
-#   include <comutil.h>
-#endif
-
-#include <kroll/javascript/javascript_module.h>
-
-#define JSContextToKrollContext(context) \
-    new KKJSObject(reinterpret_cast<JSContextRef>(context), JSContextGetGlobalObject(reinterpret_cast<JSContextRef>(context)))
-
-namespace Titanium {
-
-/*
- * Script evaluators are responsible for matching and
- * evaluating custom <script> types, and preprocessing URLs.
- */
-class ScriptEvaluator
-#if defined(OS_WIN32)
-    : public IWebScriptEvaluator, public COMReferenceCounted
-#elif defined(OS_LINUX)
-    : public WebKitWebScriptEvaluator, public ReferenceCounted
-#else
-    : public ReferenceCounted
-#endif
-{
-    public:
-    static void Initialize();
-
-    protected:
-    ScriptEvaluator() {}
-
-    public:
-#if defined(OS_WIN32)
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-         return COMReferenceCounted::QueryInterface(riid,ppvObject);
-    }
-    virtual ULONG STDMETHODCALLTYPE AddRef(void)
-    {
-        return COMReferenceCounted::AddRef();
-    }
-    virtual ULONG STDMETHODCALLTYPE Release(void)
-    {
-        return COMReferenceCounted::Release();
-    }
-    virtual HRESULT STDMETHODCALLTYPE matchesMimeType(BSTR mimeType, BOOL *result)
-    {
-        *result = kroll::Script::GetInstance()->CanEvaluate((const char *)_bstr_t(mimeType));
-        return S_OK;
-    }
-    virtual HRESULT STDMETHODCALLTYPE evaluate(BSTR mimeType, BSTR sourceCode, int* context)
-    {
-        try
-        {
-            kroll::Script::GetInstance()->Evaluate(
-                (const char *)_bstr_t(mimeType), "<script>",
-                (const char *)_bstr_t(sourceCode),
-                JSContextToKrollContext(context));
-        }
-        catch (ValueException& exception)
-        {
-            Logger::Get("UI.ScriptEvaluator")->Error("Script evaluation failed: %s",
-                exception.ToString().c_str());
-
-        }
-        return S_OK;
-    }
-#elif defined(OS_LINUX)
-    virtual bool matchesMimeType(const gchar *mimeType)
-    {
-        return kroll::Script::GetInstance()->CanEvaluate(mimeType);
-    }
-    virtual void evaluate(const gchar *mimeType, const gchar *sourceCode, void* context)
-    {
-        try
-        {
-            kroll::Script::GetInstance()->Evaluate(mimeType, "<script>",
-                sourceCode, JSContextToKrollContext(context));
-        }
-        catch (ValueException& exception)
-        {
-            Logger::Get("UI.ScriptEvaluator")->Error("Script evaluation failed: %s",
-                exception.ToString().c_str());
-
-        }
-    }
-#endif
-};
-
-} // namespace Titanium
-
-#if defined(OS_OSX)
-@interface OSXScriptEvaluator : NSObject
-{
-    Titanium::ScriptEvaluator* delegate;
-}
--(OSXScriptEvaluator*) initWithEvaluator:(Titanium::ScriptEvaluator*)evaluator;
--(BOOL) matchesMimeType:(NSString*)mimeType;
--(void) evaluate:(NSString *)mimeType sourceCode:(NSString*)sourceCode context:(void *)context;
-@end
-#elif defined(OS_LINUX)
-    extern void addScriptEvaluator(WebKitWebScriptEvaluator *evaluator);
-#endif
-
-#endif
diff --git a/modules/ti.UI/UIModule.cpp b/modules/ti.UI/UIModule.cpp
index a2986afe9..464c257b5 100644
--- a/modules/ti.UI/UIModule.cpp
+++ b/modules/ti.UI/UIModule.cpp
@@ -18,7 +18,6 @@
 
 #include <Poco/URI.h>
 
-#include "ScriptEvaluator.h"
 #include "../ti.App/ApplicationConfig.h"
 
 #if defined(OS_OSX)
@@ -53,7 +52,6 @@ void UIModule::Start()
     host->GetGlobalObject()->SetObject("UI", this->uiBinding);
     host->GetGlobalObject()->SetObject("Notification", this->uiBinding);
 
-    ScriptEvaluator::Initialize();
     ApplicationConfig* config = ApplicationConfig::Instance();
     if (!config)
     {
diff --git a/modules/ti.UI/mac/MenuDelegate.h b/modules/ti.UI/mac/MenuDelegate.h
index 574494a15..8580a1082 100644
--- a/modules/ti.UI/mac/MenuDelegate.h
+++ b/modules/ti.UI/mac/MenuDelegate.h
@@ -18,13 +18,17 @@
 
 #include "MenuMac.h"
 
-@interface MenuDelegate : NSObject
+@interface MenuDelegate : NSObject <NSMenuDelegate>
 {
     Titanium::MenuMac* menu;
     BOOL dirty;
     BOOL registerNative;
 }
 - (id)initWithMenu:(Titanium::MenuMac*)menu willRegister:(BOOL)willRegister;
+
+- (NSInteger)numberOfItemsInMenu:(NSMenu *)menu;
 - (void)menuNeedsUpdate:(NSMenu *)menu;
+
 - (void)markAsDirty;
+
 @end
diff --git a/modules/ti.UI/mac/MenuDelegate.mm b/modules/ti.UI/mac/MenuDelegate.mm
index edd19df06..69324d036 100644
--- a/modules/ti.UI/mac/MenuDelegate.mm
+++ b/modules/ti.UI/mac/MenuDelegate.mm
@@ -30,6 +30,12 @@ - (id)initWithMenu:(Titanium::MenuMac*)inMenu willRegister:(BOOL)willRegister
     return self;
 }
 
+- (NSInteger)numberOfItemsInMenu:(NSMenu *)menu
+{
+    // We will setup the menu in menuNeedsUpdate.
+    return -1;
+}
+
 - (void)menuNeedsUpdate:(NSMenu *)nativeMenu
 {
     if (!dirty) {
diff --git a/modules/ti.UI/mac/MenuItemMac.mm b/modules/ti.UI/mac/MenuItemMac.mm
index 795e10864..850c91142 100644
--- a/modules/ti.UI/mac/MenuItemMac.mm
+++ b/modules/ti.UI/mac/MenuItemMac.mm
@@ -79,10 +79,6 @@
         // native menu will have to use the title of the item it is attached to.
         [submenu setTitle:nstitle];
     }
-    if ([item menu] != nil)
-    {
-        [[item menu] sizeToFit];
-    }
 }
 
 /*static*/
@@ -105,10 +101,6 @@
         [item setImage:nil];
     }
 
-    if ([item menu] != nil) {
-        [[item menu] sizeToFit];
-    }
-
     if (needsRelease) {
         [image release];
     }
diff --git a/modules/ti.UI/mac/MenuMac.mm b/modules/ti.UI/mac/MenuMac.mm
index 7772f0c6c..db8938e3e 100644
--- a/modules/ti.UI/mac/MenuMac.mm
+++ b/modules/ti.UI/mac/MenuMac.mm
@@ -198,7 +198,6 @@
         int index = [nativeMenu numberOfItems] - rearOffset;
         [nativeMenu insertItem:nativeItem atIndex:index];
     }
-    [nativeMenu sizeToFit];
 }
 
 void MenuMac::AddChildrenToNSArray(NSMutableArray* array)
diff --git a/modules/ti.UI/mac/NativeWindow.h b/modules/ti.UI/mac/NativeWindow.h
index beb30257b..90269f692 100644
--- a/modules/ti.UI/mac/NativeWindow.h
+++ b/modules/ti.UI/mac/NativeWindow.h
@@ -21,8 +21,6 @@
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebKit.h>
 
-#import <WebKit/WebInspector.h>
-
 #include "../../ti.App/WindowConfig.h"
 
 namespace Titanium {
@@ -33,14 +31,13 @@ class UserWindowMac;
 
 @class WebViewDelegate;
 
-@interface NativeWindow : NSWindow
+@interface NativeWindow : NSWindow <NSWindowDelegate>
 {
     BOOL canReceiveFocus;
     WebView* webView;
     WebViewDelegate* delegate;
     BOOL requiresDisplay;
     AutoPtr<Titanium::UserWindowMac>* userWindow;
-    WebInspector* inspector;
     BOOL fullscreen;
     BOOL focused;
     NSRect savedFrame;
diff --git a/modules/ti.UI/mac/NativeWindow.mm b/modules/ti.UI/mac/NativeWindow.mm
index a52d11211..9c8a6ef8f 100644
--- a/modules/ti.UI/mac/NativeWindow.mm
+++ b/modules/ti.UI/mac/NativeWindow.mm
@@ -63,7 +63,6 @@ - (void)setupDecorations:(AutoPtr<WindowConfig>)config
         [self setOpaque:false];
         [self setBackgroundColor:[NSColor clearColor]];
         [webView setDrawsBackground:NO];
-        [webView setBackgroundColor:[NSColor clearColor]];
     }
     else if (config->HasTexturedBackground())
     {
@@ -78,12 +77,6 @@ - (void)setupDecorations:(AutoPtr<WindowConfig>)config
         // 1.0 to trick OS X into knowing that we are transparent.
         [webView setAlphaValue:0.99];
     }
-    else
-    {
-        // This is to match the default Windows behavior of painting
-        // the background of the web view white.
-        [webView setBackgroundColor:[NSColor whiteColor]];
-    }
 
     if (config->IsResizable() && config->IsUsingChrome())
         [self setShowsResizeIndicator:YES];
@@ -109,7 +102,6 @@ - (void)dealloc
     [delegate release];
     delegate = nil;
 
-    [inspector release];
     [webView release];
     webView = nil;
     [super dealloc];
@@ -121,30 +113,13 @@ - (UserWindowMac*)userWindow
 }
 - (void)showInspector:(BOOL)console
 {
-    if (inspector == nil)
-    {
-        inspector = [[WebInspector alloc] initWithWebView:webView];
-        [inspector detach:webView];
-    }
-    
-    if (console)
-    {
-        [inspector showConsole:webView];
-    }
-    else
-    {
-        [inspector show:webView];
-    }
+    // TODO(josh): we cannot programmatically control inspector
+    // using the public WebKit APIs. We should remove this method and any
+    // references to it else where in the code.
 }
 
 - (void)windowWillClose:(NSNotification *)notification
 {
-    if (inspector)
-    {
-        [inspector close:self];
-        [inspector release];
-        inspector = nil;
-    }
 }
 
 - (NSSize)windowWillResize:(NSWindow *) window toSize:(NSSize)newSize
diff --git a/modules/ti.UI/mac/TitaniumApplicationDelegate.h b/modules/ti.UI/mac/TitaniumApplicationDelegate.h
index b427e5fa2..c8e9e1fa3 100644
--- a/modules/ti.UI/mac/TitaniumApplicationDelegate.h
+++ b/modules/ti.UI/mac/TitaniumApplicationDelegate.h
@@ -18,16 +18,15 @@
 
 #include "UIMac.h"
 
-@interface TitaniumApplicationDelegate : NSObject
+@interface TitaniumApplicationDelegate : NSObject <NSApplicationDelegate>
 {
     Titanium::UIMac *binding;
 }
 
 -(id)initWithBinding:(Titanium::UIMac*)binding;
--(BOOL)application:(NSApplication*)theApplication
-    openFile:(NSString*)filename;
--(BOOL)application:(NSApplication*)theApplication
-    openFiles:(NSArray*)filenames;
+
+-(BOOL)application:(NSApplication*)theApplication openFile:(NSString*)filename;
+-(BOOL)application:(NSApplication*)theApplication openFiles:(NSArray*)filenames;
 -(NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication*)sender;
 
 @end
diff --git a/modules/ti.UI/mac/UIMac.mm b/modules/ti.UI/mac/UIMac.mm
index 4764108ec..925b61d2b 100644
--- a/modules/ti.UI/mac/UIMac.mm
+++ b/modules/ti.UI/mac/UIMac.mm
@@ -55,7 +55,7 @@ - (id)owner;
     , nativeDockMenu(nil)
     , activeWindow(0)
 {
-    application = [[TitaniumApplicationDelegate alloc] initWithBinding:this];
+    TitaniumApplicationDelegate* application = [[TitaniumApplicationDelegate alloc] initWithBinding:this];
     [application retain];
 
     NSApplication* nsapp = [NSApplication sharedApplication];
diff --git a/modules/ti.UI/mac/WebViewDelegate.h b/modules/ti.UI/mac/WebViewDelegate.h
index e4a35d5b0..982157c97 100644
--- a/modules/ti.UI/mac/WebViewDelegate.h
+++ b/modules/ti.UI/mac/WebViewDelegate.h
@@ -16,11 +16,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebKit.h>
-#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebInspector.h>
-#import <WebKit/WebScriptDebugDelegate.h>
 #import <WebKit/WebScriptObject.h>
-#import <WebKit/WebPreferencesPrivate.h>
 
 #include <kroll/kroll.h>
 
@@ -30,7 +26,6 @@
 @interface WebViewDelegate : NSObject
 {
     Titanium::NativeWindow* window;
-    WebInspector* inspector;
     BOOL initialDisplay;
     std::map<WebFrame*, KObjectRef>* frameToGlobalObject;
     Logger* logger;
diff --git a/modules/ti.UI/mac/WebViewDelegate.mm b/modules/ti.UI/mac/WebViewDelegate.mm
index 7a83d66b4..91b45994f 100644
--- a/modules/ti.UI/mac/WebViewDelegate.mm
+++ b/modules/ti.UI/mac/WebViewDelegate.mm
@@ -17,8 +17,6 @@
 #import "WebViewDelegate.h"
 
 #include <kroll/javascript/javascript_module.h>
-#include <WebKit/WebFramePrivate.h>
-#include <WebKit/WebPreferenceKeysPrivate.h>
 
 #include "MenuMac.h"
 #include "UserWindowMac.h"
@@ -44,30 +42,22 @@ -(void)setupPreferences
     // significantly.
     [webPrefs setCacheModel:WebCacheModelDocumentBrowser];
 
-    [webPrefs setDeveloperExtrasEnabled:kroll::Host::GetInstance()->DebugModeEnabled()];
     [webPrefs setPlugInsEnabled:YES];
     [webPrefs setJavaEnabled:YES];
     [webPrefs setJavaScriptEnabled:YES];
     [webPrefs setJavaScriptCanOpenWindowsAutomatically:YES];
-    [webPrefs setAllowUniversalAccessFromFileURLs:YES];
-    [webPrefs setDatabasesEnabled:YES];
-    [webPrefs setLocalStorageEnabled:YES];
-    [webPrefs setDOMPasteAllowed:YES];
     [webPrefs setUserStyleSheetEnabled:NO];
     [webPrefs setShouldPrintBackgrounds:YES];
 
-    // Setup the DB to store it's DB under our data directory for the app
-    NSString* datadir = [NSString stringWithUTF8String:
-        Host::GetInstance()->GetApplication()->GetDataPath().c_str()];
-    [webPrefs _setLocalStorageDatabasePath:[NSString stringWithUTF8String:
-        Host::GetInstance()->GetApplication()->GetDataPath().c_str()]];
     [[window webView] setPreferences:webPrefs];
     [webPrefs release];
 
+
+    // Store Web databases in our data directory.
+    // XXX(josh): does this work?
+    NSString* datadir = [NSString stringWithUTF8String:
+        Host::GetInstance()->GetApplication()->GetDataPath().c_str()];
     NSUserDefaults* standardUserDefaults = [NSUserDefaults standardUserDefaults];
-    [standardUserDefaults
-        setObject:[NSNumber numberWithInt:1]
-        forKey:WebKitEnableFullDocumentTeardownPreferenceKey];
     [standardUserDefaults
         setObject:datadir
         forKey:@"WebDatabaseDirectory"];
@@ -93,7 +83,6 @@ -(id)initWithWindow:(NativeWindow*)inWindow
     else
         [[[webView mainFrame] frameView] setAllowsScrolling:NO];
 
-    [webView setBackgroundColor:[NSColor clearColor]];
     [webView setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
     [webView setShouldCloseWithWindow:NO];
 
@@ -592,16 +581,6 @@ - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary
     if (!menu.isNull())
         menu->AddChildrenToNSArray(menuItems);
 
-    if (Host::GetInstance()->DebugModeEnabled())
-    {
-        [menuItems addObject:[NSMenuItem separatorItem]];
-        NSMenuItem* newItem = [[NSMenuItem alloc] initWithTitle:@"Show inspector"
-             action:@selector(showInspector) keyEquivalent:@""];
-        [newItem setTarget:self];
-        [menuItems addObject:newItem];
-        [newItem release];
-    }
-
     return menuItems;
 }