This will be Cappuccino 0.9.7-alpha1.

Fixed: nib2cib error on case sensitive filesystems.
Before this fix, nib2cib compilation would fail with `require error: couldn't find "OS"`.
2026-09-10 12:47:13 +00:00 · 2013-01-30 14:52:48 +00:00 · 2013-01-30 11:52:28 +00:00 · 2013-01-30 11:38:39 +00:00 · 2013-01-30 11:35:59 +00:00 · 2013-01-30 11:17:29 +00:00
1708 changed files with 45747 additions and 14467 deletions
@@ -10,3 +10,4 @@ WebSite
 xcuserdata/
 !*.xcodeproj/project.pbxproj
 *.xCodeSupport/
+*.XcodeSupport/
@@ -0,0 +1,8 @@
+language: node_js
+node_js:
+    - 0.8
+before_install:
+    - jdk_switcher use openjdk6
+install: ./bootstrap.sh --quiet --noprompt --directory ./narwhal
+script: jake test
+env: PATH=$HOME/build/$TRAVIS_REPO_SLUG/narwhal/bin:$PATH CAPP_BUILD=$HOME/build/$TRAVIS_REPO_SLUG/Build NARWHAL_ENGINE=rhino
@@ -227,7 +227,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
 {
    var indexSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, _items.length)];

-    [indexSet removeIndexes:_expandedIndexes];
+    [indexSet removeIndexes:_expandedItemIndexes];

    return indexSet;
 }
@@ -28,15 +28,19 @@
@import <Foundation/CPObject.j>
@import <Foundation/CPString.j>

-@import "CPApplication.j"
@import "CPButton.j"
@import "CPColor.j"
@import "CPFont.j"
@import "CPImage.j"
@import "CPImageView.j"
@import "CPPanel.j"
+@import "CPText.j"
@import "CPTextField.j"

+@class CPCheckBox
+
+@global CPApp
+
 /*
    @global
    @group CPAlertStyle
@@ -53,6 +57,8 @@ CPInformationalAlertStyle   = 1;
 */
 CPCriticalAlertStyle        = 2;

+var bottomHeight = 71;
+
 /*!
    @ingroup appkit

@@ -75,32 +81,33 @@ CPCriticalAlertStyle        = 2;
           representing the first button added to the alert which appears on the
           right, 1 representing the next button to the left and so on)
 */
-@implementation CPAlert : CPView
+@implementation CPAlert : CPObject
 {
-    BOOL            _showHelp               @accessors(property=showsHelp);
-    BOOL            _showSuppressionButton  @accessors(property=showsSuppressionButton);
+    BOOL                _showHelp               @accessors(property=showsHelp);
+    BOOL                _showSuppressionButton  @accessors(property=showsSuppressionButton);

-    CPAlertStyle    _alertStyle             @accessors(property=alertStyle);
-    CPString        _title                  @accessors(property=title);
-    CPView          _accessoryView          @accessors(property=accessoryView);
-    CPImage         _icon                   @accessors(property=icon);
+    CPAlertStyle        _alertStyle             @accessors(property=alertStyle);
+    CPString            _title                  @accessors(property=title);
+    CPView              _accessoryView          @accessors(property=accessoryView);
+    CPImage             _icon                   @accessors(property=icon);

-    CPArray         _buttons                @accessors(property=buttons,readonly);
-    CPCheckBox      _suppressionButton      @accessors(property=suppressionButton,readonly);
+    CPArray             _buttons                @accessors(property=buttons,readonly);
+    CPCheckBox          _suppressionButton      @accessors(property=suppressionButton,readonly);

-    id              _delegate               @accessors(property=delegate);
-    id              _modalDelegate;
-    SEL             _didEndSelector;
+    id                  _delegate               @accessors(property=delegate);
+    id                  _modalDelegate;
+    SEL                 _didEndSelector;

-    CPWindow        _window                 @accessors(property=window,readonly);
-    int             _defaultWindowStyle;
+    _CPAlertThemeView   _themeView              @accessors(property=themeView, readonly);
+    CPWindow            _window                 @accessors(property=window,readonly);
+    int                 _defaultWindowStyle;

-    CPImageView     _alertImageView;
-    CPTextField     _informativeLabel;
-    CPTextField     _messageLabel;
-    CPButton        _alertHelpButton;
+    CPImageView         _alertImageView;
+    CPTextField         _informativeLabel;
+    CPTextField         _messageLabel;
+    CPButton            _alertHelpButton;

-    BOOL            _needsLayout;
+    BOOL                _needsLayout;
 }

 #pragma mark Creating Alerts
@@ -163,7 +170,8 @@ CPCriticalAlertStyle        = 2;
        _alertStyle         = CPWarningAlertStyle;
        _showHelp           = NO;
        _needsLayout        = YES;
-        _defaultWindowStyle = CPTitledWindowMask;
+        _defaultWindowStyle = _CPModalWindowMask;
+        _themeView          = [_CPAlertThemeView new];

        _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
        _alertImageView     = [[CPImageView alloc] init];
@@ -180,6 +188,11 @@ CPCriticalAlertStyle        = 2;

 #pragma mark Accessors

+- (CPTheme)theme
+{
+    return [_themeView theme];
+}
+
 /*!
    set the theme to use

@@ -197,9 +210,20 @@ CPCriticalAlertStyle        = 2;

    _window = nil; // will be regenerated at next layout
    _needsLayout = YES;
-    [super setTheme:aTheme];
+    [_themeView setTheme:aTheme];
 }

+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName
+{
+    [_themeView setValue:aValue forThemeAttribute:aName];
+}
+
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(CPThemeState)aState
+{
+    [_themeView setValue:aValue forThemeAttribute:aName inState:aState];
+}
+
+
 /*! @deprecated
 */
 - (void)setWindowStyle:(int)aStyle
@@ -334,16 +358,16 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_layoutMessageView
 {
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
        sizeWithFontCorrection = 6.0,
        messageLabelWidth,
        messageLabelTextSize;

-    [_messageLabel setTextColor:[self currentValueForThemeAttribute:@"message-text-color"]];
-    [_messageLabel setFont:[self currentValueForThemeAttribute:@"message-text-font"]];
-    [_messageLabel setTextShadowColor:[self currentValueForThemeAttribute:@"message-text-shadow-color"]];
-    [_messageLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"message-text-shadow-offset"]];
-    [_messageLabel setAlignment:[self currentValueForThemeAttribute:@"message-text-alignment"]];
+    [_messageLabel setTextColor:[_themeView currentValueForThemeAttribute:@"message-text-color"]];
+    [_messageLabel setFont:[_themeView currentValueForThemeAttribute:@"message-text-font"]];
+    [_messageLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"message-text-shadow-color"]];
+    [_messageLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"message-text-shadow-offset"]];
+    [_messageLabel setAlignment:[_themeView currentValueForThemeAttribute:@"message-text-alignment"]];
    [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];

    messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -357,18 +381,18 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_layoutInformativeView
 {
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
        sizeWithFontCorrection = 6.0,
        informativeLabelWidth,
        informativeLabelOriginY,
        informativeLabelTextSize;

-    [_informativeLabel setTextColor:[self currentValueForThemeAttribute:@"informative-text-color"]];
-    [_informativeLabel setFont:[self currentValueForThemeAttribute:@"informative-text-font"]];
-    [_informativeLabel setTextShadowColor:[self currentValueForThemeAttribute:@"informative-text-shadow-color"]];
-    [_informativeLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
-    [_informativeLabel setAlignment:[self currentValueForThemeAttribute:@"informative-text-alignment"]];
+    [_informativeLabel setTextColor:[_themeView currentValueForThemeAttribute:@"informative-text-color"]];
+    [_informativeLabel setFont:[_themeView currentValueForThemeAttribute:@"informative-text-font"]];
+    [_informativeLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-color"]];
+    [_informativeLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
+    [_informativeLabel setAlignment:[_themeView currentValueForThemeAttribute:@"informative-text-alignment"]];
    [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];

    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -386,8 +410,8 @@ CPCriticalAlertStyle        = 2;
    if (!_accessoryView)
        return;

-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
        accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
        accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;

@@ -403,16 +427,16 @@ CPCriticalAlertStyle        = 2;
    if (!_showSuppressionButton)
        return;

-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        suppressionViewXOffset = [self currentValueForThemeAttribute:@"suppression-button-x-offset"],
-        suppressionViewYOffset = [self currentValueForThemeAttribute:@"suppression-button-y-offset"],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        suppressionViewXOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-x-offset"],
+        suppressionViewYOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-y-offset"],
+        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
        suppressionButtonViewOriginY = CGRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + defaultElementsMargin + suppressionViewYOffset;

-    [_suppressionButton setTextColor:[self currentValueForThemeAttribute:@"suppression-button-text-color"]];
-    [_suppressionButton setFont:[self currentValueForThemeAttribute:@"suppression-button-text-font"]];
-    [_suppressionButton setTextShadowColor:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
-    [_suppressionButton setTextShadowOffset:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
+    [_suppressionButton setTextColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-color"]];
+    [_suppressionButton setFont:[_themeView currentValueForThemeAttribute:@"suppression-button-text-font"]];
+    [_suppressionButton setTextShadowColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
+    [_suppressionButton setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
    [_suppressionButton sizeToFit];

    [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
@@ -424,14 +448,17 @@ CPCriticalAlertStyle        = 2;
 */
 - (CGSize)_layoutButtonsFromView:(CPView)lastView
 {
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        minimumSize = [self currentValueForThemeAttribute:@"size"],
-        buttonOffset = [self currentValueForThemeAttribute:@"button-offset"],
-        helpLeftOffset = [self currentValueForThemeAttribute:@"help-image-left-offset"],
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        minimumSize = [_themeView currentValueForThemeAttribute:@"size"],
+        buttonOffset = [_themeView currentValueForThemeAttribute:@"button-offset"],
+        helpLeftOffset = [_themeView currentValueForThemeAttribute:@"help-image-left-offset"],
        aRepresentativeButton = [_buttons objectAtIndex:0],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
        panelSize = [[_window contentView] frame].size,
        buttonsOriginY,
+        buttonMarginY,
+        buttonMarginX,
+        theme = [self theme],
        offsetX;

    [aRepresentativeButton setTheme:[self theme]];
@@ -442,8 +469,25 @@ CPCriticalAlertStyle        = 2;
        panelSize.height = minimumSize.height;

    buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
+
+    if ([_window styleMask] & _CPModalWindowMask)
+        buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height / 2 + buttonOffset;
+
    offsetX = panelSize.width - inset.right;

+    switch ([_window styleMask])
+    {
+        case _CPModalWindowMask:
+            buttonMarginY = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-y"];
+            buttonMarginX = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-x"];
+            break;
+
+        default:
+            buttonMarginY = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-y"];
+            buttonMarginX = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-x"];
+            break;
+    }
+
    for (var i = [_buttons count] - 1; i >= 0 ; i--)
    {
        var button = _buttons[i];
@@ -455,14 +499,14 @@ CPCriticalAlertStyle        = 2;
            height = CGRectGetHeight(buttonFrame);

        offsetX -= width;
-        [button setFrame:CGRectMake(offsetX, buttonsOriginY, width, height)];
+        [button setFrame:CGRectMake(offsetX + buttonMarginX, buttonsOriginY + buttonMarginY, width, height)];
        offsetX -= 10;
    }

    if (_showHelp)
    {
-        var helpImage = [self currentValueForThemeAttribute:@"help-image"],
-            helpImagePressed = [self currentValueForThemeAttribute:@"help-image-pressed"],
+        var helpImage = [_themeView currentValueForThemeAttribute:@"help-image"],
+            helpImagePressed = [_themeView currentValueForThemeAttribute:@"help-image-pressed"],
            helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
            helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);

@@ -487,7 +531,7 @@ CPCriticalAlertStyle        = 2;
    if (!_window)
        [self _createWindowWithStyle:nil];

-    var iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
+    var iconOffset = [_themeView currentValueForThemeAttribute:@"image-offset"],
        theImage = _icon,
        finalSize;

@@ -495,13 +539,13 @@ CPCriticalAlertStyle        = 2;
        switch (_alertStyle)
        {
            case CPWarningAlertStyle:
-                theImage = [self currentValueForThemeAttribute:@"warning-image"];
+                theImage = [_themeView currentValueForThemeAttribute:@"warning-image"];
                break;
            case CPInformationalAlertStyle:
-                theImage = [self currentValueForThemeAttribute:@"information-image"];
+                theImage = [_themeView currentValueForThemeAttribute:@"information-image"];
                break;
            case CPCriticalAlertStyle:
-                theImage = [self currentValueForThemeAttribute:@"error-image"];
+                theImage = [_themeView currentValueForThemeAttribute:@"error-image"];
                break;
        }

@@ -519,7 +563,7 @@ CPCriticalAlertStyle        = 2;
    if (_showSuppressionButton)
        lastView = _suppressionButton;
    else if (_accessoryView)
-        lastView = _accessoryView
+        lastView = _accessoryView;

    finalSize = [self _layoutButtonsFromView:lastView];
    if ([_window styleMask] & CPDocModalWindowMask)
@@ -528,6 +572,12 @@ CPCriticalAlertStyle        = 2;
    [_window setFrameSize:finalSize];
    [_window center];

+    if ([_window styleMask] & _CPModalWindowMask || [_window styleMask] & CPHUDBackgroundWindowMask)
+    {
+        [_window setMovable:YES];
+        [_window setMovableByWindowBackground:YES];
+    }
+
    _needsLayout = NO;
 }

@@ -592,7 +642,7 @@ CPCriticalAlertStyle        = 2;
 - (void)_createWindowWithStyle:(int)forceStyle
 {
    var frame = CGRectMakeZero();
-    frame.size = [self currentValueForThemeAttribute:@"size"];
+    frame.size = [_themeView currentValueForThemeAttribute:@"size"];

    _window = [[CPWindow alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
    [_window setLevel:CPStatusWindowLevel];
@@ -633,8 +683,8 @@ CPCriticalAlertStyle        = 2;
 {
    if ([_window isSheet])
    {
-        [CPApp endSheet:_window returnCode:[aSender tag]];
        [_window orderOut:nil];
+        [CPApp endSheet:_window returnCode:[aSender tag]];
    }
    else
    {
@@ -650,17 +700,19 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
 {
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-            [_delegate alertDidEnd:self returnCode:returnCode];
-
    if (_didEndSelector)
        objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);

    _modalDelegate = nil;
    _didEndSelector = nil;
+
+    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+        [_delegate alertDidEnd:self returnCode:returnCode];
 }

-#pragma mark Theme Attributes
+@end
+
+@implementation _CPAlertThemeView : CPView

 + (CPString)defaultThemeClass
 {
@@ -685,7 +737,11 @@ CPCriticalAlertStyle        = 2;
                                                [CPColor blackColor],
                                                [CPFont systemFontOfSize:12.0],
                                                [CPNull null],
-                                                0.0
+                                                0.0,
+                                                0.0,
+                                                0.0,
+                                                0.0,
+                                                0.0,
                                                ]
                                       forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
                                                @"message-text-alignment", @"message-text-color", @"message-text-font", @"message-text-shadow-color", @"message-text-shadow-offset",
@@ -703,7 +759,11 @@ CPCriticalAlertStyle        = 2;
                                                @"suppression-button-text-color",
                                                @"suppression-button-text-font",
                                                @"suppression-button-text-shadow-color",
-                                                @"suppression-button-text-shadow-offset"
+                                                @"suppression-button-text-shadow-offset",
+                                                @"modal-window-button-margin-y",
+                                                @"modal-window-button-margin-x",
+                                                @"standard-window-button-margin-y",
+                                                @"standard-window-button-margin-x"
                                                ]];
 }

@@ -123,23 +123,29 @@ ACTUAL_FRAME_RATE = 0;
 - (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
 {
    var timingFunctionName;
+
    switch (anAnimationCurve)
    {
-        case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
-                                    break;
+        case CPAnimationEaseInOut:
+            timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
+            break;

-        case CPAnimationEaseIn:     timingFunctionName = kCAMediaTimingFunctionEaseIn;
-                                    break;
+        case CPAnimationEaseIn:
+            timingFunctionName = kCAMediaTimingFunctionEaseIn;
+            break;

-        case CPAnimationEaseOut:    timingFunctionName = kCAMediaTimingFunctionEaseOut;
-                                    break;
+        case CPAnimationEaseOut:
+            timingFunctionName = kCAMediaTimingFunctionEaseOut;
+            break;

-        case CPAnimationLinear:     timingFunctionName = kCAMediaTimingFunctionLinear;
-                                    break;
+        case CPAnimationLinear:
+            timingFunctionName = kCAMediaTimingFunctionLinear;
+            break;

-        default:                    [CPException raise:CPInvalidArgumentException
-                                                reason:"Invalid value provided for animation curve"];
-                                    break;
+        default:
+            [CPException raise:CPInvalidArgumentException
+                        reason:@"Invalid value provided for animation curve"];
+            break;
    }

    _animationCurve = anAnimationCurve;
@@ -325,7 +331,7 @@ ACTUAL_FRAME_RATE = 0;
 // currently used function to determine time
 // 1:1 conversion to js from webkit source files
 // UnitBezier.h, WebCore_animation_AnimationBase.cpp
-var CubicBezierAtTime = function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration)
+var CubicBezierAtTime = function(t, p1x, p1y, p2x, p2y, duration)
 {
    var ax = 0,
        bx = 0,
@@ -20,17 +20,22 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#import "../Foundation/CPRange.h"
+
@import <Foundation/CPBundle.j>

@import "CPCompatibility.j"
+@import "CPColorPanel.j"
+@import "CPCursor.j"
+@import "CPDocumentController.j"
@import "CPEvent.j"
@import "CPMenu.j"
@import "CPResponder.j"
-@import "CPDocumentController.j"
@import "CPThemeBlend.j"
@import "CPCibLoading.j"
+@import "CPPanel.j"
@import "CPPlatform.j"
-
+@import "CPWindowController.j"

 var CPMainCibFile               = @"CPMainCibFile",
    CPMainCibFileHumanFriendly  = @"Main cib file base name",
@@ -84,6 +89,7 @@ CPRunContinuesResponse  = -1002;
    CPArray                 _eventListeners;

    CPEvent                 _currentEvent;
+    CPWindow                _lastMouseMoveWindow;

    CPArray                 _windows;
    CPWindow                _keyWindow;
@@ -139,9 +145,7 @@ CPRunContinuesResponse  = -1002;
    {
        _eventListeners = [];

-        _windows = [];
-
-        [_windows addObject:nil];
+        _windows = [[CPNull null]];
    }

    return self;
@@ -406,7 +410,7 @@ CPRunContinuesResponse  = -1002;
 }


- (void)_documentController:(NSDocumentController *)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
+- (void)_documentController:(CPDocumentController)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
 {
    // callback method for terminate:
    if (didCloseAll)
@@ -583,12 +587,14 @@ CPRunContinuesResponse  = -1002;
    _currentEvent = anEvent;
    CPEventModifierFlags = [anEvent modifierFlags];

+    var theWindow = [anEvent window];
+
 #if PLATFORM(DOM)
-    var willPropagate = [[[anEvent window] platformWindow] _willPropagateCurrentDOMEvent];
+    var willPropagate = [[theWindow platformWindow] _willPropagateCurrentDOMEvent];

    // temporarily pretend we won't propagate the event. we'll restore the saved value later
    // we do this outside the if so that changes user code might make in _handleKeyEquiv. are preserved
-    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO];
+    [[theWindow platformWindow] _propagateCurrentDOMEvent:NO];
 #endif

    // Check if this is a candidate for key equivalent...
@@ -600,7 +606,7 @@ CPRunContinuesResponse  = -1002;

        // Unconditionally propagate on these keys to solve browser copy paste bugs
        if ((characters == "c" || characters == "x" || characters == "v") && (modifierFlags & CPPlatformActionKeyMask))
-            [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:YES];
+            [[theWindow platformWindow] _propagateCurrentDOMEvent:YES];
 #endif

        return;
@@ -608,18 +614,31 @@ CPRunContinuesResponse  = -1002;

 #if PLATFORM(DOM)
    // if we make it this far, then restore the original willPropagate value
-    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
+    [[theWindow platformWindow] _propagateCurrentDOMEvent:willPropagate];
 #endif

    if (_eventListeners.length)
    {
        if (_eventListeners[_eventListeners.length - 1]._mask & (1 << [anEvent type]))
-            _eventListeners.pop()._callback(anEvent);
+        {
+            var listener = _eventListeners.pop();
+            listener._callback(anEvent);

-        return;
+            if (listener._dequeue)
+                return;
+        }
    }

-    [[anEvent window] sendEvent:anEvent];
+    if ([anEvent type] == CPMouseMoved)
+    {
+        if (theWindow !== _lastMouseMoveWindow)
+            [_lastMouseMoveWindow _mouseExitedResizeRect];
+
+        _lastMouseMoveWindow = theWindow;
+    }
+
+    if (theWindow)
+        [theWindow sendEvent:anEvent];
 }

 /*!
@@ -655,6 +674,10 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPWindow)windowWithWindowNumber:(int)aWindowNumber
 {
+    // Never allow _windows[0] to be returned - it's an internal CPNull placeholder.
+    if (!aWindowNumber)
+        return nil;
+
    return _windows[aWindowNumber];
 }

@@ -663,7 +686,8 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)windows
 {
-    return _windows;
+    // Return all windows, but not the CPNull placeholder in _windows[0].
+    return [_windows subarrayWithRange:_CPMakeRange(1, [_windows count] - 1)];
 }

 /*!
@@ -891,31 +915,33 @@ CPRunContinuesResponse  = -1002;

 /*!
    Fires a callback function when an event matching a given mask occurs.
-    @param aCallback - A js function to be fired.
-    @prarm aMask - An event mask for the next event.
-    @param anExpiration - The date for which this callback expires (not implemented).
+    @param aCallback A js function to be fired.
+    @prarm aMask An event mask for the next event.
+    @param anExpiration The date for which this callback expires (not implemented).
    @param inMode (not implemented).
-    @param shouldDequeue (not implemented).
+    @param shouldDequeue YES to remove the event from the queue after calling the callback,
+    NO to deliver it normally.
 */
 - (void)setCallback:(Function)aCallback forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.push(_CPEventListenerMake(aMask, aCallback));
+    _eventListeners.push(_CPEventListenerMake(aMask, aCallback, shouldDequeue));
 }

 /*!
    Assigns a target and action for the next event matching a given event mask.
    The callback method called will be passed the CPEvent when it fires.

-    @param aTarget - The target object for the callback.
-    @param aSelector - The selector which should be called on the target object.
-    @param aMask - The mask for a given event which should trigger the callback.
-    @param anExpiration - The date for which the callback expires (not implemented).
+    @param aTarget The target object for the callback.
+    @param aSelector The selector which should be called on the target object.
+    @param aMask The mask for a given event which should trigger the callback.
+    @param anExpiration The date for which the callback expires (not implemented).
    @param aMode (not implemented).
-    @param shouldDequeue (not implemented).
+    @param shouldDequeue YES to remove the event from the queue after calling the callback,
+    NO to deliver it normally.
 */
 - (void)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }));
+    _eventListeners.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }, shouldDequeue));
 }

 /*!
@@ -953,6 +979,7 @@ CPRunContinuesResponse  = -1002;
        [aWindow orderFront:self];
        [aSheet setPlatformWindow:[aWindow platformWindow]];
    }
+
    [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }

@@ -1042,9 +1069,9 @@ CPRunContinuesResponse  = -1002;
    if (!args || args.length == 0)
    {
        _args = [];
-#if PLATFORM(DOM)
-        window.location.hash = @"#";
-#endif
+        // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
+        if (window && window.location)
+            window.location.hash = @"#";
        return;
    }

@@ -1059,9 +1086,9 @@ CPRunContinuesResponse  = -1002;

    var hash = [toEncode componentsJoinedByString:@"/"];

-#if PLATFORM(DOM)
-    window.location.hash = @"#" + hash;
-#endif
+    // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
+    if (window && window.location)
+        window.location.hash = @"#" + hash;
 }

 - (void)_reloadArguments
@@ -1181,7 +1208,7 @@ CPRunContinuesResponse  = -1002;

 + (CPString)defaultThemeName
 {
-    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
+    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo2");
 }

@end
@@ -1191,28 +1218,29 @@ var _CPModalSessionMake = function(aWindow, aStopCode)
    return { _window:aWindow, _state:CPRunContinuesResponse , _previous:nil };
 };

-var _CPEventListenerMake = function(anEventMask, aCallback)
+var _CPEventListenerMake = function(anEventMask, aCallback, shouldDequeue)
 {
-    return { _mask:anEventMask, _callback:aCallback };
+    return { _mask:anEventMask, _callback:aCallback, _dequeue:shouldDequeue };
 };

 // Make this a global for use in CPPlatformWindow+DOM.j.
 _CPRunModalLoop = function(anEvent)
 {
-    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:NO];
+    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:YES];

    var theWindow = [anEvent window],
        modalSession = CPApp._currentSession;

-    // The special case for popovers here is not clear. In Cocoa the popover window does not respond YES to worksWhenModal,
-    // yet it works when there is a modal window. Maybe it starts its own modal session, but interaction with the original
-    // modal window seems to continue working as well. Regardless of correctness, this solution beats popovers not working
-    // at all from sheets.
+    /*
+        The special case for popovers here is not clear. In Cocoa the popover window does not respond YES to worksWhenModal, yet it works when there is a modal window. Maybe it starts its own modal session, but interaction with the original modal window seems to continue working as well. Regardless of correctness, this solution beats popovers not working at all from sheets.
+    */
    if (theWindow == modalSession._window ||
        [theWindow worksWhenModal] ||
        [theWindow attachedSheet] == modalSession._window || // -dw- allow modal parent of sheet to be repositioned
-        ([theWindow isKindOfClass:_CPAttachedWindow] && [[theWindow targetView] window] === modalSession._window))
+        ([theWindow isKindOfClass:_CPPopoverWindow] && [[theWindow targetView] window] === modalSession._window))
+    {
        [theWindow sendEvent:anEvent];
+    }
 };

 /*!
@@ -1295,7 +1323,7 @@ var _CPAppBootstrapperActions = nil;
    var defaultThemeName = [CPApplication defaultThemeName],
        themeURL = nil;

-    if (defaultThemeName === @"Aristo")
+    if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2")
        themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"];
    else
        themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"];
@@ -1340,26 +1368,25 @@ var _CPAppBootstrapperActions = nil;
    // FIXME: We should implement autoenabling.
    [mainMenu setAutoenablesItems:NO];

-    var bundle = [CPBundle bundleForClass:[CPApplication class]],
-        newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+    var newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];

-    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
-    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [newMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" forClass:_CPMenuView]];
+    [newMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" inState:CPThemeStateHighlighted forClass:_CPMenuView]];

    [mainMenu addItem:newMenuItem];

    var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];

-    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
-    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [openMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" forClass:_CPMenuView]];
+    [openMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" inState:CPThemeStateHighlighted forClass:_CPMenuView]];

    [mainMenu addItem:openMenuItem];

    var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
        saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];

-    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
-    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [saveMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" forClass:_CPMenuView]];
+    [saveMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" inState:CPThemeStateHighlighted forClass:_CPMenuView]];

    [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
    [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
@@ -964,7 +964,7 @@
                // be the 'wrong' one - as in not the one the user selected - but the wrong
                // one is still just another pointer to the same object, so the user will not
                // be able to see any difference.
-                contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
+                var contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
                [_contentObject removeObjectAtIndex:contentIndex];
            }
            [arrangedObjects removeObjectAtIndex:anIndex];
@@ -1093,7 +1093,8 @@
        isCompound = [self handlesContentAsCompoundValue],
        dotIndex = keyPath.lastIndexOf("."),
        firstPart = dotIndex !== CPNotFound ? keyPath.substring(0, dotIndex) : nil,
-        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy];
+        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy],
+        newValue;

    if (!isCompound && !isSelectionProxy)
    {
@@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPTextField.j"
@import "CPView.j"

 // CPBoxType
@@ -55,14 +56,6 @@ CPBelowBottom = 6;
 {
    CPBoxType       _boxType;
    CPBorderType    _borderType;
-
-    CPColor         _borderColor;
-    CPColor         _fillColor;
-
-    float           _cornerRadius;
-    float           _borderWidth;
-
-    CPSize          _contentMargin;
    CPView          _contentView;

    CPString        _title @accessors(getter=title);
@@ -85,18 +78,31 @@ CPBelowBottom = 6;
    return box;
 }

- (id)initWithFrame:(CPRect)frameRect
+ (CPString)defaultThemeClass
+{
+    return @"box";
+}
+
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], 1.0, 3.0, CGSizeMakeZero(), 6.0, [CPNull null], CGSizeMakeZero()]
+                                       forKeys:[   @"background-color",
+                                                   @"border-color",
+                                                   @"border-width",
+                                                   @"corner-radius",
+                                                   @"inner-shadow-offset",
+                                                   @"inner-shadow-size",
+                                                   @"inner-shadow-color",
+                                                   @"content-margin"]];
+}
+
+- (id)initWithFrame:(CGRect)frameRect
 {
    self = [super initWithFrame:frameRect];

    if (self)
    {
        _borderType = CPBezelBorder;
-        _fillColor = [CPColor clearColor];
-        _borderColor = [CPColor blackColor];
-
-        _borderWidth = 1.0;
-        _contentMargin = CGSizeMake(0.0, 0.0);

        _titlePosition = CPNoTitle;
        _titleView = [CPTextField labelWithTitle:@""];
@@ -118,7 +124,7 @@ CPBelowBottom = 6;

    @return the border rectangle of the box
 */
- (CPRect)borderRect
+- (CGRect)borderRect
 {
    return [self bounds];
 }
@@ -208,58 +214,54 @@ CPBelowBottom = 6;

 - (CPColor)borderColor
 {
-    return _borderColor;
+    return [self valueForThemeAttribute:@"border-color"];
 }

 - (void)setBorderColor:(CPColor)color
 {
-    if ([color isEqual:_borderColor])
+    if ([color isEqual:[self borderColor]])
        return;

-    _borderColor = color;
-    [self setNeedsDisplay:YES];
+    [self setValue:color forThemeAttribute:@"border-color"];
 }

 - (float)borderWidth
 {
-    return _borderWidth;
+    return [self valueForThemeAttribute:@"border-width"];
 }

 - (void)setBorderWidth:(float)width
 {
-    if (width === _borderWidth)
+    if (width === [self borderWidth])
        return;

-    _borderWidth = width;
-    [self setNeedsDisplay:YES];
+    [self setValue:width forThemeAttribute:@"border-width"];
 }

 - (float)cornerRadius
 {
-    return _cornerRadius;
+    return [self valueForThemeAttribute:@"corner-radius"];
 }

 - (void)setCornerRadius:(float)radius
 {
-    if (radius === _cornerRadius)
+    if (radius === [self cornerRadius])
        return;

-    _cornerRadius = radius;
-    [self setNeedsDisplay:YES];
+    [self setValue:radius forThemeAttribute:@"corner-radius"];
 }

 - (CPColor)fillColor
 {
-    return _fillColor;
+    return [self valueForThemeAttribute:@"background-color"];
 }

 - (void)setFillColor:(CPColor)color
 {
-    if ([color isEqual:_fillColor])
+    if ([color isEqual:[self fillColor]])
        return;

-    _fillColor = color;
-    [self setNeedsDisplay:YES];
+    [self setValue:color forThemeAttribute:@"background-color"];
 }

 - (CPView)contentView
@@ -272,34 +274,36 @@ CPBelowBottom = 6;
    if (aView === _contentView)
        return;

-    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
+    var borderWidth = [self borderWidth],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+
+    [aView setFrame:CGRectInset([self bounds], contentMargin.width + borderWidth, contentMargin.height + borderWidth)];
    [aView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
    [self replaceSubview:_contentView with:aView];

    _contentView = aView;
 }

- (CPSize)contentViewMargins
+- (CGSize)contentViewMargins
 {
-    return _contentMargin;
+    return [self valueForThemeAttribute:@"content-margin"];
 }

- (void)setContentViewMargins:(CPSize)size
+- (void)setContentViewMargins:(CGSize)size
 {
     if (size.width < 0 || size.height < 0)
         [CPException raise:CPGenericException reason:@"Margins must be positive"];

-    _contentMargin = CGSizeMakeCopy(size);
-    [self setNeedsDisplay:YES];
+    [self setValue:CGSizeMakeCopy(size) forThemeAttribute:@"content-margin"];
 }

- (void)setFrameFromContentFrame:(CPRect)aRect
+- (void)setFrameFromContentFrame:(CGRect)aRect
 {
-    var offset = [self _titleHeightOffset];
+    var offset = [self _titleHeightOffset],
+        borderWidth = [self borderWidth],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];

-    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + offset[0] + _borderWidth))];
-
-    [self setNeedsDisplay:YES];
+    [self setFrame:CGRectInset(aRect, -(contentMargin.width + borderWidth), -(contentMargin.height + offset[0] + borderWidth))];
 }

 - (void)setTitle:(CPString)aTitle
@@ -360,7 +364,7 @@ CPBelowBottom = 6;
        case CPAtTop:
        case CPAboveTop:
        case CPBelowTop:
-            [_titleView setFrameOrigin:CPPointMake(5.0, 0.0)];
+            [_titleView setFrameOrigin:CGPointMake(5.0, 0.0)];
            [_titleView setAutoresizingMask:CPViewNotSizable];
            break;

@@ -368,7 +372,7 @@ CPBelowBottom = 6;
        case CPAtBottom:
        case CPBelowBottom:
            var h = [_titleView frameSize].height;
-            [_titleView setFrameOrigin:CPPointMake(5.0, [self frameSize].height - h)];
+            [_titleView setFrameOrigin:CGPointMake(5.0, [self frameSize].height - h)];
            [_titleView setAutoresizingMask:CPViewMinYMargin];
            break;
    }
@@ -380,17 +384,13 @@ CPBelowBottom = 6;
 - (void)sizeToFit
 {
    var contentFrame = [_contentView frame],
-        offset = [self _titleHeightOffset];
+        offset = [self _titleHeightOffset],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];

    if (!contentFrame)
        return;

-    [_contentView setAutoresizingMask:CPViewNotSizable];
-    [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2,
-                                  contentFrame.size.height + _contentMargin.height * 2 + offset[0])];
-    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height + offset[1])];
+    [_contentView setFrameOrigin:CGPointMake(contentMargin.width, contentMargin.height + offset[1])];
 }

 - (float)_titleHeightOffset
@@ -411,11 +411,8 @@ CPBelowBottom = 6;
    }
 }

- (void)drawRect:(CPRect)rect
+- (void)drawRect:(CGRect)rect
 {
-    if (_borderType === CPNoBorder)
-        return;
-
    var bounds = CGRectMakeCopy([self bounds]);

    switch (_boxType)
@@ -447,10 +444,14 @@ CPBelowBottom = 6;
            [self _drawBezelBorderInRect:bounds];
            break;

-        default:
+        case CPGrooveBorder:
        case CPLineBorder:
            [self _drawLineBorderInRect:bounds];
            break;
+
+        case CPNoBorder:
+            [self _drawNoBorderInRect:bounds];
+            break;
    }
 }

@@ -461,8 +462,8 @@ CPBelowBottom = 6;
    CGContextSetStrokeColor(context, [self borderColor]);
    CGContextSetLineWidth(context, 1.0);

-    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMinY(aRect) + 0.5);
-    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMinY(aRect) + 0.5);
+    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMidY(aRect));
+    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMidY(aRect));
    CGContextStrokePath(context);
 }

@@ -473,49 +474,68 @@ CPBelowBottom = 6;
    CGContextSetStrokeColor(context, [self borderColor]);
    CGContextSetLineWidth(context, 1.0);

-    CGContextMoveToPoint(context, CGRectGetMinX(aRect) + 0.5, CGRectGetMinY(aRect));
-    CGContextAddLineToPoint(context, CGRectGetMinX(aRect) + 0.5, CGRectGetHeight(aRect));
+    CGContextMoveToPoint(context, CGRectGetMidX(aRect), CGRectGetMinY(aRect));
+    CGContextAddLineToPoint(context, CGRectGetMidX(aRect), CGRectGetHeight(aRect));
    CGContextStrokePath(context);
 }

+- (void)_drawLineBorderInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        cornerRadius = [self cornerRadius],
+        borderWidth = [self borderWidth];
+
+    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
+
+    CGContextSetFillColor(context, [self fillColor]);
+    CGContextSetStrokeColor(context, [self borderColor]);
+
+    CGContextSetLineWidth(context, borderWidth);
+    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+}
+
 - (void)_drawBezelBorderInRect:(CGRect)aRect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        sides = [CPMinYEdge, CPMaxXEdge, CPMaxYEdge, CPMinXEdge],
-        sideGray = 190.0 / 255.0,
-        grays = [142.0 / 255.0, sideGray, sideGray, sideGray],
-        borderWidth = _borderWidth;
+        cornerRadius = [self cornerRadius],
+        borderWidth = [self borderWidth],
+        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
+        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
+        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"];

-    while (borderWidth--)
-        aRect = CPDrawTiledRects(aRect, aRect, sides, grays);
+    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
+
+    // clip the canvas to the actual content view in order to only display inner shadow
+    CGContextBeginPath(context);
+    CGContextAddPath(context, CGPathWithRoundedRectangleInRect(aRect, cornerRadius, cornerRadius, YES, YES, YES, YES));
+    CGContextClip(context);
+
+    CGContextSetFillColor(context, [self fillColor]);
+    CGContextSetStrokeColor(context, [self borderColor]);
+
+    CGContextSetShadowWithColor(context, shadowOffset, shadowSize, shadowColor);
+    CGContextSetLineWidth(context, borderWidth);
+    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+}
+
+
+- (void)_drawNoBorderInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort];

    CGContextSetFillColor(context, [self fillColor]);
    CGContextFillRect(context, aRect);
 }

- (void)_drawLineBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];

-    aRect = CGRectInset(aRect, _borderWidth / 2.0, _borderWidth / 2.0);

-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextSetStrokeColor(context, [self borderColor]);
-
-    CGContextSetLineWidth(context, _borderWidth);
-    CGContextFillRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
-}

@end

 var CPBoxTypeKey          = @"CPBoxTypeKey",
    CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
-    CPBoxBorderColorKey   = @"CPBoxBorderColorKey",
-    CPBoxFillColorKey     = @"CPBoxFillColorKey",
-    CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
-    CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
-    CPBoxContentMarginKey = @"CPBoxContentMarginKey",
    CPBoxTitle            = @"CPBoxTitle",
    CPBoxTitlePosition    = @"CPBoxTitlePosition",
    CPBoxTitleView        = @"CPBoxTitleView";
@@ -531,14 +551,6 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
        _boxType       = [aCoder decodeIntForKey:CPBoxTypeKey];
        _borderType    = [aCoder decodeIntForKey:CPBoxBorderTypeKey];

-        _borderColor   = [aCoder decodeObjectForKey:CPBoxBorderColorKey];
-        _fillColor     = [aCoder decodeObjectForKey:CPBoxFillColorKey];
-
-        _cornerRadius  = [aCoder decodeFloatForKey:CPBoxCornerRadiusKey];
-        _borderWidth   = [aCoder decodeFloatForKey:CPBoxBorderWidthKey];
-
-        _contentMargin = [aCoder decodeSizeForKey:CPBoxContentMarginKey];
-
        _title         = [aCoder decodeObjectForKey:CPBoxTitle];
        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
        _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
@@ -560,18 +572,9 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",

    [aCoder encodeInt:_boxType forKey:CPBoxTypeKey];
    [aCoder encodeInt:_borderType forKey:CPBoxBorderTypeKey];
-
-    [aCoder encodeObject:_borderColor forKey:CPBoxBorderColorKey];
-    [aCoder encodeObject:_fillColor forKey:CPBoxFillColorKey];
-
-    [aCoder encodeFloat:_cornerRadius forKey:CPBoxCornerRadiusKey];
-    [aCoder encodeFloat:_borderWidth forKey:CPBoxBorderWidthKey];
-
    [aCoder encodeObject:_title forKey:CPBoxTitle];
    [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
    [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
-
-    [aCoder encodeSize:_contentMargin forKey:CPBoxContentMarginKey];
 }

@end
@@ -24,15 +24,16 @@

@import "CPControl.j"
@import "CPImage.j"
+@import "CPScrollView.j"
@import "CPTableView.j"
@import "CPTextField.j"
-@import "CPScrollView.j"
+
+@global CPApp

 /*!
    @ingroup appkit
    @class CPBrowser
 */
-
@implementation CPBrowser : CPControl
 {
    id              _delegate;
@@ -65,18 +66,18 @@
    CPArray         _columnWidths;
 }

-+ (CPImage)branchImage
+ (CPString)defaultThemeClass
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
-                                                    pathForResource:"browser-leaf.png"]
-                                              size:CGSizeMake(9,9)];
+    return "browser";
 }

-+ (CPImage)highlightedBranchImage
+ (id)themeAttributes
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
-                                                    pathForResource:"browser-leaf-highlighted.png"]
-                                              size:CGSizeMake(9,9)];
+    return [CPDictionary dictionaryWithJSObject:{
+        @"image-control-resize": [CPNull null],
+        @"image-control-leaf": [CPNull null],
+        @"image-control-leaf-pressed": [CPNull null]
+    }];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -276,8 +277,8 @@
    var column = [[CPTableColumn alloc] initWithIdentifier:@"Leaf"],
        view = [[_CPBrowserLeafView alloc] initWithFrame:CGRectMakeZero()];

-    [view setBranchImage:[[self class] branchImage]];
-    [view setHighlightedBranchImage:[[self class] highlightedBranchImage]];
+    [view setBranchImage:[self valueForThemeAttribute:@"image-control-leaf"]];
+    [view setHighlightedBranchImage:[self valueForThemeAttribute:@"image-control-leaf-pressed"]];

    [column setDataView:view];
    [column setResizingMask:CPTableColumnNoResizing];
@@ -704,8 +705,6 @@
@end


-var _CPBrowserResizeControlBackgroundImage = nil;
-
@implementation _CPBrowserResizeControl : CPView
 {
    CGPoint     _mouseDownX;
@@ -714,22 +713,14 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    unsigned    _width;
 }

-+ (CPImage)backgroundImage
-{
-    if (!_CPBrowserResizeControlBackgroundImage)
-    {
-        var path = [[CPBundle bundleForClass:[self class]] pathForResource:"browser-resize-control.png"];
-        _CPBrowserResizeControlBackgroundImage = [[CPImage alloc] initWithContentsOfFile:path
-                                                                                    size:CGSizeMake(15, 14)];
-    }
-
-    return _CPBrowserResizeControlBackgroundImage;
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
    if (self = [super initWithFrame:aFrame])
-        [self setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
+    {
+        var browser = [[CPBrowser alloc] init];
+        [self setBackgroundColor:[CPColor colorWithPatternImage:[browser valueForThemeAttribute:@"image-control-resize"]]];
+    }
+

    return self;
 }
@@ -819,13 +810,13 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    return [_browser canDragRowsWithIndexes:rowIndexes inColumn:[_browser columnOfTableView:self] withEvent:[CPApp currentEvent]];
 }

- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPointPointer)dragImageOffset
+- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
 {
    return [_browser draggingImageForRowsWithIndexes:dragRows inColumn:[_browser columnOfTableView:self] withEvent:dragEvent offset:dragImageOffset] ||
           [super dragImageForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragImageOffset];
 }

- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPoint)dragViewOffset
+- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragViewOffset
 {
    var count = theTableColumns.length;
    while (count--)
@@ -25,7 +25,8 @@

@import "CPControl.j"
@import "CPStringDrawing.j"
-
+@import "CPText.j"
+@import "CPWindow_Constants.j"

 /* @group CPBezelStyle */

@@ -79,7 +80,7 @@ var CPButtonBezelStyleStateMap = [CPDictionary dictionaryWithObjects:[CPButtonSt
                                                             forKeys:[CPRoundedBezelStyle, CPRoundRectBezelStyle]];


-CPButtonDefaultHeight = 24.0;
+CPButtonDefaultHeight = 25.0;
 CPButtonImageOffset   = 3.0;

 /*!
@@ -989,5 +990,5 @@ var CPButtonImageKey                    = @"CPButtonImageKey",

@end

-@import "CPCheckBox.j"
-@import "CPRadio.j"
+//@import "CPCheckBox.j"
+//@import "CPRadio.j"
@@ -1,5 +1,31 @@
+/*
+ * CPButtonBar.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

@import "CPView.j"
+@import "CPWindow_Constants.j"
+
+@class CPSplitView
+
+@global CPPopUpButtonStatePullsDown


@implementation CPButtonBar : CPView
@@ -12,7 +38,7 @@
 + (id)plusButton
 {
    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
+        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-plus" forClass:[CPButtonBar class]];

    [button setBordered:NO];
    [button setImage:image];
@@ -24,7 +50,7 @@
 + (id)minusButton
 {
    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
+        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-minus" forClass:[CPButtonBar class]];

    [button setBordered:NO];
    [button setImage:image];
@@ -36,7 +62,7 @@
 + (id)actionPopupButton
 {
    var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"action_button.png"] size:CGSizeMake(22, 14)];
+        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-action" forClass:[CPButtonBar class]];

    [button addItemWithTitle:nil];
    [[button lastItem] setImage:image];
@@ -55,8 +81,24 @@

 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color", @"button-text-color"]];
+    return [CPDictionary dictionaryWithObjects:[   CGInsetMake(0.0, 0.0, 0.0, 0.0),
+                                                   CGSizeMakeZero(),
+                                                   [CPNull null],
+                                                   [CPNull null],
+                                                   [CPNull null],
+                                                   [CPNull null],
+                                                   [CPNull null],
+                                                   [CPNull null],
+                                                   [CPNull null]]
+                                       forKeys:[   @"resize-control-inset",
+                                                   @"resize-control-size",
+                                                   @"resize-control-color",
+                                                   @"bezel-color",
+                                                   @"button-bezel-color",
+                                                   @"button-text-color",
+                                                   @"button-image-plus",
+                                                   @"button-image-minus",
+                                                   @"button-image-action"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -22,6 +22,7 @@

@import "CPView.j"

+@class CPScrollView

 /*!
    @ingroup appkit
@@ -26,9 +26,13 @@
@import <Foundation/CPKeyedArchiver.j>
@import <Foundation/CPKeyedUnarchiver.j>

-@import "CPView.j"
@import "CPCollectionViewItem.j"
@import "CPCompatibility.j"
+@import "CPPasteboard.j"
+@import "CPView.j"
+
+@class CPClipView
+

 /*!
    @ingroup appkit
@@ -21,12 +21,24 @@
 */

@import <Foundation/CPObject.j>
+@import "CPGraphicsContext.j"

@import "CGColor.j"

@import "CPCompatibility.j"
@import "CPImage.j"

+
+/*!
+    Orientation to use with \c CPColorPattern for vertical patterns.
+*/
+CPColorPatternIsVertical = YES;
+
+/*!
+    Orientation to use with \c CPColorPattern for horizontal patterns.
+*/
+CPColorPatternIsHorizontal = NO;
+
 /// @cond IGNORE

 var _redComponent        = 0,
@@ -57,64 +69,6 @@ var cachedBlackColor,

 /// @endcond

-/*!
-    Orientation to use with \c CPColorPattern for vertical patterns.
-*/
-CPColorPatternIsVertical = YES;
-
-/*!
-    Orientation to use with \c CPColorPattern for horizontal patterns.
-*/
-CPColorPatternIsHorizontal = NO;
-
-/*!
-    To create a simple color with a pattern image:
-
-    <code>CPColorWithImages(name, width, height{, bundle})</code>
-
-    To create a color with a three part pattern image:
-
-    <code>CPColorWithImages(slices{, orientation})</code>
-
-    where slices is an array of three [name, width, height{, bundle}] arrays,
-    and orientation is \c CPColorPatternIsVertical or \ref CPColorPatternIsHorizontal.
-    If orientatation is not passed, it defaults to \ref CPColorPatternIsHorizontal.
-
-    To create a color with a nine part pattern image:
-
-    <code>CPColorWithImages(slices);</code>
-
-    where slices is an array of nine [name, width, height{, bundle}] arrays.
-*/
-function CPColorWithImages()
-{
-    if (arguments.length < 3)
-    {
-        var slices = arguments[0],
-            imageSlices = [];
-
-        for (var i = 0; i < slices.length; ++i)
-        {
-            var slice = slices[i];
-
-            imageSlices.push(slice ? CPImageInBundle(slice[0], CGSizeMake(slice[1], slice[2]), slice[3]) : nil);
-        }
-
-        if (imageSlices.length === 3)
-            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:arguments[1] || CPColorPatternIsHorizontal]];
-        else
-            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
-    }
-    else if (arguments.length === 3 || arguments.length === 4)
-    {
-        return [CPColor colorWithPatternImage:CPImageInBundle(arguments[0], CGSizeMake(arguments[1], arguments[2]), arguments[3])];
-    }
-    else
-    {
-        return nil;
-    }
-}
-
 /*!
    @ingroup appkit

@@ -739,7 +693,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image

        for (var i = 0; i < slices.length; ++i)
        {
-            var imgDescription = [slices[i] description];
+            var imgDescription = [slices[i] description] || "nil";

            description += imgDescription.replace(/^/mg, "        ") + ",\n";
        }
@@ -747,7 +701,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
        description = description.substr(0, description.length - 2) + "\n    ]\n}";
    }
    else
-        description += [patternImage description].replace(/^/mg, "    ") + "\n}";
+        description += ([patternImage description] || "nil").replace(/^/mg, "    ") + "\n}";

    return description;
 }
@@ -872,4 +826,550 @@ var byteToHex = function(n)
           hexCharacters.charAt(n % 16);
 };

+/*!
+    To create a simple color with a pattern image:
+        CPColorWithImages(name, width, height{, bundle})
+
+    To create a color with a three-part/nine-part image using a pattern string:
+        CPColorWithImages(pattern, attributes{, bundle})
+
+    <pattern> must have one or more placeholders. There are there possible
+    placeholders available that together can be used to build a filename:
+
+    style     A top-level style, for example normal (empty) and "default".
+    state     The state of a view, for example "highlighted" and "disabled".
+    position  The position of an image within a 3-part or 9-part image.
+              This must be provided.
+
+    Each placeholder is filled with the values you pass in a the attributes object.
+    Neither style nor state are necessary, if you omit them the next level of the
+    hierarchy is the top level.
+
+    Attributes
+    ----------
+    styles: [...]
+    An array of style names. For example, if you want to generate the filenames
+    "button-bezel" and "default-button-bezel", you would use ["", "default"]
+    for the styles.
+
+    states: [...]
+    An array of state names.
+
+    positions: <spec>
+    Specifies the naming convention for the slices of the image. For 3-part images,
+    <spec> may be one of:
+
+        "@"     Equivalent to ["left", "center", "right"] for horizontal
+                images, ["top", "center", "bottom"] for vertical images
+        "#"     Equivalent to ["0", "1", "2"]
+        [...]   An array of any three literal strings
+
+    For 9-part images, <spec> may be one of:
+
+        "@" | "abbrev"  Equivalent to ["top-left", "top", "top-right",
+                                       "left", "center", "right",
+                                       "bottom-left", "bottom", "bottom-right"]
+        "full"          Equivalent to ["top-left", "top-center", "top-right",
+                                       "center-left", "center-center", "center-right",
+                                       "bottom-left", "bottom-center", "bottom-right"]
+        "#"              Equivalent to ["0", "1", "2", "3", "4", "5", "6", "7", "8"]
+        [...]           An array of any nine literal strings
+
+    width: <number>
+    The width of the left image for horizontal 3-part images, the top image for
+    vertical 3-part images, or the top left corner for 9-part images.
+
+    height: <number>
+    The height of the left image for horizontal 3-part images, the top image for
+    vertical 3-part images, or the top left corner for 9-part images.
+
+    centerWidth: <number>
+    For a horizontal 3-part image that has a center slice width that is not 1.0,
+    set this for the width of the center slice. If omitted, it defaults
+    to 1.0. Not used for 9-part images.
+
+    rightWidth: <number>
+    For a horizontal 3-part image that has different left/right slice widths,
+    or a 9-part image that has different left/right corner slice widths,
+    set this for the width of the right slice. If omitted, the "width"
+    value is used for left and right widths.
+
+    centerHeight: <number>
+    For a vertical 3-part image that has a center slice height that is not 1.0,
+    set this for the height of the center slice. If omitted, it defaults
+    to 1.0. Not used for 9-part images.
+
+    bottomHeight: <number>
+    For a vertical image that has different top/bottom slice heights,
+    or a 9-part image that has different top/bottom corner slice heights,
+    set this for the height of the bottom slice. If omitted, the "height"
+    value is used for top and bottom heights.
+
+    centerIsNil: <BOOL>
+    For 9-part images, if the center image is nil, set this to YES.
+    If omitted or set to NO, a center image must be provided.
+
+    separator: <string>
+    The separator to use between components of the pattern.
+    If it is omitted, it defaults to "-".
+
+    orientation: PatternIsHorizontal | PatternIsVertical
+    The orientation of the image. This must be specified for 3-part images,
+    it should NOT be specified for 9-part images.
+
+    Using a pattern, all of this:
+
+    bezelColor = PatternColor(
+        [
+            ["button-bezel-left.png", 4.0, 24.0],
+            ["button-bezel-center.png", 1.0, 24.0],
+            ["button-bezel-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    highlightedBezelColor = PatternColor(
+        [
+            ["button-bezel-highlighted-left.png", 4.0, 24.0],
+            ["button-bezel-highlighted-center.png", 1.0, 24.0],
+            ["button-bezel-highlighted-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    disabledBezelColor = PatternColor(
+        [
+            ["button-bezel-disabled-left.png", 4.0, 24.0],
+            ["button-bezel-disabled-center.png", 1.0, 24.0],
+            ["button-bezel-disabled-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    defaultBezelColor = PatternColor(
+        [
+            ["default-button-bezel-left.png", 4.0, 24.0],
+            ["default-button-bezel-center.png", 1.0, 24.0],
+            ["default-button-bezel-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    defaultHighlightedBezelColor = PatternColor(
+        [
+            ["default-button-bezel-highlighted-left.png", 4.0, 24.0],
+            ["default-button-bezel-highlighted-center.png", 1.0, 24.0],
+            ["default-button-bezel-highlighted-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    defaultDisabledBezelColor = PatternColor(
+        [
+            ["default-button-bezel-disabled-left.png", 4.0, 24.0],
+            ["default-button-bezel-disabled-center.png", 1.0, 24.0],
+            ["default-button-bezel-disabled-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal)
+
+    can be replaced with this:
+
+    bezelColors = PatternColor(
+        "{style}button-bezel{state}{position}.png",
+        {
+            styles: ["", "default"],
+            states: ["", "highlighted", "disabled"],
+            positions: "@",
+            width: 4.0,
+            height: 24.0,
+            orientation: PatternIsHorizontal
+        })
+
+    Which would effectively create the following object:
+
+    {
+        "@":
+        {
+            "@": <ThreePartImage>:
+            [
+                ["button-bezel-left.png", 4.0, 24.0],
+                ["button-bezel-center.png", 1.0, 24.0],
+                ["button-bezel-right.png", 4.0, 24.0]
+            ],
+            "highlighted": <ThreePartImage>:
+            [
+                ["button-bezel-highlighted-left.png", 4.0, 24.0],
+                ["button-bezel-highlighted-center.png", 1.0, 24.0],
+                ["button-bezel-highlighted-right.png", 4.0, 24.0]
+            ],
+            "disabled": <ThreePartImage>:
+            [
+                ["button-bezel-disabled-left.png", 4.0, 24.0],
+                ["button-bezel-disabled-center.png", 1.0, 24.0],
+                ["button-bezel-disabled-right.png", 4.0, 24.0]
+            ]
+        },
+
+        "default":
+        {
+            "@": <ThreePartImage>:
+            [
+                ["default-button-bezel-left.png", 4.0, 24.0],
+                ["default-button-bezel-center.png", 1.0, 24.0],
+                ["default-button-bezel-right.png", 4.0, 24.0]
+            ],
+            "highlighted": <ThreePartImage>:
+            [
+                ["default-button-bezel-highlighted-left.png", 4.0, 24.0],
+                ["default-button-bezel-highlighted-center.png", 1.0, 24.0],
+                ["default-button-bezel-highlighted-right.png", 4.0, 24.0]
+            ],
+            "disabled": <ThreePartImage>:
+            [
+                ["default-button-bezel-disabled-left.png", 4.0, 24.0],
+                ["button-bezel-disabled-center.png", 1.0, 24.0],
+                ["default-button-bezel-disabled-right.png", 4.0, 24.0]
+            ]
+        }
+    }
+
+    To reference empty names in the pattern color, use the key "@".
+    So, for example, to reference the "default" style, "disabled" state,
+    you would use the following expression:
+
+    bezelColors["@"]["disabled"]
+
+    To create a color with a three-part pattern image explicitly:
+        CPColorWithImages(slices, orientation)
+
+    where slices is an array of three [name, width, height{, bundle}] arrays,
+    and orientation is CPColorPatternIsVertical or CPColorPatternIsHorizontal.
+
+    To create a color with a nine-part pattern image explicitly:
+        CPColorWithImages(slices);
+
+    where slices is an array of nine [name, width, height{, bundle}] arrays.
+*/
+function CPColorWithImages()
+{
+    var slices = nil,
+        numParts = 0,
+        isVertical = false,
+        imageFactory = CPImageInBundle,
+        args = Array.prototype.slice.apply(arguments);
+
+    if (typeof(args[args.length - 1]) === "function")
+        imageFactory = args.pop();
+
+    switch (args.length)
+    {
+        case 1:
+            return imageFromSlices(args[0], isVertical, imageFactory);
+
+        case 2:
+            // New-style 3-part and 9-part images
+            if (typeof(args[0]) === "string")
+                return patternColorsFromPattern.call(this, args[0], args[1], imageFactory);
+
+            return imageFromSlices(args[0], args[1], imageFactory);
+
+        case 3:
+            return [CPColor colorWithPatternImage:imageFactory(args[0], args[1], args[2])];
+
+        default:
+            throw("ERROR: Invalid argument count: " + args.length);
+    }
+}
+
+var imageFromSlices = function(slices, isVertical, imageFactory)
+{
+    var imageSlices = [];
+
+    for (var i = 0; i < slices.length; ++i)
+    {
+        var slice = slices[i];
+
+        imageSlices.push(slice ? imageFactory(slice[0], slice[1], slice[2]) : nil);
+    }
+
+    switch (slices.length)
+    {
+        case 3:
+            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:isVertical]];
+
+        case 9:
+            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
+
+        default:
+            throw("ERROR: Invalid number of image slices: " + slices.length);
+    }
+};
+
+var patternColorsFromPattern = function(pattern, attributes, imageFactory)
+{
+    if (pattern.match(/^.*\{[^}]+\}/))
+    {
+        var width = attributes["width"],
+            height = attributes["height"],
+            separator = attributes["separator"] || "-",
+            orientation = attributes["orientation"],
+            rightWidth,
+            bottomHeight,
+            centerWidthHeight,
+            centerIsNil,
+            numParts;
+
+        // positions are mandatory
+        if (pattern.indexOf("{position}") < 0)
+            throw("ERROR: Pattern strings must have a {position} placeholder (\"" + pattern + "\")");
+
+        if (orientation === undefined)
+        {
+            numParts = 9;
+
+            if (attributes["centerIsNil"] !== undefined)
+                centerIsNil = attributes["centerIsNil"];
+        }
+        else
+        {
+            numParts = 3;
+            isVertical = orientation === PatternIsVertical;
+
+            if (isVertical)
+            {
+                if (attributes["centerHeight"])
+                    centerWidthHeight = attributes["centerHeight"];
+            }
+            else
+            {
+                if (attributes["centerWidth"])
+                    centerWidthHeight = attributes["centerWidth"];
+            }
+        }
+
+        if (attributes["rightWidth"])
+            rightWidth = attributes["rightWidth"];
+
+        if (attributes["bottomHeight"])
+            bottomHeight = attributes["bottomHeight"];
+
+        var positions = attributes["positions"] || "@",
+            states = nil,
+            styles = nil;
+
+        if (numParts === 3)
+        {
+            if (positions === "@")
+            {
+                if (isVertical)
+                    positions = ["top", "center", "bottom"];
+                else
+                    positions = ["left", "center", "right"];
+            }
+            else if (positions === "#")
+                positions = ["0", "1", "2"];
+            else
+                throw("ERROR: Invalid positions: " + positions)
+        }
+        else // numParts === 9
+        {
+            if (positions === "@" || positions === "abbrev")
+                positions = ["top-left", "top", "top-right", "left", "center", "right", "bottom-left", "bottom", "bottom-right"];
+            else if (positions === "full")
+                positions = ["top-left", "top-center", "top-right", "center-left", "center-center", "center-right", "bottom-left", "bottom-center", "bottom-right"];
+            else if (positions === "#")
+                positions = ["0", "1", "2", "3", "4", "5", "6", "7", "8"];
+            else
+                throw("ERROR: Invalid positions: " + positions)
+        }
+
+        // states
+        if (pattern.indexOf("{state}") >= 0)
+        {
+            states = attributes["states"];
+
+            if (!states)
+                throw("ERROR: {state} placeholder in the pattern (\"" + pattern + "\") but no states item in the attributes");
+        }
+
+        // styles
+        if (pattern.indexOf("{style}") >= 0)
+        {
+            styles = attributes["styles"];
+
+            if (!styles)
+                throw("ERROR: {style} placeholder in the pattern (\"" + pattern + "\") but no styles item in the attributes");
+        }
+
+        // Now assemble the hierarchy
+        var placeholder = "{position}",
+            pos = pattern.indexOf(placeholder),
+            i;
+
+        for (i = 0; i < positions.length; ++i)
+            positions[i] = pattern.replace(placeholder, pos === 0 ? positions[i] + separator : separator + positions[i]);
+
+        var slices = positions,
+            object = slices,
+            key,
+            sep;
+
+        if (states)
+        {
+            placeholder = "{state}";
+            pos = pattern.indexOf(placeholder);
+            object = {};
+
+            for (i = 0; i < states.length; ++i)
+            {
+                var state = states[i];
+                key = state || "@";
+                sep = state ? separator : "";
+
+                object[key] = slices.slice(0);
+                replacePlaceholderInArray(object[key], placeholder, pos === 0 ? state + sep : sep + state);
+            }
+        }
+
+        if (styles)
+        {
+            placeholder = "{style}";
+            pos = pattern.indexOf(placeholder);
+
+            var styleObject = {};
+
+            for (i = 0; i < styles.length; ++i)
+            {
+                var style = styles[i];
+                key = style || "@";
+                sep = style ? separator : "";
+
+                if (states)
+                {
+                    styleObject[key] = cloneObject(object);
+                    replacePlaceholderInObject(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
+                }
+                else
+                {
+                    styleObject[key] = slices.slice(0);
+                    replacePlaceholderInArray(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
+                }
+            }
+
+            object = styleObject;
+        }
+
+        if (styles || states)
+        {
+            if (numParts === 3)
+                makeThreePartSlicesFromObject(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
+            else
+                makeNinePartSlicesFromObject(object, width, height, rightWidth, bottomHeight, centerIsNil);
+
+            makeImagesFromObject(object, isVertical, imageFactory);
+            return object;
+        }
+        else
+        {
+            if (numParts === 3)
+                makeThreePartSlicesFromArray(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
+            else
+                makeNinePartSlicesFromArray(object, width, height, rightWidth, bottomHeight, centerIsNil);
+
+            return imageFromSlices(object, isVertical, imageFactory);
+        }
+    }
+    else
+        throw("ERROR: No placeholders in slice pattern (\"" + pattern + "\")");
+};
+
+var replacePlaceholderInArray = function(array, find, replacement)
+{
+    for (var i = 0; i < array.length; ++i)
+        array[i] = array[i].replace(find, replacement);
+};
+
+var replacePlaceholderInObject = function(object, find, replacement)
+{
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                replacePlaceholderInArray(object[key], find, replacement);
+            else
+                replacePlaceholderInObject(object[key], find, replacement);
+};
+
+var cloneObject = function(object)
+{
+    var clone = {};
+
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                clone[key] = object[key].slice(0);
+            else if (typeof(object) === "object")
+                clone[key] = cloneObject(object[key]);
+            else
+                clone[key] = object[key];
+
+    return clone;
+};
+
+var makeThreePartSlicesFromObject = function(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
+{
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                makeThreePartSlicesFromArray(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
+            else // object
+                makeThreePartSlicesFromObject(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
+};
+
+var makeThreePartSlicesFromArray = function(array, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
+{
+    array[0] = [array[0], width, height];
+
+    if (isVertical)
+    {
+        array[1] = [array[1], width, centerWidthHeight ? centerWidthHeight : 1.0];
+        array[2] = [array[2], width, bottomHeight ? bottomHeight : height];
+    }
+    else
+    {
+        array[1] = [array[1], centerWidthHeight ? centerWidthHeight : 1.0, height];
+        array[2] = [array[2], rightWidth ? rightWidth : width, height];
+    }
+};
+
+var makeNinePartSlicesFromObject = function(object, width, height, rightWidth, bottomHeight, centerIsNil)
+{
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                makeNinePartSlicesFromArray(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
+            else // object
+                makeNinePartSlicesFromObject(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
+};
+
+var makeNinePartSlicesFromArray = function(array, width, height, rightWidth, bottomHeight, centerIsNil)
+{
+    rightWidth = rightWidth ? rightWidth : width;
+    bottomHeight = bottomHeight ? bottomHeight : height;
+
+    array[0] = [array[0], width, height];                // top-left
+    array[1] = [array[1], 1.0, height];                  // top
+    array[2] = [array[2], rightWidth, height];           // top-right
+    array[3] = [array[3], width, 1.0];                   // left
+    array[4] = centerIsNil ? nil : [array[4], 1.0, 1.0]; // center
+    array[5] = [array[5], rightWidth, 1.0];              // right
+    array[6] = [array[6], width, bottomHeight];          // bottom-left
+    array[7] = [array[7], 1.0, bottomHeight];            // bottom
+    array[8] = [array[8], rightWidth, bottomHeight];     // bottom-right
+};
+
+var makeImagesFromObject = function(object, isVertical, imageFactory)
+{
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                object[key] = imageFromSlices(object[key], isVertical, imageFactory);
+            else // object
+                makeImagesFromObject(object[key], isVertical, imageFactory);
+};
+
 /// @endcond
@@ -20,12 +20,31 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPApplication.j"
@import "CPButton.j"
@import "CPCookie.j"
@import "CPPanel.j"
@import "CPView.j"

+@class CPSlider
+
+@global CPApp
+
+/*
+    A color wheel
+    @global
+    @group CPColorPanelMode
+*/
+CPWheelColorPickerMode = 1;
+
+/*
+    Slider based picker
+    @global
+    @group CPColorPanelMode
+*/
+CPSliderColorPickerMode = 2;
+
+CPColorPickerViewWidth  = 265;
+CPColorPickerViewHeight = 370;

 CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";

@@ -38,22 +57,6 @@ var PREVIEW_HEIGHT = 20.0,
 var SharedColorPanel = nil,
    ColorPickerClasses = [];

-/*
-    A color wheel
-    @global
-    @group CPColorPanelMode
-*/
-CPWheelColorPickerMode = 1;
-/*
-    Slider based picker
-    @global
-    @group CPColorPanelMode
-*/
-CPSliderColorPickerMode = 2;
-
-CPColorPickerViewWidth  = 265;
-CPColorPickerViewHeight = 370;
-
 /*!
    @ingroup appkit
    @class CPColorPanel
@@ -123,7 +126,7 @@ CPColorPickerViewHeight = 370;

    if (self)
    {
-        [[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];
+        //[[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];

        [self setTitle:@"Color Panel"];
        [self setLevel:CPFloatingWindowLevel];
@@ -248,8 +251,8 @@ CPColorPickerViewHeight = 370;
        var height = (TOOLBAR_HEIGHT + 10 + PREVIEW_HEIGHT + 5 + SWATCH_HEIGHT + 32),
            bounds = [[self contentView] bounds];

-        [view setFrameSize:CPSizeMake(bounds.size.width - 10, bounds.size.height - height)];
-        [view setFrameOrigin:CPPointMake(5, height)];
+        [view setFrameSize:CGSizeMake(bounds.size.width - 10, bounds.size.height - height)];
+        [view setFrameOrigin:CGPointMake(5, height)];
    }

    [_currentView removeFromSuperview];
@@ -419,7 +422,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    CPCookie        _swatchCookie;
 }

- (id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];

@@ -437,7 +440,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    for (var i = 0; i < 50; i++)
    {
        // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-        var view = [[CPView alloc] initWithFrame:CPRectMake(13 * i + 1, 1, 12, 12)],
+        var view = [[CPView alloc] initWithFrame:CGRectMake(13 * i + 1, 1, 12, 12)],
            fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];

        [view setBackgroundColor:whiteColor];
@@ -592,7 +595,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    CPColorPanel    _colorPanel;
 }

- (id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];

@@ -633,7 +636,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";

    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPColorDragType] owner:self];

-    var bounds = CPRectMake(0, 0, 15, 15);
+    var bounds = CGRectMake(0, 0, 15, 15);

    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
    var dragView = [[CPView alloc] initWithFrame:bounds],
@@ -645,8 +648,8 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    [dragView addSubview:dragFillView];

    [self dragView:dragView
-                at:CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset:CPPointMake(0.0, 0.0)
+                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset:CGPointMake(0.0, 0.0)
             event:anEvent
        pasteboard:nil
            source:self
@@ -24,6 +24,12 @@

@import "CPView.j"

+@class CPSlider
+
+@global CPColorPickerViewWidth
+@global CPColorPickerViewHeight
+@global CPWheelColorPickerMode
+

 /*!
    @ingroup appkit
@@ -222,7 +228,7 @@
    float       _radius;
 }

- (id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
    if (self = [super initWithFrame:aFrame])
    {
@@ -269,13 +275,13 @@
 #endif
 }

- (void)setFrameSize:(CPSize)aSize
+- (void)setFrameSize:(CGSize)aSize
 {
    [super setFrameSize:aSize];
    [self setWheelSize:aSize];
 }

- (void)setWheelSize:(CPSize)aSize
+- (void)setWheelSize:(CGSize)aSize
 {
    var min = MIN(aSize.width, aSize.height);

@@ -353,7 +359,7 @@
    _angle     = [self radiansToDegrees:angle];
    _distance  = (distance / _radius) * 100.0;

-    [_crosshair setFrameOrigin:CPPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
+    [_crosshair setFrameOrigin:CGPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
 }

 - (void)setPositionToColor:(CPColor)aColor
@@ -20,6 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPObject.j>
+
 var sRGBColorSpace = nil;

 /*!
@@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPText.j"
@import "CPTextField.j"
@import "_CPPopUpList.j"

@@ -83,7 +84,7 @@ var CPComboBoxTextSubview = @"text",
 - (void)_initComboBox
 {
    _items = [CPArray array];
-    _listClass = [_CPPopUpList class];
+//    _listClass = [_CPPopUpList class];
    _usesDataSource = NO;
    _completes = NO;
    _canComplete = NO;
@@ -20,7 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPEvent.j"
+@import "CPEvent_Constants.j"
@import "CPPlatform.j"


@@ -83,7 +83,8 @@ CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
 var USER_AGENT                          = "",
    PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
    PLATFORM_FEATURES                   = 0,
-    PLATFORM_BUGS                       = 0;
+    PLATFORM_BUGS                       = 0,
+    PLATFORM_STYLE_JS_PROPERTIES        = {};

 // default these features to true

@@ -273,3 +274,106 @@ else
    CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
    CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
 }
+
+/*!
+    Return the properly prefixed JS property for the given name. E.g. in a webkit browser,
+    CPBrowserStyleProperty('transition') -> WebkitTransition
+
+    While technically not a style property, style related event handler names are also supported.
+    CPBrowserStyleProperty('transitionend') -> 'webkitTransitionEnd'
+
+    CSS is only available in platform(dom), so don't rely too heavily on it.
+*/
+function CPBrowserStyleProperty(aProperty)
+{
+    var lowerProperty = aProperty.toLowerCase();
+
+    if (PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] === undefined)
+    {
+        var r = nil;
+
+#if PLATFORM(DOM)
+        var testElement = document.createElement('div');
+
+        switch (lowerProperty)
+        {
+            case 'transitionend':
+                var candidates = {
+                        'WebkitTransition' : 'webkitTransitionEnd',
+                        'MozTransition'    : 'transitionend',
+                        'OTransition'      : 'oTransitionEnd',
+                        'msTransition'     : 'MSTransitionEnd',
+                        'transition'       : 'transitionend'
+                    };
+
+                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transition']] || nil;
+                break;
+            default:
+                var prefixes = ["Webkit", "Moz", "O", "ms"],
+                    strippedProperty = aProperty.split('-').join(' '),
+                    capProperty = [strippedProperty capitalizedString].split(' ').join('');
+
+                for (var i = 0; i < prefixes.length; i++)
+                {
+                    // First check if the property is already valid without being formatted, otherwise try the capitalized property
+                    if (prefixes[i] + aProperty in testElement.style)
+                    {
+                        r = prefixes[i] + aProperty;
+                        break;
+                    }
+                    else if (prefixes[i] + capProperty in testElement.style)
+                    {
+                        r = prefixes[i] + capProperty;
+                        break;
+                    }
+                }
+
+                if (!r && lowerProperty in testElement.style)
+                    r = lowerProperty;
+
+                break;
+        }
+#endif
+
+        PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] = r;
+    }
+
+    return PLATFORM_STYLE_JS_PROPERTIES[lowerProperty];
+}
+
+function CPBrowserCSSProperty(aProperty)
+{
+    var browserProperty = CPBrowserStyleProperty(aProperty);
+
+    if (!browserProperty)
+        return nil;
+
+    var prefixes = {
+            'Webkit': '-webkit-',
+            'Moz': '-moz-',
+            'O': '-o-',
+            'ms': '-ms-'
+        };
+
+    for (var prefix in prefixes)
+    {
+        if (browserProperty.substring(0, prefix.length) == prefix)
+        {
+            var browserPropertyWithoutPrefix = browserProperty.substring(prefix.length),
+                parts = browserPropertyWithoutPrefix.match(/[A-Z][a-z]+/g);
+
+            // If there were any capitalized words in the browserProperty, insert a "-" between each one
+            if (parts && parts.length > 0)
+                browserPropertyWithoutPrefix = parts.join("-");
+
+            return prefixes[prefix] + browserPropertyWithoutPrefix.toLowerCase();
+        }
+    }
+
+    var parts = browserProperty.match(/[A-Z][a-z]+/g);
+
+    if (parts && parts.length > 0)
+        browserProperty = parts.join("-");
+
+    return browserProperty.toLowerCase();
+}
@@ -22,12 +22,16 @@

 #import "../Foundation/Ref.h"

-@import "../Foundation/CPFormatter.j"
+@import <Foundation/CPFormatter.j>
+@import <Foundation/CPTimer.j>
+
@import "CPFont.j"
@import "CPShadow.j"
@import "CPView.j"
@import "CPKeyValueBinding.j"

+@global CPApp
+
 CPLeftTextAlignment      = 0;
 CPRightTextAlignment     = 1;
 CPCenterTextAlignment    = 2;
@@ -397,6 +401,14 @@ var CPControlBlackColor = [CPColor blackColor];
        [self highlight:YES];
 }

+/*!
+    Enabled controls accept first mouse by default.
+*/
+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return [self isEnabled];
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
    if (![self isEnabled])
@@ -64,7 +64,7 @@ var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey";
        count = _editors.length;

    for (; index < count; ++index)
-        if (![[_editors objectAtIndex:i] commitEditing])
+        if (![[_editors objectAtIndex:index] commitEditing])
            return NO;

    return YES;
@@ -94,7 +94,7 @@
        domain = "";

 #if PLATFORM(DOM)
-    document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;
+    document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain;
 #else
    _cookieValue = value;
    _expires = expires;
@@ -23,9 +23,12 @@ Cursor support by browser:

@import <Foundation/CPObject.j>

+@global CPApp
+
 var currentCursor = nil,
    cursorStack = [],
-    cursors = {};
+    cursors = {},
+    ieCursorMap = {};

@implementation CPCursor : CPObject
 {
@@ -36,6 +39,20 @@ var currentCursor = nil,
    BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
 }

+ (void)initialize
+{
+    if (self !== CPCursor)
+        return;
+
+    // IE < 9 does not support some CSS cursors, we map them to supported ones
+    ieCursorMap = {
+        "ew-resize":   "e-resize",
+        "ns-resize":   "n-resize",
+        "nesw-resize": "ne-resize",
+        "nwse-resize": "nw-resize"
+    };
+}
+
 - (id)initWithCSSString:(CPString)aString
 {
    if (self = [super init])
@@ -44,23 +61,30 @@ var currentCursor = nil,
    return self;
 }

-// hotspot is supported in CSS3 (but not IE).
- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
+/*!
+    Init a cursor with the given image and hotspot.
+    hotspot is supported in CSS3 (but not IE).
+*/
+- (id)initWithImage:(CPImage)image hotSpot:(CGPoint)hotSpot
 {
    _hotSpot = hotSpot;
    _image = image;
    return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
 }

-// foregroundColor and backgroundColor are ignored in Cocoa as well.  See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CPPoint)aHotSpot
+/*!
+    Init a cursor with the given image and hotspot. This is provided
+    for compliance with Cocoa. Note that foregroundColor and backgroundColor are ignored
+    (as they are in Cocoa). See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
+*/
+- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CGPoint)aHotSpot
 {
-    return [self initWithImage:image hotSpot:hotSpot];
+    return [self initWithImage:image hotSpot:aHotSpot];
 }

 + (void)hide
 {
-    [self _setCursorCSS:"none"]; // Not supported in IE
+    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
 }

 + (void)unhide
@@ -121,6 +145,7 @@ var currentCursor = nil,
 {
 #if PLATFORM(DOM)
    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
+
    for (var i = 0, count = [platformWindows count]; i < count; i++)
        platformWindows[i]._DOMBodyElement.style.cursor = aString;
 #endif
@@ -130,22 +155,38 @@ var currentCursor = nil,
 + (CPCursor)_systemCursorWithName:(CPString)cursorName cssString:(CPString)aString hasImage:(BOOL)doesHaveImage
 {
    var cursor = cursors[cursorName];
-    if (typeof cursor === 'undefined')
+
+    if (typeof cursor === "undefined")
    {
        var cssString;
+
        if (doesHaveImage)
-            cssString = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/" + cursorName + ".cur), " + aString;
+        {
+            var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath];
+            cssString = [CPString stringWithFormat:@"url(%@cursors/%@.cur), %@", themeResourcePath, cursorName, aString];
+        }
+
        else
-            cssString = aString
+        {
+            // IE <= 8 does not support some cursors, map them to supported cursors
+            var ieLessThan9 = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) && !CPFeatureIsCompatible(CPHTMLCanvasFeature);
+
+            if (ieLessThan9)
+                cssString = ieCursorMap[aString] || aString;
+            else
+                cssString = aString;
+        }
+
        cursor = [[CPCursor alloc] initWithCSSString:cssString];
        cursors[cursorName] = cursor;
    }
+
    return cursor;
 }

 + (CPCursor)arrowCursor
 {
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:"default" hasImage:NO];
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"default" hasImage:NO];
 }

 + (CPCursor)crosshairCursor
@@ -163,6 +204,36 @@ var currentCursor = nil,
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer" hasImage:NO];
 }

+ (CPCursor)resizeNorthwestCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nw-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeNorthwestSoutheastCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nwse-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeNortheastCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ne-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeNortheastSouthwestCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nesw-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeSouthwestCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"sw-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeSoutheastCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"se-resize" hasImage:NO];
+}
+
 + (CPCursor)resizeDownCursor
 {
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"s-resize" hasImage:NO];
@@ -188,11 +259,21 @@ var currentCursor = nil,
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize" hasImage:NO];
 }

+ (CPCursor)resizeEastWestCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ew-resize" hasImage:NO];
+}
+
 + (CPCursor)resizeUpDownCursor
 {
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"row-resize" hasImage:NO];
 }

+ (CPCursor)resizeNorthSouthCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ns-resize" hasImage:NO];
+}
+
 + (CPCursor)operationNotAllowedCursor
 {
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"not-allowed" hasImage:NO];
@@ -23,12 +23,16 @@
@import <Foundation/CPString.j>
@import <Foundation/CPArray.j>

-@import "CPApplication.j"
+@import "CPAlert.j"
@import "CPResponder.j"
@import "CPSavePanel.j"
@import "CPViewController.j"
@import "CPWindowController.j"

+@class CPDocumentController
+
+@global CPApp
+

 /*
    @global
@@ -142,7 +146,7 @@ var CPDocumentUntitledCount = 0;
    @param anError not used
    @return the initialized document
 */
- (id)initWithType:(CPString)aType error:({CPError})anError
+- (id)initWithType:(CPString)aType error:(/*{*/CPError/*}*/)anError
 {
    self = [self init];

@@ -211,7 +215,7 @@ var CPDocumentUntitledCount = 0;
    @throws CPUnsupportedMethodException if this method hasn't been overridden by the subclass
    @return the document data
 */
- (CPData)dataOfType:(CPString)aType error:({CPError})anError
+- (CPData)dataOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
 {
    [CPException raise:CPUnsupportedMethodException
                reason:"dataOfType:error: must be overridden by the document subclass."];
@@ -25,6 +25,10 @@

@import "CPDocument.j"
@import "CPOpenPanel.j"
+@import "CPMenuItem.j"
+@import "CPWindowController.j"
+
+@global CPApp


 var CPSharedDocumentController = nil;
@@ -124,7 +128,7 @@ var CPSharedDocumentController = nil;
    @param anError not used
    @return the created document
 */
- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:({CPError})anError
+- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
 {
    return [[[self documentClassForType:aType] alloc] initWithType:aType error:anError];
 }
@@ -339,10 +343,10 @@ var CPSharedDocumentController = nil;
 - (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info
 {
    var context = {
-        delegate: aDelegate,
-        selector: didCloseSelector,
-        context: info
-    };
+            delegate: aDelegate,
+            selector: didCloseSelector,
+            context: info
+        };

    [self _closeDocumentsStartingWith:nil shouldClose:YES context:context];
 }
@@ -20,22 +20,16 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPApplication.j"
+@import "CPDragServer_Constants.j"
@import "CPEvent.j"
@import "CPImageView.j"
@import "CPPasteboard.j"
@import "CPView.j"
@import "CPWindow.j"

+@class _CPDOMDataTransferPasteboard

-CPDragOperationNone     = 0;
-CPDragOperationCopy     = 1 << 1;
-CPDragOperationLink     = 1 << 1;
-CPDragOperationGeneric  = 1 << 2;
-CPDragOperationPrivate  = 1 << 3;
-CPDragOperationMove     = 1 << 4;
-CPDragOperationDelete   = 1 << 5;
-CPDragOperationEvery    = -1;
+@global CPApp

 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])

@@ -72,7 +66,7 @@ var CPDragServerSource             = nil,
 - (unsigned)draggingSourceOperationMask
 */

- (CPPoint)draggingLocation
+- (CGPoint)draggingLocation
 {
    return [[CPDragServer sharedDragServer] draggingLocation];
 }
@@ -461,6 +455,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
    else if (type === CPKeyDown)
    {
        var characters = [anEvent characters];
+
        if (characters === CPEscapeFunctionKey)
        {
            _dragOperation = CPDragOperationNone;
@@ -477,7 +472,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
    // If we're not a mouse up, then we're going to want to grab the next event.
    [CPApp setTarget:self selector:@selector(trackDragging:)
        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPKeyDownMask
-        untilDate:nil inMode:0 dequeue:NO];
+        untilDate:nil inMode:0 dequeue:YES];
 }

@end
@@ -0,0 +1,30 @@
+/*
+ * CPDragServer_Constants.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+CPDragOperationNone     = 0;
+CPDragOperationCopy     = 1 << 1;
+CPDragOperationLink     = 1 << 1;
+CPDragOperationGeneric  = 1 << 2;
+CPDragOperationPrivate  = 1 << 3;
+CPDragOperationMove     = 1 << 4;
+CPDragOperationDelete   = 1 << 5;
+CPDragOperationEvery    = -1;
@@ -20,162 +20,19 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPEvent_Constants.j"
+
@import <Foundation/CPObject.j>
+@import <Foundation/CPObjJRuntime.j>
+@import <Foundation/CPString.j>
+
+@import "CPCompatibility.j"
+@import "CGGeometry.j"
@import "CPText.j"

+@class CPTextField

-CPLeftMouseDown                         = 1;
-CPLeftMouseUp                           = 2;
-CPRightMouseDown                        = 3;
-CPRightMouseUp                          = 4;
-CPMouseMoved                            = 5;
-CPLeftMouseDragged                      = 6;
-CPRightMouseDragged                     = 7;
-CPMouseEntered                          = 8;
-CPMouseExited                           = 9;
-CPKeyDown                               = 10;
-CPKeyUp                                 = 11;
-CPFlagsChanged                          = 12;
-CPAppKitDefined                         = 13;
-CPSystemDefined                         = 14;
-CPApplicationDefined                    = 15;
-CPPeriodic                              = 16;
-CPCursorUpdate                          = 17;
-CPScrollWheel                           = 22;
-CPOtherMouseDown                        = 25;
-CPOtherMouseUp                          = 26;
-CPOtherMouseDragged                     = 27;
-
-// iPhone Event Types
-CPTouchStart                            = 28;
-CPTouchMove                             = 29;
-CPTouchEnd                              = 30;
-CPTouchCancel                           = 31;
-
-CPAlphaShiftKeyMask                     = 1 << 16;
-CPShiftKeyMask                          = 1 << 17;
-CPControlKeyMask                        = 1 << 18;
-CPAlternateKeyMask                      = 1 << 19;
-CPCommandKeyMask                        = 1 << 20;
-CPNumericPadKeyMask                     = 1 << 21;
-CPHelpKeyMask                           = 1 << 22;
-CPFunctionKeyMask                       = 1 << 23;
-CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
-
-CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
-CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
-CPRightMouseDownMask                    = 1 << CPRightMouseDown;
-CPRightMouseUpMask                      = 1 << CPRightMouseUp;
-CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
-CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
-CPMouseMovedMask                        = 1 << CPMouseMoved;
-CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
-CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
-CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
-CPMouseEnteredMask                      = 1 << CPMouseEntered;
-CPMouseExitedMask                       = 1 << CPMouseExited;
-CPCursorUpdateMask                      = 1 << CPCursorUpdate;
-CPKeyDownMask                           = 1 << CPKeyDown;
-CPKeyUpMask                             = 1 << CPKeyUp;
-CPFlagsChangedMask                      = 1 << CPFlagsChanged;
-CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
-CPSystemDefinedMask                     = 1 << CPSystemDefined;
-CPApplicationDefinedMask                = 1 << CPApplicationDefined;
-CPPeriodicMask                          = 1 << CPPeriodic;
-CPScrollWheelMask                       = 1 << CPScrollWheel;
-CPAnyEventMask                          = 0xffffffff;
-
-CPUpArrowFunctionKey                    = "\uF700";
-CPDownArrowFunctionKey                  = "\uF701";
-CPLeftArrowFunctionKey                  = "\uF702";
-CPRightArrowFunctionKey                 = "\uF703";
-CPF1FunctionKey                         = "\uF704";
-CPF2FunctionKey                         = "\uF705";
-CPF3FunctionKey                         = "\uF706";
-CPF4FunctionKey                         = "\uF707";
-CPF5FunctionKey                         = "\uF708";
-CPF6FunctionKey                         = "\uF709";
-CPF7FunctionKey                         = "\uF70A";
-CPF8FunctionKey                         = "\uF70B";
-CPF9FunctionKey                         = "\uF70C";
-CPF10FunctionKey                        = "\uF70D";
-CPF11FunctionKey                        = "\uF70E";
-CPF12FunctionKey                        = "\uF70F";
-CPF13FunctionKey                        = "\uF710";
-CPF14FunctionKey                        = "\uF711";
-CPF15FunctionKey                        = "\uF712";
-CPF16FunctionKey                        = "\uF713";
-CPF17FunctionKey                        = "\uF714";
-CPF18FunctionKey                        = "\uF715";
-CPF19FunctionKey                        = "\uF716";
-CPF20FunctionKey                        = "\uF717";
-CPF21FunctionKey                        = "\uF718";
-CPF22FunctionKey                        = "\uF719";
-CPF23FunctionKey                        = "\uF71A";
-CPF24FunctionKey                        = "\uF71B";
-CPF25FunctionKey                        = "\uF71C";
-CPF26FunctionKey                        = "\uF71D";
-CPF27FunctionKey                        = "\uF71E";
-CPF28FunctionKey                        = "\uF71F";
-CPF29FunctionKey                        = "\uF720";
-CPF30FunctionKey                        = "\uF721";
-CPF31FunctionKey                        = "\uF722";
-CPF32FunctionKey                        = "\uF723";
-CPF33FunctionKey                        = "\uF724";
-CPF34FunctionKey                        = "\uF725";
-CPF35FunctionKey                        = "\uF726";
-CPInsertFunctionKey                     = "\uF727";
-CPDeleteFunctionKey                     = "\uF728";
-CPHomeFunctionKey                       = "\uF729";
-CPBeginFunctionKey                      = "\uF72A";
-CPEndFunctionKey                        = "\uF72B";
-CPPageUpFunctionKey                     = "\uF72C";
-CPPageDownFunctionKey                   = "\uF72D";
-CPPrintScreenFunctionKey                = "\uF72E";
-CPScrollLockFunctionKey                 = "\uF72F";
-CPPauseFunctionKey                      = "\uF730";
-CPSysReqFunctionKey                     = "\uF731";
-CPBreakFunctionKey                      = "\uF732";
-CPResetFunctionKey                      = "\uF733";
-CPStopFunctionKey                       = "\uF734";
-CPMenuFunctionKey                       = "\uF735";
-CPUserFunctionKey                       = "\uF736";
-CPSystemFunctionKey                     = "\uF737";
-CPPrintFunctionKey                      = "\uF738";
-CPClearLineFunctionKey                  = "\uF739";
-CPClearDisplayFunctionKey               = "\uF73A";
-CPInsertLineFunctionKey                 = "\uF73B";
-CPDeleteLineFunctionKey                 = "\uF73C";
-CPInsertCharFunctionKey                 = "\uF73D";
-CPDeleteCharFunctionKey                 = "\uF73E";
-CPPrevFunctionKey                       = "\uF73F";
-CPNextFunctionKey                       = "\uF740";
-CPSelectFunctionKey                     = "\uF741";
-CPExecuteFunctionKey                    = "\uF742";
-CPUndoFunctionKey                       = "\uF743";
-CPRedoFunctionKey                       = "\uF744";
-CPFindFunctionKey                       = "\uF745";
-CPHelpFunctionKey                       = "\uF746";
-CPModeSwitchFunctionKey                 = "\uF747";
-CPEscapeFunctionKey                     = "\u001B";
-CPSpaceFunctionKey                      = "\u0020";
-
-
-CPDOMEventDoubleClick                   = "dblclick";
-CPDOMEventMouseDown                     = "mousedown";
-CPDOMEventMouseUp                       = "mouseup";
-CPDOMEventMouseMoved                    = "mousemove";
-CPDOMEventMouseDragged                  = "mousedrag";
-CPDOMEventKeyUp                         = "keyup";
-CPDOMEventKeyDown                       = "keydown";
-CPDOMEventKeyPress                      = "keypress";
-CPDOMEventCopy                          = "copy";
-CPDOMEventPaste                         = "paste";
-CPDOMEventScrollWheel                   = "mousewheel";
-CPDOMEventTouchStart                    = "touchstart";
-CPDOMEventTouchMove                     = "touchmove";
-CPDOMEventTouchEnd                      = "touchend";
-CPDOMEventTouchCancel                   = "touchcancel";
+@global CPApp

 var _CPEventPeriodicEventPeriod         = 0,
    _CPEventPeriodicEventTimer          = nil,
@@ -190,7 +47,7 @@ var _CPEventPeriodicEventPeriod         = 0,
@implementation CPEvent : CPObject
 {
    CPEventType         _type;
-    CPPoint             _location;
+    CGPoint             _location;
    unsigned            _modifierFlags;
    CPTimeInterval      _timestamp;
    CPGraphicsContext   _context;
@@ -206,6 +63,7 @@ var _CPEventPeriodicEventPeriod         = 0,
    DOMEvent            _DOMEvent;
    int                 _data1;
    int                 _data2;
+    short               _subtype;

    float               _deltaX;
    float               _deltaY;
@@ -308,13 +166,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /* @ignore */
- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned)modifierFlags
+- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
    eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
 {
    if (self = [self _initWithType:anEventType])
    {
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
        _context = aGraphicsContext;
@@ -328,13 +186,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /* @ignore */
- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned int)modifierFlags
+- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
    characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)isARepeat keyCode:(unsigned short)code
 {
    if (self = [self _initWithType:anEventType])
    {
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
        _context = aGraphicsContext;
@@ -355,7 +213,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 {
    if (self = [self _initWithType:anEventType])
    {
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
        _context = aGraphicsContext;
@@ -649,7 +507,7 @@ var _CPEventPeriodicEventPeriod         = 0,
        case CPKeyDown:
        case CPKeyUp:
        case CPFlagsChanged:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
        case CPLeftMouseDown:
        case CPLeftMouseUp:
        case CPRightMouseDown:
@@ -659,9 +517,9 @@ var _CPEventPeriodicEventPeriod         = 0,
        case CPRightMouseDragged:
        case CPMouseEntered:
        case CPMouseExited:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
        default:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
    }
 }

@@ -0,0 +1,174 @@
+/*
+ * CPEvent_Constants.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+CPLeftMouseDown                         = 1;
+CPLeftMouseUp                           = 2;
+CPRightMouseDown                        = 3;
+CPRightMouseUp                          = 4;
+CPMouseMoved                            = 5;
+CPLeftMouseDragged                      = 6;
+CPRightMouseDragged                     = 7;
+CPMouseEntered                          = 8;
+CPMouseExited                           = 9;
+CPKeyDown                               = 10;
+CPKeyUp                                 = 11;
+CPFlagsChanged                          = 12;
+CPAppKitDefined                         = 13;
+CPSystemDefined                         = 14;
+CPApplicationDefined                    = 15;
+CPPeriodic                              = 16;
+CPCursorUpdate                          = 17;
+CPScrollWheel                           = 22;
+CPOtherMouseDown                        = 25;
+CPOtherMouseUp                          = 26;
+CPOtherMouseDragged                     = 27;
+
+// iPhone Event Types
+CPTouchStart                            = 28;
+CPTouchMove                             = 29;
+CPTouchEnd                              = 30;
+CPTouchCancel                           = 31;
+
+CPAlphaShiftKeyMask                     = 1 << 16;
+CPShiftKeyMask                          = 1 << 17;
+CPControlKeyMask                        = 1 << 18;
+CPAlternateKeyMask                      = 1 << 19;
+CPCommandKeyMask                        = 1 << 20;
+CPNumericPadKeyMask                     = 1 << 21;
+CPHelpKeyMask                           = 1 << 22;
+CPFunctionKeyMask                       = 1 << 23;
+CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
+
+CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
+CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
+CPRightMouseDownMask                    = 1 << CPRightMouseDown;
+CPRightMouseUpMask                      = 1 << CPRightMouseUp;
+CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
+CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
+CPMouseMovedMask                        = 1 << CPMouseMoved;
+CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
+CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
+CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
+CPMouseEnteredMask                      = 1 << CPMouseEntered;
+CPMouseExitedMask                       = 1 << CPMouseExited;
+CPCursorUpdateMask                      = 1 << CPCursorUpdate;
+CPKeyDownMask                           = 1 << CPKeyDown;
+CPKeyUpMask                             = 1 << CPKeyUp;
+CPFlagsChangedMask                      = 1 << CPFlagsChanged;
+CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
+CPSystemDefinedMask                     = 1 << CPSystemDefined;
+CPApplicationDefinedMask                = 1 << CPApplicationDefined;
+CPPeriodicMask                          = 1 << CPPeriodic;
+CPScrollWheelMask                       = 1 << CPScrollWheel;
+CPAnyEventMask                          = 0xffffffff;
+
+CPUpArrowFunctionKey                    = "\uF700";
+CPDownArrowFunctionKey                  = "\uF701";
+CPLeftArrowFunctionKey                  = "\uF702";
+CPRightArrowFunctionKey                 = "\uF703";
+CPF1FunctionKey                         = "\uF704";
+CPF2FunctionKey                         = "\uF705";
+CPF3FunctionKey                         = "\uF706";
+CPF4FunctionKey                         = "\uF707";
+CPF5FunctionKey                         = "\uF708";
+CPF6FunctionKey                         = "\uF709";
+CPF7FunctionKey                         = "\uF70A";
+CPF8FunctionKey                         = "\uF70B";
+CPF9FunctionKey                         = "\uF70C";
+CPF10FunctionKey                        = "\uF70D";
+CPF11FunctionKey                        = "\uF70E";
+CPF12FunctionKey                        = "\uF70F";
+CPF13FunctionKey                        = "\uF710";
+CPF14FunctionKey                        = "\uF711";
+CPF15FunctionKey                        = "\uF712";
+CPF16FunctionKey                        = "\uF713";
+CPF17FunctionKey                        = "\uF714";
+CPF18FunctionKey                        = "\uF715";
+CPF19FunctionKey                        = "\uF716";
+CPF20FunctionKey                        = "\uF717";
+CPF21FunctionKey                        = "\uF718";
+CPF22FunctionKey                        = "\uF719";
+CPF23FunctionKey                        = "\uF71A";
+CPF24FunctionKey                        = "\uF71B";
+CPF25FunctionKey                        = "\uF71C";
+CPF26FunctionKey                        = "\uF71D";
+CPF27FunctionKey                        = "\uF71E";
+CPF28FunctionKey                        = "\uF71F";
+CPF29FunctionKey                        = "\uF720";
+CPF30FunctionKey                        = "\uF721";
+CPF31FunctionKey                        = "\uF722";
+CPF32FunctionKey                        = "\uF723";
+CPF33FunctionKey                        = "\uF724";
+CPF34FunctionKey                        = "\uF725";
+CPF35FunctionKey                        = "\uF726";
+CPInsertFunctionKey                     = "\uF727";
+CPDeleteFunctionKey                     = "\uF728";
+CPHomeFunctionKey                       = "\uF729";
+CPBeginFunctionKey                      = "\uF72A";
+CPEndFunctionKey                        = "\uF72B";
+CPPageUpFunctionKey                     = "\uF72C";
+CPPageDownFunctionKey                   = "\uF72D";
+CPPrintScreenFunctionKey                = "\uF72E";
+CPScrollLockFunctionKey                 = "\uF72F";
+CPPauseFunctionKey                      = "\uF730";
+CPSysReqFunctionKey                     = "\uF731";
+CPBreakFunctionKey                      = "\uF732";
+CPResetFunctionKey                      = "\uF733";
+CPStopFunctionKey                       = "\uF734";
+CPMenuFunctionKey                       = "\uF735";
+CPUserFunctionKey                       = "\uF736";
+CPSystemFunctionKey                     = "\uF737";
+CPPrintFunctionKey                      = "\uF738";
+CPClearLineFunctionKey                  = "\uF739";
+CPClearDisplayFunctionKey               = "\uF73A";
+CPInsertLineFunctionKey                 = "\uF73B";
+CPDeleteLineFunctionKey                 = "\uF73C";
+CPInsertCharFunctionKey                 = "\uF73D";
+CPDeleteCharFunctionKey                 = "\uF73E";
+CPPrevFunctionKey                       = "\uF73F";
+CPNextFunctionKey                       = "\uF740";
+CPSelectFunctionKey                     = "\uF741";
+CPExecuteFunctionKey                    = "\uF742";
+CPUndoFunctionKey                       = "\uF743";
+CPRedoFunctionKey                       = "\uF744";
+CPFindFunctionKey                       = "\uF745";
+CPHelpFunctionKey                       = "\uF746";
+CPModeSwitchFunctionKey                 = "\uF747";
+CPEscapeFunctionKey                     = "\u001B";
+CPSpaceFunctionKey                      = "\u0020";
+
+
+CPDOMEventDoubleClick                   = "dblclick";
+CPDOMEventMouseDown                     = "mousedown";
+CPDOMEventMouseUp                       = "mouseup";
+CPDOMEventMouseMoved                    = "mousemove";
+CPDOMEventMouseDragged                  = "mousedrag";
+CPDOMEventKeyUp                         = "keyup";
+CPDOMEventKeyDown                       = "keydown";
+CPDOMEventKeyPress                      = "keypress";
+CPDOMEventCopy                          = "copy";
+CPDOMEventPaste                         = "paste";
+CPDOMEventScrollWheel                   = "mousewheel";
+CPDOMEventTouchStart                    = "touchstart";
+CPDOMEventTouchMove                     = "touchmove";
+CPDOMEventTouchEnd                      = "touchend";
+CPDOMEventTouchCancel                   = "touchcancel";
@@ -281,7 +281,7 @@ following:
           that dynamically tracks the current system font size.
    @return the requested system font
 */
-+ (CPFont)systemFontOfSize:(CPSize)aSize
+ (CPFont)systemFontOfSize:(CGSize)aSize
 {
    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, NO);
 }
@@ -293,7 +293,7 @@ following:
           that dynamically tracks the current system font size.
    @return the requested bold system font
 */
-+ (CPFont)boldSystemFontOfSize:(CPSize)aSize
+ (CPFont)boldSystemFontOfSize:(CGSize)aSize
 {
    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, YES);
 }
@@ -24,6 +24,8 @@

@import "CPFont.j"

+@global CPApp
+
 CPItalicFontMask                    = 1 << 0;
 CPBoldFontMask                      = 1 << 1;
 CPUnboldFontMask                    = 1 << 2;
@@ -54,7 +56,7 @@ var CPSharedFontManager     = nil,
    id              _delegate @accessors(property=delegate);

    CPFont          _selectedFont;
-    BOOL            _multiple @accessors;
+    BOOL            _multiple @accessors(getter=isMultiple, setter=setMultiple:);

    CPDictionary    _activeChange;
 }
@@ -139,7 +141,7 @@ var CPSharedFontManager     = nil,
 - (void)setSelectedFont:(CPFont)aFont isMultiple:(BOOL)aFlag
 {
    _selectedFont = aFont;
-    _isMultiple = aFlag;
+    _multiple = aFlag;

    // TODO Notify CPFontPanel when it exists.
 }
@@ -149,11 +151,6 @@ var CPSharedFontManager     = nil,
    return _selectedFont;
 }

- (BOOL)isMultiple
-{
-    return _isMultiple;
-}
-
 - (int)weightOfFont:(CPFont)aFont
 {
    // TODO Weight 5 is a normal of book weight and 9 and above is bold, but it would be nice to be more
@@ -20,6 +20,15 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPObject.j>
+@import <Foundation/CPException.j>
+@import <Foundation/CPMutableArray.j>
+
+@import "CGColor.j"
+@import "CGColorSpace.j"
+@import "CGGradient.j"
+@import "CPGraphicsContext.j"
+
 CPGradientDrawsBeforeStartingLocation   = kCGGradientDrawsBeforeStartLocation;
 CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;

@@ -21,12 +21,14 @@
 */

@import <Foundation/CPBundle.j>
-@import <Foundation/CPGeometry.j>
@import <Foundation/CPNotificationCenter.j>
@import <Foundation/CPObject.j>
@import <Foundation/CPRunLoop.j>
@import <Foundation/CPString.j>
+@import <Foundation/CPData.j>

+@import "CGGeometry.j"
+@import "CPCompatibility.j"

 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -49,15 +51,44 @@ var imagesForNames = { },
 AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
 AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);

-function CPImageInBundle(aFilename, aSize, aBundle)
+/*!
+    Returns a resource image with a relative path and size
+    in a bundle.
+
+    @param filename A filename or relative path to a resource image.
+    @param width    Width of the image. May be omitted.
+    @param height   Height of the image. May be omitted if width is omitted.
+    @param size     Instead of passing width/height, a CGSize may be passed.
+    @param bundle   Bundle in which the image resource can be found.
+                    If omitted, defaults to the main bundle.
+    @return CPImage
+*/
+function CPImageInBundle()
 {
-    if (!aBundle)
-        aBundle = [CPBundle mainBundle];
+    var filename = arguments[0],
+        size = nil,
+        bundle = nil;

-    if (aSize)
-        return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
+    if (typeof(arguments[1]) === "number")
+    {
+        if (arguments[1] !== nil && arguments[1] === undefined)
+            size = CGSizeMake(arguments[1], arguments[2]);

-    return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
+        bundle = arguments[3];
+    }
+    else if (typeof(arguments[1]) === "object")
+    {
+        size = arguments[1];
+        bundle = arguments[2];
+    }
+
+    if (!bundle)
+        bundle = [CPBundle mainBundle];
+
+    if (size)
+        return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename] size:size];
+
+    return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename]];
 }

 function CPAppKitImage(aFilename, aSize)
@@ -117,7 +148,7 @@ function CPAppKitImage(aFilename, aSize)

    if (self)
    {
-        _size = CPSizeCreateCopy(aSize);
+        _size = CGSizeCreateCopy(aSize);
        _filename = aFilename;
        _loadStatus = CPImageLoadStatusInitialized;
    }
@@ -26,6 +26,9 @@
@import "CPImage.j"
@import "CPShadowView.j"

+@global CPImagesPboardType
+@global appkit_tag_dom_elements
+
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
 CPImageAlignTopLeft     = 2;
@@ -21,9 +21,10 @@
 */

@import <Foundation/CPObject.j>
+@import <Foundation/CPArray.j>

-@import "CPEvent.j"
-
+@import "CPEvent_Constants.j"
+@import "CPText.j"

 CPStandardKeyBindings = {
    @"@.": @"cancelOperation:",
@@ -27,6 +27,7 @@
@import <Foundation/CPArray.j>
@import <Foundation/CPDictionary.j>
@import <Foundation/CPValueTransformer.j>
+@import <Foundation/CPKeyValueObserving.j>


 var exposedBindingsMap = [CPDictionary new],
@@ -21,6 +21,9 @@
 */

@import "CPControl.j"
+@import "CPWindow_Constants.j"
+
+@global CPApp

 CPTickMarkBelow                             = 0;
 CPTickMarkAbove                             = 1;
@@ -32,14 +35,6 @@ CPContinuousCapacityLevelIndicatorStyle     = 1;
 CPDiscreteCapacityLevelIndicatorStyle       = 2;
 CPRatingLevelIndicatorStyle                 = 3;

-var _CPLevelIndicatorBezelColor = nil,
-    _CPLevelIndicatorSegmentEmptyColor = nil,
-    _CPLevelIndicatorSegmentNormalColor = nil,
-    _CPLevelIndicatorSegmentWarningColor = nil,
-    _CPLevelIndicatorSegmentCriticalColor = nil,
-
-    _CPLevelIndicatorSpacing = 1;
-
 /*!
    @ingroup appkit
    @class CPLevelIndicator
@@ -62,59 +57,23 @@ var _CPLevelIndicatorBezelColor = nil,
    BOOL                _isTracking;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [CPLevelIndicator class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:CPLevelIndicator];
-
-    _CPLevelIndicatorBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-left.png"] size:CGSizeMake(3.0, 18.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-center.png"] size:CGSizeMake(1.0, 18.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-right.png"] size:CGSizeMake(3.0, 18.0)]
-        ]
-        isVertical:NO
-    ]];
-
-    _CPLevelIndicatorSegmentEmptyColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-left.png"] size:CGSizeMake(3.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-center.png"] size:CGSizeMake(1.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-right.png"] size:CGSizeMake(3.0, 17.0)]
-        ]
-        isVertical:NO
-    ]];
-
-    _CPLevelIndicatorSegmentNormalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-left.png"] size:CGSizeMake(3.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-center.png"] size:CGSizeMake(1.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-right.png"] size:CGSizeMake(3.0, 17.0)]
-        ]
-        isVertical:NO
-    ]];
-
-    _CPLevelIndicatorSegmentWarningColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-left.png"] size:CGSizeMake(3.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-center.png"] size:CGSizeMake(1.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-right.png"] size:CGSizeMake(3.0, 17.0)]
-        ]
-        isVertical:NO
-    ]];
-
-    _CPLevelIndicatorSegmentCriticalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-left.png"] size:CGSizeMake(3.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-center.png"] size:CGSizeMake(1.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-right.png"] size:CGSizeMake(3.0, 17.0)]
-        ]
-        isVertical:NO
-    ]];
+    return "level-indicator";
 }

+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjectsAndKeys:[CPNull null], @"bezel-color",
+                                                      [CPNull null], @"color-empty",
+                                                      [CPNull null], @"color-normal",
+                                                      [CPNull null], @"color-warning",
+                                                      [CPNull null], @"color-critical",
+                                                      1.0,           @"spacing"];
+}
+
+
+
 - (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];
@@ -142,20 +101,20 @@ var _CPLevelIndicatorBezelColor = nil,
                                           positioned:CPWindowBelow
                      relativeToEphemeralSubviewNamed:nil];
    // TODO Make themable.
-    [bezelView setBackgroundColor:_CPLevelIndicatorBezelColor];
+    [bezelView setBackgroundColor:[self valueForThemeAttribute:@"bezel-color"]];

    var segmentCount = _maxValue - _minValue;

    if (segmentCount <= 0)
        return;

-    var filledColor = _CPLevelIndicatorSegmentNormalColor,
+    var filledColor = [self valueForThemeAttribute:@"color-normal"],
        value = [self doubleValue];

    if (value <= _criticalValue)
-        filledColor = _CPLevelIndicatorSegmentCriticalColor;
+        filledColor = [self valueForThemeAttribute:@"color-critical"];
    else if (value <= _warningValue)
-        filledColor = _CPLevelIndicatorSegmentWarningColor;
+        filledColor = [self valueForThemeAttribute:@"color-warning"];

    for (var i = 0; i < segmentCount; i++)
    {
@@ -163,7 +122,7 @@ var _CPLevelIndicatorBezelColor = nil,
                                               positioned:CPWindowAbove
                          relativeToEphemeralSubviewNamed:bezelView];

-        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : _CPLevelIndicatorSegmentEmptyColor];
+        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : [self valueForThemeAttribute:@"color-empty"]];
    }
 }

@@ -194,11 +153,12 @@ var _CPLevelIndicatorBezelColor = nil,
            return _CGRectMakeZero();

        var basicSegmentWidth = bounds.size.width / segmentCount,
-            segmentFrame = CGRectCreateCopy([self bounds]);
+            segmentFrame = CGRectCreateCopy([self bounds]),
+            spacing = [self valueForThemeAttribute:@"spacing"];

        segmentFrame.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
        segmentFrame.origin.x =  FLOOR(segment * basicSegmentWidth);
-        segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - _CPLevelIndicatorSpacing;
+        segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - spacing;
        segmentFrame.size.height = segmentHeight;

        return segmentFrame;
@@ -226,7 +186,7 @@ var _CPLevelIndicatorBezelColor = nil,
    return _isEditable;
 }

- (CPView)hitTest:(CPPoint)aPoint
+- (CPView)hitTest:(CGPoint)aPoint
 {
    // Don't swallow clicks when displayed in a table.
    if (![self isEditable])
@@ -25,12 +25,9 @@
@import <Foundation/CPNotificationCenter.j>
@import <Foundation/CPString.j>

-@import "_CPMenuManager.j"
-@import "CPApplication.j"
-@import "CPClipView.j"
@import "CPMenuItem.j"
-@import "CPPanel.j"

+@global CPApp

 CPMenuDidAddItemNotification        = @"CPMenuDidAddItemNotification";
 CPMenuDidChangeItemNotification     = @"CPMenuDidChangeItemNotification";
@@ -38,12 +35,8 @@ CPMenuDidRemoveItemNotification     = @"CPMenuDidRemoveItemNotification";

 CPMenuDidEndTrackingNotification    = @"CPMenuDidEndTrackingNotification";

-var MENUBAR_HEIGHT = 28.0;
-
 var _CPMenuBarVisible               = NO,
    _CPMenuBarTitle                 = @"",
-    _CPMenuBarIconImage             = nil,
-    _CPMenuBarIconImageAlphaValue   = 1.0,
    _CPMenuBarAttributes            = nil,
    _CPMenuBarSharedWindow          = nil;

@@ -109,8 +102,8 @@ var _CPMenuBarVisible               = NO,
        [_CPMenuBarSharedWindow setMenu:[CPApp mainMenu]];

        [_CPMenuBarSharedWindow setTitle:_CPMenuBarTitle];
-        [_CPMenuBarSharedWindow setIconImage:_CPMenuBarIconImage];
-        [_CPMenuBarSharedWindow setIconImageAlphaValue:_CPMenuBarIconImageAlphaValue];
+        [_CPMenuBarSharedWindow setIconImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image" forClass:_CPMenuView]];
+        [_CPMenuBarSharedWindow setIconImageAlphaValue:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image-alpha-value" forClass:_CPMenuView]];

        [_CPMenuBarSharedWindow setColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarBackgroundColor"]];
        [_CPMenuBarSharedWindow setTextColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarTextColor"]];
@@ -178,8 +171,8 @@ var _CPMenuBarVisible               = NO,

    else if (!textColor && !titleColor)
    {
-        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTextColor"];
-        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTitleColor"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextColor"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleColor"];
    }

    if (!textShadowColor && titleShadowColor)
@@ -190,18 +183,18 @@ var _CPMenuBarVisible               = NO,

    else if (!textShadowColor && !titleShadowColor)
    {
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTextShadowColor"];
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTitleShadowColor"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextShadowColor"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleShadowColor"];
    }

    if (!highlightColor)
-        [_CPMenuBarAttributes setObject:[CPColor colorWithCalibratedRed:94.0 / 255.0 green:130.0 / 255.0 blue:186.0 / 255.0 alpha:1.0] forKey:@"CPMenuBarHighlightColor"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightColor"];

    if (!highlightTextColor)
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarHighlightTextColor"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextColor"];

    if (!highlightTextShadowColor)
-        [_CPMenuBarAttributes setObject:[CPColor blackColor] forKey:@"CPMenuBarHighlightTextShadowColor"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextShadowColor"];

    if (_CPMenuBarSharedWindow)
    {
@@ -230,14 +223,14 @@ var _CPMenuBarVisible               = NO,
 - (float)menuBarHeight
 {
    if (self === [CPApp mainMenu])
-        return MENUBAR_HEIGHT;
+        return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-height" forClass:_CPMenuView];

    return 0.0;
 }

 + (float)menuBarHeight
 {
-    return MENUBAR_HEIGHT;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-height" forClass:_CPMenuView];
 }

 // Creating a CPMenu Object
@@ -1,14 +1,33 @@
+/*
+ * _CPMenuBarWindow.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
@import "CPPanel.j"
-@import "_CPMenuWindow.j"
+@import "_CPMenuManager.j"

+@class _CPMenuView

-var MENUBAR_HEIGHT          = 28.0,
-    MENUBAR_MARGIN          = 10.0,
-    MENUBAR_LEFT_MARGIN     = 10.0,
-    MENUBAR_RIGHT_MARGIN    = 10.0;
-
-var _CPMenuBarWindowBackgroundColor = nil,
-    _CPMenuBarWindowFont            = nil;
+@global CPMenuDidAddItemNotification
+@global CPMenuDidChangeItemNotification
+@global CPMenuDidRemoveItemNotification

@implementation _CPMenuBarWindow : CPPanel
 {
@@ -32,19 +51,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
    CPColor     _highlightTextShadowColor;
 }

-+ (void)initialize
-{
-    if (self !== [_CPMenuBarWindow class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:[CPFont systemFontSize]];
-}
-
 + (CPFont)font
 {
-    return _CPMenuBarWindowFont;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-font" forClass:_CPMenuView];
 }

 - (id)init
@@ -52,7 +61,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
    // This only shows up in browser land, so don't bother calculating metrics in desktop.
    var contentRect = [[CPPlatformWindow primaryPlatformWindow] contentBounds];

-    contentRect.size.height = MENUBAR_HEIGHT;
+    contentRect.size.height = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView];

    self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];

@@ -119,12 +128,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 - (void)setColor:(CPColor)aColor
 {
    if (!aColor)
-    {
-        if (!_CPMenuBarWindowBackgroundColor)
-            _CPMenuBarWindowBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPMenuBarWindow class]] pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackground.png"] size:CGSizeMake(1.0, 28.0)]];
-
-        [[self contentView] setBackgroundColor:_CPMenuBarWindowBackgroundColor];
-    }
+        [[self contentView] setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-color" forClass:_CPMenuView]];
    else
        [[self contentView] setBackgroundColor:aColor];
 }
@@ -316,6 +320,11 @@ var _CPMenuBarWindowBackgroundColor = nil,
    [self tile];
 }

+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return YES;
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
    var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
@@ -344,7 +353,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
        index = 0,
        count = items.length,

-        x = MENUBAR_LEFT_MARGIN,
+        x = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-left-margin" forClass:_CPMenuView],
        y = 0.0,
        isLeftAligned = YES;

@@ -354,7 +363,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

        if ([item isSeparatorItem])
        {
-            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
+            x = CGRectGetWidth([self frame]) - [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-right-margin" forClass:_CPMenuView];
            isLeftAligned = NO;

            continue;
@@ -368,13 +377,13 @@ var _CPMenuBarWindowBackgroundColor = nil,

        if (isLeftAligned)
        {
-            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
+            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];

            x += CGRectGetWidth([menuItemView frame]);
        }
        else
        {
-            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
+            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];

            x = CGRectGetMinX([menuItemView frame]);
        }
@@ -452,102 +461,3 @@ var _CPMenuBarWindowBackgroundColor = nil,
 }

@end
-
-@implementation _CPMenuBarView : _CPMenuView
-{
-}
-
- (CGRect)rectForItemAtIndex:(int)anIndex
-{
-    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
-}
-
- (int)itemIndexAtPoint:(CGPoint)aPoint
-{
-    var bounds = [self bounds];
-
-    if (!CGRectContainsPoint(bounds, aPoint))
-        return CPNotFound;
-
-    var x = aPoint.x,
-        low = 0,
-        high = _visibleMenuItemInfos.length - 1;
-
-    while (low <= high)
-    {
-        var middle = FLOOR(low + (high - low) / 2),
-            info = _visibleMenuItemInfos[middle],
-            frame = [info.view frame];
-
-        if (x < CGRectGetMinX(frame))
-            high = middle - 1;
-
-        else if (x > CGRectGetMaxX(frame))
-            low = middle + 1;
-
-        else
-            return info.index;
-   }
-
-   return CPNotFound;
-}
-
- (void)tile
-{
-    var items = [_menu itemArray],
-        index = 0,
-        count = items.length,
-
-        x = MENUBAR_LEFT_MARGIN,
-        y = 0.0,
-        isLeftAligned = YES;
-
-    for (; index < count; ++index)
-    {
-        var item = items[index];
-
-        if ([item isSeparatorItem])
-        {
-            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
-            isLeftAligned = NO;
-
-            continue;
-        }
-
-         if ([item isHidden])
-            continue;
-
-        var menuItemView = [item _menuItemView],
-            frame = [menuItemView frame];
-
-        if (isLeftAligned)
-        {
-            [menuItemView setFrameOrigin:CGPointMake(x, (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
-
-            x += CGRectGetWidth([menuItemView frame]) + MENUBAR_MARGIN;
-        }
-        else
-        {
-            [menuItemView setFrameOrigin:CGPointMake(x - CGRectGetWidth(frame), (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
-
-            x = CGRectGetMinX([menuItemView frame]) - MENUBAR_MARGIN;
-        }
-    }
-
-    var bounds = [[self contentView] bounds],
-        titleFrame = [_titleField frame];
-
-    if ([_iconImageView isHidden])
-        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(titleFrame)) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
-    else
-    {
-        var iconFrame = [_iconImageView frame],
-            iconWidth = CGRectGetWidth(iconFrame),
-            totalWidth = iconWidth + CGRectGetWidth(titleFrame);
-
-        [_iconImageView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(iconFrame)) / 2.0)];
-        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0 + iconWidth, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
-    }
-}
-
-@end
@@ -1,5 +1,39 @@
-@import <Foundation/CPObject.j>
+/*
+ * _CPMenuManager.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

+@import <Foundation/CPObject.j>
+@import <Foundation/CPNotificationCenter.j>
+
+@import "CPEvent.j"
+@import "CPKeyBinding.j"
+
+@class CPWindow
+@class _CPMenuWindow
+
+
+@global CPApp
+@global CPMenuDidEndTrackingNotification
+@global _CPMenuWindowMenuBarBackgroundStyle
+@global _CPMenuWindowPopUpBackgroundStyle

 _CPMenuManagerScrollingStateUp      = -1;
 _CPMenuManagerScrollingStateDown    = 1;
@@ -26,6 +60,8 @@ var STICKY_TIME_INTERVAL            = 0.5,

    CPMenuItem          _previousActiveItem;
    int                 _showTimerID;
+
+    int                 _menuBarButtonItemIndex;
 }

 + (_CPMenuManager)sharedMenuManager
@@ -85,7 +121,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
            activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;

        _menuBarButtonItemIndex = activeItemIndex;
-        _menuBarButtonMenuContainer = aMenuContainer;
+//        _menuBarButtonMenuContainer = aMenuContainer;

        if ([activeItem _isMenuBarButton])
            return [self trackMenuBarButtonEvent:anEvent];
@@ -125,15 +161,6 @@ var STICKY_TIME_INTERVAL            = 0.5,
        return;
    }

-    if (_keyBuffer)
-    {
-        if (([anEvent timestamp] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
-            [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:YES];
-
-        if (type === CPPeriodic)
-            return;
-    }
-
    // Periodic events don't have a valid location.
    var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];

@@ -149,6 +176,15 @@ var STICKY_TIME_INTERVAL            = 0.5,
        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;

+    if (_keyBuffer)
+    {
+        if (([anEvent timestamp] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
+            [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:YES];
+
+        if (type === CPPeriodic)
+            return;
+    }
+
    // unhighlight when mouse is moved off the menu
    if (_lastGlobalLocation && CGRectContainsPoint([activeMenuContainer globalFrame], _lastGlobalLocation)
                            && !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation))
@@ -556,7 +592,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
        return;
    }

-    next = current + (last - first);
+    var next = current + (last - first);

    if (next < [menu numberOfItems])
        [menu _highlightItemAtIndex:next];
@@ -584,7 +620,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
        return;
    }

-    next = current - (last - first);
+    var next = current - (last - first);

    if (next < 0)
        [menu _highlightItemAtIndex:0];
@@ -1,5 +1,29 @@
-@import "CPWindow.j"
+/*
+ * _CPMenuWindow.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

+@import "CPClipView.j"
+@import "CPImageView.j"
+@import "CPWindow.j"
+@import "_CPMenuManager.j"

 var _CPMenuWindowPool                       = [],
    _CPMenuWindowPoolCapacity               = 5,
@@ -10,14 +34,7 @@ _CPMenuWindowMenuBarBackgroundStyle         = 0;
 _CPMenuWindowPopUpBackgroundStyle           = 1;
 _CPMenuWindowAttachedMenuBackgroundStyle    = 2;

-var STICKY_TIME_INTERVAL        = 500,
-
-    TOP_MARGIN                  = 5.0,
-    LEFT_MARGIN                 = 1.0,
-    RIGHT_MARGIN                = 1.0,
-    BOTTOM_MARGIN               = 5.0,
-
-    SCROLL_INDICATOR_HEIGHT     = 16.0;
+var STICKY_TIME_INTERVAL        = 500;

 /*
    @ignore
@@ -63,17 +80,6 @@ var STICKY_TIME_INTERVAL        = 500,
    _CPMenuWindowPool.push(aMenuWindow);
 }

-+ (void)initialize
-{
-    if (self !== [_CPMenuWindow class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    _CPMenuWindowMoreAboveImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreAbove.png"] size:CGSizeMake(38.0, 18.0)];
-    _CPMenuWindowMoreBelowImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreBelow.png"] size:CGSizeMake(38.0, 18.0)];
-}
-
 - (id)initWithContentRect:(CGRect)aRect styleMask:(unsigned)aStyleMask
 {
    _constraintRect = _CGRectMakeZero();
@@ -92,22 +98,22 @@ var STICKY_TIME_INTERVAL        = 500,

        _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];

-        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, 0.0, 0.0)];
+        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake([_menuView valueForThemeAttribute:@"menu-window-margin-inset"].left, [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top, 0.0, 0.0)];
        [_menuClipView setDocumentView:_menuView];

        [contentView addSubview:_menuClipView];

        _moreAboveView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];

-        [_moreAboveView setImage:_CPMenuWindowMoreAboveImage];
-        [_moreAboveView setFrameSize:[_CPMenuWindowMoreAboveImage size]];
+        [_moreAboveView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-above-image"]];
+        [_moreAboveView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-above-image"] size]];

        [contentView addSubview:_moreAboveView];

        _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];

-        [_moreBelowView setImage:_CPMenuWindowMoreBelowImage];
-        [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
+        [_moreBelowView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-below-image"]];
+        [_moreBelowView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-below-image"] size]];

        [contentView addSubview:_moreBelowView];
    }
@@ -117,7 +123,7 @@ var STICKY_TIME_INTERVAL        = 500,

 + (float)_standardLeftMargin
 {
-    return LEFT_MARGIN;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-margin-inset" forClass:_CPMenuView].left;
 }

 - (void)setFont:(CPFont)aFont
@@ -139,36 +145,10 @@ var STICKY_TIME_INTERVAL        = 500,
        var bundle = [CPBundle bundleForClass:[self class]];

        if (aBackgroundStyle == _CPMenuWindowPopUpBackgroundStyle)
-            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-                [
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded0.png"] size:CGSizeMake(4.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow1.png"] size:CGSizeMake(1.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded2.png"] size:CGSizeMake(4.0, 4.0)],
-
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
-
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
-                ]]];
+            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-pop-up-background-style-color" forClass:_CPMenuView];

        else if (aBackgroundStyle == _CPMenuWindowMenuBarBackgroundStyle)
-            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-                [
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 0.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 0.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 0.0)],
-
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
-
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
-                ]]];
+            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-menu-bar-background-style-color" forClass:_CPMenuView];

        _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
    }
@@ -186,12 +166,13 @@ var STICKY_TIME_INTERVAL        = 500,
    [aMenu _setMenuWindow:self];
    [_menuView setMenu:aMenu];

-    var menuViewSize = [_menuView frame].size;
+    var menuViewSize = [_menuView frame].size,
+        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"];

-    [self setFrameSize:CGSizeMake(LEFT_MARGIN + menuViewSize.width + RIGHT_MARGIN, TOP_MARGIN + menuViewSize.height + BOTTOM_MARGIN)];
+    [self setFrameSize:CGSizeMake(marginInset.left + menuViewSize.width + marginInset.right, marginInset.top + menuViewSize.height + marginInset.bottom)];

    [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
-    [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
+    [_menuClipView setFrame:CGRectMake(marginInset.left, marginInset.top, menuViewSize.width, menuViewSize.height)];
 }

 - (void)setMinWidth:(float)aWidth
@@ -249,7 +230,9 @@ var STICKY_TIME_INTERVAL        = 500,
    // FIXME: This gets called far too often.
    _unconstrainedFrame = _CGRectMakeCopy(aFrame);

-    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect);
+    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect),
+        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"],
+        scrollIndicatorHeight = [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"];

    // We don't want to simply intersect the visible frame and the unconstrained frame.
    // We should be allowing as much of the width to fit as possible (pushing back and forward).
@@ -268,41 +251,41 @@ var STICKY_TIME_INTERVAL        = 500,
    [super setFrame:constrainedFrame display:shouldDisplay animate:shouldAnimate];

    // This needs to happen before changing the frame.
-    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + LEFT_MARGIN, CGRectGetMinY(aFrame) + TOP_MARGIN),
-        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + TOP_MARGIN,
-        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - BOTTOM_MARGIN,
+    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + marginInset.left, CGRectGetMinY(aFrame) + marginInset.top),
+        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + marginInset.top,
+        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - marginInset.bottom,

-        topMargin = TOP_MARGIN,
-        bottomMargin = BOTTOM_MARGIN,
+        topMargin = marginInset.top,
+        bottomMargin = marginInset.bottom,

        contentView = [self contentView],
        bounds = [contentView bounds];

    if (moreAbove)
    {
-        topMargin += SCROLL_INDICATOR_HEIGHT;
+        topMargin += scrollIndicatorHeight;

        var frame = [_moreAboveView frame];

-        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
+        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (marginInset.top + scrollIndicatorHeight - CGRectGetHeight(frame)) / 2.0)];
    }

    [_moreAboveView setHidden:!moreAbove];

    if (moreBelow)
    {
-        bottomMargin += SCROLL_INDICATOR_HEIGHT;
+        bottomMargin += scrollIndicatorHeight;

-        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - SCROLL_INDICATOR_HEIGHT - BOTTOM_MARGIN)];
+        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - scrollIndicatorHeight - marginInset.bottom)];
    }

    [_moreBelowView setHidden:!moreBelow];

    var clipFrame = CGRectMakeZero();

-    clipFrame.origin.x = LEFT_MARGIN;
+    clipFrame.origin.x = marginInset.left;
    clipFrame.origin.y = topMargin;
-    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN;
+    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - marginInset.left - marginInset.right;
    clipFrame.size.height = CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin;

    [_menuClipView setFrame:clipFrame];
@@ -398,15 +381,15 @@ var STICKY_TIME_INTERVAL        = 500,
 - (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
 {
    var frame = [self frame];
-    if (!CPRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
+    if (!CGRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
        return _CPMenuManagerScrollingStateNone;

    // If we're at or above of the top scroll indicator...
-    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT &&  ![_moreAboveView isHidden])
+    if (aGlobalLocation.y < CGRectGetMinY(frame) + [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreAboveView isHidden])
        return _CPMenuManagerScrollingStateUp;

    // If we're at or below the bottom scroll indicator...
-    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT &&  ![_moreBelowView isHidden])
+    if (aGlobalLocation.y > CGRectGetMaxY(frame) - [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].bottom - [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreBelowView isHidden])
        return _CPMenuManagerScrollingStateDown;

    return _CPMenuManagerScrollingStateNone;
@@ -414,7 +397,7 @@ var STICKY_TIME_INTERVAL        = 500,

 - (float)deltaYForItemAtIndex:(int)anIndex
 {
-    return TOP_MARGIN + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
+    return [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
 }

 - (CGPoint)rectForItemAtIndex:(int)anIndex
@@ -445,6 +428,49 @@ var STICKY_TIME_INTERVAL        = 500,
    CPFont  _font @accessors(property=font);
 }

+
+ (CPString)defaultThemeClass
+{
+    return "menu-view";
+}
+
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[    [CPNull null], [CPNull null], [CPNull null], [CPNull null], CGInsetMake(5.0, 1.0, 1.0, 5.0), 16.0,
+                                                    [CPNull null], [CPNull null], [CPNull null], 30.0, 10.0, 10.0, 10.0,
+                                                    [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 28.0, [CPNull null], 1.0,
+                                                    [CPNull null], [CPNull null], [CPNull null]]
+                                       forKeys:[    @"menu-window-more-above-image",
+                                                    @"menu-window-more-below-image",
+                                                    @"menu-window-pop-up-background-style-color",
+                                                    @"menu-window-menu-bar-background-style-color",
+                                                    @"menu-window-margin-inset",
+                                                    @"menu-window-scroll-indicator-height",
+
+                                                    @"menu-bar-window-background-color",
+                                                    @"menu-bar-window-background-selected-color",
+                                                    @"menu-bar-window-font",
+                                                    @"menu-bar-window-height",
+                                                    @"menu-bar-window-margin",
+                                                    @"menu-bar-window-left-margin",
+                                                    @"menu-bar-window-right-margin",
+
+                                                    @"menu-bar-text-color",
+                                                    @"menu-bar-title-color",
+                                                    @"menu-bar-text-shadow-color",
+                                                    @"menu-bar-title-shadow-color",
+                                                    @"menu-bar-highlight-color",
+                                                    @"menu-bar-highlight-text-color",
+                                                    @"menu-bar-highlight-text-shadow-color",
+                                                    @"menu-bar-height",
+                                                    @"menu-bar-icon-image",
+                                                    @"menu-bar-icon-image-alpha-value",
+
+                                                    @"menu-general-icon-new",
+                                                    @"menu-general-icon-save",
+                                                    @"menu-general-icon-open"]];
+}
+
 - (unsigned)numberOfUnhiddenItems
 {
    return _visibleMenuItemInfos.length;
@@ -25,29 +25,33 @@
@import <Foundation/CPString.j>

@import "CPImage.j"
-@import "CPMenu.j"
+@import "CPText.j"
@import "CPView.j"
@import "_CPMenuItemView.j"

+@class CPMenu

-var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
-[CPMenuItemStringRepresentationDictionary setObject:"\u238B" forKey:CPEscapeFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u21E5" forKey:CPTabCharacter];
-[CPMenuItemStringRepresentationDictionary setObject:"\u21E4" forKey:CPBackTabCharacter];
-[CPMenuItemStringRepresentationDictionary setObject:"\u2423" forKey:CPSpaceFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u23CE" forKey:CPCarriageReturnCharacter];
-[CPMenuItemStringRepresentationDictionary setObject:"\u232B" forKey:CPBackspaceCharacter];
-[CPMenuItemStringRepresentationDictionary setObject:"\u232B" forKey:CPDeleteFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u2326" forKey:CPDeleteCharacter];
-[CPMenuItemStringRepresentationDictionary setObject:"\u21F1" forKey:CPHomeFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u21F2" forKey:CPEndFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u21DE" forKey:CPPageUpFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u21DF" forKey:CPPageDownFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u2191" forKey:CPUpArrowFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u2193" forKey:CPDownArrowFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u2190" forKey:CPLeftArrowFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u2192" forKey:CPRightArrowFunctionKey];
-[CPMenuItemStringRepresentationDictionary setObject:"\u2327" forKey:CPClearDisplayFunctionKey];
+@global CPApp
+
+var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionaryWithObjectsAndKeys:
+        "\u238B", CPEscapeFunctionKey,
+        "\u21E5", CPTabCharacter,
+        "\u21E4", CPBackTabCharacter,
+        "\u2423", CPSpaceFunctionKey,
+        "\u23CE", CPCarriageReturnCharacter,
+        "\u232B", CPBackspaceCharacter,
+        "\u232B", CPDeleteFunctionKey,
+        "\u2326", CPDeleteCharacter,
+        "\u21F1", CPHomeFunctionKey,
+        "\u21F2", CPEndFunctionKey,
+        "\u21DE", CPPageUpFunctionKey,
+        "\u21DF", CPPageDownFunctionKey,
+        "\u2191", CPUpArrowFunctionKey,
+        "\u2193", CPDownArrowFunctionKey,
+        "\u2190", CPLeftArrowFunctionKey,
+        "\u2192", CPRightArrowFunctionKey,
+        "\u2327", CPClearDisplayFunctionKey
+    ];

 /*!
    @ingroup appkit
@@ -1,17 +1,30 @@
-@import "CPView.j"
+/*
+ * _CPMenuItemMenuBarView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

+@import "CPControl.j"
+@import "_CPImageAndTextView.j"

-var HORIZONTAL_MARGIN           = 8.0,
-    SUBMENU_INDICATOR_MARGIN    = 3.0,
-    VERTICAL_MARGIN             = 4.0;
-
-var SelectionColor                              = nil,
-    SUBMENU_INDICATOR_COLOR                     = nil,
-    _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
+@class _CPMenuBarWindow
+@class _CPMenuView

@implementation _CPMenuItemMenuBarView : CPView
 {
@@ -27,28 +40,20 @@ var SelectionColor                              = nil,
    CPView                  _submenuIndicatorView;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [_CPMenuItemMenuBarView class])
-        return;
+    return "menu-item-bar-view";
+}

-    var bundle = [CPBundle bundleForClass:self];
-
-    SelectionColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png"] size:CGSizeMake(1.0, 28.0)]];
-
-    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
-
-    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
-    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-
-    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], 8.0, 3.0, 4.0]
+                                       forKeys:[    @"submenu-indicator-color",
+                                                    @"menu-item-selection-color",
+                                                    @"menu-item-text-shadow-color",
+                                                    @"horizontal-margin",
+                                                    @"submenu-indicator-margin",
+                                                    @"vertical-margin"]];
 }

 + (id)view
@@ -62,7 +67,7 @@ var SelectionColor                              = nil,

    if (self)
    {
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(HORIZONTAL_MARGIN, 0.0, 0.0, 0.0)];
+        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake([self valueForThemeAttribute:@"horizontal-margin"], 0.0, 0.0, 0.0)];

        [_imageAndTextView setImagePosition:CPImageLeft];
        [_imageAndTextView setImageOffset:3.0];
@@ -101,7 +106,7 @@ var SelectionColor                              = nil,

 - (void)update
 {
-    var x = HORIZONTAL_MARGIN,
+    var x = [self valueForThemeAttribute:@"horizontal-margin"],
        height = 0.0;

    [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
@@ -129,7 +134,7 @@ var SelectionColor                              = nil,

        var submenuViewFrame = [_submenuIndicatorView frame];

-        submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
+        submenuViewFrame.origin.x = x + [self valueForThemeAttribute:@"submenu-indicator-margin"];

        x = CGRectGetMaxX(submenuViewFrame);
        height = MAX(height, CGRectGetHeight(submenuViewFrame));
@@ -137,7 +142,7 @@ var SelectionColor                              = nil,
    else
        [_submenuIndicatorView setHidden:YES];

-    height += 2.0 * VERTICAL_MARGIN;
+    height += 2.0 * [self valueForThemeAttribute:@"vertical-margin"];

    imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
    [_imageAndTextView setFrame:imageAndTextViewFrame];
@@ -149,7 +154,7 @@ var SelectionColor                              = nil,
    }

    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(x + HORIZONTAL_MARGIN, height)];
+    [self setFrameSize:CGSizeMake(x + [self valueForThemeAttribute:@"horizontal-margin"], height)];
    [self setAutoresizesSubviews:YES];
 }

@@ -162,11 +167,11 @@ var SelectionColor                              = nil,
    if (shouldHighlight)
    {
        if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:SelectionColor];
+            [self setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-selected-color" forClass:_CPMenuView]];

        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
        [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+        [_imageAndTextView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];

        [_submenuIndicatorView setColor:[CPColor whiteColor]];
        [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
@@ -1,3 +1,24 @@
+/*
+ * _CPMenuItemSeparatorView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

@import "CPView.j"

@@ -35,4 +56,4 @@
    CGContextStrokePath(context);
 }

-@end
+@end
@@ -1,21 +1,28 @@
+/*
+ * _CPMenuItemStandardView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
@import "CPControl.j"
-
-
-var LEFT_MARGIN                 = 3.0,
-    RIGHT_MARGIN                = 14.0 + 3.0,
-    STATE_COLUMN_WIDTH          = 14.0,
-    INDENTATION_WIDTH           = 17.0,
-    VERTICAL_MARGIN             = 4.0,
-
-    RIGHT_COLUMNS_MARGIN        = 30.0,
-    KEY_EQUIVALENT_MARGIN       = 10.0;
-
-var SUBMENU_INDICATOR_COLOR                     = nil,
-    _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
+@import "CPImageView.j"
+@import "_CPImageAndTextView.j"

@implementation _CPMenuItemStandardView : CPView
 {
@@ -34,26 +41,29 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    CPView                  _submenuIndicatorView;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [_CPMenuItemStandardView class])
-        return;
+    return "menu-item-standard-view";
+}

-    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
-
-    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
-    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 3.0, 17.0, 14.0, 17.0, 4.0, 30.0]
+                                       forKeys:[    @"submenu-indicator-color",
+                                                    @"menu-item-selection-color",
+                                                    @"menu-item-text-shadow-color",
+                                                    @"menu-item-default-off-state-image",
+                                                    @"menu-item-default-off-state-highlighted-image",
+                                                    @"menu-item-default-on-state-image",
+                                                    @"menu-item-default-on-state-highlighted-image",
+                                                    @"menu-item-default-mixed-state-image",
+                                                    @"menu-item-default-mixed-state-highlighted-image",
+                                                    @"left-margin",
+                                                    @"right-margin",
+                                                    @"state-column-width",
+                                                    @"indentation-width",
+                                                    @"vertical-margin",
+                                                    @"right-columns-margin"]];
 }

 + (id)view
@@ -63,7 +73,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,

 + (float)_standardLeftMargin
 {
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"left-margin" forClass:[self class]] + [[CPTheme defaultTheme] valueForAttributeWithName:@"state-column-width" forClass:[self class]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -95,7 +105,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,

        _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];

-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
+        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
        [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];

        [self addSubview:_submenuIndicatorView];
@@ -129,16 +139,34 @@ var SUBMENU_INDICATOR_COLOR                     = nil,

 - (void)update
 {
-    var x = LEFT_MARGIN + [_menuItem indentationLevel] * INDENTATION_WIDTH,
+    var x = [self valueForThemeAttribute:@"left-margin"] + [_menuItem indentationLevel] * [self valueForThemeAttribute:@"indentation-width"],
        height = 0.0,
        hasStateColumn = [[_menuItem menu] showsStateColumn];

    if (hasStateColumn)
    {
        [_stateView setHidden:NO];
-        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
+        //[_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];

-        x += STATE_COLUMN_WIDTH;
+        switch ([_menuItem state])
+        {
+            case CPOnState:
+                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
+                break;
+
+            case CPOffState:
+                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-image"]];
+                break;
+
+            case CPMixedState:
+                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-image"]];
+                break;
+
+            default:
+                break;
+        }
+
+        x += [self valueForThemeAttribute:@"state-column-width"];
    }
    else
        [_stateView setHidden:YES];
@@ -162,7 +190,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        hasSubmenu = [_menuItem hasSubmenu];

    if (hasKeyEquivalent || hasSubmenu)
-        x += RIGHT_COLUMNS_MARGIN;
+        x += [self valueForThemeAttribute:@"right-columns-margin"];

    if (hasKeyEquivalent)
    {
@@ -173,7 +201,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        [_keyEquivalentView setTextColor:[self textColor]];
        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
-        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
+        [_keyEquivalentView setFrameOrigin:CGPointMake(x, [self valueForThemeAttribute:@"vertical-margin"])];
        [_keyEquivalentView sizeToFit];

        var keyEquivalentViewFrame = [_keyEquivalentView frame];
@@ -183,7 +211,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));

        if (hasSubmenu)
-            x += RIGHT_COLUMNS_MARGIN;
+            x += [self valueForThemeAttribute:@"right-columns-margin"];
    }
    else
        [_keyEquivalentView setHidden:YES];
@@ -202,13 +230,13 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    else
        [_submenuIndicatorView setHidden:YES];

-    height += 2.0 * VERTICAL_MARGIN;
+    height += 2.0 * [self valueForThemeAttribute:@"vertical-margin"];

    imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
    [_imageAndTextView setFrame:imageAndTextViewFrame];

    if (hasStateColumn)
-        [_stateView setFrameSize:CGSizeMake(STATE_COLUMN_WIDTH, height)];
+        [_stateView setFrameSize:CGSizeMake([self valueForThemeAttribute:@"state-column-width"], height)];

    if (hasKeyEquivalent)
    {
@@ -222,7 +250,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        [_submenuIndicatorView setFrame:submenuViewFrame];
    }

-    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
+    _minSize = CGSizeMake(x + [self valueForThemeAttribute:@"right-margin"], height);

    [self setAutoresizesSubviews:NO];
    [self setFrameSize:_minSize];
@@ -237,15 +265,15 @@ var SUBMENU_INDICATOR_COLOR                     = nil,

    if (shouldHighlight)
    {
-        [self setBackgroundColor:_CPMenuItemSelectionColor];
+        [self setBackgroundColor:[self valueForThemeAttribute:@"menu-item-selection-color"]];

        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
        [_imageAndTextView setTextColor:[CPColor whiteColor]];
        [_keyEquivalentView setTextColor:[CPColor whiteColor]];
        [_submenuIndicatorView setColor:[CPColor whiteColor]];

-        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
-        [_keyEquivalentView setTextShadowColor:_CPMenuItemTextShadowColor];
+        [_imageAndTextView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
+        [_keyEquivalentView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
    }
    else
    {
@@ -254,7 +282,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        [_imageAndTextView setImage:[_menuItem image]];
        [_imageAndTextView setTextColor:[self textColor]];
        [_keyEquivalentView setTextColor:[self textColor]];
-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
+        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];

        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
@@ -263,9 +291,45 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    if ([[_menuItem menu] showsStateColumn])
    {
        if (shouldHighlight)
-            [_stateView setImage:_CPMenuItemDefaultStateHighlightedImages[[_menuItem state]] || nil];
+        {
+            switch ([_menuItem state])
+            {
+                case CPOnState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-highlighted-image"]];
+                    break;
+
+                case CPOffState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-highlighted-image"]];
+                    break;
+
+                case CPMixedState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-highlighted-image"]];
+                    break;
+
+                default:
+                    break;
+            }
+        }
        else
-            [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
+        {
+            switch ([_menuItem state])
+            {
+                case CPOnState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
+                    break;
+
+                case CPOffState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-image"]];
+                    break;
+
+                case CPMixedState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-image"]];
+                    break;
+
+                default:
+                    break;
+            }
+        }
    }
 }

@@ -1,22 +1,38 @@
+/*
+ * _CPMenuItemView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

-@import <AppKit/CPControl.j>
+@import "CPControl.j"

@import "_CPMenuItemSeparatorView.j"
@import "_CPMenuItemStandardView.j"
@import "_CPMenuItemMenuBarView.j"

+@global CPApp

-var LEFT_MARGIN                 = 3.0,
-    RIGHT_MARGIN                = 16.0,
-    STATE_COLUMN_WIDTH          = 14.0,
-    INDENTATION_WIDTH           = 17.0,
-    VERTICAL_MARGIN             = 4.0;
-
-var _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
+// var LEFT_MARGIN                 = 3.0,
+//     RIGHT_MARGIN                = 16.0,
+//     STATE_COLUMN_WIDTH          = 14.0,
+//     INDENTATION_WIDTH           = 17.0,
+//     VERTICAL_MARGIN             = 4.0;

 /*
    @ignore
@@ -38,31 +54,23 @@ var _CPMenuItemSelectionColor                   = nil,
    CPView                  _submenuView;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [_CPMenuItemView class])
-        return;
-
-    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
-    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+    return "menu-item-view";
 }

-+ (float)leftMargin
+ (id)themeAttributes
 {
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+    return [CPDictionary dictionaryWithObjects:[]
+                                       forKeys:[]];
 }

+// Not used in the Appkit
+// + (float)leftMargin
+// {
+//     return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+// }
+
 - (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
 {
    self = [super initWithFrame:aFrame];
@@ -24,6 +24,7 @@
@import <Foundation/CPCountedSet.j>

@import "CPController.j"
+@import "CPKeyValueBinding.j"

 /*!
    @class
@@ -798,7 +799,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

    [_observationProxies removeObjectAtIndex:index];

-    _observedObjects = nil;
+    _observedObjectsByKeyPath[aKeyPath] = nil;
 }

@end
@@ -47,9 +47,9 @@
        var options = { directoryURL: [self directoryURL],
                        canChooseFiles: [self canChooseFiles],
                        canChooseDirectories: [self canChooseDirectories],
-                        allowsMultipleSelection: [self allowsMultipleSelection] };
+                        allowsMultipleSelection: [self allowsMultipleSelection] },

-        var result = window.cpOpenPanel(options);
+            result = window.cpOpenPanel(options);

        _URLs = result.URLs;

@@ -20,9 +20,11 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPButton.j"
@import "CPTableColumn.j"
@import "CPTableView.j"

+@global CPApp

 CPOutlineViewColumnDidMoveNotification          = @"CPOutlineViewColumnDidMoveNotification";
 CPOutlineViewColumnDidResizeNotification        = @"CPOutlineViewColumnDidResizeNotification";
@@ -1052,11 +1054,12 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    @ignore
    We need to offset the dataview and add the disclosure triangle.
 */
- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CPPointPointer)theDragViewOffset
+- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CGPoint)theDragViewOffset
 {
    var dragView = [[_CPColumnDragView alloc] initWithLineColor:[self gridColor]],
        tableColumn = [[self tableColumns] objectAtIndex:theColumnIndex],
-        bounds = _CGRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self exposedRect]) + 23.0),
+        defaultRowHeight = [self valueForThemeAttribute:@"default-row-height"],
+        bounds = _CGRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self exposedRect]) + defaultRowHeight),
        columnRect = [self rectOfColumn:theColumnIndex],
        headerView = [tableColumn headerView],
        row = [_exposedRows firstIndex];
@@ -1070,7 +1073,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
        dataViewFrame.origin.x = 0.0;

        // Offset by table header height - scroll position
-        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + 23.0;
+        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + defaultRowHeight;
        [dataView setFrame:dataViewFrame];

        [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
@@ -1184,7 +1187,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
    @ignore
 */
- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CPPoint)theOffset
+- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CGPoint)theOffset
 {
    if (_shouldRetargetItem)
        return _retargetedItem;
@@ -1214,7 +1217,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
    @ignore
 */
- (CPRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CPPoint)theOffset
+- (CGRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CGPoint)theOffset
 {
    // Call super and the update x to reflect the current indentation level
    var rect = [super _rectForDropHighlightViewBetweenUpperRow:theUpperRowIndex andLowerRow:theLowerRowIndex offset:theOffset],
@@ -1727,7 +1730,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return [_outlineView._outlineViewDataSource outlineView:_outlineView writeItems:items toPasteboard:thePasteboard];
 }

- (int)_childIndexForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CPPoint)theOffset
+- (int)_childIndexForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CGPoint)theOffset
 {
    if (_outlineView._shouldRetargetChildIndex)
        return _outlineView._retargedChildIndex;
@@ -1751,7 +1754,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return childIndex;
 }

- (void)_parentItemForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CPPoint)theOffset
+- (void)_parentItemForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CGPoint)theOffset
 {
    if (theDropOperation === CPTableViewDropAbove)
        return [_outlineView _parentItemForUpperRow:theRow - 1 andLowerRow:theRow atMouseOffset:theOffset]
@@ -114,4 +114,9 @@ CPDocModalWindowMask    = 1 << 6;
    return NO;
 }

+- (BOOL)canBecomeKeyWindow
+{
+  return YES;
+}
+
@end
@@ -22,6 +22,7 @@

@import <Foundation/CPObject.j>
@import <Foundation/CPArray.j>
+@import <Foundation/CPData.j>
@import <Foundation/CPDictionary.j>
@import <Foundation/CPPropertyListSerialization.j>

@@ -117,7 +118,7 @@ var CPPasteboards = nil,

    if (self)
    {
-        _name = aName;
+//        _name = aName;
        _types = [];

        _owners = [CPDictionary dictionary];
@@ -20,8 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import <Foundation/CPGeometry.j>
-
+@import "CGGeometry.j"
@import "CPButton.j"
@import "CPKeyValueBinding.j"
@import "CPMenu.j"
@@ -28,7 +28,7 @@
@import "CPImageView.j"
@import "CPResponder.j"
@import "CPView.j"
-@import "_CPAttachedWindow.j"
+@import "_CPPopoverWindow.j"


 CPPopoverBehaviorApplicationDefined = 0;
@@ -45,7 +45,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*! @ingroup appkit
    @class CPPopover

-    This class represent a widget that displays a attached
+    This class represent a widget that displays a popover
    view relative to another one.

    Delegate can implement:
@@ -67,7 +67,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
    int                         _appearance             @accessors(property=appearance);
    int                         _behavior               @accessors(getter=behavior);

-    _CPAttachedWindow           _attachedWindow;
+    _CPPopoverWindow            _popoverWindow;
    int                         _implementedDelegateMethods;
 }

@@ -103,9 +103,10 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (CGRect)positioningRect
 {
-    if (![_attachedWindow isVisible])
+    if (![_popoverWindow isVisible])
        return CGRectMakeZero();
-    return [_attachedWindow frame];
+
+    return [_popoverWindow frame];
 }

 /*! Sets the frame of the popover
@@ -113,9 +114,10 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (void)setPositioningRect:(CGRect)aRect
 {
-    if (![_attachedWindow isVisible])
+    if (![_popoverWindow isVisible])
        return;
-    [_attachedWindow setFrame:aRect];
+
+    [_popoverWindow setFrame:aRect];
 }

 /*!
@@ -125,8 +127,9 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (CGSize)contentSize
 {
-    if (![_attachedWindow isVisible])
+    if (![_popoverWindow isVisible])
        return CGRectMakeZero();
+
    return [[_contentViewController view] frameSize];
 }

@@ -135,7 +138,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,

    @param aSize the desired size
 */
- (void)setContentSize:(CPSize)aSize
+- (void)setContentSize:(CGSize)aSize
 {
    [[_contentViewController view] setFrameSize:aSize];
 }
@@ -147,7 +150,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (BOOL)isShown
 {
-    return [_attachedWindow isVisible];
+    return [_popoverWindow isVisible];
 }

 /*!
@@ -164,7 +167,7 @@ Set the behavior of the CPPopover. It can be:
        return;

    _behavior = aBehavior;
-    [_attachedWindow setStyleMask:[self styleMaskForBehavior]];
+    [_popoverWindow setStyleMask:[self styleMaskForBehavior]];
 }

 - (void)setDelegate:(id)aDelegate
@@ -210,29 +213,24 @@ Set the behavior of the CPPopover. It can be:
        [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];

    // If the popover is currently closing, do nothing. That is what Cocoa does.
-    if ([_attachedWindow isClosing])
+    if ([_popoverWindow isClosing])
        return;

    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
        [_delegate popoverWillShow:self];

-    if (!_attachedWindow)
+    if (!_popoverWindow)
    {
-        _attachedWindow = [[_CPAttachedWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
-
-        var parentWindow = [positioningView window];
-
-        if (![parentWindow isKindOfClass:_CPAttachedWindow])
-            [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(parentWindowWillClose:) name:CPWindowWillCloseNotification object:parentWindow];
+        _popoverWindow = [[_CPPopoverWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
    }

-    [_attachedWindow setAppearance:_appearance];
-    [_attachedWindow setAnimates:_animates];
-    [_attachedWindow setDelegate:self];
-    [_attachedWindow setMovableByWindowBackground:NO];
-    [_attachedWindow setFrame:[_attachedWindow frameRectForContentRect:[[_contentViewController view] frame]]];
-    [_attachedWindow setContentView:[_contentViewController view]];
-    [_attachedWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge];
+    [_popoverWindow setAppearance:_appearance];
+    [_popoverWindow setAnimates:_animates];
+    [_popoverWindow setDelegate:self];
+    [_popoverWindow setMovableByWindowBackground:NO];
+    [_popoverWindow setFrame:[_popoverWindow frameRectForContentRect:[[_contentViewController view] frame]]];
+    [_popoverWindow setContentView:[_contentViewController view]];
+    [_popoverWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge];

    if (!_animates && _implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
        [_delegate popoverDidShow:self];
@@ -256,16 +254,16 @@ Set the behavior of the CPPopover. It can be:
 */
 - (void)_close
 {
-    if ([_attachedWindow isClosing] || ![self isShown])
+    if ([_popoverWindow isClosing] || ![self isShown])
        return;

    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
        [_delegate popoverWillClose:self];

-    [_attachedWindow close];
+    [_popoverWindow close];

-    // popoverDidClose will be sent from attachedWindowDidClose, since
-    // the attached window will close asynchronously when animating.
+    // popoverDidClose will be sent from popoverWindowDidClose, since
+    // the popover window will close asynchronously when animating.
 }


@@ -279,7 +277,7 @@ Set the behavior of the CPPopover. It can be:
 */
 - (IBAction)performClose:(id)sender
 {
-    if ([_attachedWindow isClosing])
+    if ([_popoverWindow isClosing])
        return;

    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
@@ -294,46 +292,30 @@ Set the behavior of the CPPopover. It can be:
 #pragma mark Delegates

 /*! @ignore */
- (BOOL)attachedWindowShouldClose:(_CPAttachedWindow)anAttachedWindow
+- (BOOL)popoverWindowShouldClose:(_CPPopoverWindow)aPopoverWindow
 {
    [self performClose:self];

    // We return NO, because we want the CPPopover to determine
-    // if the attached window can be closed and to give us a chance
+    // if the popover window can be closed and to give us a chance
    // to send delegate messages.
    return NO;
 }

 /*! @ignore */
- (void)attachedWindowDidClose:(_CPAttachedWindow)anAttachedWindow
+- (void)popoverWindowDidClose:(_CPPopoverWindow)aPopoverWindow
 {
    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
        [_delegate popoverDidClose:self];
 }

 /*! @ignore */
- (void)attachedWindowDidShow:(_CPAttachedWindow)anAttachedWindow
+- (void)popoverWindowDidShow:(_CPPopoverWindow)aPopoverWindow
 {
    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
        [_delegate popoverDidShow:self];
 }

-
-#pragma mark -
-#pragma mark Notifications
-
-/*!
-    @ignore
-
-    This method is called only when a non-popover parent window
-    is closing. In that case popovers should order out.
-*/
- (void)parentWindowWillClose:(CPNotification)aNotification
-{
-    [_attachedWindow orderOut:nil];
-    [self performClose:nil];
-}
-
@end

@implementation CPPopover (Deprecated)
@@ -347,7 +329,7 @@ Set the behavior of the CPPopover. It can be:

@end

-var CPPopoverNeedsNewAttachedWindowKey = @"CPPopoverNeedsNewAttachedWindowKey",
+var CPPopoverNeedsNewPopoverWindowKey = @"CPPopoverNeedsNewPopoverWindowKey",
    CPPopoverAppearanceKey = @"CPPopoverAppearanceKey",
    CPPopoverAnimatesKey = @"CPPopoverAnimatesKey",
    CPPopoverContentViewControllerKey = @"CPPopoverContentViewControllerKey",
@@ -23,6 +23,7 @@
@import "CGGeometry.j"
@import "CPImageView.j"
@import "CPView.j"
+@import "CPWindow_Constants.j"


 /*
@@ -41,11 +42,7 @@ CPProgressIndicatorSpinningStyle    = 1;
 */
 CPProgressIndicatorHUDBarStyle      = 2;

-var CPProgressIndicatorSpinningStyleColors  = nil,
-
-    CPProgressIndicatorClassName            = nil,
-    CPProgressIndicatorStyleIdentifiers     = nil,
-    CPProgressIndicatorStyleSizes           = nil;
+var CPProgressIndicatorSpinningStyleColors  = nil;

 /*!
    @ingroup appkit
@@ -73,66 +70,15 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
    BOOL                        _isDisplayedWhenStopped;
 }

-/*
-    @ignore
-*/
-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [CPProgressIndicator class])
-        return;
+    return @"progress-indicator";
+}

-    var bundle = [CPBundle bundleForClass:self];
-
-    CPProgressIndicatorSpinningStyleColors = [];
-
-    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize]       = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif"] size:CGSizeMake(16.0, 16.0)]];
-    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize]      = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleSmall.gif"] size:CGSizeMake(32.0, 32.0)]];
-    CPProgressIndicatorSpinningStyleColors[CPRegularControlSize]    = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
-
-    CPProgressIndicatorBezelBorderViewPool = [];
-
-    var start = CPProgressIndicatorBarStyle,
-        end = CPProgressIndicatorHUDBarStyle;
-
-    for (; start <= end; ++start)
-    {
-        CPProgressIndicatorBezelBorderViewPool[start] = [];
-        CPProgressIndicatorBezelBorderViewPool[start][CPMiniControlSize]    = [];
-        CPProgressIndicatorBezelBorderViewPool[start][CPSmallControlSize]   = [];
-        CPProgressIndicatorBezelBorderViewPool[start][CPRegularControlSize]  = [];
-    }
-
-    CPProgressIndicatorClassName = [self className];
-    CPProgressIndicatorStyleIdentifiers = [];
-
-    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle]        = @"Bar";
-    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorSpinningStyle]   = @"Spinny";
-    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]     = @"HUDBar";
-
-    var regularIdentifier = _CPControlIdentifierForControlSize(CPRegularControlSize),
-        smallIdentifier = _CPControlIdentifierForControlSize(CPSmallControlSize),
-        miniIdentifier = _CPControlIdentifierForControlSize(CPMiniControlSize);
-
-    CPProgressIndicatorStyleSizes = [];
-
-    // Bar Style
-    var prefixes = [
-            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-            CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
-            CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
-        ];
-
-    for (var i = 0, count = prefixes.length; i < count; i++)
-    {
-        var prefix = prefixes[i];
-        CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
-        CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
-        CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
-    }
+ (CPDictionary)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], 25, [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
+                                       forKeys:[@"indeterminate-bar-color", @"bar-color", @"default-height", @"bezel-color", @"spinning-mini-gif", @"spinning-small-gif", @"spinning-regular-gif"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -151,8 +97,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

        _controlSize = CPRegularControlSize;

-        [self updateBackgroundColor];
-        [self drawBar];
+        [self setNeedsLayout];
    }

    return self;
@@ -343,6 +288,8 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

    _style = aStyle;

+    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+
    [self updateBackgroundColor];
 }

@@ -354,8 +301,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
    if (_style == CPProgressIndicatorSpinningStyle)
        [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
    else
-        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CPProgressIndicatorStyleSizes[
-            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + _CPControlIdentifierForControlSize(_controlSize)][0].height)];
+        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), [self valueForThemeAttribute:@"default-height"])];
 }

 /*!
@@ -405,20 +351,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 /* @ignore */
 - (void)drawBar
 {
-    if (_style == CPProgressIndicatorSpinningStyle)
-        return;
-
-    var barView = [self layoutEphemeralSubviewNamed:"bar-view"
-                                         positioned:CPWindowBelow
-                    relativeToEphemeralSubviewNamed:nil];
-
-    [barView setBackgroundColor:_CPControlThreePartImagePattern(
-        NO,
-        CPProgressIndicatorStyleSizes,
-        CPProgressIndicatorClassName,
-        @"Bar",
-        CPProgressIndicatorStyleIdentifiers[_style],
-        _CPControlIdentifierForControlSize(_controlSize))];
+    [self setNeedsLayout];
 }

 - (CPView)createEphemeralSubviewNamed:(CPString)aName
@@ -436,7 +369,10 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
        if (barWidth > 0.0 && barWidth < 4.0)
            barWidth = 4.0;

-        return _CGRectMake(0, 0, barWidth, 16.0);
+        if (_isIndeterminate)
+            barWidth = width;
+
+        return _CGRectMake(0, 0, barWidth, [self valueForThemeAttribute:@"default-height"]);
    }

    return nil;
@@ -445,6 +381,17 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 /* @ignore */
 - (void)updateBackgroundColor
 {
+    [self setNeedsLayout];
+}
+
+- (void)layoutSubviews
+{
+    CPProgressIndicatorSpinningStyleColors = [];
+
+    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize] = [self valueForThemeAttribute:@"spinning-mini-gif"];
+    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize] = [self valueForThemeAttribute:@"spinning-small-gif"];
+    CPProgressIndicatorSpinningStyleColors[CPRegularControlSize] = [self valueForThemeAttribute:@"spinning-regular-gif"];
+
    if (YES)//_isBezeled)
    {
        if (_style == CPProgressIndicatorSpinningStyle)
@@ -458,15 +405,17 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
        }
        else
        {
-            [self setBackgroundColor:_CPControlThreePartImagePattern(
-                NO,
-                CPProgressIndicatorStyleSizes,
-                CPProgressIndicatorClassName,
-                @"BezelBorder",
-                CPProgressIndicatorStyleIdentifiers[_style],
-                _CPControlIdentifierForControlSize(_controlSize))];
+           [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+
+           var barView = [self layoutEphemeralSubviewNamed:"bar-view"
+                                                 positioned:CPWindowBelow
+                            relativeToEphemeralSubviewNamed:nil];
+
+           if (_isIndeterminate)
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"indeterminate-bar-color"]];
+           else
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"bar-color"]];

-            [self drawBar];
        }
    }
    else
@@ -25,6 +25,8 @@

@import "CPButton.j"

+@global CPApp
+

 /*!
    @ingroup appkit
@@ -21,7 +21,11 @@
 */

@import <Foundation/CPObject.j>
+@import <Foundation/CPObjJRuntime.j>

+@import "CPEvent.j"
+
+@class CPKeyBinding

 CPDeleteKeyCode         = 8;
 CPTabKeyCode            = 9;
@@ -220,7 +220,7 @@
        var children = [CPArray array],
            itemsCount = 0,
            menuIndex = -1,
-            itemsArray,
+            itemArray,

            templateView = [templateViews objectAtIndex:count],
            isPopup = [templateView isKindOfClass:[CPPopUpButton class]];
@@ -20,6 +20,17 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPPredicate.j>
+
+@import "CPCheckBox.j"
+@import "CPPopUpButton.j"
+@import "CPMenuItem.j"
+@import "CPTextField.j"
+
+// NOTE: CPDatePicker is not implemented yet
+@class CPDatePicker
+
+
 CPUndefinedAttributeType     = 0;
 CPInteger16AttributeType     = 100;
 CPInteger32AttributeType     = 200;
@@ -583,7 +594,7 @@ CPTransformableAttributeType = 1800;

 - (CPPopUpButton)_viewFromExpressions:(CPArray)expressions
 {
-    var popup = [[CPPopUpButton alloc] initWithFrame:CPMakeRect(0, 0, 100, 18)],
+    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
        count = [expressions count];

    for (var i = 0; i < count; i++)
@@ -20,35 +20,25 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import <AppKit/CPTextField.j>
-@import <AppKit/CPViewAnimation.j>
-@import <AppKit/CPView.j>
@import <Foundation/CPPredicate.j>
@import <Foundation/CPArray.j>
@import <Foundation/CPDictionary.j>
@import <Foundation/CPIndexSet.j>

+@import "CPRuleEditor_Constants.j"
+@import "CPTextField.j"
+@import "CPViewAnimation.j"
+@import "CPView.j"
+
@import "_CPRuleEditorViewSliceRow.j"
@import "_CPRuleEditorLocalizer.j"

-CPRuleEditorPredicateLeftExpression     = "CPRuleEditorPredicateLeftExpression";
-CPRuleEditorPredicateRightExpression    = "CPRuleEditorPredicateRightExpression";
-CPRuleEditorPredicateComparisonModifier = "CPRuleEditorPredicateComparisonModifier";
-CPRuleEditorPredicateOptions            = "CPRuleEditorPredicateOptions";
-CPRuleEditorPredicateOperatorType       = "CPRuleEditorPredicateOperatorType";
-CPRuleEditorPredicateCustomSelector     = "CPRuleEditorPredicateCustomSelector";
-CPRuleEditorPredicateCompoundType       = "CPRuleEditorPredicateCompoundType";
+@class CPCompoundPredicate
+@class CPComparisonPredicate

-CPRuleEditorRowsDidChangeNotification   = "CPRuleEditorRowsDidChangeNotification";
-CPRuleEditorRulesDidChangeNotification  = "CPRuleEditorRulesDidChangeNotification";
-
-CPRuleEditorNestingModeSingle   = 0;        // Only a single row is allowed.  Plus/minus buttons will not be shown
-CPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nesting and no compound rows
-CPRuleEditorNestingModeCompound = 2;        // Unlimited nesting and compound rows; this is the default
-CPRuleEditorNestingModeSimple   = 3;        // One compound row at the top with subrows beneath it, and no further nesting allowed
-
-CPRuleEditorRowTypeSimple       = 0;
-CPRuleEditorRowTypeCompound     = 1;
+@global CPDirectPredicateModifier
+@global CPCaseInsensitivePredicateOption
+@global CPOrPredicateType

 var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
    itemsContext                = "items",
@@ -1512,23 +1502,10 @@ TODO: implement
            oldRows = [CPArray arrayWithArray:newRows];
            [oldRows removeObjectsInArray:changeNewValue];
        }
-        else if (changeKind === CPKeyValueChangeRemoval)
-        {
-            newRows = [self _subrowObjectsOfObject:object];
-            oldRows = [CPArray arrayWithArray:newRows];
-            var delIndexes = [change objectForKey:CPKeyValueChangeIndexesKey];
-            [oldRows insertObjects:delObjects atIndexes:changeOldValue];    // Pas sur que ce soit bon
-        }

        [self _changedRowArray:newRows withOldRowArray:oldRows forParent:object];
        [self _reconfigureSubviewsAnimate:[self _wantsRowAnimations]];
    }
-    else if (context === itemsContext)
-    {
-    }
-    else if (context === valuesContext)
-    {
-    }
 }

 - (void)_changedItem:(id)fromItem toItem:(id)toItem inRow:(int)aRow atCriteriaIndex:(int)fromItemIndex
@@ -1703,8 +1680,8 @@ TODO: implement

 - (void)_setBoundDataSource:(id)datasource withKeyPath:(CPString)keyPath options:(CPDictionary)options
 {
-    if ([observableController respondsToSelector:@selector(objectClass)])
-        _rowClass = [observableController objectClass];
+    if ([datasource respondsToSelector:@selector(objectClass)])
+        _rowClass = [datasource objectClass];

    _boundArrayKeyPath = keyPath;
    _boundArrayOwner = datasource;
@@ -2058,7 +2035,7 @@ TODO: implement
    [super setNeedsDisplay:flag];
 }

- (void)setFrameSize:(CPSize)size
+- (void)setFrameSize:(CGSize)size
 {
    [self setNeedsDisplay:YES];

@@ -2126,7 +2103,7 @@ TODO: implement
    [dragview setBackgroundColor:[firstSlice backgroundColor]];
    [dragview setAlphaValue:0.7];

-    dragPoint = CPMakePoint(0, firstIndex * _sliceHeight);
+    dragPoint = CGPointMake(0, firstIndex * _sliceHeight);

    [self dragView:dragview
                at:dragPoint
@@ -2188,7 +2165,7 @@ TODO: implement
        if (_subviewIndexOfDropLine !== CPNotFound && _subviewIndexOfDropLine < numberOfRows)
        {
            var previousBelowSlice = [_slices objectAtIndex:_subviewIndexOfDropLine];
-            [previousBelowSlice setFrameOrigin:CPMakePoint(0, [previousBelowSlice rowIndex] * _sliceHeight)];
+            [previousBelowSlice setFrameOrigin:CGPointMake(0, [previousBelowSlice rowIndex] * _sliceHeight)];
        }

        if (indexOfDropLine <= _lastRow && indexOfDropLine < numberOfRows)
@@ -2254,7 +2231,7 @@ TODO: implement
    return [CPIndexSet indexSetWithIndex:CPDragOperationMove];
 }

- (void)draggedView:(CPView)dragView endedAt:(CPPoint)aPoint operation:(CPDragOperation)operation
+- (void)draggedView:(CPView)dragView endedAt:(CGPoint)aPoint operation:(CPDragOperation)operation
 {
    _draggingRows = nil;

@@ -2578,7 +2555,7 @@ var dropSeparatorColor = [CPColor colorWithHexString:@"4886ca"];
 {
 }

- (void)drawRect:(CPRect)rect
+- (void)drawRect:(CGRect)rect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort];
    CGContextSetFillColor(context, dropSeparatorColor);
@@ -0,0 +1,40 @@
+/*
+ * CPRuleEditor_Constants.j
+ * AppKit
+ *
+ * Created by cacaodev.
+ * Copyright 2011, cacaodev.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+CPRuleEditorPredicateLeftExpression     = "CPRuleEditorPredicateLeftExpression";
+CPRuleEditorPredicateRightExpression    = "CPRuleEditorPredicateRightExpression";
+CPRuleEditorPredicateComparisonModifier = "CPRuleEditorPredicateComparisonModifier";
+CPRuleEditorPredicateOptions            = "CPRuleEditorPredicateOptions";
+CPRuleEditorPredicateOperatorType       = "CPRuleEditorPredicateOperatorType";
+CPRuleEditorPredicateCustomSelector     = "CPRuleEditorPredicateCustomSelector";
+CPRuleEditorPredicateCompoundType       = "CPRuleEditorPredicateCompoundType";
+
+CPRuleEditorRowsDidChangeNotification   = "CPRuleEditorRowsDidChangeNotification";
+CPRuleEditorRulesDidChangeNotification  = "CPRuleEditorRulesDidChangeNotification";
+
+CPRuleEditorNestingModeSingle   = 0;        // Only a single row is allowed.  Plus/minus buttons will not be shown
+CPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nesting and no compound rows
+CPRuleEditorNestingModeCompound = 2;        // Unlimited nesting and compound rows; this is the default
+CPRuleEditorNestingModeSimple   = 3;        // One compound row at the top with subrows beneath it, and no further nesting allowed
+
+CPRuleEditorRowTypeSimple       = 0;
+CPRuleEditorRowTypeCompound     = 1;
@@ -1,9 +1,25 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@class _CPPredicateEditorTree;
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
@implementation _CPPredicateEditorRowNode : CPObject
 {
    _CPPredicateEditorTree                   tree @accessors;
@@ -1,8 +1,25 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
@implementation _CPPredicateEditorTree : CPObject
 {
    CPPredicateEditorRowTemplate         template @accessors;
@@ -1,11 +1,27 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

@import <Foundation/CPObject.j>
@import <Foundation/CPDictionary.j>
@import <Foundation/CPString.j>
+@import <Foundation/CPURLConnection.j>
+@import <Foundation/CPURLRequest.j>

 var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");

@@ -13,7 +29,7 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
 {
    CPDictionary    _dictionary @accessors(property=dictionary);
    CPURLConnection connection;
-    CPURLRequest    resquest;
+    CPURLRequest    request;
 }

 - (void)loadContentOfURL:(CPURL)aURL
@@ -77,3 +93,5 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)

    return aString;
 }
+
+@end
@@ -1,8 +1,27 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPBezierPath.j"
+@import "CPPopUpButton.j"
+
+@class _CPRuleEditorViewSlice
+
 var GRADIENT_START_COLOR = "#fcfcfc",
    GRADIENT_END_COLOR = "#dfdfdf",
    BORDER_COLOR = "#BDBDBD";
@@ -44,9 +63,11 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 {
    [self setBordered:NO];

+#if PLATFORM(DOM)
    var style = _DOMElement.style;
    style.border = "1px solid " + BORDER_COLOR;
    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
+#endif
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -65,9 +86,9 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
    return self;
 }

- (id)hitTest:(CPPoint)point
+- (id)hitTest:(CGPoint)point
 {
-    if (!CPRectContainsPoint([self frame], point) || ![self sliceIsEditable])
+    if (!CGRectContainsPoint([self frame], point) || ![self sliceIsEditable])
        return nil;

    return self;
@@ -98,11 +119,13 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))

 - (void)layoutSubviews
 {
+#if PLATFORM(DOM)
    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
    var style = _DOMElement.style,
        radiusCSS = radius + "px";

    style.borderRadius = radiusCSS;
+#endif

    [super layoutSubviews];
 }
@@ -139,9 +162,11 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 {
    [self setBordered:NO];

+#if PLATFORM(DOM)
    var style = _DOMElement.style;
    style.border = "1px solid " + BORDER_COLOR;
    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
+#endif
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -162,6 +187,7 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))

 - (void)layoutSubviews
 {
+#if PLATFORM(DOM)
    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);

    var style = _DOMElement.style,
@@ -169,6 +195,7 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))

    style.borderRadius = radiusCSS;
    style[GRADIENT_PROPERTY] = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+#endif

    [super layoutSubviews];
 }
@@ -1,17 +1,34 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPView.j"
+
@implementation _CPRuleEditorViewSlice : CPView
 {
    CPRuleEditor _ruleEditor;
    int          _indentation           @accessors(property=indentation);
    int          _rowIndex              @accessors(property=rowIndex);
-    CPRect       _animationTargetRect   @accessors(property=_animationTargetRect);
+    CGRect       _animationTargetRect   @accessors(property=_animationTargetRect);
    BOOL         _selected              @accessors(getter=_isSelected, setter=_setSelected:);
    BOOL         _lastSelected          @accessors(getter=_isLastSelected, setter=_setLastSelected:);
    CPColor      _backgroundColor       @accessors(property=backgroundColor);
+    BOOL         _editable              @accessors(getter=isEditable, setter=setEditable:);
 }

 - (void)removeFromSuperview
@@ -41,7 +58,7 @@
    _selected = select;
 }

- (void)drawRect:(CPRect)rect
+- (void)drawRect:(CGRect)rect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort],
        bounds = [self bounds],
@@ -81,13 +98,13 @@

 - (void)mouseDown:(CPEvent)theEvent
 {
-    if (editable)
+    if (_editable)
        [_ruleEditor _mouseDownOnSlice:self withEvent:theEvent];
 }

 - (void)mouseUp:(CPEvent)theEvent
 {
-    if (editable)
+    if (_editable)
        [_ruleEditor _mouseUpOnSlice:self withEvent:theEvent];
 }

@@ -1,11 +1,27 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPRuleEditor_Constants.j"
@import "_CPRuleEditorViewSlice.j"
@import "_CPRuleEditorPopUpButton.j"
-@import "CPRuleEditor.j"
+
+@global CPApp

 var CONTROL_HEIGHT = 16.,
    BUTTON_HEIGHT = 16.;
@@ -18,7 +34,7 @@ var CONTROL_HEIGHT = 16.,
    CPMutableArray  _ruleOptionInitialViewFrames;
    CPButton        _addButton;
    CPButton        _subtractButton;
-    BOOL            editable;
+
    CPRuleEditorRowType _rowType @accessors;
    CPRuleEditorRowType _plusButtonRowType;
 }
@@ -37,14 +53,14 @@ var CONTROL_HEIGHT = 16.,
    _ruleOptionFrames = [[CPMutableArray alloc] init];
    _ruleOptionInitialViewFrames = [[CPMutableArray alloc] init];
    _ruleOptionViews = [[CPMutableArray alloc] init];
-     editable = [_ruleEditor isEditable];
+     _editable = [_ruleEditor isEditable];

    _addButton = [self _createAddRowButton];
    _subtractButton = [self _createDeleteRowButton];
    [_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
    [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
-    [_addButton setHidden:!editable];
-    [_subtractButton setHidden:!editable];
+    [_addButton setHidden:!_editable];
+    [_subtractButton setHidden:!_editable];
    [self addSubview:_addButton];
    [self addSubview:_subtractButton];

@@ -123,15 +139,16 @@ var CONTROL_HEIGHT = 16.,

 - (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString)text
 {
-    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CPMakeRect(0, 0, 200, CONTROL_HEIGHT)],
-        refont = [_ruleEditor font],
-        font = [CPFont fontWithName:[refont familyName] size:[refont size] + 2],
+    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CGRectMakeZero()],
+        ruleEditorFont = [_ruleEditor font],
+        font = [CPFont fontWithName:[ruleEditorFont familyName] size:[ruleEditorFont size] + 2],
+        localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text],
+        size = [localizedText sizeWithFont:font];

-        localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text];
+    [textField setFrameSize:CGSizeMake(size.width + 4, CONTROL_HEIGHT + 2)];

    [textField setValue:font forThemeAttribute:@"font"];
    [textField setStringValue:localizedText];
-    [textField sizeToFit];

    return textField;
 }
@@ -300,7 +317,7 @@ var CONTROL_HEIGHT = 16.,

    [_correspondingRuleItems setArray:ruleItems];

-    if (!editable)
+    if (!_editable)
        [self _updateEnabledStateForSubviews];

    [self _relayoutSubviewsWidthChanged:YES];
@@ -353,14 +370,6 @@ var CONTROL_HEIGHT = 16.,

        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2 - 2;

-        // small positioning fix
-        if ([ruleOptionView isKindOfClass:CPTextField])
-        {
-            optionFrame.origin.y += 2;
-            [_ruleOptionViews[i] setValue:CGInsetMake(7, 7, 7, 8) forThemeAttribute:@"content-inset"];
-        }
-
-
        if (widthChanged)
        {
            optionFrame.origin.x = optionViewOriginX;
@@ -390,14 +399,9 @@ var CONTROL_HEIGHT = 16.,
    [self _setRowTypeToAddFromPlusButton:type];
 }

- (BOOL)isEditable
-{
-    return editable;
-}
-
 - (void)setEditable:(BOOL)value
 {
-    editable = value;
+    [super setEditable:value]
 //  [self _updateEnabledStateForSubviews];
    [self _updateButtonVisibilities];
 }
@@ -473,7 +477,7 @@ var CONTROL_HEIGHT = 16.,
    [self layoutSubviews];
 }

- (void)drawRect:(CPRect)rect
+- (void)drawRect:(CGRect)rect
 {
    [super drawRect:rect];
 }
@@ -485,13 +489,6 @@ var CONTROL_HEIGHT = 16.,
    return NO;
 }

- (BOOL)_isRuleStaticTextField:(CPView)view
-{
-    if ([view isKindOfClass:[_CPRuleEditorTextField class]])
-        return YES;
-    return NO;
-}
-
 - (void)_sendRuleAction:(id)sender
 {
    [_ruleEditor _updatePredicate];
@@ -513,19 +510,17 @@ var CONTROL_HEIGHT = 16.,
 - (id)initWithFrame:(CGRect)frame
 {
    self = [super initWithFrame:frame];
-    if (self != nil)
+    if (self)
    {
-        [self setBordered:NO];
-        [self setEditable:NO];
        [self setDrawsBackground:NO];
    }

    return self;
 }

- (id)hitTest:(CPPoint)point
+- (id)hitTest:(CGPoint)point
 {
-    if (!CPRectContainsPoint([self frame], point))
+    if (!CGRectContainsPoint([self frame], point))
        return nil;

    return [self superview];
@@ -213,7 +213,7 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,

    @param aStyle the scroller style to set all scroller views to use (CPScrollerStyleLegacy or CPScrollerStyleOverlay)
 */
-+ (int)setGlobalScrollerStyle:(int)aStyle
+ (void)setGlobalScrollerStyle:(int)aStyle
 {
    CPScrollerStyleGlobal = aStyle;
    [[CPNotificationCenter defaultCenter] postNotificationName:CPScrollerStyleGlobalChangeNotification object:nil];
@@ -1112,8 +1112,8 @@ Notifies the delegate when the scroll view has finished scrolling.
    contentFrame.size.height -= headerClipViewHeight;

    var difference = _CGSizeMake(_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentFrame), _CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentFrame)),
-        verticalScrollerWidth = _CGRectGetWidth([_verticalScroller frame]),
-        horizontalScrollerHeight = _CGRectGetHeight([_horizontalScroller frame]),
+        verticalScrollerWidth = [CPScroller scrollerWidthInStyle:[_verticalScroller style]],
+        horizontalScrollerHeight = [CPScroller scrollerWidthInStyle:[_horizontalScroller style]],
        hasVerticalScroll = difference.height > 0.0,
        hasHorizontalScroll = difference.width > 0.0,
        shouldShowVerticalScroller = _hasVerticalScroller && (!_autohidesScrollers || hasVerticalScroll),
@@ -1256,7 +1256,7 @@ Notifies the delegate when the scroll view has finished scrolling.
 #pragma mark -
 #pragma mark Overrides

- (void)drawRect:(CPRect)aRect
+- (void)drawRect:(CGRect)aRect
 {
    [super drawRect:aRect];

@@ -25,7 +25,12 @@

 #include "../Foundation/Foundation.h"

+@import "CPAnimation.j"
@import "CPControl.j"
+@import "CPWindow_Constants.j"
+@import "CPViewAnimation.j"
+
+@global CPApp

 // CPScroller Constants
 CPScrollerNoPart            = 0;
@@ -217,7 +222,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
        [self unsetThemeState:CPThemeStateScrollViewLegacy];
    }

-    [self _adjustScrollerSize];
+    //[self _adjustScrollerSize];
 }

 - (void)setObjectValue:(id)aValue
@@ -523,6 +528,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");

 - (void)layoutSubviews
 {
+    [self _adjustScrollerSize];
    [self checkSpaceForParts];

    var index = 0,
@@ -21,22 +21,19 @@
 */

@import "CPButton.j"
+@import "CPMenu.j"
+@import "CPMenuItem.j"
@import "CPTextField.j"

+@class CPUserDefaults
+
+@global CPApp
+
 CPSearchFieldRecentsTitleMenuItemTag    = 1000;
 CPSearchFieldRecentsMenuItemTag         = 1001;
 CPSearchFieldClearRecentsMenuItemTag    = 1002;
 CPSearchFieldNoRecentsMenuItemTag       = 1003;

-var CPSearchFieldSearchImage = nil,
-    CPSearchFieldFindImage = nil,
-    CPSearchFieldCancelImage = nil,
-    CPSearchFieldCancelPressedImage = nil;
-
-var SEARCH_BUTTON_DEFAULT_WIDTH = 25.0,
-    CANCEL_BUTTON_DEFAULT_WIDTH = 22.0,
-    BUTTON_DEFAULT_HEIGHT = 22.0;
-
 var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification";

 var RECENT_SEARCH_PREFIX = @"   ";
@@ -70,16 +67,15 @@ var RECENT_SEARCH_PREFIX = @"   ";
    return @"searchfield"
 }

-+ (void)initialize
+ (CPDictionary)themeAttributes
 {
-    if (self !== [CPSearchField class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
+    return [CPDictionary dictionaryWithJSObject:
+        {
+            @"image-search": [CPNull null],
+            @"image-find": [CPNull null],
+            @"image-cancel": [CPNull null],
+            @"image-cancel-pressed": [CPNull null]
+        }];
 }

 - (id)initWithFrame:(CGRect)frame
@@ -170,7 +166,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)resetSearchButton
 {
    var button = [self searchButton],
-        searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage;
+        searchButtonImage = (_searchMenuTemplate === nil) ? [self valueForThemeAttribute:@"image-search"] : [self valueForThemeAttribute:@"image-find"];

    [button setBordered:NO];
    [button setImageScaling:CPImageScaleAxesIndependently];
@@ -193,6 +189,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
        [_cancelButton setAutoresizingMask:CPViewMinXMargin];
        [_cancelButton setTarget:self];
        [_cancelButton setAction:@selector(cancelOperation:)];
+        [_cancelButton setButtonType:CPMomentaryChangeButton];
        [self _updateCancelButtonVisibility];
        [self addSubview:_cancelButton];
    }
@@ -216,8 +213,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
    var button = [self cancelButton];
    [button setBordered:NO];
    [button setImageScaling:CPImageScaleAxesIndependently];
-    [button setImage:CPSearchFieldCancelImage];
-    [button setAlternateImage:CPSearchFieldCancelPressedImage];
+    [button setImage:[self valueForThemeAttribute:@"image-cancel"]];
+    [button setAlternateImage:[self valueForThemeAttribute:@"image-cancel-pressed"]];
    [button setAutoresizingMask:CPViewMinXMargin];
    [button setTarget:self];
    [button setAction:@selector(cancelOperation:)];
@@ -258,7 +255,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)searchButtonRectForBounds:(CGRect)rect
 {
-    return _CGRectMake(5, (_CGRectGetHeight(rect) - BUTTON_DEFAULT_HEIGHT) / 2, SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT);
+    var size = [[self valueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
+
+    return _CGRectMake(5, (_CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
 }

 /*!
@@ -268,7 +267,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)cancelButtonRectForBounds:(CGRect)rect
 {
-    return _CGRectMake(_CGRectGetWidth(rect) - CANCEL_BUTTON_DEFAULT_WIDTH - 5, (_CGRectGetHeight(rect) - CANCEL_BUTTON_DEFAULT_WIDTH) / 2, BUTTON_DEFAULT_HEIGHT, BUTTON_DEFAULT_HEIGHT);
+    var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
+
+    return _CGRectMake(_CGRectGetWidth(rect) - size.width - 5, (_CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
 }

 // Managing Menu Templates
@@ -679,7 +680,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
        return;

    var aFrame = [[self superview] convertRect:[self frame] toView:nil],
-        location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
+        location = CGPointMake(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);

    var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0];

@@ -23,7 +23,10 @@
@import <Foundation/CPArray.j>

@import "CPControl.j"
+@import "CPWindow_Constants.j"
+@import "_CPImageAndTextView.j"

+@global CPApp

 CPSegmentSwitchTrackingSelectOne = 0;
 CPSegmentSwitchTrackingSelectAny = 1;
@@ -115,13 +118,15 @@ CPSegmentSwitchTrackingMomentary = 2;
    if (_selectedSegment >= _segments.length)
        _selectedSegment = -1;

-    // Make space for/remove space used by dividers.
    var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
-        delta = thickness * (dividersAfter - dividersBefore),
-        frame = [self frame];
+        frame = [self frame],
+        widthOfAllSegments = 0,
+        dividerExtraSpace = ([_segments count] - 1) * thickness;

-    if (delta)
-        [self setFrameSize:CGSizeMake(frame.size.width + delta, frame.size.height)];
+    for (var i = 0; i < [_segments count]; i++)
+        widthOfAllSegments += [_segments[i] width];
+
+    [self setFrameSize:CGSizeMake(widthOfAllSegments + dividerExtraSpace, frame.size.height)];

    [self tileWithChangedSegment:0];
 }
@@ -463,7 +468,7 @@ CPSegmentSwitchTrackingMomentary = 2;
    }
    else if (aName === "right-segment-bezel")
    {
-        return CPRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
+        return CGRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
                            bezelInset.top,
                            contentInset.right,
                            height);
@@ -799,6 +804,7 @@ CPSegmentSwitchTrackingMomentary = 2;
            return;

        var highlighted = [self testSegment:location] === _trackingSegment;
+
        if (highlighted != _trackingHighlighted)
        {
            _trackingHighlighted = highlighted;
@@ -31,7 +31,7 @@
 */
@implementation CPShadow : CPObject
 {
-    CPSize      _offset;
+    CGSize      _offset;
    float       _blurRadius;
    CPColor     _color;

@@ -51,7 +51,7 @@
 }

 /* @ignore */
- (id)_initWithOffset:(CPSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
+- (id)_initWithOffset:(CGSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
 {
    self = [super init];

@@ -99,4 +99,4 @@
    return _cssString;
 }

-@end
+@end
@@ -24,25 +24,15 @@

@import "CGGeometry.j"
@import "CPImage.j"
-@import "CPImageView.j"
@import "CPView.j"


 CPLightShadow   = 0;
 CPHeavyShadow   = 1;

-var CPShadowViewLightBackgroundColor    = nil,
-    CPShadowViewHeavyBackgroundColor    = nil;
+CPThemeStateShadowViewLight = CPThemeState("shadowview-style-light");
+CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");

-var LIGHT_LEFT_INSET    = 3.0,
-    LIGHT_RIGHT_INSET   = 3.0,
-    LIGHT_TOP_INSET     = 3.0,
-    LIGHT_BOTTOM_INSET  = 5.0,
-
-    HEAVY_LEFT_INSET    = 7.0,
-    HEAVY_RIGHT_INSET   = 7.0,
-    HEAVY_TOP_INSET     = 5.0,
-    HEAVY_BOTTOM_INSET  = 5.0;

 /*!
    @ingroup appkit
@@ -52,40 +42,26 @@ var LIGHT_LEFT_INSET    = 3.0,
    CPShadowWeight  _weight;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [CPShadowView class])
-        return;
+    return "shadow-view";
+}

-    var bundle = [CPBundle bundleForClass:[self class]];
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithJSObject:
+        {
+            @"bezel-color": [CPNull null],
+            @"content-inset": CGInsetMakeZero()
+        }];
+}

-    CPShadowViewLightBackgroundColor = CPColorWithImages([
-        [@"CPShadowView/CPShadowViewLightTopLeft.png", 9.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightTop.png", 1.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightTopRight.png", 9.0, 9.0, bundle],
+ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
+{
+    var shadowView = [CPShadowView new],
+        inset = [shadowView valueForThemeAttribute:@"content-inset" inState:(aWeight == CPLightShadow) ? CPThemeStateShadowViewLight : CPThemeStateShadowViewHeavy];

-        [@"CPShadowView/CPShadowViewLightLeft.png", 9.0, 1.0, bundle],
-        nil,
-        [@"CPShadowView/CPShadowViewLightRight.png", 9.0, 1.0, bundle],
-
-        [@"CPShadowView/CPShadowViewLightBottomLeft.png", 9.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightBottom.png", 1.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightBottomRight.png", 9.0, 9.0, bundle]
-    ]);
-
-    CPShadowViewHeavyBackgroundColor = CPColorWithImages([
-        [@"CPShadowView/CPShadowViewHeavyTopLeft.png", 17.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyTop.png", 1.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyTopRight.png", 17.0, 17.0, bundle],
-
-        [@"CPShadowView/CPShadowViewHeavyLeft.png", 17.0, 1.0, bundle],
-        nil,
-        [@"CPShadowView/CPShadowViewHeavyRight.png", 17.0, 1.0, bundle],
-
-        [@"CPShadowView/CPShadowViewHeavyBottomLeft.png", 17.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyBottom.png", 1.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyBottomRight.png", 17.0, 17.0, bundle]
-    ]);
+    return CGRectMake(_CGRectGetMinX(aFrame) - inset.left, _CGRectGetMinY(aFrame) - inset.top, _CGRectGetWidth(aFrame) + inset.left + inset.right, _CGRectGetHeight(aFrame) + inset.top + inset.bottom);
 }

 + (id)shadowViewEnclosingView:(CPView)aView
@@ -102,15 +78,16 @@ var LIGHT_LEFT_INSET    = 3.0,
        [shadowView setWeight:aWeight];

        var size = [shadowView frame].size,
-            width = size.width - [shadowView leftInset] - [shadowView rightInset],
-            height = size.height - [shadowView topInset] - [shadowView bottomInset],
+            inset = [shadowView currentValueForThemeAttribute:@"content-inset"],
+            width = size.width - inset.left - inset.right,
+            height = size.height - inset.top - inset.bottom,
            enclosingView = [aView superview];

        [shadowView setHitTests:[aView hitTests]];
        [shadowView setAutoresizingMask:[aView autoresizingMask]];
        [aView removeFromSuperview];
        [shadowView addSubview:aView];
-        [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
+        [aView setFrame:CGRectMake(inset.left, inset.top, width, height)];
        [enclosingView addSubview:shadowView];
    }

@@ -123,9 +100,7 @@ var LIGHT_LEFT_INSET    = 3.0,

    if (self)
    {
-        _weight = CPLightShadow;
-
-        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
+        [self setWeight:CPLightShadow];

        [self setHitTests:NO];
    }
@@ -141,54 +116,45 @@ var LIGHT_LEFT_INSET    = 3.0,
    _weight = aWeight;

    if (_weight == CPLightShadow)
-        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
-
+        [self setThemeState:CPThemeStateShadowViewLight];
    else
-        [self setBackgroundColor:CPShadowViewHeavyBackgroundColor];
+        [self setThemeState:CPThemeStateShadowViewHeavy];
+
+    [self setNeedsLayout];
 }

 - (float)leftInset
 {
-    return _weight == CPLightShadow ? LIGHT_LEFT_INSET : HEAVY_LEFT_INSET;
+    return [self currentValueForThemeAttribute:@"content-inset"].left;
 }

 - (float)rightInset
 {
-    return _weight == CPLightShadow ? LIGHT_RIGHT_INSET : HEAVY_RIGHT_INSET;
+    return [self currentValueForThemeAttribute:@"content-inset"].right;
 }

 - (float)topInset
 {
-    return _weight == CPLightShadow ? LIGHT_TOP_INSET : HEAVY_TOP_INSET;
+    return [self currentValueForThemeAttribute:@"content-inset"].top;
 }

 - (float)bottomInset
 {
-    return _weight == CPLightShadow ? LIGHT_BOTTOM_INSET : HEAVY_BOTTOM_INSET;
+    return [self currentValueForThemeAttribute:@"content-inset"].bottom;
 }

 - (float)horizontalInset
 {
-    if (_weight == CPLightShadow)
-        return LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET;
+    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];

-    return HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET;
+    return currentContentInset.left + currentContentInset.right;
 }

 - (float)verticalInset
 {
-    if (_weight == CPLightShadow)
-        return LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET;
+    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];

-    return HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET;
-}
-
-+ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
-{
-    if (aWeight == CPLightShadow)
-        return CGRectMake(_CGRectGetMinX(aFrame) - LIGHT_LEFT_INSET, _CGRectGetMinY(aFrame) - LIGHT_TOP_INSET, _CGRectGetWidth(aFrame) + LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET, _CGRectGetHeight(aFrame) + LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET);
-    else
-        return CGRectMake(_CGRectGetMinX(aFrame) - HEAVY_LEFT_INSET, _CGRectGetMinY(aFrame) - HEAVY_TOP_INSET, _CGRectGetWidth(aFrame) + HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET, _CGRectGetHeight(aFrame) + HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET);
+    return currentContentInset.top + currentContentInset.bottom;
 }

 - (CGRect)frameForContentFrame:(CGRect)aFrame
@@ -201,4 +167,11 @@ var LIGHT_LEFT_INSET    = 3.0,
    [self setFrame:[self frameForContentFrame:aFrame]];
 }

+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+
+    [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+}
+
@end
@@ -21,6 +21,7 @@
 */

@import "CPControl.j"
+@import "CPWindow_Constants.j"


 /*! SLIDER STATES */
@@ -39,6 +40,8 @@ CPCircularSlider    = 1;
    double          _altIncrementValue;

    BOOL            _isVertical;
+
+    CGSize          _dragOffset;
 }

 + (CPString)defaultThemeClass
@@ -20,8 +20,14 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPView.j"
@import "CPColorPicker.j"
+@import "CPSlider.j"
+@import "CPTextField.j"
+@import "CPView.j"
+
+@global CPColorPickerViewWidth
+@global CPColorPickerViewHeight
+@global CPSliderColorPickerMode


 /*
@@ -65,7 +71,7 @@

 - (id)initView
 {
-    aFrame = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+    var aFrame = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);

    _contentView = [[CPView alloc] initWithFrame:aFrame];
    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
@@ -21,6 +21,7 @@
 */

@import <Foundation/CPObject.j>
+@import <Foundation/CPRunLoop.j>

 CPSoundLoadStateEmpty       = 0;
 CPSoundLoadStateLoading     = 1;
@@ -59,7 +60,7 @@ CPSoundPlayBackStatePause   = 2;
    if (self = [super init])
    {
        _loadStatus = CPSoundLoadStateEmpty;
-        _loops = NO;
+//        _loops = NO;
        _audioTag = document.createElement("audio");
        _audioTag.preload = YES;
        _playRequestBeforeLoad = NO;
@@ -25,6 +25,10 @@
@import "CPButtonBar.j"
@import "CPImage.j"
@import "CPView.j"
+@import "CPCursor.j"
+
+@class CPUserDefaults
+@global CPApp

 #define SPLIT_VIEW_MAYBE_POST_WILL_RESIZE() \
    if ((_suppressResizeNotificationsMask & DidPostWillResizeNotification) === 0) \
@@ -51,10 +55,7 @@
 CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification";
 CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification";

-var CPSplitViewHorizontalImage = nil,
-    CPSplitViewVerticalImage = nil,
-
-    ShouldSuppressResizeNotifications   = 1,
+var ShouldSuppressResizeNotifications   = 1,
    DidPostWillResizeNotification       = 1 << 1,
    DidSuppressResizeNotification       = 1 << 2;

@@ -104,22 +105,16 @@ var CPSplitViewHorizontalImage = nil,

 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[1.0, 10.0, [CPColor grayColor]]
-                                       forKeys:[@"divider-thickness", @"pane-divider-thickness", @"pane-divider-color"]];
-}
-
-/*
-    @ignore
-*/
-+ (void)initialize
-{
-    if (self !== [CPSplitView class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    CPSplitViewHorizontalImage = CPImageInBundle("CPSplitView/CPSplitViewHorizontal.png", CGSizeMake(5.0, 10.0), bundle);
-    CPSplitViewVerticalImage = CPImageInBundle("CPSplitView/CPSplitViewVertical.png", CGSizeMake(10.0, 5.0), bundle);
+    return [CPDictionary dictionaryWithObjects:[1.0,
+                                                10.0,
+                                                [CPColor grayColor],
+                                                [CPNull null],
+                                                [CPNull null]]
+                                       forKeys:[@"divider-thickness",
+                                                @"pane-divider-thickness",
+                                                @"pane-divider-color",
+                                                @"horizontal-divider-color",
+                                                @"vertical-divider-color"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -202,7 +197,7 @@ var CPSplitViewHorizontalImage = nil,

    _originComponent = [self isVertical] ? "x" : "y";
    _sizeComponent = [self isVertical] ? "width" : "height";
-    _dividerImagePath = [self isVertical] ? [CPSplitViewVerticalImage filename] : [CPSplitViewHorizontalImage filename];
+    _dividerImagePath = [self isVertical] ? [[self valueForThemeAttribute:@"vertical-divider-color"] filename] : [[self valueForThemeAttribute:@"horizontal-divider-color"] filename];

    return changed;
 }
@@ -793,7 +788,7 @@ var CPSplitViewHorizontalImage = nil,
    [self setNeedsDisplay:YES];
 }

- (void)resizeSubviewsWithOldSize:(CPSize)oldSize
+- (void)resizeSubviewsWithOldSize:(CGSize)oldSize
 {
    if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
    {
@@ -1102,7 +1097,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
    for (var i = 0; i < count; i++)
    {
        var frame = [_subviews[i] frame];
-        [positions addObject:CPStringFromRect(frame)];
+        [positions addObject:CGStringFromRect(frame)];
        [preCollapseArray addObject:[_preCollapsePositions objectForKey:"" + i]];
    }

@@ -1149,7 +1144,7 @@ The sum of the views and the sum of the dividers should be equal to the size of

        for (var i = 0, count = [frames count] - 1; i < count; i++)
        {
-            var frame = CPRectFromString(frames[i]);
+            var frame = CGRectFromString(frames[i]);
            position += frame.size[_sizeComponent];

            [self setPosition:position ofDividerAtIndex:i];
@@ -20,9 +20,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import <AppKit/CPControl.j>
-@import <AppKit/CPButton.j>
-@import <AppKit/CPTextField.j>
+@import "CPControl.j"
+@import "CPButton.j"
+@import "CPTextField.j"



@@ -55,11 +55,15 @@
 */
 + (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMake(0, 0, 19, 25)];
+    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMakeZero()];
+
    [stepper setDoubleValue:aValue];
    [stepper setMinValue:aMinValue];
    [stepper setMaxValue:aMaxValue];

+    // _sizeToFit will put the good size for the stepper depending of the current theme
+    [stepper _sizeToFit];
+
    return stepper;
 }

@@ -173,6 +177,7 @@
        downSize = [self valueForThemeAttribute:@"down-button-size"],
        upFrame = _CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height),
        downFrame = _CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height);
+
    [_buttonUp setFrame:upFrame];
    [_buttonDown setFrame:downFrame];

@@ -184,6 +189,11 @@
    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
 }

+- (void)_sizeToFit
+{
+    [self setFrame:CGRectMake([self frameOrigin].x, [self frameOrigin].y, 0, 0)];
+}
+
 /*!
    Set if CPStepper should autorepeat.
    @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
@@ -22,6 +22,7 @@

@import <Foundation/CPString.j>

+@import "CGGeometry.j"
@import "CPPlatformString.j"


@@ -88,9 +88,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    _box = [[CPBox alloc] initWithFrame:[self  bounds]];
    [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];

-    [_box setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-    [_tabs setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
-
    [self addSubview:_box];
    [self addSubview:_tabs];
 }
@@ -343,21 +340,9 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    _type = aTabViewType;

    if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
-    {
-        [_box setFrame:[self bounds]];
        [_tabs removeFromSuperview];
-    }
    else
-    {
-        var aFrame = [self frame],
-            segmentedHeight = _CGRectGetHeight([_tabs frame]),
-            origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;
-
-        [_box setFrame:_CGRectMake(0, origin, _CGRectGetWidth(aFrame),
-                                   _CGRectGetHeight(aFrame) - segmentedHeight / 2)];
-
        [self addSubview:_tabs];
-    }

    switch (_type)
    {
@@ -373,6 +358,29 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
            [_box setBorderType:CPNoBorder];
            break;
    }
+
+    [self setNeedsLayout];
+}
+
+- (void)layoutSubviews
+{
+    // Even if CPTabView's autoresizesSubviews is NO, _tabs and _box has to be laid out.
+    // This means we can't rely on autoresize masks.
+    if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
+    {
+        [_box setFrame:[self bounds]];
+    }
+    else
+    {
+        var aFrame = [self frame],
+            segmentedHeight = _CGRectGetHeight([_tabs frame]),
+            origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;
+
+        [_box setFrame:_CGRectMake(0, origin, _CGRectGetWidth(aFrame),
+                                   _CGRectGetHeight(aFrame) - segmentedHeight / 2)];
+
+        [self _repositionTabs];
+    }
 }

 /*!
@@ -497,7 +505,6 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
        [_items makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];

        [self _updateItems];
-        [self _repositionTabs];

        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];

@@ -506,6 +513,8 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
            [self selectTabViewItem:selected];

        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
+
+        [self setNeedsLayout];
    }

    return self;
@@ -60,6 +60,7 @@ CPPressedTab    = 2;
    CPView      _auxiliaryView;

    CPTabView   _tabView;
+    unsigned    _tabState;      // Looks like it is not yet implemented
 }

 - (id)init
@@ -26,8 +26,11 @@
@import <Foundation/CPSortDescriptor.j>
@import <Foundation/CPString.j>

-@import "CPTableHeaderView.j"
+@import "CPTextField.j"

+@global CPTableViewColumnDidResizeNotification
+
+@class _CPTableColumnHeaderView

 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;
@@ -22,9 +22,15 @@

@import <Foundation/CPIndexSet.j>

+@import "CPCursor.j"
+@import "CPPasteboard.j"
@import "CPTableColumn.j"
-@import "CPTableView.j"
@import "CPView.j"
+@import "_CPImageAndTextView.j"
+
+@class CPTableView
+
+@global CPApp


@implementation _CPTableColumnHeaderView : CPView
@@ -46,6 +52,7 @@
 - (void)initWithFrame:(CGRect)frame
 {
    self = [super initWithFrame:frame];
+
    if (self)
        [self _init];

@@ -23,13 +23,26 @@
@import <Foundation/CPArray.j>
@import <Foundation/CPIndexSet.j>

+@import "CPDragServer_Constants.j"
@import "CGGradient.j"
-
-@import "CPControl.j"
-@import "CPTableColumn.j"
-@import "_CPCornerView.j"
-@import "CPScroller.j"
@import "CPCompatibility.j"
+@import "CPControl.j"
+@import "CPImageView.j"
+@import "CPScroller.j"
+@import "CPScrollView.j"
+@import "CPTableColumn.j"
+@import "CPTableHeaderView.j"
+@import "CPText.j"
+@import "_CPCornerView.j"
+
+@class CPButton
+@class CPClipView
+@class CPUserDefaults
+@class CPTableHeaderView
+@class CPClipView
+@class CPButton
+
+@global CPApp


 CPTableViewColumnDidMoveNotification        = @"CPTableViewColumnDidMoveNotification";
@@ -260,8 +273,26 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 */
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:["alternating-row-colors", "grid-color", "highlighted-grid-color", "selection-color", "sourcelist-selection-color", "sort-image", "sort-image-reversed", "selection-radius"]];
+    return [CPDictionary dictionaryWithObjects:[[CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                25.0]
+                                       forKeys:[@"alternating-row-colors",
+                                                @"grid-color",
+                                                @"highlighted-grid-color",
+                                                @"selection-color",
+                                                @"sourcelist-selection-color",
+                                                @"sort-image",
+                                                @"sort-image-reversed",
+                                                @"selection-radius",
+                                                @"image-generic-file",
+                                                @"default-row-height"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -291,7 +322,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        _numberOfHiddenColumns = 0;

        _intercellSpacing = _CGSizeMake(3.0, 2.0);
-        _rowHeight = 23.0;
+        _rowHeight = [self valueForThemeAttribute:@"default-row-height"];

        [self setGridColor:[CPColor colorWithHexString:@"dce0e2"]];
        [self setGridStyleMask:CPTableViewGridNone];
@@ -2803,7 +2834,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
 {
-    return [[CPImage alloc] initWithContentsOfFile:@"Frameworks/AppKit/Resources/GenericFile.png" size:CGSizeMake(32,32)];
+    return [self valueForThemeAttribute:@"image-generic-file"];
 }

 /*!
@@ -2860,11 +2891,12 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    // Copy the dataviews add them to a transparent drag view and use that drag view
    // to make it appear we are dragging images of those rows (as you would do in regular Cocoa)
 */
- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CPPointPointer)theDragViewOffset
+- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CGPoint)theDragViewOffset
 {
    var dragView = [[_CPColumnDragView alloc] initWithLineColor:[self gridColor]],
        tableColumn = [[self tableColumns] objectAtIndex:theColumnIndex],
-        bounds = _CGRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self exposedRect]) + 23.0),
+        defaultRowHeight = [self valueForThemeAttribute:@"default-row-height"],
+        bounds = _CGRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self exposedRect]) + defaultRowHeight),
        columnRect = [self rectOfColumn:theColumnIndex],
        headerView = [tableColumn headerView],
        row = [_exposedRows firstIndex];
@@ -2878,7 +2910,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
        dataViewFrame.origin.x = 0.0;

        // Offset by table header height - scroll position
-        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + 23.0;
+        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + defaultRowHeight;
        [dataView setFrame:dataViewFrame];

        [self _setObjectValueForTableColumn:tableColumn row:row forView:dataView];
@@ -4131,7 +4163,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
            if ([self canDragRowsWithIndexes:_draggedRowIndexes atPoint:aPoint] && [_dataSource tableView:self writeRowsWithIndexes:_draggedRowIndexes toPasteboard:pboard])
            {
                var currentEvent = [CPApp currentEvent],
-                    offset = CPPointMakeZero(),
+                    offset = CGPointMakeZero(),
                    tableColumns = [_tableColumns objectsAtIndexes:_exposedColumns];

                // We deviate from the default Cocoa implementation here by asking for a view in stead of an image
@@ -4148,13 +4180,13 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
                                                     tableColumns:tableColumns
                                                            event:currentEvent
                                                           offset:offset];
-                    view = [[CPImageView alloc] initWithFrame:CPMakeRect(0, 0, [image size].width, [image size].height)];
+                    view = [[CPImageView alloc] initWithFrame:CGRectMake(0, 0, [image size].width, [image size].height)];
                    [view setImage:image];
                }

                var bounds = [view bounds],
-                    viewLocation = CPPointMake(aPoint.x - CGRectGetWidth(bounds) / 2 + offset.x, aPoint.y - CGRectGetHeight(bounds) / 2 + offset.y);
-                [self dragView:view at:viewLocation offset:CPPointMakeZero() event:[CPApp currentEvent] pasteboard:pboard source:self slideBack:YES];
+                    viewLocation = CGPointMake(aPoint.x - CGRectGetWidth(bounds) / 2 + offset.x, aPoint.y - CGRectGetHeight(bounds) / 2 + offset.y);
+                [self dragView:view at:viewLocation offset:CGPointMakeZero() event:[CPApp currentEvent] pasteboard:pboard source:self slideBack:YES];
                _startTrackingPoint = nil;

                return NO;
@@ -4333,7 +4365,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    // If there is no (the default) or to little inter cell spacing we create some room for the CPTableViewDropAbove indicator
    // This probably doesn't work if the row height is smaller than or around 5.0
    if ([self intercellSpacing].height < 5.0)
-        rowRect = CPRectInset(rowRect, 0.0, 5.0 - [self intercellSpacing].height);
+        rowRect = CGRectInset(rowRect, 0.0, 5.0 - [self intercellSpacing].height);

    // If the altered row rect contains the drag point we show the drop on
    // We don't show the drop on indicator if we are dragging below the last row
@@ -4381,7 +4413,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 /*!
    @ignore
 */
- (CPRect)_rectForDropHighlightViewOnRow:(int)theRowIndex
+- (CGRect)_rectForDropHighlightViewOnRow:(int)theRowIndex
 {
    if (theRowIndex >= [self numberOfRows])
        theRowIndex = [self numberOfRows] - 1;
@@ -4392,7 +4424,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 /*!
    @ignore
 */
- (CPRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CPPoint)theOffset
+- (CGRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CGPoint)theOffset
 {
    if (theLowerRowIndex > [self numberOfRows])
        theLowerRowIndex = [self numberOfRows];
@@ -4621,6 +4653,14 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    return YES;
 }

+/*!
+    @ignore
+*/
+- (BOOL)needsPanelToBecomeKey
+{
+    return YES;
+}
+
 /*!
    @ignore
 */
@@ -4875,7 +4915,7 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
        _tableColumns = [aCoder decodeObjectForKey:CPTableViewTableColumnsKey] || [];
        [_tableColumns makeObjectsPerformSelector:@selector(setTableView:) withObject:self];

-        _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey] || 23.0;
+        _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey] || [self valueForThemeAttribute:@"default-row-height"];
        _intercellSpacing = [aCoder decodeSizeForKey:CPTableViewIntercellSpacingKey];

        if (_CGSizeEqualToSize(_intercellSpacing, _CGSizeMakeZero()))
@@ -25,8 +25,14 @@
@import "CPControl.j"
@import "CPStringDrawing.j"
@import "CPCompatibility.j"
+@import "CPText.j"
+@import "CPWindow_Constants.j"
@import "_CPImageAndTextView.j"

+@class CPPasteboard
+
+@global CPApp
+@global CPStringPboardType

 CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with squared corners. */
 CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */
@@ -34,8 +40,6 @@ CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corne
 CPTextFieldDidFocusNotification = @"CPTextFieldDidFocusNotification";
 CPTextFieldDidBlurNotification  = @"CPTextFieldDidBlurNotification";

-#if PLATFORM(DOM)
-
 var CPTextFieldDOMInputElement = nil,
    CPTextFieldDOMPasswordInputElement = nil,
    CPTextFieldDOMStandardInputElement = nil,
@@ -46,13 +50,42 @@ var CPTextFieldDOMInputElement = nil,
    CPTextFieldInputIsActive = NO,
    CPTextFieldCachedSelectStartFunction = nil,
    CPTextFieldCachedDragFunction = nil,
-    CPTextFieldBlurFunction = nil,
+    CPTextFieldBlurHandler = nil,
    CPTextFieldInputFunction = nil;

-#endif
-
 var CPSecureTextFieldCharacter = "\u2022";

+
+function CPTextFieldBlurFunction(anEvent, owner, domElement, inputElement, resigning, didBlurRef)
+{
+    if (owner && domElement != inputElement.parentNode)
+        return;
+
+    if (!resigning && [[owner window] isKeyWindow])
+    {
+        /*
+            Browsers blur text fields when a click occurs anywhere outside the text field. That is normal for browsers, but in Cocoa the key view retains focus unless the click target accepts first responder. So if we lost focus but were not told to resign and our window is still key, restore focus.
+        */
+        window.setTimeout(function()
+        {
+            inputElement.focus();
+        }, 0.0);
+    }
+
+    CPTextFieldHandleBlur(anEvent, AT_REF(owner));
+    AT_DEREF(didBlurRef, YES);
+
+    return true;
+}
+
+function CPTextFieldHandleBlur(anEvent, ownerRef)
+{
+    AT_DEREF(ownerRef, nil);
+
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+}
+
+
@implementation CPString (CPTextFieldAdditions)

 /*!
@@ -169,7 +202,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), [CPNull null]]
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(1.0, 0.0, 0.0, 0.0), [CPNull null]]
                                       forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
 }

@@ -188,28 +221,15 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        CPTextFieldDOMInputElement.style.background = "transparent";
        CPTextFieldDOMInputElement.style.outline = "none";

-        CPTextFieldBlurFunction = function(anEvent)
+        CPTextFieldBlurHandler = function(anEvent)
        {
-            if (CPTextFieldInputOwner && CPTextFieldInputOwner._DOMElement != CPTextFieldDOMInputElement.parentNode)
-                return;
-
-            if (!CPTextFieldInputResigning)
-            {
-                [[CPTextFieldInputOwner window] makeFirstResponder:nil];
-                return;
-            }
-
-            CPTextFieldHandleBlur(anEvent, CPTextFieldDOMInputElement);
-            CPTextFieldInputDidBlur = YES;
-
-            return true;
-        };
-
-        CPTextFieldHandleBlur = function(anEvent)
-        {
-            CPTextFieldInputOwner = nil;
-
-            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            return CPTextFieldBlurFunction(
+                        anEvent,
+                        CPTextFieldInputOwner,
+                        CPTextFieldInputOwner._DOMElement,
+                        CPTextFieldDOMInputElement,
+                        CPTextFieldInputResigning,
+                        AT_REF(CPTextFieldInputDidBlur));
        };

        if (CPFeatureIsCompatible(CPInputOnInputEventFeature))
@@ -219,9 +239,16 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
                if (!CPTextFieldInputOwner)
                    return;

-                var cappEvent = [CPEvent keyEventWithType:CPKeyUp location:_CGPointMakeZero() modifierFlags:0
-                                                timestamp:[CPEvent currentTimestamp] windowNumber:[[CPApp keyWindow] windowNumber] context:nil
-                                               characters:nil charactersIgnoringModifiers:nil isARepeat:NO keyCode:nil];
+                var cappEvent = [CPEvent keyEventWithType:CPKeyUp
+                                                 location:_CGPointMakeZero()
+                                            modifierFlags:0
+                                                timestamp:[CPEvent currentTimestamp]
+                                             windowNumber:[[CPApp keyWindow] windowNumber]
+                                                  context:nil
+                                               characters:nil
+                              charactersIgnoringModifiers:nil
+                                                isARepeat:NO
+                                                  keyCode:nil];

                [CPTextFieldInputOwner keyUp:cappEvent];

@@ -231,8 +258,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
            CPTextFieldDOMInputElement.oninput = CPTextFieldInputFunction;
        }

-        //FIXME make this not onblur
-        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurFunction;
+        // FIXME make this not onblur
+        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurHandler;

        CPTextFieldDOMStandardInputElement = CPTextFieldDOMInputElement;
    }
@@ -261,7 +288,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
            CPTextFieldDOMPasswordInputElement.style.outline = "none";
            CPTextFieldDOMPasswordInputElement.type = "password";

-            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurFunction;
+            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurHandler;
        }

        CPTextFieldDOMInputElement = CPTextFieldDOMPasswordInputElement;
@@ -308,6 +335,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    if (shouldBeEditable)
        _isSelectable = YES;

+    if (_isEditable)
+        [self setThemeState:CPThemeStateEditable];
+    else
+        [self unsetThemeState:CPThemeStateEditable];
+
    // We only allow first responder status if the field is editable and enabled.
    if (!shouldBeEditable && [[self window] firstResponder] === self)
        [[self window] makeFirstResponder:nil];
@@ -489,12 +521,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 /* @ignore */
 - (BOOL)becomeFirstResponder
 {
-#if PLATFORM(DOM)
-    // FIXME Why do we care about who's the first responder in a different window?
-    if (CPTextFieldInputOwner && [CPTextFieldInputOwner window] !== [self window])
-        [[CPTextFieldInputOwner window] makeFirstResponder:nil];
-#endif
-
    // As long as we are the first responder we need to monitor the key status of our window.
    [self _setObserveWindowKeyNotifications:YES];

@@ -507,7 +533,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }

 /*!
-    A text field can be the first responder without necessarily being the focus of keyboard input. For example, it might be the first responder of window A but window B is the main and key window. It's important we don't put a focused input field into a text field in a non key window, even if that field is the first responder, because the key window might also have a first responder text field which the user will expect to receive keyboard input.
+    A text field can be the first responder without necessarily being the focus of keyboard input. For example, it might be the first responder of window A but window B is the main and key window. It's important we don't put a focused input field into a text field in a non-key window, even if that field is the first responder, because the key window might also have a first responder text field which the user will expect to receive keyboard input.

    Since a first responder but non-key window text field can't receive input it should not even look like an active text field (Cocoa has a "slightly active" text field look it uses when another window is the key window, but Cappuccino doesn't today.)
 */
@@ -529,8 +555,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

    element.value = _stringValue;
    element.style.color = [[self currentValueForThemeAttribute:@"text-color"] cssString];
+
    if (CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
        element.style.font = [font cssString];
+
    element.style.zIndex = 1000;

    switch ([self alignment])
@@ -566,35 +594,24 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

    element.style.top = topPoint;
    var left = _CGRectGetMinX(contentRect);
+
    // If the browser has a built in left padding, compensate for it. We need the input text to be exactly on top of the original text.
    if (CPFeatureIsCompatible(CPInput1PxLeftPadding))
        left -= 1;
+
    element.style.left = left + "px";
    element.style.width = _CGRectGetWidth(contentRect) + "px";
    element.style.height = ROUND(lineHeight) + "px";
    element.style.lineHeight = ROUND(lineHeight) + "px";
-    element.style.verticalAlign = @"top";
+    element.style.verticalAlign = "top";
+    element.style.cursor = "auto";

    _DOMElement.appendChild(element);

-    // The font change above doesn't work for some browsers if the element isn't already .appendChild'ed.
+    // The font change above doesn't work for some browsers if the element isn't already appendChild'ed.
    if (!CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
        element.style.font = [font cssString];

-    window.setTimeout(function()
-    {
-        element.focus();
-
-        // Select the text if the textfield became first responder through keyboard interaction
-        if (!_willBecomeFirstResponderByClick)
-            [self _selectText:self immediately:YES];
-
-        _willBecomeFirstResponderByClick = NO;
-
-        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
-        CPTextFieldInputOwner = self;
-    }, 0.0);
-
    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];

    CPTextFieldInputIsActive = YES;
@@ -607,6 +624,28 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        [[self window] platformWindow]._DOMBodyElement.ondrag = function () {};
        [[self window] platformWindow]._DOMBodyElement.onselectstart = function () {};
    }
+
+    CPTextFieldInputOwner = self;
+
+    window.setTimeout(function()
+    {
+        /*
+            setTimeout handlers are not guaranteed to fire in the order they were initiated. This can cause a race condition when several windows with text fields are opened quickly, resulting in several instances of this timeout function being fired, perhaps out of order. So we have to check that by the time this function is fired, CPTextFieldInputOwner has not been changed to another text field in the meantime.
+        */
+        if (CPTextFieldInputOwner !== self)
+            return;
+
+        element.focus();
+
+        // Select the text if the textfield became first responder through keyboard interaction
+        if (!_willBecomeFirstResponderByClick)
+            [self _selectText:self immediately:YES];
+
+        _willBecomeFirstResponderByClick = NO;
+
+        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
+    }, 0.0);
+
 #endif
 }

@@ -672,7 +711,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        element.blur();

    if (!CPTextFieldInputDidBlur)
-        CPTextFieldBlurFunction();
+        CPTextFieldBlurHandler();

    CPTextFieldInputDidBlur = NO;
    CPTextFieldInputResigning = NO;
@@ -743,11 +782,20 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }

 /*!
-    Text fields require panels to become key window, so this returns \c YES.
+    Text fields require panels to become key window, so this returns \c YES
+    if the text field is ready to become the first responder as well.
 */
 - (BOOL)needsPanelToBecomeKey
 {
-    return YES;
+    return [self acceptsFirstResponder];
+}
+
+/*!
+    Only text fields that can become first responder accepts first mouse.
+*/
+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return [self acceptsFirstResponder];
 }

 - (void)mouseDown:(CPEvent)anEvent
@@ -21,9 +21,11 @@
 */

@import <Foundation/CPObject.j>
+@import <Foundation/CPMutableArray.j>
@import <Foundation/CPString.j>
@import <Foundation/CPKeyedUnarchiver.j>

+@class CPView

 var CPThemesByName          = { },
    CPThemeDefaultTheme     = nil,
@@ -145,7 +147,7 @@ var CPThemesByName          = { },
                className = [aClass defaultThemeClass];
            else if ([aClass respondsToSelector:@selector(themeClass)])
            {
-                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass",CPStringFromClass([anObject class]));
+                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass", CPStringFromClass(aClass));
                className = [aClass themeClass];
            }
            else
@@ -33,7 +33,7 @@

@implementation CPThemeBlend : CPObject
 {
-    CPBundle    _bundle;
+    CPBundle    _bundle @accessors(getter=bundle);
    CPArray     _themes;
    id          _loadDelegate;
 }
@@ -21,6 +21,7 @@
 */

 #import "../Foundation/CPRange.h"
+#import "../Foundation/Ref.h"

@import <Foundation/CPCharacterSet.j>
@import <Foundation/CPIndexSet.j>
@@ -28,11 +29,14 @@

@import "CPButton.j"
@import "CPScrollView.j"
-@import "CPTextField.j"
@import "CPTableView.j"
-@import "CPWindow.j"
+@import "CPText.j"
+@import "CPTextField.j"
+@import "CPWindow_Constants.j"
@import "_CPAutocompleteMenu.j"

+@global CPApp
+
 #if PLATFORM(DOM)

 var CPTokenFieldDOMInputElement = nil,
@@ -47,7 +51,7 @@ var CPTokenFieldDOMInputElement = nil,
    CPTokenFieldCachedDragFunction = nil,
    CPTokenFieldFocusInput = NO,

-    CPTokenFieldBlurFunction = nil;
+    CPTokenFieldBlurHandler = nil;

 #endif

@@ -71,7 +75,6 @@ var CPScrollDestinationNone             = 0,

    CPEvent             _mouseDownEvent;

-    BOOL                _preventResign;
    BOOL                _shouldNotifyTarget;
 }

@@ -95,7 +98,7 @@ var CPScrollDestinationNone             = 0,
    return [CPDictionary dictionaryWithObject:_CGInsetMakeZero() forKey:@"editor-inset"];
 }

- (id)initWithFrame:(CPRect)frame
+- (id)initWithFrame:(CGRect)frame
 {
    if (self = [super initWithFrame:frame])
    {
@@ -390,9 +393,6 @@ var CPScrollDestinationNone             = 0,

 - (BOOL)resignFirstResponder
 {
-    if (_preventResign)
-        return NO;
-
    [self _autocomplete];

    // From CPTextField superclass.
@@ -427,7 +427,7 @@ var CPScrollDestinationNone             = 0,
    element.blur();

    if (!CPTokenFieldInputDidBlur)
-        CPTokenFieldBlurFunction();
+        CPTokenFieldBlurHandler();

    CPTokenFieldInputDidBlur = NO;
    CPTokenFieldInputResigning = NO;
@@ -451,7 +451,6 @@ var CPScrollDestinationNone             = 0,

 - (void)mouseDown:(CPEvent)anEvent
 {
-    _preventResign = YES;
    _mouseDownEvent = anEvent;

    [self _selectToken:nil byExtendingSelection:NO];
@@ -461,13 +460,11 @@ var CPScrollDestinationNone             = 0,

 - (void)mouseUp:(CPEvent)anEvent
 {
-    _preventResign = NO;
    _mouseDownEvent = nil;
 }

 - (void)_mouseDownOnToken:(_CPTokenFieldToken)aToken withEvent:(CPEvent)anEvent
 {
-    _preventResign = YES;
    _mouseDownEvent = anEvent;
 }

@@ -480,8 +477,6 @@ var CPScrollDestinationNone             = 0,
        // Snap to the token if it's only half visible due to mouse wheel scrolling.
        _shouldScrollTo = aToken;
    }
-
-    _preventResign = NO;
 }

 // ===========
@@ -570,6 +565,7 @@ var CPScrollDestinationNone             = 0,
                [newToken setTokenField:self];
                [newToken setRepresentedObject:tokenObject];
                [newToken setStringValue:tokenValue];
+                [newToken setEditable:[self isEditable]];
                [contentView addSubview:newToken];
            }

@@ -615,6 +611,13 @@ var CPScrollDestinationNone             = 0,
    }
 }

+- (void)setEditable:(BOOL)shouldBeEditable
+{
+    [super setEditable:shouldBeEditable];
+
+    [[self _tokens] makeObjectsPerformSelector:@selector(setEditable:) withObject:shouldBeEditable];
+}
+
 - (void)sendAction:(SEL)anAction to:(id)anObject
 {
    _shouldNotifyTarget = NO;
@@ -644,38 +647,19 @@ var CPScrollDestinationNone             = 0,
        CPTokenFieldDOMInputElement.style.background = "transparent";
        CPTokenFieldDOMInputElement.style.outline = "none";

-        CPTokenFieldBlurFunction = function(anEvent)
+        CPTokenFieldBlurHandler = function(anEvent)
        {
-            if (CPTokenFieldInputOwner && [CPTokenFieldInputOwner._tokenScrollView documentView]._DOMElement != CPTokenFieldDOMInputElement.parentNode)
-                return;
-
-            if (CPTokenFieldInputOwner && CPTokenFieldInputOwner._preventResign)
-                return false;
-
-            if (!CPTokenFieldInputResigning && [[CPTokenFieldInputOwner window] isKeyWindow])
-            {
-                // If we lost focus somehow but we're not resigning and we're still in the key window, we'll need to take it back.
-                window.setTimeout(function()
-                {
-                    CPTokenFieldDOMInputElement.focus();
-                }, 0.0);
-            }
-
-            CPTokenFieldHandleBlur(anEvent, CPTokenFieldDOMInputElement);
-            CPTokenFieldInputDidBlur = YES;
-
-            return true;
+            return CPTextFieldBlurFunction(
+                        anEvent,
+                        CPTokenFieldInputOwner,
+                        [CPTokenFieldInputOwner._tokenScrollView documentView]._DOMElement,
+                        CPTokenFieldDOMInputElement,
+                        CPTokenFieldInputResigning,
+                        AT_REF(CPTokenFieldInputDidBlur));
        };

-        CPTokenFieldHandleBlur = function(anEvent)
-        {
-            CPTokenFieldInputOwner = nil;
-
-            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        };
-
-        //FIXME make this not onblur
-        CPTokenFieldDOMInputElement.onblur = CPTokenFieldBlurFunction;
+        // FIXME make this not onblur
+        CPTokenFieldDOMInputElement.onblur = CPTokenFieldBlurHandler;

        CPTokenFieldDOMStandardInputElement = CPTokenFieldDOMInputElement;
    }
@@ -930,7 +914,9 @@ var CPScrollDestinationNone             = 0,

 - (void)keyDown:(CPEvent)anEvent
 {
+#if PLATFORM(DOM)
    CPTokenFieldTextDidChangeValue = [self stringValue];
+#endif

    // Leave the default _propagateCurrentDOMEvent setting in place. This might be YES or NO depending
    // on if something that could be a browser shortcut was pressed or not, such as Cmd-R to reload.
@@ -940,14 +926,16 @@ var CPScrollDestinationNone             = 0,
    [self interpretKeyEvents:[anEvent]];

    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-}}
+}

 - (void)keyUp:(CPEvent)anEvent
 {
+#if PLATFORM(DOM)
    if ([self stringValue] !== CPTokenFieldTextDidChangeValue)
    {
        [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
    }
+#endif

    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 }
@@ -1013,8 +1001,8 @@ var CPScrollDestinationNone             = 0,
    var contentRect = _CGRectMakeCopy([contentView bounds]),
        contentOrigin = contentRect.origin,
        contentSize = contentRect.size,
-        offset = CPPointMake(contentOrigin.x, contentOrigin.y),
-        spaceBetweenTokens = CPSizeMake(2.0, 2.0),
+        offset = CGPointMake(contentOrigin.x, contentOrigin.y),
+        spaceBetweenTokens = CGSizeMake(2.0, 2.0),
        isEditing = [[self window] firstResponder] == self,
        tokenToken = [_CPTokenFieldToken new],
        font = [self currentValueForThemeAttribute:@"font"],
@@ -1296,11 +1284,11 @@ var CPScrollDestinationNone             = 0,
    return NO;
 }

- (id)initWithFrame:(CPRect)frame
+- (id)initWithFrame:(CGRect)frame
 {
    if (self = [super initWithFrame:frame])
    {
-        _deleteButton = [[_CPTokenFieldTokenCloseButton alloc] initWithFrame:CPRectMakeZero()];
+        _deleteButton = [[_CPTokenFieldTokenCloseButton alloc] initWithFrame:CGRectMakeZero()];
        [self addSubview:_deleteButton];

        [self setEditable:NO];
@@ -1331,6 +1319,34 @@ var CPScrollDestinationNone             = 0,
    _representedObject = representedObject;
 }

+- (void)setEditable:(BOOL)shouldBeEditable
+{
+    [super setEditable:shouldBeEditable];
+    [self setNeedsLayout];
+}
+
+- (BOOL)setThemeState:(CPThemeState)aState
+{
+    var r = [super setThemeState:aState];
+
+    // Share hover state with the delete button.
+    if (r && aState === CPThemeStateHovered)
+        [_deleteButton setThemeState:aState];
+
+    return r;
+}
+
+- (BOOL)unsetThemeState:(CPThemeState)aState
+{
+    var r = [super unsetThemeState:aState];
+
+    // Share hover state with the delete button.
+    if (r && aState === CPThemeStateHovered)
+        [_deleteButton unsetThemeState:aState];
+
+    return r;
+}
+
 - (CGSize)_minimumFrameSize
 {
    var size = _CGSizeMakeZero(),
@@ -1356,12 +1372,13 @@ var CPScrollDestinationNone             = 0,
    {
        [_deleteButton setTarget:self];
        [_deleteButton setAction:@selector(_delete:)];
+        [_deleteButton setEnabled:[self isEditable]];

        var frame = [bezelView frame],
            buttonOffset = [_deleteButton currentValueForThemeAttribute:@"offset"],
            buttonSize = [_deleteButton currentValueForThemeAttribute:@"min-size"];

-        [_deleteButton setFrame:_CGRectMake(CPRectGetMaxX(frame) - buttonOffset.x, CPRectGetMinY(frame) + buttonOffset.y, buttonSize.width, buttonSize.height)];
+        [_deleteButton setFrame:_CGRectMake(CGRectGetMaxX(frame) - buttonOffset.x, CGRectGetMinY(frame) + buttonOffset.y, buttonSize.width, buttonSize.height)];
    }
 }

@@ -1377,7 +1394,8 @@ var CPScrollDestinationNone             = 0,

 - (void)_delete:(id)sender
 {
-    [_tokenField _deleteToken:self];
+    if ([self isEditable])
+        [_tokenField _deleteToken:self];
 }

@end
@@ -28,6 +28,7 @@
@import "CPPopUpButton.j"
@import "CPToolbarItem.j"

+@global CPApp

 /*
    @global
@@ -135,19 +136,6 @@ var CPToolbarsByIdentifier              = nil,
    [toolbarsSharingIdentifier addObject:toolbar];
 }

-/*
-    Temporary theme attributes until we've figured out which CPView these theme attributes should
-    belong to.
-    @ignore
-*/
-+ (id)_themeAttributes
-{
-    // "regular-size-height" is used if no item has a non-zero min size and sizeMode == CPToolbarSizeModeRegular.
-    // "small-size-height" is used if no item has a non-zero min size and sizeMode == CPToolbarSizeModeSmall.
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMake(4.0, 4.0, 4.0, TOOLBAR_ITEM_MARGIN), 59.0, 46.0]
-                                       forKeys:[@"content-inset", @"regular-size-height", @"small-size-height"]];
-}
-
 - (id)init
 {
    return [self initWithIdentifier:@""];
@@ -281,18 +269,8 @@ var CPToolbarsByIdentifier              = nil,

 - (CGRect)_toolbarViewFrame
 {
-    var height = _desiredHeight || (_sizeMode != CPToolbarSizeModeSmall ? [self _valueForThemeAttribute:@"regular-size-height"] : [self _valueForThemeAttribute:@"small-size-height"]);
-    return CPRectMake(0.0, 0.0, 1200.0, height);
-}
-
-/*
-    Temporary theme attributes until we've figured out which CPView these theme attributes should
-    belong to.
-    @ignore
-*/
- (id)_valueForThemeAttribute:(CPString)attributeName
-{
-    return [[[self class] _themeAttributes] valueForKey:attributeName];
+    var height = _desiredHeight || (_sizeMode != CPToolbarSizeModeSmall ? [_toolbarView valueForThemeAttribute:@"regular-size-height"] : [_toolbarView valueForThemeAttribute:@"small-size-height"]);
+    return CGRectMake(0.0, 0.0, 1200.0, height);
 }

 /* @ignore */
@@ -592,9 +570,6 @@ var _CPToolbarViewBackgroundColor = nil,
    _CPToolbarViewExtraItemsImage = nil,
    _CPToolbarViewExtraItemsAlternateImage = nil;

-var TOOLBAR_ITEM_MARGIN         = 10.0,
-    TOOLBAR_EXTRA_ITEMS_WIDTH   = 20.0;
-
 var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
    return { index:anIndex, view:aView, label:aLabel, minWidth:aMinWidth };
@@ -623,16 +598,32 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
    BOOL                _FIXME_isHUD;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [_CPToolbarView class])
-        return;
+    return @"toolbar-view";
+}

-    var bundle = [CPBundle bundleForClass:self];
-
-    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size:CPSizeMake(10.0, 15.0)];
-
-    _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:_CGSizeMake(10.0, 15.0)];
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[10.0,
+                                                20.0,
+                                                [CPNull null],
+                                                [CPNull null],
+                                                _CGInsetMake(4.0, 4.0, 4.0, 10),
+                                                59.0,
+                                                46.0,
+                                                [CPNull null],
+                                                CGRectMake(0.0, 0.0, 2.0, 32.0)]
+                                       forKeys:[
+                                               @"item-margin",
+                                               @"extra-item-width",
+                                               @"extra-item-extra-image",
+                                               @"extra-item-extra-alternate-image",
+                                               @"content-inset",
+                                               @"regular-size-height",
+                                               @"small-size-height",
+                                               @"image-item-separator-color",
+                                               @"image-item-separator-size"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -652,8 +643,6 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
        [_additionalItemsButton setImagePosition:CPImageOnly];
        [[_additionalItemsButton menu] setShowsStateColumn:NO];
        [[_additionalItemsButton menu] setAutoenablesItems:NO];
-
-        [_additionalItemsButton setAlternateImage:_CPToolbarViewExtraItemsAlternateImage];
    }

    return self;
@@ -709,7 +698,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
    // minimum width for hiding items.
    if (itemsWidth < minWidth)
    {
-        itemsWidth -= TOOLBAR_EXTRA_ITEMS_WIDTH;
+        itemsWidth -= [self valueForThemeAttribute:@"extra-item-width"];

        _visibleItems = [_visibleItems copy];

@@ -725,7 +714,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
            var item = itemsSortedByVisibilityPriority[--count],
                view = [self viewForItem:item];

-            minWidth -= [view minSize].width + TOOLBAR_ITEM_MARGIN;
+            minWidth -= [view minSize].width + [self valueForThemeAttribute:@"item-margin"];

            [_visibleItems removeObjectIdenticalTo:item];
            [invisibleItemsSortedByPriority addObject:item];
@@ -751,7 +740,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
    // We'll figure out the proper height for the toolbar depending on its items.
    // If nothing has a minimum size we'll use the standard toolbar size for the
    // sizeMode, indicated by a 0 _desiredHeight.
-    var contentInset = [_toolbar _valueForThemeAttribute:@"content-inset"],
+    var contentInset = [self valueForThemeAttribute:@"content-inset"],
        newDesiredHeight = height ? height + contentInset.top + contentInset.bottom : 0;

    if (newDesiredHeight != _toolbar._desiredHeight)
@@ -828,7 +817,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
    var index = 0,
        count = _visibleItems.length,
        x = contentInset.left,
-        contentInset = [_toolbar _valueForThemeAttribute:@"content-inset"],
+        contentInset = [self valueForThemeAttribute:@"content-inset"],
        y = contentInset.top;

    for (; index < count; ++index)
@@ -838,7 +827,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)

        [view setFrame:_CGRectMake(x, y, viewWidth, height)];

-        x += viewWidth + TOOLBAR_ITEM_MARGIN;
+        x += viewWidth + [self valueForThemeAttribute:@"item-margin"];
    }

    var needsAdditionalItemsButton = NO;
@@ -877,7 +866,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
        [_additionalItemsButton removeAllItems];

        [_additionalItemsButton addItemWithTitle:@"Additional Items"];
-        [[_additionalItemsButton itemArray][0] setImage:_CPToolbarViewExtraItemsImage];
+        [[_additionalItemsButton itemArray][0] setImage:[self valueForThemeAttribute:@"extra-item-extra-image"]];

        var index = 0,
            count = [_invisibleItems count],
@@ -943,7 +932,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)

    count = items.length;

-    _minWidth = TOOLBAR_ITEM_MARGIN;
+    _minWidth = [self valueForThemeAttribute:@"item-margin"];
    _viewsForToolbarItems = { };

    for (; index < count; ++index)
@@ -958,12 +947,17 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)

        [self addSubview:view];

-        _minWidth += [view minSize].width + TOOLBAR_ITEM_MARGIN;
+        _minWidth += [view minSize].width + [self valueForThemeAttribute:@"item-margin"];
    }

    [self tile];
 }

+- (void)layoutSubviews
+{
+    [_additionalItemsButton setAlternateImage:[self valueForThemeAttribute:@"extra-item-extra-alternate-image"]];
+}
+
@end

 /* @ignore */
@@ -1060,13 +1054,7 @@ var LABEL_MARGIN    = 2.0;

        if (identifier === CPToolbarSeparatorItemIdentifier)
        {
-            _view = [[CPView alloc] initWithFrame:_CGRectMake(0.0, 0.0, 2.0, 32.0)];
-
-            // FIXME: Get rid of this old API!!!
-            sizes = {};
-            sizes[@"CPToolbarItemSeparator"] = [_CGSizeMake(2.0, 26.0), _CGSizeMake(2.0, 1.0), _CGSizeMake(2.0, 26.0)];
-            [_view setBackgroundColor:_CPControlThreePartImagePattern(YES, sizes, @"CPToolbarItem", @"Separator")];
-
+            _view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
            [self addSubview:_view];
        }

@@ -1139,7 +1127,15 @@ var LABEL_MARGIN    = 2.0;
        width = _CGRectGetWidth(bounds);

    if (identifier === CPToolbarSeparatorItemIdentifier)
-        return [_view setFrame:_CGRectMake(ROUND((width - 2.0) / 2.0), 0.0, 2.0, _CGRectGetHeight(bounds))];
+    {
+        var itemSeparatorColor = [_toolbar valueForThemeAttribute:@"image-item-separator-color"],
+            itemSeparatorSize = [_toolbar valueForThemeAttribute:@"image-item-separator-size"];
+
+        [_view setFrame:_CGRectMake(ROUND((width - itemSeparatorSize.size.width) / 2.0), 0.0, itemSeparatorSize.size.width, _CGRectGetHeight(bounds))];
+        [_view setBackgroundColor:itemSeparatorColor];
+
+        return;
+    }

    // The view is centred in the available space above the label.
    var view = _view || _imageView,
@@ -20,641 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import <Foundation/CPObject.j>
-@import <Foundation/CPString.j>
-
-@import "CPImage.j"
-@import "CPView.j"
-
-
-CPToolbarItemVisibilityPriorityStandard = 0;
-CPToolbarItemVisibilityPriorityLow      = -1000;
-CPToolbarItemVisibilityPriorityHigh     = 1000;
-CPToolbarItemVisibilityPriorityUser     = 2000;
-
-CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItem";
-CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItem";
-CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItem";
-CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItem";
-CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItem";
-CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItem";
-CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
-
-/*!
-    @ingroup appkit
-    @class CPToolbarItem
-
-    A representation of an item in a CPToolbar.
-*/
-@implementation CPToolbarItem : CPObject
-{
-    CPString    _itemIdentifier;
-
-    CPToolbar   _toolbar;
-
-    CPString    _label;
-    CPString    _paletteLabel;
-    CPString    _toolTip;
-    int         _tag;
-    id          _target;
-    SEL         _action;
-    BOOL        _isEnabled;
-    CPImage     _image;
-    CPImage     _alternateImage;
-
-    CPView      _view;
-
-    CGSize      _minSize;
-    CGSize      _maxSize;
-
-    int         _visibilityPriority;
-
-    BOOL        _autovalidates;
-}
-
- (id)init
-{
-    return [self initWithItemIdentifier:@""];
-}
-
-// Creating a Toolbar Item
-/*!
-    Initializes the toolbar item with a specified identifier.
-    @param anItemIdentifier the item's identifier
-    @return the initialized toolbar item
-*/
- (id)initWithItemIdentifier:(CPString)anItemIdentifier
-{
-    self = [super init];
-
-    if (self)
-    {
-        _itemIdentifier = anItemIdentifier;
-
-        _tag = 0;
-        _isEnabled = YES;
-
-        _minSize = CGSizeMakeZero();
-        _maxSize = CGSizeMakeZero();
-
-        _visibilityPriority = CPToolbarItemVisibilityPriorityStandard;
-        _autovalidates = YES;
-    }
-
-    return self;
-}
-
-// Managing Attributes
-/*!
-    Returns the item's identifier.
-*/
- (CPString)itemIdentifier
-{
-    return _itemIdentifier;
-}
-
-/*!
-    Returns the toolbar of which this item is a part.
-*/
- (CPToolbar)toolbar
-{
-    return _toolbar;
-}
-
-/* @ignore */
- (void)_setToolbar:(CPToolbar)aToolbar
-{
-    _toolbar = aToolbar;
-}
-
-/*!
-    Returns the item's label
-*/
- (CPString)label
-{
-    return _label;
-}
-
-/*!
-    Sets the item's label.
-    @param aLabel the new label for the item
-*/
- (void)setLabel:(CPString)aLabel
-{
-    _label = aLabel;
-}
-
-/*!
-    Returns the palette label.
-*/
- (CPString)paletteLabel
-{
-    return _paletteLabel;
-}
-
-/*!
-    Sets the palette label
-    @param aPaletteLabel the new palette label
-*/
- (void)setPaletteLabel:(CPString)aPaletteLabel
-{
-    _paletteLabel = aPaletteLabel;
-}
-
-/*!
-    Returns the item's tooltip. A tooltip pops up
-    next to the cursor when the user hovers over
-    the item with the mouse.
-*/
- (CPString)toolTip
-{
-    if ([_view respondsToSelector:@selector(toolTip)])
-        return [_view toolTip];
-
-    return _toolTip;
-}
-
-/*!
-    Sets the item's tooltip. A tooltip pops up next to the cursor when the user hovers over the item with the mouse.
-    @param aToolTip the new item tool tip
-*/
- (void)setToolTip:(CPString)aToolTip
-{
-    if ([_view respondsToSelector:@selector(setToolTip:)])
-        [_view setToolTip:aToolTip];
-
-    _toolTip = aToolTip;
-}
-
-/*!
-    Returns the item's tag.
-*/
- (int)tag
-{
-    if ([_view respondsToSelector:@selector(tag)])
-        return [_view tag];
-
-    return _tag;
-}
-
-/*!
-    Sets the item's tag.
-    @param aTag the new tag for the item
-*/
- (void)setTag:(int)aTag
-{
-    if ([_view respondsToSelector:@selector(setTag:)])
-        [_view setTag:aTag];
-
-    _tag = aTag;
-}
-
-/*!
-    Returns the item's action target.
-*/
- (id)target
-{
-    if (_view)
-        return [_view respondsToSelector:@selector(target)] ? [_view target] : nil;
-
-    return _target;
-}
-
-/*!
-    Sets the target of the action that is triggered when the user clicks this item. \c nil will cause
-    the action to be passed on to the first responder.
-    @param aTarget the new target
-*/
- (void)setTarget:(id)aTarget
-{
-    if (!_view)
-        _target = aTarget;
-
-    else if ([_view respondsToSelector:@selector(setTarget:)])
-        [_view setTarget:aTarget];
-}
-
-/*!
-    Returns the action that is triggered when the user clicks this item.
-*/
- (SEL)action
-{
-    if (_view)
-        return [_view respondsToSelector:@selector(action)] ? [_view action] : nil;
-
-    return _action;
-}
-
-/*!
-    Sets the action that is triggered when the user clicks this item.
-    @param anAction the new action
-*/
- (void)setAction:(SEL)anAction
-{
-    if (!_view)
-        _action = anAction;
-
-    else if ([_view respondsToSelector:@selector(setAction:)])
-        [_view setAction:anAction];
-}
-
-/*!
-    Returns \c YES if the item is enabled.
-*/
- (BOOL)isEnabled
-{
-    if ([_view respondsToSelector:@selector(isEnabled)])
-        return [_view isEnabled];
-
-    return _isEnabled;
-}
-
-/*!
-    Sets whether the item is enabled.
-    @param aFlag \c YES enables the item
-*/
- (void)setEnabled:(BOOL)shouldBeEnabled
-{
-    if (_isEnabled === shouldBeEnabled)
-        return;
-
-    if ([_view respondsToSelector:@selector(setEnabled:)])
-        [_view setEnabled:shouldBeEnabled];
-
-    _isEnabled = shouldBeEnabled;
-}
-
-/*!
-    Returns the item's image
-*/
- (CPImage)image
-{
-    if ([_view respondsToSelector:@selector(image)])
-        return [_view image];
-
-    return _image;
-}
-
-/*!
-    Sets the item's image.
-    @param anImage the new item image
-*/
- (void)setImage:(CPImage)anImage
-{
-    if ([_view respondsToSelector:@selector(setImage:)])
-        [_view setImage:anImage];
-
-    _image = anImage;
-
-    if (!_image)
-        return;
-
-    if (_minSize.width === 0 && _minSize.height === 0 &&
-        _maxSize.width === 0 && _maxSize.height === 0)
-    {
-        var imageSize = [_image size];
-
-        if (imageSize.width > 0 || imageSize.height > 0)
-        {
-            [self setMinSize:imageSize];
-            [self setMaxSize:imageSize];
-        }
-    }
-}
-
-/*!
-    Sets the alternate image. This image is displayed on the item when the user is clicking it.
-    @param anImage the new alternate image
-*/
- (void)setAlternateImage:(CPImage)anImage
-{
-    if ([_view respondsToSelector:@selector(setAlternateImage:)])
-        [_view setAlternateImage:anImage];
-
-    _alternateImage = anImage;
-}
-
-/*!
-    Returns the alternate image. This image is displayed on the item when the user is clicking it.
-*/
- (CPImage)alternateImage
-{
-    if ([_view respondsToSelector:@selector(alternateIamge)])
-        return [_view alternateImage];
-
-    return _alternateImage;
-}
-
-/*!
-    Returns the item's view.
-*/
- (CPView)view
-{
-    return _view;
-}
-
-/*!
-    Sets the item's view
-    @param aView the item's new view
-*/
- (void)setView:(CPView)aView
-{
-    if (_view == aView)
-        return;
-
-    _view = aView;
-
-    if (_view)
-    {
-        // Tags get forwarded.
-        if (_tag !== 0 && [_view respondsToSelector:@selector(setTag:)])
-            [_view setTag:_tag];
-
-        _target = nil;
-        _action = nil;
-    }
-}
-
-/*!
-    Returns the item's minimum size.
-*/
- (CGSize)minSize
-{
-    return _minSize;
-}
-
-/*!
-    Sets the item's minimum size.
-    @param aMinSize the new minimum size
-*/
- (void)setMinSize:(CGSize)aMinSize
-{
-    if (!aMinSize.height || !aMinSize.width)
-        return;
-
-    _minSize = CGSizeMakeCopy(aMinSize);
-
-    // Try to provide some sanity: Make maxSize >= minSize
-    _maxSize = CGSizeMake(MAX(_minSize.width, _maxSize.width), MAX(_minSize.height, _maxSize.height));
-}
-
-/*!
-    Returns the item's maximum size.
-*/
- (CGSize)maxSize
-{
-    return _maxSize;
-}
-
-/*!
-    Sets the item's new maximum size.
-    @param aMaxSize the new maximum size
-*/
- (void)setMaxSize:(CGSize)aMaxSize
-{
-    if (!aMaxSize.height || !aMaxSize.width)
-        return;
-
-    _maxSize = CGSizeMakeCopy(aMaxSize);
-
-    // Try to provide some sanity: Make minSize <= maxSize
-    _minSize = CGSizeMake(MIN(_minSize.width, _maxSize.width), MIN(_minSize.height, _maxSize.height));
-}
-
-// Visibility Priority
-/*!
-    Returns the item's visibility priority. The value will be one of:
-<pre>
-CPToolbarItemVisibilityPriorityStandard
-CPToolbarItemVisibilityPriorityLow
-CPToolbarItemVisibilityPriorityHigh
-CPToolbarItemVisibilityPriorityUser
-</pre>
-*/
- (int)visibilityPriority
-{
-    return _visibilityPriority;
-}
-
-/*!
-    Sets the item's visibility priority. The value must be one of:
-<pre>
-CPToolbarItemVisibilityPriorityStandard
-CPToolbarItemVisibilityPriorityLow
-CPToolbarItemVisibilityPriorityHigh
-CPToolbarItemVisibilityPriorityUser
-</pre>
-    @param aVisiblityPriority the priority
-*/
- (void)setVisibilityPriority:(int)aVisibilityPriority
-{
-    _visibilityPriority = aVisibilityPriority;
-}
-
- (void)validate
-{
-    var action = [self action],
-        target = [self target];
-
-    // View items do not do any target-action analysis.
-    if (_view)
-    {
-        if ([target respondsToSelector:@selector(validateToolbarItem:)])
-        {
-            var shouldBeEnabled = [target validateToolbarItem:self];
-            if (_isEnabled !== shouldBeEnabled)
-                [self setEnabled:shouldBeEnabled];
-        }
-
-        return;
-    }
-
-    if (!action)
-    {
-        if (_isEnabled)
-            return [self setEnabled:NO];
-        return;
-    }
-
-    if (target && ![target respondsToSelector:action])
-    {
-        if (_isEnabled)
-            return [self setEnabled:NO];
-        return;
-    }
-
-    target = [CPApp targetForAction:action to:target from:self];
-
-    if (!target)
-    {
-        if (_isEnabled)
-            return [self setEnabled:NO];
-        return;
-    }
-
-    if ([target respondsToSelector:@selector(validateToolbarItem:)])
-    {
-        var shouldBeEnabled = [target validateToolbarItem:self];
-        if (_isEnabled !== shouldBeEnabled)
-            [self setEnabled:shouldBeEnabled];
-    }
-    else
-    {
-        if (!_isEnabled)
-            [self setEnabled:YES];
-    }
-}
-
- (BOOL)autovalidates
-{
-    return _autovalidates;
-}
-
- (void)setAutovalidates:(BOOL)shouldAutovalidate
-{
-    _autovalidates = !!shouldAutovalidate;
-}
-
-@end
-
-var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
-    CPToolbarItemLabelKey               = @"CPToolbarItemLabelKey",
-    CPToolbarItemPaletteLabelKey        = @"CPToolbarItemPaletteLabelKey",
-    CPToolbarItemToolTipKey             = @"CPToolbarItemToolTipKey",
-    CPToolbarItemTagKey                 = @"CPToolbarItemTagKey",
-    CPToolbarItemTargetKey              = @"CPToolbarItemTargetKey",
-    CPToolbarItemActionKey              = @"CPToolbarItemActionKey",
-    CPToolbarItemEnabledKey             = @"CPToolbarItemEnabledKey",
-    CPToolbarItemImageKey               = @"CPToolbarItemImageKey",
-    CPToolbarItemAlternateImageKey      = @"CPToolbarItemAlternateImageKey",
-    CPToolbarItemViewKey                = @"CPToolbarItemViewKey",
-    CPToolbarItemMinSizeKey             = @"CPToolbarItemMinSizeKey",
-    CPToolbarItemMaxSizeKey             = @"CPToolbarItemMaxSizeKey",
-    CPToolbarItemVisibilityPriorityKey  = @"CPToolbarItemVisibilityPriorityKey",
-    CPToolbarItemAutovalidatesKey       = @"CPToolbarItemAutovalidatesKey";
-
-@implementation CPToolbarItem (CPCoding)
-
- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-
-    if (self)
-    {
-        _itemIdentifier = [aCoder decodeObjectForKey:CPToolbarItemItemIdentifierKey];
-
-        _minSize = [aCoder decodeSizeForKey:CPToolbarItemMinSizeKey];
-        _maxSize = [aCoder decodeSizeForKey:CPToolbarItemMaxSizeKey];
-
-        [self setLabel:[aCoder decodeObjectForKey:CPToolbarItemLabelKey]];
-        [self setPaletteLabel:[aCoder decodeObjectForKey:CPToolbarItemPaletteLabelKey]];
-        [self setToolTip:[aCoder decodeObjectForKey:CPToolbarItemToolTipKey]];
-
-        [self setTag:[aCoder decodeObjectForKey:CPToolbarItemTagKey]];
-        [self setTarget:[aCoder decodeObjectForKey:CPToolbarItemTargetKey]];
-        [self setAction:CPSelectorFromString([aCoder decodeObjectForKey:CPToolbarItemActionKey])];
-
-        [self setEnabled:[aCoder decodeBoolForKey:CPToolbarItemEnabledKey]];
-
-        [self setImage:[aCoder decodeObjectForKey:CPToolbarItemImageKey]];
-        [self setAlternateImage:[aCoder decodeObjectForKey:CPToolbarItemAlternateImageKey]];
-
-        [self setView:[aCoder decodeObjectForKey:CPToolbarItemViewKey]];
-
-        [self setVisibilityPriority:[aCoder decodeIntForKey:CPToolbarItemVisibilityPriorityKey]];
-        [self setAutovalidates:[aCoder decodeBoolForKey:CPToolbarItemAutovalidatesKey]];
-    }
-
-    return self;
-}
-
- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_itemIdentifier forKey:CPToolbarItemItemIdentifierKey];
-
-    [aCoder encodeObject:[self label] forKey:CPToolbarItemLabelKey];
-    [aCoder encodeObject:[self paletteLabel] forKey:CPToolbarItemPaletteLabelKey];
-
-    [aCoder encodeObject:[self toolTip] forKey:CPToolbarItemToolTipKey];
-
-    [aCoder encodeObject:[self tag] forKey:CPToolbarItemTagKey];
-    [aCoder encodeObject:[self target] forKey:CPToolbarItemTargetKey];
-    [aCoder encodeObject:[self action] forKey:CPToolbarItemActionKey];
-
-    [aCoder encodeObject:[self isEnabled] forKey:CPToolbarItemEnabledKey];
-
-    [aCoder encodeObject:[self image] forKey:CPToolbarItemImageKey];
-    [aCoder encodeObject:[self alternateImage] forKey:CPToolbarItemAlternateImageKey];
-
-    [aCoder encodeObject:[self view] forKey:CPToolbarItemViewKey];
-
-    [aCoder encodeSize:[self minSize] forKey:CPToolbarItemMinSizeKey];
-    [aCoder encodeSize:[self maxSize] forKey:CPToolbarItemMaxSizeKey];
-
-    [aCoder encodeObject:[self visibilityPriority] forKey:CPToolbarItemVisibilityPriorityKey];
-    [aCoder encodeBool:[self autovalidates] forKey:CPToolbarItemAutovalidatesKey];
-}
-
-@end
-
-@implementation CPToolbarItem (CPCopying)
-
- (id)copy
-{
-    var copy = [[[self class] alloc] initWithItemIdentifier:_itemIdentifier];
-
-    if (_view)
-        [copy setView:[CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:_view]]];
-
-    [copy _setToolbar:_toolbar];
-
-    [copy setLabel:_label];
-    [copy setPaletteLabel:_paletteLabel];
-    [copy setToolTip:[self toolTip]];
-
-    [copy setTag:[self tag]];
-    [copy setTarget:[self target]];
-    [copy setAction:[self action]];
-
-    [copy setEnabled:[self isEnabled]];
-
-    [copy setImage:[self image]];
-    [copy setAlternateImage:[self alternateImage]];
-
-    [copy setMinSize:_minSize];
-    [copy setMaxSize:_maxSize];
-
-    [copy setVisibilityPriority:[self visibilityPriority]];
-    [copy setAutovalidates:[self autovalidates]];
-
-    return copy;
-}
-
-@end
-
-// Standard toolbar identifiers
-
-@implementation CPToolbarItem (Standard)
-
-/* @ignore */
-+ (CPToolbarItem)_standardItemWithItemIdentifier:(CPString)anItemIdentifier
-{
-    switch (anItemIdentifier)
-    {
-        case CPToolbarSeparatorItemIdentifier:          return [_CPToolbarSeparatorItem new];
-        case CPToolbarSpaceItemIdentifier:              return [_CPToolbarSpaceItem new];
-        case CPToolbarFlexibleSpaceItemIdentifier:      return [_CPToolbarFlexibleSpaceItem new];
-        case CPToolbarShowColorsItemIdentifier:         return [_CPToolbarShowColorsItem new];
-        case CPToolbarShowFontsItemIdentifier:          return nil;
-        case CPToolbarCustomizeToolbarItemIdentifier:   return nil;
-        case CPToolbarPrintItemIdentifier:              return nil;
-    }
-
-    return nil;
-}
-
-@end

+@import "_CPToolbarItem.j"
@import "_CPToolbarFlexibleSpaceItem.j"
@import "_CPToolbarShowColorsItem.j"
@import "_CPToolbarSeparatorItem.j"
@@ -1,3 +1,24 @@
+/*
+ * CPTreeNode.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

@import <Foundation/CPObject.j>
@import <Foundation/CPIndexPath.j>
@@ -23,9 +23,15 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPNotificationCenter.j>
@import <Foundation/CPString.j>
-@import <AppKit/CPController.j>
+@import <Foundation/CPUserDefaults.j>
+
+@import "CPController.j"
+
+@global CPUserDefaultsDidChangeNotification
+

 var SharedUserDefaultsController = nil;

@@ -34,6 +40,7 @@ var SharedUserDefaultsController = nil;
    CPUserDefaults  _defaults           @accessors(readonly, property=defaults);
    CPDictionary    _initialValues      @accessors(property=initialValues);
    BOOL            _appliesImmediately @accessors(property=appliesImmediately);
+    id              _valueProxy;
 }

 + (id)sharedUserDefaultsController
@@ -21,19 +21,29 @@
 */

@import <Foundation/CPArray.j>
-@import <Foundation/CPGeometry.j>
@import <Foundation/CPObjJRuntime.j>
@import <Foundation/CPSet.j>

@import "CGAffineTransform.j"
-
-
+@import "CGGeometry.j"
@import "CPColor.j"
@import "CPGraphicsContext.j"
@import "CPResponder.j"
@import "CPTheme.j"
@import "_CPDisplayServer.j"

+@class _CPToolTip
+@class CPWindow
+@class _CPMenuItemView
+@class CPPlatformWindow
+@class CPMenu
+@class CPClipView
+@class CPScrollView
+
+@global appkit_tag_dom_elements
+@global CPWindowAbove
+@global CPBorderlessWindowMask
+@global CPScreenSaverWindowLevel

 /*
    @global
@@ -463,7 +473,7 @@ var CPViewFlags                     = { },
    // We will have to adjust the z-index of all views starting at this index.
    var count = _subviews.length;

-    // dirty the key view loop, in case the window wants to auto recalculate it
+    // Dirty the key view loop, in case the window wants to auto recalculate it
    [[self window] _dirtyKeyViewLoop];

    // If this is already one of our subviews, remove it.
@@ -544,7 +554,7 @@ var CPViewFlags                     = { },
    if (!_superview)
        return;

-    // dirty the key view loop, in case the window wants to auto recalculate it
+    // Dirty the key view loop, in case the window wants to auto recalculate it
    [[self window] _dirtyKeyViewLoop];

    [_superview willRemoveSubview:self];
@@ -1487,10 +1497,9 @@ var CPViewFlags                     = { },
    Returns \c YES by default.
    @return \c YES, if the view object accepts first mouse-down event. \c NO, otherwise.
 */
-//FIXME: should be NO by default?
 - (BOOL)acceptsFirstMouse:(CPEvent)anEvent
 {
-    return YES;
+    return NO;
 }

 /*!
@@ -1516,7 +1525,7 @@ var CPViewFlags                     = { },
    @param aPoint the point to test
    @return returns the containing view, or nil if the point is not contained
 */
- (CPView)hitTest:(CPPoint)aPoint
+- (CPView)hitTest:(CGPoint)aPoint
 {
    if (_isHidden || !_hitTests || !_CGRectContainsPoint(_frame, aPoint))
        return nil;
@@ -2037,7 +2046,7 @@ setBoundsOrigin:
    @param aSourceObject the drag operation controller
    @param slideBack Whether the view should 'slide back' if the drag is rejected
 */
- (void)dragView:(CPView)aView at:(CPPoint)aLocation offset:(CPSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
+- (void)dragView:(CPView)aView at:(CGPoint)aLocation offset:(CGSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
 {
    [_window dragView:aView at:[self convertPoint:aLocation toView:nil] offset:mouseOffset event:anEvent pasteboard:aPasteboard source:aSourceObject slideBack:slideBack];
 }
@@ -2087,7 +2096,7 @@ setBoundsOrigin:
    Draws the receiver into \c aRect. This method should be overridden by subclasses.
    @param aRect the area that should be drawn into
 */
- (void)drawRect:(CPRect)aRect
+- (void)drawRect:(CGRect)aRect
 {

 }
@@ -2107,7 +2116,7 @@ setBoundsOrigin:
    Marks the area denoted by \c aRect as dirty, and initiates a redraw on it.
    @param aRect the area that needs to be redrawn
 */
- (void)setNeedsDisplayInRect:(CPRect)aRect
+- (void)setNeedsDisplayInRect:(CGRect)aRect
 {
    if (!(_viewClassFlags & CPViewHasCustomDrawRect))
        return;
@@ -2155,7 +2164,7 @@ setBoundsOrigin:
    Draws the receiver into the area defined by \c aRect.
    @param aRect the area to be drawn
 */
- (void)displayRect:(CPRect)aRect
+- (void)displayRect:(CGRect)aRect
 {
    [self viewWillDraw];

@@ -2192,6 +2201,7 @@ setBoundsOrigin:
    {
        var graphicsPort = CGBitmapGraphicsContextCreate();

+#if PLATFORM(DOM)
        _DOMContentsElement = graphicsPort.DOMElement;

        _DOMContentsElement.style.zIndex = -100;
@@ -2208,7 +2218,6 @@ setBoundsOrigin:
        _DOMContentsElement.style.width = ROUND(_CGRectGetWidth(_frame)) + "px";
        _DOMContentsElement.style.height = ROUND(_CGRectGetHeight(_frame)) + "px";

-#if PLATFORM(DOM)
        // The performance implications of this aren't clear, but without this subviews might not be redrawn when this
        // view moves.
        if (CPPlatformHasBug(CPCanvasParentDrawErrorsOnMovementBug))
@@ -22,6 +22,7 @@

@import "CPAnimation.j"

+@class CPWindow

 CPViewAnimationTargetKey = @"CPViewAnimationTargetKey";
 CPViewAnimationStartFrameKey = @"CPViewAnimationStartFrameKey";
@@ -22,10 +22,13 @@

@import <Foundation/CPArray.j>

-@import "CPApplication.j"
@import "CPCib.j"
@import "CPResponder.j"

+@class CPDocument
+
+@global CPApp
+

 var CPViewControllerCachedCibs;

@@ -222,7 +225,7 @@ var CPViewControllerCachedCibs;
 {
    [self willChangeValueForKey:"isViewLoaded"];
    [self viewDidLoad];
-    isViewLoaded = YES;
+    _isViewLoaded = YES;
    [self didChangeValueForKey:"isViewLoaded"];
 }

@@ -126,7 +126,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
    BOOL                _drawsBackground;
 }

- (id)initWithFrame:(CPRect)frameRect frameName:(CPString)frameName groupName:(CPString)groupName
+- (id)initWithFrame:(CGRect)frameRect frameName:(CPString)frameName groupName:(CPString)groupName
 {
    if (self = [self initWithFrame:frameRect])
    {
@@ -136,7 +136,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
    return self;
 }

- (id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
    if (self = [super initWithFrame:aFrame])
    {
@@ -157,7 +157,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
    return self;
 }

- (id)_initDOMWithFrame:(CPRect)aFrame
+- (id)_initDOMWithFrame:(CGRect)aFrame
 {
    _ignoreLoadStart = YES;
    _ignoreLoadEnd  = YES;
@@ -221,7 +221,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
    [self addSubview:_scrollView];
 }

- (void)setFrameSize:(CPSize)aSize
+- (void)setFrameSize:(CGSize)aSize
 {
    [super setFrameSize:aSize];
    [self _resizeWebFrame];
@@ -0,0 +1,191 @@
+/*
+ * CPWindow_Constants.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+    Borderless window mask option.
+    @global
+    @class CPWindow
+*/
+CPBorderlessWindowMask          = 0;
+/*
+    Titled window mask option.
+    @global
+    @class CPWindow
+*/
+CPTitledWindowMask              = 1 << 0;
+/*
+    Closeable window mask option.
+    @global
+    @class CPWindow
+*/
+CPClosableWindowMask            = 1 << 1;
+/*
+    Miniaturizabe window mask option.
+    @global
+    @class CPWindow
+*/
+CPMiniaturizableWindowMask      = 1 << 2;
+/*
+    Resizable window mask option.
+    @global
+    @class CPWindow
+*/
+CPResizableWindowMask           = 1 << 3;
+/*
+    Textured window mask option.
+    @global
+    @class CPWindow
+*/
+CPTexturedBackgroundWindowMask  = 1 << 8;
+/*
+    @global
+    @class CPWindow
+*/
+CPBorderlessBridgeWindowMask    = 1 << 20;
+/*
+    @global
+    @class CPWindow
+*/
+CPHUDBackgroundWindowMask       = 1 << 21;
+
+/*!
+    @global
+    @class CPWindow
+*/
+_CPModalWindowMask              = 1 << 22;
+
+CPWindowNotSizable              = 0;
+CPWindowMinXMargin              = 1;
+CPWindowWidthSizable            = 2;
+CPWindowMaxXMargin              = 4;
+CPWindowMinYMargin              = 8;
+CPWindowHeightSizable           = 16;
+CPWindowMaxYMargin              = 32;
+
+CPBackgroundWindowLevel         = -1;
+/*
+    Default level for windows
+    @group CPWindowLevel
+    @global
+*/
+CPNormalWindowLevel             = 0;
+/*
+    Floating palette type window
+    @group CPWindowLevel
+    @global
+*/
+CPFloatingWindowLevel           = 3;
+/*
+    Submenu type window
+    @group CPWindowLevel
+    @global
+*/
+CPSubmenuWindowLevel            = 3;
+/*
+    For a torn-off menu
+    @group CPWindowLevel
+    @global
+*/
+CPTornOffMenuWindowLevel        = 3;
+/*
+    For the application's main menu
+    @group CPWindowLevel
+    @global
+*/
+CPMainMenuWindowLevel           = 24;
+/*
+    Status window level
+    @group CPWindowLevel
+    @global
+*/
+CPStatusWindowLevel             = 25;
+/*
+    Level for a modal panel
+    @group CPWindowLevel
+    @global
+*/
+CPModalPanelWindowLevel         = 8;
+/*
+    Level for a pop up menu
+    @group CPWindowLevel
+    @global
+*/
+CPPopUpMenuWindowLevel          = 101;
+/*
+    Level for a window being dragged
+    @group CPWindowLevel
+    @global
+*/
+CPDraggingWindowLevel           = 500;
+/*
+    Level for the screens saver
+    @group CPWindowLevel
+    @global
+*/
+CPScreenSaverWindowLevel        = 1000;
+
+/*
+    The receiver is placed directly in front of the window specified.
+    @global
+    @class CPWindowOrderingMode
+*/
+CPWindowAbove                   = 1;
+/*
+    The receiver is placed directly behind the window specified.
+    @global
+    @class CPWindowOrderingMode
+*/
+CPWindowBelow                   = -1;
+/*
+    The receiver is removed from the screen list and hidden.
+    @global
+    @class CPWindowOrderingMode
+*/
+CPWindowOut                     = 0;
+
+CPWindowWillCloseNotification                   = @"CPWindowWillCloseNotification";
+CPWindowDidBecomeMainNotification               = @"CPWindowDidBecomeMainNotification";
+CPWindowDidResignMainNotification               = @"CPWindowDidResignMainNotification";
+CPWindowDidBecomeKeyNotification                = @"CPWindowDidBecomeKeyNotification";
+CPWindowDidResignKeyNotification                = @"CPWindowDidResignKeyNotification";
+CPWindowDidResizeNotification                   = @"CPWindowDidResizeNotification";
+CPWindowDidMoveNotification                     = @"CPWindowDidMoveNotification";
+CPWindowWillBeginSheetNotification              = @"CPWindowWillBeginSheetNotification";
+CPWindowDidEndSheetNotification                 = @"CPWindowDidEndSheetNotification";
+CPWindowDidMiniaturizeNotification              = @"CPWindowDidMiniaturizeNotification";
+CPWindowWillMiniaturizeNotification             = @"CPWindowWillMiniaturizeNotification";
+CPWindowDidDeminiaturizeNotification            = @"CPWindowDidDeminiaturizeNotification";
+
+_CPWindowDidChangeFirstResponderNotification    = @"_CPWindowDidChangeFirstResponderNotification";
+
+CPWindowShadowStyleStandard = 0;
+CPWindowShadowStyleMenu     = 1;
+CPWindowShadowStylePanel    = 2;
+
+CPWindowResizeStyleModern = 0;
+CPWindowResizeStyleLegacy = 1;
+CPWindowResizeStyle = CPWindowResizeStyleModern;
+
+CPWindowPositionFlexibleRight   = 1 << 19;
+CPWindowPositionFlexibleLeft    = 1 << 20;
+CPWindowPositionFlexibleBottom  = 1 << 21;
+CPWindowPositionFlexibleTop     = 1 << 22;
@@ -22,27 +22,20 @@

@import "_CPWindowView.j"

-
-var _CPToolbarViewBackgroundColor = nil;
-
@implementation _CPBorderlessBridgeWindowView : _CPWindowView
 {
    CPView  _toolbarBackgroundView;
 }

-+ (CPColor)toolbarBackgroundColor
+ (CPString)defaultThemeClass
 {
-    if (!_CPToolbarViewBackgroundColor)
-    {
-        var bundle = [CPBundle bundleForClass:[_CPBorderlessBridgeWindowView class]];
-        _CPToolbarViewBackgroundColor = CPColorWithImages([
-                ["_CPToolbarView/toolbar-background-top.png", 1, 1, bundle],
-                ["_CPToolbarView/toolbar-background-center.png", 1, 57.0, bundle],
-                ["_CPToolbarView/toolbar-background-bottom.png", 1, 1, bundle]
-            ], CPColorPatternIsVertical);
-    }
+    return @"bordeless-bridge-window-view";
+}

-    return _CPToolbarViewBackgroundColor;
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPColor grayColor]]
+                                       forKeys:[@"toolbar-background-color"]];
 }

 - (void)setShowsResizeIndicator:(BOOL)shouldShowResizeIndicator
@@ -72,7 +65,7 @@ var _CPToolbarViewBackgroundColor = nil;
    {
        _toolbarBackgroundView = [[CPView alloc] initWithFrame:CGRectMakeZero()];

-        [_toolbarBackgroundView setBackgroundColor:[[self class] toolbarBackgroundColor]];
+        [_toolbarBackgroundView setBackgroundColor:[self valueForThemeAttribute:@"toolbar-background-color"]];
        [_toolbarBackgroundView setAutoresizingMask:CPViewWidthSizable];

        [self addSubview:_toolbarBackgroundView positioned:CPWindowBelow relativeTo:nil];
@@ -1,7 +1,27 @@
+/*
+ * _CPDocModalWindowView.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

@import "_CPWindowView.j"

-var _CPStandardWindowViewBodyBackgroundColor = nil;

@implementation _CPDocModalWindowView : _CPWindowView
 {
@@ -9,35 +29,34 @@ var _CPStandardWindowViewBodyBackgroundColor = nil;
    CPView _shadowView;
 }

-+ (CPColor)bodyBackgroundColor
+ (CPString)defaultThemeClass
 {
-    if (!_CPStandardWindowViewBodyBackgroundColor)
-        _CPStandardWindowViewBodyBackgroundColor = [CPColor colorWithWhite:0.96 alpha:0.9];
-
-    return _CPStandardWindowViewBodyBackgroundColor;
+    return @"doc-modal-window-view";
 }

- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPColor whiteColor], 8]
+                                       forKeys:[ @"body-color", @"height-shadow"]];
+}
+
+- (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask
 {
    self = [super initWithFrame:aFrame styleMask:aStyleMask];

    if (self)
    {
-        var theClass = [self class],
-            bounds = [self bounds];
+        var bounds = [self bounds];

       _bodyView = [[CPView alloc] initWithFrame:_CGRectMake(0.0, 0.0, _CGRectGetWidth(bounds), _CGRectGetHeight(bounds))];

        [_bodyView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-        [_bodyView setBackgroundColor:[theClass bodyBackgroundColor]];
        [_bodyView setHitTests:NO];

        [self addSubview:_bodyView];

-        var bundle = [CPBundle bundleForClass:[CPWindow class]];
-        _shadowView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, _CGRectGetWidth(bounds), 8)];
+        _shadowView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, _CGRectGetWidth(bounds), [self valueForThemeAttribute:@"height-shadow"])];
        [_shadowView setAutoresizingMask:CPViewWidthSizable];
-        [_shadowView setBackgroundColor:[CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowAttachedSheetShadow.png"] size:CGSizeMake(9,8)]]];
        [self addSubview:_shadowView];
     }

@@ -59,5 +78,17 @@ var _CPStandardWindowViewBodyBackgroundColor = nil;
    // do nothing, already a sheet
 }

+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+
+    var bounds = [self bounds];
+
+    [_bodyView setBackgroundColor:[self valueForThemeAttribute:@"body-color"]];
+
+    [_shadowView setFrame:CGRectMake(0,0, _CGRectGetWidth(bounds), [self valueForThemeAttribute:@"height-shadow"])];
+    [_shadowView setBackgroundColor:[self valueForThemeAttribute:@"attached-sheet-shadow-color"]];
+}
+
@end

@@ -20,15 +20,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPButton.j"
@import "CPTextField.j"
@import "_CPTitleableWindowView.j"

-var _CPHUDWindowViewBackgroundColor = nil,
-    _CPHUDWindowViewThemeValues     = nil,
-
-    CPHUDCloseButtonImage           = nil;
-
-var HUD_TITLEBAR_HEIGHT             = 26.0;

@implementation _CPHUDWindowView : _CPTitleableWindowView
 {
@@ -36,47 +31,9 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
    CPButton            _closeButton;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [_CPHUDWindowView class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    _CPHUDWindowViewBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground0.png"] size:CPSizeMake(7.0, 37.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground1.png"] size:CPSizeMake(1.0, 37.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground2.png"] size:CPSizeMake(7.0, 37.0)],
-
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground3.png"] size:CPSizeMake(7.0, 1.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground4.png"] size:CPSizeMake(2.0, 2.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground5.png"] size:CPSizeMake(7.0, 1.0)],
-
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground6.png"] size:CPSizeMake(7.0, 3.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground7.png"] size:CPSizeMake(1.0, 3.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground8.png"] size:CPSizeMake(7.0, 3.0)]
-        ]]];
-
-    _CPHUDWindowViewCloseImage        = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"HUDTheme/WindowClose.png"] size:CPSizeMake(18.0, 18.0)];
-    _CPHUDWindowViewCloseActiveImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"HUDTheme/WindowCloseActive.png"] size:CPSizeMake(18.0, 18.0)];
-
-    _CPHUDWindowViewThemeValues = [
-        [@"title-font",                 [CPFont systemFontOfSize:[CPFont systemFontSize] - 1]],
-        [@"title-text-color",           [CPColor colorWithWhite:255.0 / 255.0 alpha:0.75]],
-        [@"title-text-color",           [CPColor colorWithWhite:255.0 / 255.0 alpha:1], CPThemeStateKeyWindow],
-        [@"title-text-shadow-color",    [CPColor blackColor]],
-        [@"title-text-shadow-offset",   CGSizeMake(0.0, 1.0)],
-        [@"title-alignment",            CPCenterTextAlignment],
-        // FIXME: Make this to CPLineBreakByTruncatingMiddle once it's implemented.
-        [@"title-line-break-mode",      CPLineBreakByTruncatingTail],
-        [@"title-vertical-alignment",   CPCenterVerticalTextAlignment]
-    ];
-}
-
-+ (int)titleBarHeight
-{
-    return HUD_TITLEBAR_HEIGHT;
+    return @"hud-window-view";
 }

 - (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
@@ -109,30 +66,17 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
    return frameRect;
 }

- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
+- (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask
 {
    self = [super initWithFrame:aFrame styleMask:aStyleMask];

    if (self)
    {
-        // Until windows become properly themable, just set these values here in the subclass.
-        [self registerThemeValues:_CPHUDWindowViewThemeValues];
-
-        var bounds = [self bounds];
-
-        [self setBackgroundColor:_CPHUDWindowViewBackgroundColor];
-
        if (_styleMask & CPClosableWindowMask)
        {
-            var closeSize = [_CPHUDWindowViewCloseImage size];
-
-            _closeButton = [[CPButton alloc] initWithFrame:CGRectMake(8.0, 4.0, closeSize.width, closeSize.height)];
-
+            _closeButton = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
            [_closeButton setBordered:NO];
-
-            [_closeButton setImage:_CPHUDWindowViewCloseImage];
-            [_closeButton setAlternateImage:_CPHUDWindowViewCloseActiveImage];
-
+            [_closeButton setButtonType:CPMomentaryChangeButton];
            [self addSubview:_closeButton];
        }

@@ -215,4 +159,17 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
    [theWindow setMovableByWindowBackground:!enable];
 }

+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+
+    if (_styleMask & CPClosableWindowMask)
+    {
+        [_closeButton setFrameOrigin:[self valueForThemeAttribute:@"close-image-origin"]];
+        [_closeButton setFrameSize:[self valueForThemeAttribute:@"close-image-size"]]
+        [_closeButton setImage:[self valueForThemeAttribute:@"close-image"]];
+        [_closeButton setAlternateImage:[self valueForThemeAttribute:@"close-active-image"]];
+    }
+}
+
@end
--- a/Show More
+++ b/Show More