diff --git a/AppKit/AppKit.j b/AppKit/AppKit.j
index 95bbe6201..9241c6398 100644
--- a/AppKit/AppKit.j
+++ b/AppKit/AppKit.j
@@ -36,8 +36,8 @@
 @import "CPCibLoading.j"
 @import "CPCibOutletConnector.j"
 @import "CPClipView.j"
-@import "CPCollectionViewItem.j"
 @import "CPCollectionView.j"
+@import "CPCollectionViewItem.j"
 @import "CPColor.j"
 @import "CPColorPanel.j"
 @import "CPColorWell.j"
@@ -53,6 +53,7 @@
 @import "CPFont.j"
 @import "CPFontManager.j"
 @import "CPGeometry.j"
+@import "CPGraphics.j"
 @import "CPImage.j"
 @import "CPImageView.j"
 @import "CPKeyBinding.j"
@@ -66,17 +67,17 @@
 @import "CPProgressIndicator.j"
 @import "CPRadio.j"
 @import "CPResponder.j"
-@import "CPSearchField.j"
-@import "CPScrollView.j"
 @import "CPScroller.j"
+@import "CPScrollView.j"
+@import "CPSearchField.j"
 @import "CPSecureTextField.j"
 @import "CPSegmentedControl.j"
 @import "CPShadow.j"
 @import "CPSlider.j"
 @import "CPSplitView.j"
-@import "CPTabView.j"
 @import "CPTableColumn.j"
 @import "CPTableView.j"
+@import "CPTabView.j"
 @import "CPText.j"
 @import "CPTextField.j"
 @import "CPToolbar.j"
diff --git a/AppKit/CPGraphics.j b/AppKit/CPGraphics.j
index 3044acf7e..baf1379e3 100644
--- a/AppKit/CPGraphics.j
+++ b/AppKit/CPGraphics.j
@@ -29,44 +29,44 @@
 function CPDrawGrayBezel(aRect)
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
-    
+
     CGContextBeginPath(context);
     CGContextSetStrokeColor(context, [CPColor colorWithWhite:142.0/255.0 alpha:1.0]);
-    
+
     var y = _CGRectGetMinY(aRect) + 0.5;
-    
+
     CGContextMoveToPoint(context, _CGRectGetMinX(aRect), y);
     CGContextAddLineToPoint(context, _CGRectGetMinX(aRect) + 1.0, y);
     CGContextStrokePath(context);
-    
+
     CGContextBeginPath(context);
     CGContextSetStrokeColor(context, [CPColor colorWithWhite:192.0/255.0 alpha:1.0]);
     CGContextMoveToPoint(context, _CGRectGetMinX(aRect) + 1.0, y);
     CGContextAddLineToPoint(context, _CGRectGetMaxX(aRect) - 1.0, y);
     CGContextStrokePath(context);
-    
+
     CGContextBeginPath(context);
     CGContextSetStrokeColor(context, [CPColor colorWithWhite:142.0/255.0 alpha:1.0]);
     CGContextMoveToPoint(context, _CGRectGetMaxX(aRect) - 1.0, y);
     CGContextAddLineToPoint(context, _CGRectGetMaxX(aRect), y);
     CGContextStrokePath(context);
-    
+
     CGContextBeginPath(context);
     CGContextSetStrokeColor(context, [CPColor colorWithWhite:190.0/255.0 alpha:1.0]);
-    
+
     var x = _CGRectGetMaxX(aRect) - 0.5;
-    
+
     CGContextMoveToPoint(context, x, _CGRectGetMinY(aRect) + 1.0);
     CGContextAddLineToPoint(context, x, _CGRectGetMaxY(aRect));
-    
+
     CGContextMoveToPoint(context, x - 0.5, _CGRectGetMaxY(aRect) - 0.5);
     CGContextAddLineToPoint(context, _CGRectGetMinX(aRect), _CGRectGetMaxY(aRect) - 0.5);
-    
+
     x = _CGRectGetMinX(aRect) + 0.5;
-    
+
     CGContextMoveToPoint(context, x, _CGRectGetMaxY(aRect));
     CGContextAddLineToPoint(context, x, _CGRectGetMinY(aRect) + 1.0);
-    
+
     CGContextStrokePath(context);
 }
 
@@ -76,38 +76,38 @@ function CPDrawGroove(aRect, drawTopBorder)
 
     CGContextBeginPath(context);
     CGContextSetStrokeColor(context, [CPColor colorWithWhite:159.0/255.0 alpha:1.0]);
-    
+
     var y = _CGRectGetMinY(aRect) + 0.5;
-    
+
     CGContextMoveToPoint(context, _CGRectGetMinX(aRect), y);
     CGContextAddLineToPoint(context, _CGRectGetMaxX(aRect), y);
-    
+
     var x = _CGRectGetMaxX(aRect) - 1.5;
-    
+
     CGContextMoveToPoint(context, x, _CGRectGetMinY(aRect) + 2.0);
     CGContextAddLineToPoint(context, x, _CGRectGetMaxY(aRect) - 1.0);
-    
+
     y = _CGRectGetMaxY(aRect) - 1.5;
-    
+
     CGContextMoveToPoint(context, _CGRectGetMaxX(aRect) - 1.0, y);
     CGContextAddLineToPoint(context, _CGRectGetMinX(aRect) + 2.0, y);
-    
+
     x = _CGRectGetMinX(aRect) + 0.5;
-    
+
     CGContextMoveToPoint(context, x, _CGRectGetMaxY(aRect));
     CGContextAddLineToPoint(context, x, _CGRectGetMinY(aRect));
-    
+
     CGContextStrokePath(context);
-    
+
     CGContextBeginPath(context);
     CGContextSetStrokeColor(context, [CPColor whiteColor]);
-    
+
     var rect = _CGRectOffset(aRect, 1.0, 1.0);
-    
+
     rect.size.width -= 1.0;
     rect.size.height -= 1.0;
     CGContextStrokeRect(context, _CGRectInset(rect, 0.5, 0.5));
-    
+
     if (drawTopBorder)
     {
         CGContextBeginPath(context);
diff --git a/AppKit/CPScrollView.j b/AppKit/CPScrollView.j
index b0d89c1f7..41dc25c94 100644
--- a/AppKit/CPScrollView.j
+++ b/AppKit/CPScrollView.j
@@ -40,21 +40,21 @@
     CPClipView      _contentView;
     CPClipView      _headerClipView;
     CPView          _cornerView;
-                    
+
     BOOL            _hasVerticalScroller;
     BOOL            _hasHorizontalScroller;
     BOOL            _autohidesScrollers;
-                    
+
     CPScroller      _verticalScroller;
     CPScroller      _horizontalScroller;
-                    
+
     int             _recursionCount;
-                    
+
     float           _verticalLineScroll;
     float           _verticalPageScroll;
     float           _horizontalLineScroll;
     float           _horizontalPageScroll;
-    
+
     CPBorderType    _borderType;
 }
 
@@ -69,7 +69,7 @@
 
         _horizontalLineScroll = 10.0;
         _horizontalPageScroll = 10.0;
-        
+
         _borderType = CPNoBorder;
 
         _contentView = [[CPClipView alloc] initWithFrame:[self _insetBounds]];
@@ -93,13 +93,13 @@
 {
     var bounds = [self _insetBounds:_CGRectMake(0.0, 0.0, frameSize.width, frameSize.height) borderType:borderType],
         scrollerWidth = [CPScroller scrollerWidth];
-        
+
     if (hFlag)
         bounds.size.height -= scrollerWidth;
-        
+
     if (vFlag)
         bounds.size.width -= scrollerWidth;
-        
+
     return bounds.size;
 }
 
@@ -110,13 +110,13 @@
         heightInset = contentSize.height - bounds.size.height,
         frameSize = _CGSizeMake(contentSize.width + widthInset, contentSize.height + heightInset),
         scrollerWidth = [CPScroller scrollerWidth];
-        
+
     if (hFlag)
         frameSize.height -= scrollerWidth;
-        
+
     if (vFlag)
         frameSize.width -= scrollerWidth;
-        
+
     return frameSize;
 }
 
@@ -127,14 +127,14 @@
         case CPLineBorder:
         case CPBezelBorder:
             return _CGRectInset(bounds, 1.0, 1.0);
-            
+
         case CPGrooveBorder:
             bounds = _CGRectInset(bounds, 2.0, 2.0);
             ++bounds.origin.y;
             --bounds.size.height;
-            
+
             return bounds;
-        
+
         case CPNoBorder:
         default:
             return bounds;
@@ -339,9 +339,9 @@
 {
     if (_borderType == borderType)
         return;
-        
+
     _borderType = borderType;
-    
+
     [self reflectScrolledClipView:_contentView];
     [self setNeedsDisplay:YES];
 }
@@ -401,8 +401,8 @@
     if (_hasHorizontalScroller && !_horizontalScroller)
     {
         var bounds = [self _insetBounds];
-        
-        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, MAX(_CGRectGetWidth(bounds), [CPScroller scrollerWidth]+1), [CPScroller scrollerWidth])]];
+
+        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, MAX(_CGRectGetWidth(bounds), [CPScroller scrollerWidth] + 1), [CPScroller scrollerWidth])]];
         [[self horizontalScroller] setFrameSize:CGSizeMake(_CGRectGetWidth(bounds), [CPScroller scrollerWidth])];
     }
 
@@ -464,8 +464,8 @@
     if (_hasVerticalScroller && !_verticalScroller)
     {
         var bounds = [self _insetBounds];
-        
-        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:_CGRectMake(0.0, 0.0, [CPScroller scrollerWidth], MAX(_CGRectGetHeight(bounds), [CPScroller scrollerWidth]+1))]];
+
+        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:_CGRectMake(0.0, 0.0, [CPScroller scrollerWidth], MAX(_CGRectGetHeight(bounds), [CPScroller scrollerWidth] + 1))]];
         [[self verticalScroller] setFrameSize:CGSizeMake([CPScroller scrollerWidth], _CGRectGetHeight(bounds))];
     }
 
@@ -755,13 +755,13 @@
 - (void)drawRect:(CPRect)aRect
 {
     [super drawRect:aRect];
-    
-    var strokeRect = [self bounds],
-        context = [[CPGraphicsContext currentContext] graphicsPort];
-        
+
     if (_borderType == CPNoBorder)
         return;
-    
+
+    var strokeRect = [self bounds],
+        context = [[CPGraphicsContext currentContext] graphicsPort];
+
     CGContextSetLineWidth(context, 1);
 
     switch (_borderType)
@@ -774,7 +774,7 @@
         case CPBezelBorder:
             CPDrawGrayBezel(strokeRect);
             break;
-            
+
         case CPGrooveBorder:
             CPDrawGroove(strokeRect, YES);
             break;
@@ -944,7 +944,7 @@ var CPScrollViewContentViewKey       = "CPScrollViewContentView",
     [aCoder encodeBool:_autohidesScrollers      forKey:CPScrollViewAutohidesScrollerKey];
 
     [aCoder encodeObject:_cornerView            forKey:CPScrollViewCornerViewKey];
-    
+
     [aCoder encodeInt:_borderType               forKey:CPScrollViewBorderTypeKey];
 }
 
diff --git a/AppKit/CPShadowView.j b/AppKit/CPShadowView.j
index 36cfabdad..c1aaac6f5 100644
--- a/AppKit/CPShadowView.j
+++ b/AppKit/CPShadowView.j
@@ -35,12 +35,12 @@ CPHeavyShadow   = 1;
 
 var CPShadowViewLightBackgroundColor    = nil,
     CPShadowViewHeavyBackgroundColor    = nil;
-    
+
 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,
@@ -61,51 +61,76 @@ var LIGHT_LEFT_INSET    = 3.0,
         return;
 
     var bundle = [CPBundle bundleForClass:[self class]];
-    
+
     CPShadowViewLightBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
         [
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopLeft.png"] size:CGSizeMake(9.0, 9.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTop.png"] size:CGSizeMake(1.0, 9.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopRight.png"] size:CGSizeMake(9.0, 9.0)],
-            
+
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightLeft.png"] size:CGSizeMake(9.0, 1.0)],
             nil,
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightRight.png"] size:CGSizeMake(9.0, 1.0)],
-            
+
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomLeft.png"] size:CGSizeMake(9.0, 9.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottom.png"] size:CGSizeMake(1.0, 9.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomRight.png"] size:CGSizeMake(9.0, 9.0)]
         ]]];
-        
+
     CPShadowViewHeavyBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
         [
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopLeft.png"] size:CGSizeMake(17.0, 17.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTop.png"] size:CGSizeMake(1.0, 17.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopRight.png"] size:CGSizeMake(17.0, 17.0)],
-            
+
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyLeft.png"] size:CGSizeMake(17.0, 1.0)],
             nil,
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyRight.png"] size:CGSizeMake(17.0, 1.0)],
-            
+
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomLeft.png"] size:CGSizeMake(17.0, 17.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottom.png"] size:CGSizeMake(1.0, 17.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomRight.png"] size:CGSizeMake(17.0, 17.0)]
         ]]];
 }
 
++ (id)shadowViewEnclosingView:(CPView)aView
+{
+    return [self shadowViewEnclosingView:aView withWeight:CPLightShadow];
+}
+
++ (id)shadowViewEnclosingView:(CPView)aView withWeight:(CPShadowWeight)aWeight
+{
+    var shadowView = [[CPShadowView alloc] initWithFrame:[aView frame]];
+    [shadowView setWeight:aWeight];
+
+    var size = [shadowView frame].size,
+        width = size.width - [shadowView leftInset] - [shadowView rightInset],
+        height = size.height - [shadowView topInset] - [shadowView bottomInset],
+        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)]
+    [enclosingView addSubview:shadowView];
+
+    return shadowView;
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-    
+
     if (self)
     {
         _weight = CPLightShadow;
-        
+
         [self setBackgroundColor:CPShadowViewLightBackgroundColor];
-        
+
         [self setHitTests:NO];
     }
-    
+
     return self;
 }
 
@@ -113,9 +138,9 @@ var LIGHT_LEFT_INSET    = 3.0,
 {
     if (_weight == aWeight)
         return;
-    
+
     _weight = aWeight;
-    
+
     if (_weight == CPLightShadow)
         [self setBackgroundColor:CPShadowViewLightBackgroundColor];
 
@@ -147,7 +172,7 @@ var LIGHT_LEFT_INSET    = 3.0,
 {
     if (_weight == CPLightShadow)
         return LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET;
-    
+
     return HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET;
 }
 
@@ -155,7 +180,7 @@ var LIGHT_LEFT_INSET    = 3.0,
 {
     if (_weight == CPLightShadow)
         return LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET;
-    
+
     return HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET;
 }
 
diff --git a/AppKit/CPSlider.j b/AppKit/CPSlider.j
index b448becd0..c5626b8e3 100644
--- a/AppKit/CPSlider.j
+++ b/AppKit/CPSlider.j
@@ -61,14 +61,14 @@ CPCircularSlider    = 1;
     {
         _minValue = 0.0;
         _maxValue = 100.0;
-        
+
         [self setObjectValue:50.0];
-        
+
         [self setContinuous:YES];
 
         [self _recalculateIsVertical];
     }
-    
+
     return self;
 }
 
@@ -76,11 +76,11 @@ CPCircularSlider    = 1;
 {
     if (_minValue === aMinimumValue)
         return;
-    
+
     _minValue = aMinimumValue;
 
     var doubleValue = [self doubleValue];
-    
+
     if (doubleValue < _minValue)
         [self setDoubleValue:_minValue];
 
@@ -98,11 +98,11 @@ CPCircularSlider    = 1;
 {
     if (_maxValue === aMaximumValue)
         return;
-    
+
     _maxValue = aMaximumValue;
-    
+
     var doubleValue = [self doubleValue];
-    
+
     if (doubleValue > _maxValue)
         [self setDoubleValue:_maxValue];
 
@@ -169,20 +169,20 @@ CPCircularSlider    = 1;
             bounds.size.height = trackWidth;
         }
     }
-    
+
     return bounds;
 }
 
 - (CGRect)knobRectForBounds:(CGRect)bounds
 {
     var knobSize = [self currentValueForThemeAttribute:@"knob-size"];
-    
+
     if (knobSize.width <= 0 || knobSize.height <= 0)
         return _CGRectMakeZero();
-    
+
     var knobRect = _CGRectMake(0.0, 0.0, knobSize.width, knobSize.height),
         trackRect = [self trackRectForBounds:bounds];
-    
+
     // No track, do our best to approximate a place for this thing.
     if (!trackRect || _CGRectIsEmpty(trackRect))
         trackRect = bounds;
@@ -198,7 +198,7 @@ CPCircularSlider    = 1;
     else if ([self isVertical])
     {
         knobRect.origin.x = _CGRectGetMidX(trackRect) - knobSize.width / 2.0;
-        knobRect.origin.y = (([self doubleValue] - _minValue) / (_maxValue - _minValue)) * (_CGRectGetHeight(trackRect) - knobSize.height);
+        knobRect.origin.y = ((_maxValue - [self doubleValue]) / (_maxValue - _minValue)) * (_CGRectGetHeight(trackRect) - knobSize.height);
     }
     else
     {
@@ -213,10 +213,10 @@ CPCircularSlider    = 1;
 {
     if (aName === "track-view")
         return [self trackRectForBounds:[self bounds]];
-    
+
     else if (aName === "knob-view")
         return [self knobRectForBounds:[self bounds]];
-    
+
     return [super rectForEphemeralSubviewNamed:aName];
 }
 
@@ -225,12 +225,12 @@ CPCircularSlider    = 1;
     if (aName === "track-view" || aName === "knob-view")
     {
         var view = [[CPView alloc] init];
-        
+
         [view setHitTests:NO];
-        
+
         return view;
     }
-    
+
     return [super createEphemeralSubviewNamed:aName];
 }
 
@@ -256,7 +256,7 @@ CPCircularSlider    = 1;
     var bounds = [self bounds],
         width = _CGRectGetWidth(bounds),
         height = _CGRectGetHeight(bounds);
-    
+
     _isVertical = width < height ? 1 : (width > height ? 0 : -1);
 
     if (_isVertical === 1)
@@ -282,7 +282,7 @@ CPCircularSlider    = 1;
     var knobView = [self layoutEphemeralSubviewNamed:@"knob-view"
                                           positioned:CPWindowAbove
                      relativeToEphemeralSubviewNamed:@"track-view"];
-      
+
     if (knobView)
         [knobView setBackgroundColor:[self currentValueForThemeAttribute:"knob-color"]];
 }
@@ -320,7 +320,7 @@ CPCircularSlider    = 1;
 
         var minValue = [self minValue];
 
-        return MAX(0.0, MIN(1.0, (aPoint.y - _CGRectGetMinY(trackRect)) / _CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
+        return MAX(0.0, MIN(1.0, (_CGRectGetMaxY(trackRect) - aPoint.y) / _CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
     }
     else
     {
@@ -339,31 +339,31 @@ CPCircularSlider    = 1;
 {
     var bounds = [self bounds],
         knobRect = [self knobRectForBounds:_CGRectMakeCopy(bounds)];
-    
+
     if (_CGRectContainsPoint(knobRect, aPoint))
         _dragOffset = _CGSizeMake(_CGRectGetMidX(knobRect) - aPoint.x, _CGRectGetMidY(knobRect) - aPoint.y);
-    
-    else 
+
+    else
     {
         var trackRect = [self trackRectForBounds:bounds];
-        
+
         if (trackRect && _CGRectContainsPoint(trackRect, aPoint))
         {
             _dragOffset = _CGSizeMakeZero();
-            
+
             [self setObjectValue:[self _valueAtPoint:aPoint]];
         }
-    
+
         else
             return NO;
     }
-    
+
     [self setHighlighted:YES];
-    
+
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 
-    return YES;   
+    return YES;
 }
 
 - (BOOL)continueTracking:(CGPoint)lastPoint at:(CGPoint)aPoint
@@ -376,7 +376,7 @@ CPCircularSlider    = 1;
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
     [self setHighlighted:NO];
-    
+
     if ([_target respondsToSelector:@selector(sliderDidFinish:)])
         [_target sliderDidFinish:self];
 
@@ -392,7 +392,7 @@ CPCircularSlider    = 1;
 {
     if (flag)
         _sendActionOn |= CPLeftMouseDraggedMask;
-    else 
+    else
         _sendActionOn &= ~CPLeftMouseDraggedMask;
 }
 
@@ -454,14 +454,14 @@ var CPSliderMinValueKey             = "CPSliderMinValueKey",
 - (id)value
 {
     CPLog.warn("[CPSlider value] is deprecated, use doubleValue or objectValue instead.");
-    
-    return [self doubleValue];    
+
+    return [self doubleValue];
 }
 
 - (void)setValue:(id)aValue
 {
     CPLog.warn("[CPSlider setValue:] is deprecated, use setDoubleValue: or setObjectValue: instead.");
-    
+
     [self setObjectValue:aValue];
 }
 
diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j
index 0fc8806e1..1f8e55d1d 100644
--- a/AppKit/CPTableHeaderView.j
+++ b/AppKit/CPTableHeaderView.j
@@ -25,7 +25,7 @@
 @import "CPView.j"
 
 #include "CoreGraphics/CGGeometry.h"
- 
+
 @implementation _CPTableColumnHeaderView : CPView
 {
     _CPImageAndTextView     _textField;
@@ -240,7 +240,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     rect.origin.x = _CGRectGetMaxX(rect) - 5;
     rect.size.width = 20;
 
-    return rect;    
+    return rect;
 }
 
 - (void)_setPressedColumn:(CPInteger)column
@@ -249,7 +249,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     {
         var headerView = [_tableView._tableColumns[_pressedColumn] headerView];
         [headerView unsetThemeState:CPThemeStateHighlighted];
-    }    
+    }
 
     if (column != -1)
     {
@@ -353,7 +353,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         viewLocation.x = ( _CGRectGetMinX(columnRect) + offset.x ) + ( aPoint.x - _mouseDownLocation.x );
         viewLocation.y = _CGRectGetMinY(columnRect) + offset.y;
 
-        [self dragView:view at:viewLocation offset:_CGSizeMakeZero() event:[CPApp currentEvent] 
+        [self dragView:view at:viewLocation offset:_CGSizeMakeZero() event:[CPApp currentEvent]
             pasteboard:[CPPasteboard pasteboardWithName:CPDragPboard] source:self slideBack:YES];
 
         return NO;
@@ -364,7 +364,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
 - (BOOL)_shouldStopTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
 {
-    return _isTrackingColumn && _activeColumn === aColumnIndex && 
+    return _isTrackingColumn && _activeColumn === aColumnIndex &&
         _CGRectContainsPoint([self headerRectOfColumn:aColumnIndex], aPoint);
 }
 
@@ -427,16 +427,16 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     [_tableView moveColumn:aFromIndex toColumn:aToIndex];
     _activeColumn = aToIndex;
     _pressedColumn = _activeColumn;
-
-    [_tableView _setDraggedColumn:_activeColumn];
 }
 
 - (void)draggedView:(CPView)aView beganAt:(CGPoint)aPoint
 {
     _isDragging = YES;
 
-    [[[[_tableView tableColumns] objectAtIndex:_activeColumn] headerView] setHidden:YES];
-    [_tableView _setDraggedColumn:_activeColumn];
+    var column = [[_tableView tableColumns] objectAtIndex:_activeColumn];
+
+    [[column headerView] setHidden:YES];
+    [_tableView _setDraggedColumn:column];
 
     [self setNeedsDisplay:YES];
 }
@@ -480,7 +480,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     _isDragging = NO;
     _isTrackingColumn = NO; // We need to do this explicitly because the mouse up section of trackMouse is never reached
 
-    [_tableView _setDraggedColumn:-1];
+    [_tableView _setDraggedColumn:nil];
     [[[[_tableView tableColumns] objectAtIndex:_activeColumn] headerView] setHidden:NO];
     [self stopTrackingTableColumn:_activeColumn at:aLocation];
 
@@ -547,7 +547,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         return;
     }
 
-    var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil],    
+    var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil],
         mouseOverLocation = CGPointMake(mouseLocation.x - 5, mouseLocation.y),
         overColumn = [self columnAtPoint:mouseOverLocation];
 
@@ -568,7 +568,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 }
 
 - (void)mouseEntered:(CPEvent)theEvent
-{   
+{
     [self _updateResizeCursor:theEvent];
 }
 
@@ -586,16 +586,16 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 - (void)layoutSubviews
 {
     var tableColumns = [_tableView tableColumns],
-        count = [tableColumns count];    
+        count = [tableColumns count];
 
-    for (var i = 0; i < count; i++) 
+    for (var i = 0; i < count; i++)
     {
         var column = [tableColumns objectAtIndex:i],
             headerView = [column headerView];
 
         var frame = [self headerRectOfColumn:i];
         frame.size.height -= 0.5;
-        if (i > 0) 
+        if (i > 0)
         {
             frame.origin.x += 0.5;
             frame.size.width -= 1;
@@ -681,4 +681,4 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey",
     [aCoder encodeBool:_drawsColumnLines forKey:CPTableHeaderViewDrawsColumnLines];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 9ad77f6af..0f898b516 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -214,8 +214,9 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
     BOOL        _disableAutomaticResizing @accessors(property=disableAutomaticResizing);
     BOOL        _lastColumnShouldSnap;
+    BOOL        _implementsCustomDrawRow;
 
-    int         _draggedColumnIndex;
+    CPTableColumn _draggedColumn;
     CPArray     _differedColumnDataToRemove;
 }
 
@@ -330,8 +331,8 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         if (!_cornerView)
             _cornerView = [[_CPCornerView alloc] initWithFrame:CGRectMake(0, 0, [CPScroller scrollerWidth], CGRectGetHeight([_headerView frame]))];
 
-        _draggedColumnIndex = -1;
         _dragCursor = [CPCursor arrowCursor];
+        _draggedColumn = nil;
 
 /*      //gradients for the source list when CPTableView is NOT first responder or the window is NOT key
         // FIX ME: we need to actually implement this.
@@ -339,6 +340,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         _sourceListInactiveTopLineColor = [CPColor colorWithCalibratedRed:(173.0/255.0) green:(187.0/255.0) blue:(209.0/255.0) alpha:1.0];
         _sourceListInactiveBottomLineColor = [CPColor colorWithCalibratedRed:(150.0/255.0) green:(161.0/255.0) blue:(183.0/255.0) alpha:1.0];*/
         _differedColumnDataToRemove = [ ];
+        _implementsCustomDrawRow = [self implementsSelector:@selector(drawRow:clipRect:)];
 }
 
 /*!
@@ -754,14 +756,14 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     [self setNeedsLayout];
 }
 
-- (void)_setDraggedColumn:(int)aColumnIndex
+- (void)_setDraggedColumn:(CPTableColumn)aColumn
 {
-    if (_draggedColumnIndex === aColumnIndex)
+    if (_draggedColumn === aColumn)
         return;
 
-    _draggedColumnIndex = aColumnIndex;
+    _draggedColumn = aColumn;
 
-    [self reloadDataForRowIndexes:_exposedRows columnIndexes:[CPIndexSet indexSetWithIndex:aColumnIndex]];
+    [self reloadDataForRowIndexes:_exposedRows columnIndexes:[CPIndexSet indexSetWithIndex:[_tableColumns indexOfObject:aColumn]]];
 }
 
 /*!
@@ -2021,9 +2023,9 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 */
 - (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CPPointPointer)theDragViewOffset
 {
-    var dragView = [[_CPColumnDragView alloc] initWithFrame:CPRectMakeZero()];
+    var dragView = [[_CPColumnDragView alloc] initWithLineColor:[self gridColor]];
         tableColumn = [[self tableColumns] objectAtIndex:theColumnIndex],
-        bounds = CPRectMake(0.0, 0.0, [tableColumn width], CPRectGetHeight([self _exposedRect]) + 23.0),
+        bounds = CPRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self visibleRect]) + 23.0),
         columnRect = [self rectOfColumn:theColumnIndex],
         headerView = [tableColumn headerView],
         row = [_exposedRows firstIndex];
@@ -2037,7 +2039,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         dataViewFrame.origin.x = 0.0;
 
         // Offset by table header height - scroll position
-        dataViewFrame.origin.y = ( CPRectGetMinY(dataViewFrame) - CPRectGetMinY([self _exposedRect]) ) + 23.0;
+        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self visibleRect]) ) + 23.0;
         [dataView setFrame:dataViewFrame];
 
         [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
@@ -2048,7 +2050,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
     // Add the column header view
     var headerFrame = [headerView frame];
-    headerFrame.origin = CPPointMakeZero();
+    headerFrame.origin = _CGPointMakeZero();
 
     var columnHeaderView = [[_CPTableColumnHeaderView alloc] initWithFrame:headerFrame];
     [columnHeaderView setStringValue:[headerView stringValue]];
@@ -2177,16 +2179,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     return objectValue;
 }
 
-- (CGRect)_exposedRect
-{
-    var superview = [self superview];
-
-    if (![superview isKindOfClass:[CPClipView class]])
-        return [self bounds];
-
-    return [self convertRect:CGRectIntersection([superview bounds], [self frame]) fromView:superview];
-}
-
 - (void)load
 {
     if (_reloadAllRows)
@@ -2199,7 +2191,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         _reloadAllRows = NO;
     }
 
-    var exposedRect = [self _exposedRect],
+    var exposedRect = [self visibleRect],
         exposedRows = [CPIndexSet indexSetWithIndexesInRange:[self rowsInRect:exposedRect]],
         exposedColumns = [self columnIndexesInRect:exposedRect],
         obscuredRows = [_exposedRows copy],
@@ -2223,6 +2215,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     [self _unloadDataViewsInRows:previouslyExposedRows columns:obscuredColumns];
     [self _unloadDataViewsInRows:obscuredRows columns:previouslyExposedColumns];
     [self _unloadDataViewsInRows:obscuredRows columns:obscuredColumns];
+    [self _unloadDataViewsInRows:newlyExposedRows columns:newlyExposedColumns];
 
     [self _loadDataViewsInRows:previouslyExposedRows columns:newlyExposedColumns];
     [self _loadDataViewsInRows:newlyExposedRows columns:previouslyExposedColumns];
@@ -2288,9 +2281,14 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         for (; rowIndex < rowsCount; ++rowIndex)
         {
             var row = rowArray[rowIndex],
-                dataView = _dataViewsForTableColumns[tableColumnUID][row];
+                dataViews = _dataViewsForTableColumns[tableColumnUID];
 
-            _dataViewsForTableColumns[tableColumnUID][row] = nil;
+            if (!dataViews || row >= dataViews.length)
+                continue;
+
+            var dataView = [dataViews objectAtIndex:row];
+
+            [dataViews replaceObjectAtIndex:row withObject:nil];
 
             [self _enqueueReusableDataView:dataView];
         }
@@ -2319,7 +2317,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         var column = columnArray[columnIndex],
             tableColumn = _tableColumns[column];
 
-        if ([tableColumn isHidden] || columnIndex === _draggedColumnIndex)
+        if ([tableColumn isHidden] || tableColumn === _draggedColumn)
             continue;
 
         var tableColumnUID = [tableColumn UID];
@@ -2460,16 +2458,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         [_headerView setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), _CGRectGetHeight([_headerView frame]))];
 }
 
-- (CGRect)exposedClipRect
-{
-    var superview = [self superview];
-
-    if (![superview isKindOfClass:[CPClipView class]])
-        return [self bounds];
-
-    return [self convertRect:CGRectIntersection([superview bounds], [self frame]) fromView:superview];
-}
-
 - (void)setNeedsDisplay:(BOOL)aFlag
 {
     [super setNeedsDisplay:aFlag];
@@ -2481,7 +2469,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     // FIX ME: All three of these methods will likely need to be rewritten for 1.0
     // We've got grid drawing in highlightSelection and crap everywhere.
 
-    var exposedRect = [self _exposedRect];
+    var exposedRect = [self visibleRect];
 
     [self drawBackgroundInClipRect:exposedRect];
     [self drawGridInClipRect:exposedRect];
@@ -2754,6 +2742,22 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     CGContextStrokePath(context);
 }
 
+- (void)_drawRows:(CPIndexSet)rowsIndexes clipRect:(CGRect)clipRect
+{
+    var row = [rowsIndexes firstIndex];
+
+    while (row !== CPNotFound)
+    {
+        [self drawRow:row clipRect:CGRectIntersection(clipRect, [self rectOfRow:row])];
+        row = [rowsIndexes indexGreaterThanIndex:row];
+    }
+}
+
+- (void)drawRow:(CPInteger)row clipRect:(CGRect)rect
+{
+    // This method does currently nothing in cappuccino. Can be overriden by subclasses.
+}
+
 - (void)layoutSubviews
 {
     [self load];
@@ -3153,7 +3157,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
     var row = [self _proposedRowAtPoint:location],
         dragOperation = [self _validateDrop:sender proposedRow:row proposedDropOperation:dropOperation];
-        exposedClipRect = [self exposedClipRect];
+        exposedClipRect = [self visibleRect];
 
     if(_retargetedDropRow !== nil)
         row = _retargetedDropRow;
@@ -3162,7 +3166,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     if (dropOperation === CPTableViewDropOn && row >= [self numberOfRows])
         row = [self numberOfRows] - 1;
 
-    var rect = CPRectMakeZero();
+    var rect = _CGRectMakeZero();
 
     if (row === -1)
         rect = exposedClipRect;
@@ -3568,7 +3572,7 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
 
     [aCoder encodeInt:_selectionHighlightStyle forKey:CPTableViewSelectionHighlightStyleKey];
     [aCoder encodeInt:_columnAutoResizingStyle forKey:CPTableViewColumnAutoresizingStyleKey];
-    
+
     [aCoder encodeBool:_allowsMultipleSelection forKey:CPTableViewMultipleSelectionKey];
     [aCoder encodeBool:_allowsEmptySelection forKey:CPTableViewEmptySelectionKey];
     [aCoder encodeBool:_allowsColumnReordering forKey:CPTableViewColumnReorderingKey];
@@ -3626,16 +3630,16 @@ var CPDropOperationIndicatorHeight = 8;
 {
     CGContextSetStrokeColor(context, aColor);
     CGContextSetLineWidth(context, aWidth);
-    
+
     // draw the circle thing
     var inset = CPDropOperationIndicatorHeight / 2,
-        rect = _CGRectMake(aRect.origin.x + inset, 
-                           aRect.origin.y + inset, 
-                           CPDropOperationIndicatorHeight, 
+        rect = _CGRectMake(aRect.origin.x + inset,
+                           aRect.origin.y + inset,
+                           CPDropOperationIndicatorHeight,
                            CPDropOperationIndicatorHeight);
-                           
+
     CGContextStrokeEllipseInRect(context, rect);
-    
+
     // then draw the line
     CGContextBeginPath(context);
     CGContextMoveToPoint(context, _CGRectGetMaxX(rect), _CGRectGetMidY(rect));
@@ -3657,7 +3661,7 @@ var CPDropOperationIndicatorHeight = 8;
     {
         var borderWidth = 4.0,
             strokeRect = _CGRectInset([self bounds], borderWidth / 2.0, borderWidth / 2.0);
-            
+
         CGContextSetLineWidth(context, borderWidth);
         CGContextSetStrokeColor(context, [highlightColor colorWithAlphaComponent:0.8]);
         CGContextStrokeRect(context, strokeRect);
@@ -3667,7 +3671,7 @@ var CPDropOperationIndicatorHeight = 8;
         // if row is selected don't fill and stroke white
         var selectedRows = [tableView selectedRowIndexes],
             newRect = _CGRectInset(aRect, 2.0, 2.0);
-            
+
         --newRect.size.height;
 
         if ([selectedRows containsIndex:currentRow])
@@ -3681,19 +3685,19 @@ var CPDropOperationIndicatorHeight = 8;
             CGContextSetFillColor(context, [highlightColor colorWithAlphaComponent:0.25]);
             CGContextFillRoundedRectangleInRect(context, newRect, 8, YES, YES, YES, YES);
         }
-        
+
         CGContextStrokeRoundedRectangleInRect(context, newRect, 8, YES, YES, YES, YES);
     }
     else if (dropOperation === CPTableViewDropAbove)
     {
         // reposition the view up a tad so indicator can draw above the row rect
         [self setFrameOrigin:CGPointMake(_frame.origin.x, _frame.origin.y - CPDropOperationIndicatorHeight)];
-        
+
         var selectedRows = [tableView selectedRowIndexes];
 
         if ([selectedRows containsIndex:currentRow - 1] || [selectedRows containsIndex:currentRow])
             [self _drawDropAboveIndicatorWithContext:context rect:aRect color:[CPColor whiteColor] width:4];
-            
+
         [self _drawDropAboveIndicatorWithContext:context rect:aRect color:highlightColor width:3];
     }
 }
@@ -3723,21 +3727,35 @@ var CPDropOperationIndicatorHeight = 8;
 @end
 
 @implementation _CPColumnDragView : CPView
+{
+    CPColor _lineColor;
+}
+
+- (id)initWithLineColor:(CPColor)aColor
+{
+    self = [super initWithFrame:_CGRectMakeZero()];
+
+    if (self)
+        _lineColor = aColor;
+
+    return self;
+}
+
 - (void)drawRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
 
-    CGContextSetStrokeColor(context, [CPColor grayColor]);
+    CGContextSetStrokeColor(context, _lineColor);
 
     var points = [
-                    _CGPointMake(0.5, 0), 
+                    _CGPointMake(0.5, 0),
                     _CGPointMake(0.5, aRect.size.height)
                  ];
 
     CGContextStrokeLineSegments(context, points, 2);
-    
+
     points = [
-                _CGPointMake(aRect.size.width - 0.5, 0), 
+                _CGPointMake(aRect.size.width - 0.5, 0),
                 _CGPointMake(aRect.size.width - 0.5, aRect.size.height)
              ];
 
diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index e3b0e5423..a0eb82303 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -1188,7 +1188,10 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
         [self setDrawsBackground:[aCoder decodeBoolForKey:CPTextFieldDrawsBackgroundKey]];
 
         [self setTextFieldBackgroundColor:[aCoder decodeObjectForKey:CPTextFieldBackgroundColorKey]];
-              
+
+        [self setLineBreakMode:[aCoder decodeIntForKey:CPTextFieldLineBreakModeKey]];
+        [self setAlignment:[aCoder decodeIntForKey:CPTextFieldAlignmentKey]];
+
         [self setLineBreakMode:[aCoder decodeIntForKey:CPTextFieldLineBreakModeKey]];
         [self setAlignment:[aCoder decodeIntForKey:CPTextFieldAlignmentKey]];
 
@@ -1212,10 +1215,10 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
     [aCoder encodeBool:_drawsBackground forKey:CPTextFieldDrawsBackgroundKey];
 
     [aCoder encodeObject:_textFieldBackgroundColor forKey:CPTextFieldBackgroundColorKey];
-    
+
     [aCoder encodeInt:[self lineBreakMode] forKey:CPTextFieldLineBreakModeKey];
     [aCoder encodeInt:[self alignment] forKey:CPTextFieldAlignmentKey];
-    
+
     [aCoder encodeObject:_placeholderString forKey:CPTextFieldPlaceholderStringKey];
 }
 
diff --git a/Foundation/CPArray.j b/Foundation/CPArray.j
index e3f5fd152..c6c1c97e6 100755
--- a/Foundation/CPArray.j
+++ b/Foundation/CPArray.j
@@ -410,7 +410,7 @@ CPEnumerationReverse    = 1 << 1;
     @param predicate The function to apply to elements of the array. The function receives two arguments:
                      object The element in the array.
                      index  The index of the element in the array.
-    The predicate function should either return a Boolean value that indicates whether the object passed the test, 
+    The predicate function should either return a Boolean value that indicates whether the object passed the test,
     or nil to stop the search, which will return CPNotFound to the sender.
     @return The index of the first matching object, or \c CPNotFound if there is no matching object.
 */
@@ -425,7 +425,7 @@ CPEnumerationReverse    = 1 << 1;
                      object  The element in the array.
                      index   The index of the element in the array.
                      context The object passed to the receiver in the aContext parameter.
-    The predicate function should either return a Boolean value that indicates whether the object passed the test, 
+    The predicate function should either return a Boolean value that indicates whether the object passed the test,
     or nil to stop the search, which will return CPNotFound to the sender.
     @param context An object that contains context information you want passed to the predicate function.
     @return The index of the first matching object, or \c CPNotFound if there is no matching object.
@@ -437,29 +437,29 @@ CPEnumerationReverse    = 1 << 1;
 
 /*!
     Returns the index of the first object in the receiver that passes a test in a given Javascript function.
-    @param opts Specifies the direction in which the array is searched. Pass CPEnumerationNormal to search forwards 
+    @param opts Specifies the direction in which the array is searched. Pass CPEnumerationNormal to search forwards
     or CPEnumerationReverse to search in reverse.
     @param predicate The function to apply to elements of the array. The function receives two arguments:
                      object The element in the array.
                      index  The index of the element in the array.
-    The predicate function should either return a Boolean value that indicates whether the object passed the test, 
+    The predicate function should either return a Boolean value that indicates whether the object passed the test,
     or nil to stop the search, which will return CPNotFound to the sender.
     @return The index of the first matching object, or \c CPNotFound if there is no matching object.
 */
 - (unsigned)indexOfObjectWithOptions:(CPEnumerationOptions)opts passingTest:(Function)predicate
 {
     return [self indexOfObjectWithOptions:opts passingTest:predicate context:undefined];
-}    
+}
 
 /*!
     Returns the index of the first object in the receiver that passes a test in a given Javascript function.
-    @param opts Specifies the direction in which the array is searched. Pass CPEnumerationNormal to search forwards 
+    @param opts Specifies the direction in which the array is searched. Pass CPEnumerationNormal to search forwards
     or CPEnumerationReverse to search in reverse.
     @param predicate The function to apply to elements of the array. The function receives two arguments:
                      object  The element in the array.
                      index   The index of the element in the array.
                      context The object passed to the receiver in the aContext parameter.
-    The predicate function should either return a Boolean value that indicates whether the object passed the test, 
+    The predicate function should either return a Boolean value that indicates whether the object passed the test,
     or nil to stop the search, which will return CPNotFound to the sender.
     @param context An object that contains context information you want passed to the predicate function.
     @return The index of the first matching object, or \c CPNotFound if there is no matching object.
@@ -468,9 +468,9 @@ CPEnumerationReverse    = 1 << 1;
 {
     // We don't use an enumerator because they return nil to indicate end of enumeration,
     // but nil may actually be the value we are looking for, so we have to loop over the array.
-    
+
     var start, stop, increment;
-    
+
     if (opts & CPEnumerationReverse)
     {
         start = [self count] - 1;
@@ -483,17 +483,17 @@ CPEnumerationReverse    = 1 << 1;
         stop = [self count];
         increment = 1;
     }
-        
+
     for (var i = start; i != stop; i += increment)
     {
         var result = predicate([self objectAtIndex:i], i, aContext);
-        
+
         if (typeof result === 'boolean' && result)
             return i;
         else if (typeof result === 'object' && result == nil)
             return CPNotFound;
     }
-    
+
     return CPNotFound;
 }
 
@@ -1331,9 +1331,9 @@ CPEnumerationReverse    = 1 << 1;
 */
 - (void)sortUsingFunction:(Function)aFunction context:(id)aContext
 {
-    var h, i, j, k, l, m, n = [self count];
+    var h, i, j, k, l, m, n = [self count], o;
     var A, B = [];
-     
+
     for (h = 1; h < n; h += h)
     {
         for (m = n - 1 - h; m >= 0; m -= h + h)
@@ -1341,14 +1341,15 @@ CPEnumerationReverse    = 1 << 1;
             l = m - h + 1;
             if (l < 0)
                 l = 0;
-            
+
             for (i = 0, j = l; j <= m; i++, j++)
                 B[i] = self[j];
-            
+
             for (i = 0, k = l; k < j && j <= m + h; k++)
             {
                 A = self[j];
-                if (aFunction(A, B[i], aContext) == CPOrderedDescending)
+                o = aFunction(A, B[i], aContext);
+                if (o == CPOrderedDescending || o == CPOrderedSame)
                     self[k] = B[i++];
                 else
                 {
@@ -1356,7 +1357,7 @@ CPEnumerationReverse    = 1 << 1;
                     j++;
                 }
             }
-            
+
             while (k < j)
                 self[k++] = B[i++];
         }
@@ -1381,14 +1382,14 @@ var selectorCompare = function selectorCompare(object1, object2, selector)
 
 // sort using sort descriptors
 var compareObjectsUsingDescriptors= function compareObjectsUsingDescriptors(lhs, rhs, descriptors)
-{ 
+{
     var result,
-        i = 0,  
+        i = 0,
         n = [descriptors count];
-        
+
     while (i < n && result == CPOrderedSame);
        result = [descriptors[i++] compareObject:lhs withObject:rhs];
-    
+
     return result;
 }
 
diff --git a/Tests/Foundation/CPArrayPerformance.j b/Tests/Foundation/CPArrayPerformance.j
deleted file mode 100644
index a41c16dce..000000000
--- a/Tests/Foundation/CPArrayPerformance.j
+++ /dev/null
@@ -1,56 +0,0 @@
-@import <Foundation/CPArray.j>
-@import <Foundation/CPString.j>
-@import <Foundation/CPNumber.j>
-@import <Foundation/CPSortDescriptor.j>
-
-@implementation CPArrayPerformance : OJTestCase
-
-- (void)testSortUsingDescriptorsSpeed
-{
-
-    var ELEMENTS = 1000,
-        REPEATS = 10,
-        array = [];
-    for (var i=0; i<ELEMENTS; i++) {
-        var s = [Sortable new];
-        [s setA:(i % 5)];
-        [s setB:(ELEMENTS-i)];
-        array.push(s);
-    }
-
-    var descriptors = [
-        [CPSortDescriptor sortDescriptorWithKey:"a" ascending:NO],
-        [CPSortDescriptor sortDescriptorWithKey:"b" ascending:YES]
-    ];
-
-    var start = (new Date).getTime();
-
-    for (var i=0; i<REPEATS; i++)
-    {
-        var sorted = [array sortedArrayUsingDescriptors:descriptors];
-
-        // Verify it really got sorted.
-        for (var j=0; j<ELEMENTS; j++) {
-            var expectedA = 4-FLOOR(j * 5 / ELEMENTS);
-            if (sorted[j].a != expectedA)
-                [self fail:"a out of order: "+expectedA+" != "+sorted[j].a];
-            var expectedB = (5-expectedA) + 5 * (j % (ELEMENTS / 5))
-            if (sorted[j].b != expectedB)
-                [self fail:"b out of order: "+expectedB+" != "+sorted[j].b];
-        }
-    }
-
-    var end = (new Date).getTime();
-
-    CPLog.warn("testSortUsingDescriptorsSpeed: "+(end-start)+"ms");
-}
-
-@end
-
-@implementation Sortable : CPObject
-{
-    int a @accessors;
-    int b @accessors;
-}
-
-@end
\ No newline at end of file
diff --git a/Tests/Manual/TableTest/BorderTableTest/AppController.j b/Tests/Manual/TableTest/BorderTableTest/AppController.j
new file mode 100644
index 000000000..9bd9d257b
--- /dev/null
+++ b/Tests/Manual/TableTest/BorderTableTest/AppController.j
@@ -0,0 +1,60 @@
+/*
+ * AppController.j
+ * TableCibTest
+ *
+ * Created by Francisco Tolmasky on July 5, 2009.
+ * Copyright 2009, 280 North, Inc. All rights reserved.
+ */
+
+@import <Foundation/CPObject.j>
+
+CPLogRegister(CPLogConsole);
+
+@implementation AppController : CPObject
+{
+    CPWindow        theWindow; //this "outlet" is connected automatically by the Cib
+    CPScrollView    theScrollView;
+    CPTableView     theTableView;
+    CPPopupButton   theBorderTypePopup;
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    // This is called when the application is done loading.
+}
+
+- (void)awakeFromCib
+{
+    // This is called when the cib is done loading.
+    // You can implement this method on any object instantiated from a Cib.
+    // It's a useful hook for setting up current UI values, and other things.
+
+    // In this case, we want the window from Cib to become our full browser window
+    [theWindow setFullPlatformWindow:YES];
+
+    [theWindow setBackgroundColor:[CPColor colorWithHexString:@"f3f4f5"]];
+
+    [theBorderTypePopup selectItemWithTag:[theScrollView borderType]];
+}
+
+- (int)numberOfRowsInTableView:(CPTableView)tableView
+{
+    return 10;
+}
+
+- (id)tableView:(CPTableView)tableView objectValueForTableColumn:(CPTableColumn)tableColumn row:(int)row
+{
+    return String((row + 1) * [[tableColumn identifier] intValue]);
+}
+
+// Actions
+
+- (void)setBorder:(id)sender
+{
+    var type = [[sender selectedItem] tag];
+    console.log('type=%d', type);
+
+    [theScrollView setBorderType:type];
+}
+
+@end
diff --git a/Tests/Manual/TableTest/BorderTableTest/Info.plist b/Tests/Manual/TableTest/BorderTableTest/Info.plist
new file mode 100644
index 000000000..f2ebe529d
--- /dev/null
+++ b/Tests/Manual/TableTest/BorderTableTest/Info.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Main cib file base name</key>
+	<string>MainMenu.cib</string>
+	<key>CPBundleName</key>
+	<string>TableCibTest</string>
+	<key>CPPrincipalClass</key>
+	<string>CPApplication</string>
+</dict>
+</plist>
diff --git a/Tests/Manual/TableTest/BorderTableTest/Resources/MainMenu.cib b/Tests/Manual/TableTest/BorderTableTest/Resources/MainMenu.cib
new file mode 100644
index 000000000..5cf64541f
--- /dev/null
+++ b/Tests/Manual/TableTest/BorderTableTest/Resources/MainMenu.cib
@@ -0,0 +1 @@
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;4E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;7E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;9E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;2;10E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;2;11E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;2;12E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;2;13E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;2;14E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;16E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;18E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;1;0E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;2;65E;D;K;6;CP$UIDd;2;66E;D;K;6;CP$UIDd;2;67E;D;K;6;CP$UIDd;2;68E;D;K;6;CP$UIDd;2;69E;D;K;6;CP$UIDd;2;70E;D;K;6;CP$UIDd;2;71E;D;K;6;CP$UIDd;2;72E;D;K;6;CP$UIDd;2;73E;D;K;6;CP$UIDd;2;74E;D;K;6;CP$UIDd;2;75E;D;K;6;CP$UIDd;2;76E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;78E;D;K;6;CP$UIDd;2;79E;D;K;6;CP$UIDd;2;80E;D;K;6;CP$UIDd;2;81E;D;K;6;CP$UIDd;2;82E;D;K;6;CP$UIDd;2;83E;D;K;6;CP$UIDd;2;85E;E;E;S;16;IBCocoaFrameworkD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;22E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;29E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;15E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;86E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;17E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;87E;E;D;K;10;$classnameS;10;CPScrollerK;8;$classesA;S;10;CPScrollerS;9;CPControlS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;19E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;47E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;88E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;89E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;47E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;90E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;91E;K;17;CPControlValueKeyD;K;6;CP$UIDd;2;92E;K;18;CPControlTargetKeyD;K;6;CP$UIDd;2;47E;K;18;CPControlActionKeyD;K;6;CP$UIDd;2;93E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;2;94E;K;21;CPScrollerControlSizeD;K;6;CP$UIDd;2;92E;K;24;CPScrollerKnobProportionD;K;6;CP$UIDd;2;95E;E;D;K;10;$classnameS;6;CPMenuK;8;$classesA;S;6;CPMenuS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;21E;K;14;CPMenuTitleKeyD;K;6;CP$UIDd;2;96E;K;14;CPMenuItemsKeyD;K;6;CP$UIDd;2;97E;E;D;K;10;$classnameS;13;CPTableColumnK;8;$classesA;S;13;CPTableColumnS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;23E;K;26;CPTableColumnIdentifierKeyD;K;6;CP$UIDd;2;98E;K;21;CPTableColumnWidthKeyD;K;6;CP$UIDd;2;99E;K;24;CPTableColumnMinWidthKeyD;K;6;CP$UIDd;3;100E;K;24;CPTableColumnMaxWidthKeyD;K;6;CP$UIDd;3;101E;K;26;CPTableColumnHeaderViewKeyD;K;6;CP$UIDd;3;103E;K;24;CPTableColumnDataViewKeyD;K;6;CP$UIDd;3;104E;K;28;CPTableColumnResizingMaskKeyD;K;6;CP$UIDd;3;105E;K;24;CPTableColumnIsHiddenKeyD;K;6;CP$UIDd;1;0E;K;28;CPSortDescriptorPrototypeKeyD;K;6;CP$UIDd;1;0E;E;D;K;10;$classnameS;10;CPMenuItemK;8;$classesA;S;10;CPMenuItemS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;25E;K;18;CPMenuItemTitleKeyD;K;6;CP$UIDd;3;106E;K;19;CPMenuItemTargetKeyD;K;6;CP$UIDd;2;29E;K;19;CPMenuItemActionKeyD;K;6;CP$UIDd;3;107E;K;21;CPMenuItemIsHiddenKeyD;K;6;CP$UIDd;1;0E;K;16;CPMenuItemTagKeyD;K;6;CP$UIDd;3;108E;K;18;CPMenuItemStateKeyD;K;6;CP$UIDd;1;0E;K;17;CPMenuItemMenuKeyD;K;6;CP$UIDd;2;22E;K;38;CPMenuItemKeyEquivalentModifierMaskKeyD;K;6;CP$UIDd;3;109E;E;D;K;6;$classD;K;6;CP$UIDd;2;25E;K;18;CPMenuItemTitleKeyD;K;6;CP$UIDd;3;110E;K;19;CPMenuItemTargetKeyD;K;6;CP$UIDd;2;29E;K;19;CPMenuItemActionKeyD;K;6;CP$UIDd;3;107E;K;21;CPMenuItemIsHiddenKeyD;K;6;CP$UIDd;1;0E;K;16;CPMenuItemTagKeyD;K;6;CP$UIDd;1;0E;K;18;CPMenuItemStateKeyD;K;6;CP$UIDd;3;108E;K;17;CPMenuItemMenuKeyD;K;6;CP$UIDd;2;22E;K;38;CPMenuItemKeyEquivalentModifierMaskKeyD;K;6;CP$UIDd;3;109E;E;D;K;10;$classnameS;13;CPPopUpButtonK;8;$classesA;S;13;CPPopUpButtonS;8;CPButtonS;9;CPControlS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;28E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;33E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;111E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;112E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;33E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;113E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;114E;K;17;$aline-break-modeD;K;6;CP$UIDd;2;94E;K;11;$aalignmentD;K;6;CP$UIDd;2;92E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;2;94E;K;16;CPButtonImageKeyD;K;6;CP$UIDd;1;0E;K;25;CPButtonAlternateImageKeyD;K;6;CP$UIDd;1;0E;K;16;CPButtonTitleKeyD;K;6;CP$UIDd;1;0E;K;25;CPButtonAlternateTitleKeyD;K;6;CP$UIDd;1;0E;K;32;CPButtonImageDimsWhenDisabledKeyD;K;6;CP$UIDd;1;0E;K;28;CPButtonKeyEquivalentMaskKeyD;K;6;CP$UIDd;1;0E;K;20;CPPopUpButtonMenuKeyD;K;6;CP$UIDd;2;22E;K;29;CPPopUpButtonSelectedIndexKeyD;K;6;CP$UIDd;2;92E;E;D;K;6;$classD;K;6;CP$UIDd;2;23E;K;26;CPTableColumnIdentifierKeyD;K;6;CP$UIDd;3;115E;K;21;CPTableColumnWidthKeyD;K;6;CP$UIDd;3;116E;K;24;CPTableColumnMinWidthKeyD;K;6;CP$UIDd;3;117E;K;24;CPTableColumnMaxWidthKeyD;K;6;CP$UIDd;3;118E;K;26;CPTableColumnHeaderViewKeyD;K;6;CP$UIDd;3;119E;K;24;CPTableColumnDataViewKeyD;K;6;CP$UIDd;3;120E;K;28;CPTableColumnResizingMaskKeyD;K;6;CP$UIDd;3;105E;K;24;CPTableColumnIsHiddenKeyD;K;6;CP$UIDd;1;0E;K;28;CPSortDescriptorPrototypeKeyD;K;6;CP$UIDd;1;0E;E;D;K;6;$classD;K;6;CP$UIDd;2;25E;K;18;CPMenuItemTitleKeyD;K;6;CP$UIDd;3;121E;K;19;CPMenuItemTargetKeyD;K;6;CP$UIDd;2;29E;K;19;CPMenuItemActionKeyD;K;6;CP$UIDd;3;107E;K;21;CPMenuItemIsHiddenKeyD;K;6;CP$UIDd;1;0E;K;16;CPMenuItemTagKeyD;K;6;CP$UIDd;3;105E;K;18;CPMenuItemStateKeyD;K;6;CP$UIDd;1;0E;K;17;CPMenuItemMenuKeyD;K;6;CP$UIDd;2;22E;K;38;CPMenuItemKeyEquivalentModifierMaskKeyD;K;6;CP$UIDd;3;109E;E;D;K;10;$classnameS;6;CPViewK;8;$classesA;S;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;32E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;122E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;122E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;3;123E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;E;D;K;6;$classD;K;6;CP$UIDd;2;15E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;3;125E;E;D;K;10;$classnameS;17;CPTableHeaderViewK;8;$classesA;S;17;CPTableHeaderViewS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;35E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;3;126E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;127E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;127E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;3;126E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;29;CPTableHeaderViewTableViewKeyD;K;6;CP$UIDd;2;41E;E;D;K;6;$classD;K;6;CP$UIDd;2;25E;K;18;CPMenuItemTitleKeyD;K;6;CP$UIDd;3;128E;K;19;CPMenuItemTargetKeyD;K;6;CP$UIDd;2;29E;K;19;CPMenuItemActionKeyD;K;6;CP$UIDd;3;107E;K;21;CPMenuItemIsHiddenKeyD;K;6;CP$UIDd;1;0E;K;16;CPMenuItemTagKeyD;K;6;CP$UIDd;3;129E;K;18;CPMenuItemStateKeyD;K;6;CP$UIDd;1;0E;K;17;CPMenuItemMenuKeyD;K;6;CP$UIDd;2;22E;E;D;K;10;$classnameS;20;_CPCibWindowTemplateK;8;$classesA;S;20;_CPCibWindowTemplateS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;38E;K;30;_CPCibWindowTemplateMaxSizeKeyD;K;6;CP$UIDd;3;130E;K;32;_CPCibWindowTemplateViewClassKeyD;K;6;CP$UIDd;1;0E;K;34;_CPCibWindowTemplateWindowClassKeyD;K;6;CP$UIDd;3;131E;K;33;_CPCibWindowTemplateWindowRectKeyD;K;6;CP$UIDd;3;132E;K;30;_CPCibWindowTempatStyleMaskKeyD;K;6;CP$UIDd;3;133E;K;34;_CPCibWindowTemplateWindowTitleKeyD;K;6;CP$UIDd;3;134E;K;33;_CPCibWindowTemplateWindowViewKeyD;K;6;CP$UIDd;2;33E;E;D;K;10;$classnameS;11;CPTableViewK;8;$classesA;S;11;CPTableViewS;9;CPControlS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;40E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;3;135E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;136E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;136E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;3;135E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;12;$agrid-colorD;K;6;CP$UIDd;3;138E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;2;94E;K;24;CPTableViewDataSourceKeyD;K;6;CP$UIDd;1;0E;K;22;CPTableViewDelegateKeyD;K;6;CP$UIDd;1;0E;K;23;CPTableViewRowHeightKeyD;K;6;CP$UIDd;3;139E;K;30;CPTableViewIntercellSpacingKeyD;K;6;CP$UIDd;3;140E;K;31;CPTableViewMultipleSelectionKeyD;K;6;CP$UIDd;3;141E;K;28;CPTableViewEmptySelectionKeyD;K;6;CP$UIDd;3;141E;K;30;CPTableViewColumnReorderingKeyD;K;6;CP$UIDd;3;141E;K;28;CPTableViewColumnResizingKeyD;K;6;CP$UIDd;3;141E;K;29;CPTableViewColumnSelectionKeyD;K;6;CP$UIDd;3;141E;K;26;CPTableViewTableColumnsKeyD;K;6;CP$UIDd;3;142E;K;23;CPTableViewGridColorKeyD;K;6;CP$UIDd;3;138E;K;27;CPTableViewGridStyleMaskKeyD;K;6;CP$UIDd;1;0E;K;39;CPTableViewUsesAlternatingBackgroundKeyD;K;6;CP$UIDd;3;141E;K;34;CPTableViewAlternatingRowColorsKeyD;K;6;CP$UIDd;1;0E;K;24;CPTableViewCornerViewKeyD;K;6;CP$UIDd;3;144E;K;24;CPTableViewHeaderViewKeyD;K;6;CP$UIDd;2;36E;E;D;K;6;$classD;K;6;CP$UIDd;2;19E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;47E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;145E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;146E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;47E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;90E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;147E;K;17;CPControlValueKeyD;K;6;CP$UIDd;2;92E;K;18;CPControlTargetKeyD;K;6;CP$UIDd;2;47E;K;18;CPControlActionKeyD;K;6;CP$UIDd;3;148E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;2;94E;K;21;CPScrollerControlSizeD;K;6;CP$UIDd;2;92E;K;24;CPScrollerKnobProportionD;K;6;CP$UIDd;3;149E;E;D;K;6;$classD;K;6;CP$UIDd;2;15E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;86E;E;D;K;10;$classnameS;11;CPTextFieldK;8;$classesA;S;11;CPTextFieldS;9;CPControlS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;44E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;33E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;150E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;151E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;33E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;113E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;12;$atext-colorD;K;6;CP$UIDd;3;152E;K;17;$aline-break-modeD;K;6;CP$UIDd;3;105E;K;11;$aalignmentD;K;6;CP$UIDd;2;94E;K;17;CPControlValueKeyD;K;6;CP$UIDd;3;153E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;3;154E;K;24;CPTextFieldIsEditableKeyD;K;6;CP$UIDd;3;141E;K;26;CPTextFieldIsSelectableKeyD;K;6;CP$UIDd;3;141E;K;29;CPTextFieldDrawsBackgroundKeyD;K;6;CP$UIDd;1;0E;K;29;CPTextFieldBackgroundColorKeyD;K;6;CP$UIDd;1;0E;K;31;CPTextFieldPlaceholderStringKeyD;K;6;CP$UIDd;1;0E;E;D;K;10;$classnameS;12;CPScrollViewK;8;$classesA;S;12;CPScrollViewS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;46E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;33E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;155E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;156E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;3;157E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;33E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;158E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;23;CPScrollViewContentViewD;K;6;CP$UIDd;3;135E;K;29;CPScrollViewHeaderClipViewKeyD;K;6;CP$UIDd;3;126E;K;21;CPScrollViewVScrollerD;K;6;CP$UIDd;2;20E;K;21;CPScrollViewHScrollerD;K;6;CP$UIDd;2;42E;K;23;CPScrollViewVLineScrollD;K;6;CP$UIDd;3;117E;K;23;CPScrollViewVPageScrollD;K;6;CP$UIDd;3;117E;K;23;CPScrollViewHLineScrollD;K;6;CP$UIDd;3;117E;K;23;CPScrollViewHPageScrollD;K;6;CP$UIDd;3;117E;K;24;CPScrollViewHasVScrollerD;K;6;CP$UIDd;3;160E;K;24;CPScrollViewHasHScrollerD;K;6;CP$UIDd;3;160E;K;29;CPScrollViewAutohidesScrollerD;K;6;CP$UIDd;3;160E;K;25;CPScrollViewCornerViewKeyD;K;6;CP$UIDd;3;144E;K;25;CPScrollViewBorderTypeKeyD;K;6;CP$UIDd;3;105E;E;D;K;6;$classD;K;6;CP$UIDd;2;23E;K;26;CPTableColumnIdentifierKeyD;K;6;CP$UIDd;3;161E;K;21;CPTableColumnWidthKeyD;K;6;CP$UIDd;3;162E;K;24;CPTableColumnMinWidthKeyD;K;6;CP$UIDd;3;100E;K;24;CPTableColumnMaxWidthKeyD;K;6;CP$UIDd;3;101E;K;26;CPTableColumnHeaderViewKeyD;K;6;CP$UIDd;3;163E;K;24;CPTableColumnDataViewKeyD;K;6;CP$UIDd;3;164E;K;28;CPTableColumnResizingMaskKeyD;K;6;CP$UIDd;3;105E;K;24;CPTableColumnIsHiddenKeyD;K;6;CP$UIDd;1;0E;K;28;CPSortDescriptorPrototypeKeyD;K;6;CP$UIDd;1;0E;E;D;K;6;$classD;K;6;CP$UIDd;2;44E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;33E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;165E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;166E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;33E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;113E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;12;$atext-colorD;K;6;CP$UIDd;3;152E;K;17;$aline-break-modeD;K;6;CP$UIDd;3;105E;K;11;$aalignmentD;K;6;CP$UIDd;2;92E;K;17;CPControlValueKeyD;K;6;CP$UIDd;3;167E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;3;154E;K;24;CPTextFieldIsEditableKeyD;K;6;CP$UIDd;3;141E;K;26;CPTextFieldIsSelectableKeyD;K;6;CP$UIDd;3;141E;K;29;CPTextFieldDrawsBackgroundKeyD;K;6;CP$UIDd;1;0E;K;29;CPTextFieldBackgroundColorKeyD;K;6;CP$UIDd;1;0E;K;31;CPTextFieldPlaceholderStringKeyD;K;6;CP$UIDd;1;0E;E;S;17;Vertical ScrollerS;13;Menu (Border)S;16;Table Column (2)S;16;Menu Item (Line)S;12;File's OwnerS;25;Text Field Cell (Border:)S;16;Menu Item (None)S;13;Pop Up ButtonS;16;Table Column (3)S;17;Menu Item (Bezel)S;12;Content ViewS;14;App ControllerS;17;Table Header ViewS;18;Menu Item (Groove)S;25;Pop Up Button Cell (None)S;15;Window (Window)S;29;Table View (Column 1, Two, 3)S;19;Horizontal ScrollerS;35;Text Field Cell (Visual Attributes)S;11;ApplicationS;31;Static Text (Visual Attributes)S;33;Bordered Scroll View (Table View)S;16;Table Column (1)S;21;Static Text (Border:)S;27;Text Field Cell (Text Cell)S;29;Text Field Cell (Text Cell)-1S;29;Text Field Cell (Text Cell)-2D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;77E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;16E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;34E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;3;168E;E;D;K;6;$classD;K;6;CP$UIDd;2;77E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;34E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;29E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;3;169E;E;D;K;6;$classD;K;6;CP$UIDd;2;77E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;34E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;47E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;3;170E;E;D;K;6;$classD;K;6;CP$UIDd;2;77E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;34E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;41E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;3;171E;E;D;K;6;$classD;K;6;CP$UIDd;2;77E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;34E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;39E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;3;172E;E;D;K;6;$classD;K;6;CP$UIDd;2;77E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;41E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;34E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;3;173E;E;D;K;10;$classnameS;21;CPCibControlConnectorK;8;$classesA;S;21;CPCibControlConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;84E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;29E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;34E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;3;174E;E;S;13;CPApplicationD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;39E;E;E;S;22;{{885, 16}, {15, 215}}S;19;{{0, 0}, {15, 215}}d;1;8S;17;disabled+verticald;1;0S;27;_verticalScrollerDidScroll:d;1;4f;18;0.9956896551724138S;6;BorderD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;37E;E;E;S;1;2d;3;154d;2;40d;4;1000D;K;10;$classnameS;24;_CPTableColumnHeaderViewK;8;$classesA;S;24;_CPTableColumnHeaderViewS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;102E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;175E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;175E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;3;176E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;38;_CPTableColumnHeaderViewStringValueKeyD;K;6;CP$UIDd;3;177E;K;32;_CPTableColumnHeaderViewImageKeyD;K;6;CP$UIDd;1;0E;K;31;_CPTableColumnHeaderViewFontKeyD;K;6;CP$UIDd;3;179E;E;D;K;6;$classD;K;6;CP$UIDd;2;44E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;175E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;175E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;180E;K;6;$afontD;K;6;CP$UIDd;3;182E;K;12;$atext-colorD;K;6;CP$UIDd;3;183E;K;17;$aline-break-modeD;K;6;CP$UIDd;2;94E;K;20;$avertical-alignmentD;K;6;CP$UIDd;3;105E;K;11;$aalignmentD;K;6;CP$UIDd;2;92E;K;15;$acontent-insetD;K;6;CP$UIDd;3;185E;K;17;CPControlValueKeyD;K;6;CP$UIDd;3;186E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;3;154E;K;24;CPTextFieldIsEditableKeyD;K;6;CP$UIDd;1;0E;K;26;CPTextFieldIsSelectableKeyD;K;6;CP$UIDd;1;0E;K;29;CPTextFieldDrawsBackgroundKeyD;K;6;CP$UIDd;1;0E;K;29;CPTextFieldBackgroundColorKeyD;K;6;CP$UIDd;1;0E;K;31;CPTextFieldPlaceholderStringKeyD;K;6;CP$UIDd;3;186E;E;d;1;2S;4;LineS;17;_popUpItemAction:d;1;1d;7;1048576S;4;NoneS;23;{{104, 309}, {147, 24}}S;19;{{0, 0}, {147, 24}}d;2;12S;8;borderedS;1;3d;3;188d;2;10d;22;3.4028234663852886e+38D;K;6;$classD;K;6;CP$UIDd;3;102E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;175E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;175E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;3;187E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;38;_CPTableColumnHeaderViewStringValueKeyD;K;6;CP$UIDd;3;115E;K;32;_CPTableColumnHeaderViewImageKeyD;K;6;CP$UIDd;1;0E;K;31;_CPTableColumnHeaderViewFontKeyD;K;6;CP$UIDd;3;179E;E;D;K;6;$classD;K;6;CP$UIDd;2;44E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;175E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;175E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;180E;K;6;$afontD;K;6;CP$UIDd;3;188E;K;12;$atext-colorD;K;6;CP$UIDd;3;189E;K;17;$aline-break-modeD;K;6;CP$UIDd;2;94E;K;20;$avertical-alignmentD;K;6;CP$UIDd;3;105E;K;11;$aalignmentD;K;6;CP$UIDd;2;92E;K;15;$acontent-insetD;K;6;CP$UIDd;3;190E;K;17;CPControlValueKeyD;K;6;CP$UIDd;3;186E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;3;154E;K;24;CPTextFieldIsEditableKeyD;K;6;CP$UIDd;1;0E;K;26;CPTextFieldIsSelectableKeyD;K;6;CP$UIDd;1;0E;K;29;CPTextFieldDrawsBackgroundKeyD;K;6;CP$UIDd;1;0E;K;29;CPTextFieldBackgroundColorKeyD;K;6;CP$UIDd;1;0E;K;31;CPTextFieldPlaceholderStringKeyD;K;6;CP$UIDd;3;186E;E;S;5;BezelS;20;{{0, 0}, {941, 593}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;49E;E;E;S;6;normalS;13;AppControllerD;K;6;$classD;K;6;CP$UIDd;3;159E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;47E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;198E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;199E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;3;200E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;47E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;90E;K;21;CPViewBackgroundColorD;K;6;CP$UIDd;3;197E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;24;CPScrollViewDocumentViewD;K;6;CP$UIDd;2;36E;E;S;19;{{0, 0}, {899, 23}}S;6;Grooved;1;3S;28;{1.79769e+308, 1.79769e+308}S;8;CPWindowS;24;{{335, 128}, {941, 593}}d;1;7S;6;WindowD;K;6;$classD;K;6;CP$UIDd;3;159E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;47E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;195E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;136E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;3;196E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;47E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;90E;K;21;CPViewBackgroundColorD;K;6;CP$UIDd;3;197E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;24;CPScrollViewDocumentViewD;K;6;CP$UIDd;2;41E;E;S;20;{{0, 0}, {899, 231}}D;K;10;$classnameS;7;CPColorK;8;$classesA;S;7;CPColorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;137E;K;20;CPColorComponentsKeyD;K;6;CP$UIDd;3;191E;E;d;2;23S;6;{3, 2}F;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;30E;E;E;D;K;10;$classnameS;13;_CPCornerViewK;8;$classesA;S;13;_CPCornerViewS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;143E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;47E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;192E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;193E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;47E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;90E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;E;S;19;{{1, 1}, {884, 15}}S;19;{{0, 0}, {884, 15}}S;8;disabledS;29;_horizontalScrollerDidScroll:f;18;0.9988888888888889S;22;{{21, 284}, {117, 25}}S;19;{{0, 0}, {117, 25}}D;K;6;$classD;K;6;CP$UIDd;3;137E;K;20;CPColorComponentsKeyD;K;6;CP$UIDd;3;194E;E;S;17;Visual Attributesd;4;3072S;22;{{20, 20}, {901, 249}}S;20;{{0, 0}, {901, 249}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;135E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;3;126E;D;K;6;CP$UIDd;3;144E;E;E;d;2;18D;K;10;$classnameS;10;CPClipViewK;8;$classesA;S;10;CPClipViewS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;T;S;1;1d;3;101D;K;6;$classD;K;6;CP$UIDd;3;102E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;175E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;175E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;3;201E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;K;38;_CPTableColumnHeaderViewStringValueKeyD;K;6;CP$UIDd;3;202E;K;32;_CPTableColumnHeaderViewImageKeyD;K;6;CP$UIDd;1;0E;K;31;_CPTableColumnHeaderViewFontKeyD;K;6;CP$UIDd;3;179E;E;D;K;6;$classD;K;6;CP$UIDd;2;44E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;175E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;175E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;180E;K;6;$afontD;K;6;CP$UIDd;3;203E;K;12;$atext-colorD;K;6;CP$UIDd;3;204E;K;17;$aline-break-modeD;K;6;CP$UIDd;2;94E;K;20;$avertical-alignmentD;K;6;CP$UIDd;3;105E;K;11;$aalignmentD;K;6;CP$UIDd;2;92E;K;15;$acontent-insetD;K;6;CP$UIDd;3;205E;K;17;CPControlValueKeyD;K;6;CP$UIDd;3;186E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;3;154E;K;24;CPTextFieldIsEditableKeyD;K;6;CP$UIDd;1;0E;K;26;CPTextFieldIsSelectableKeyD;K;6;CP$UIDd;1;0E;K;29;CPTextFieldDrawsBackgroundKeyD;K;6;CP$UIDd;1;0E;K;29;CPTextFieldBackgroundColorKeyD;K;6;CP$UIDd;1;0E;K;31;CPTextFieldPlaceholderStringKeyD;K;6;CP$UIDd;3;186E;E;S;21;{{41, 312}, {65, 25}}S;18;{{0, 0}, {65, 25}}S;7;Border:S;8;delegateS;18;theBorderTypePopupS;13;theScrollViewS;12;theTableViewS;9;theWindowS;10;dataSourceS;10;setBorder:S;16;{{0, 0}, {0, 0}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;207E;E;E;S;3;TwoD;K;10;$classnameS;6;CPFontK;8;$classesA;S;6;CPFontS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;178E;K;13;CPFontNameKeyD;K;6;CP$UIDd;3;208E;K;13;CPFontSizeKeyD;K;6;CP$UIDd;3;113E;K;15;CPFontIsBoldKeyD;K;6;CP$UIDd;3;141E;E;S;11;placeholderD;K;10;$classnameS;17;_CPThemeAttributeK;8;$classesA;S;17;_CPThemeAttributeS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;181E;K;4;nameD;K;6;CP$UIDd;3;209E;K;5;stateD;K;6;CP$UIDd;3;210E;K;5;valueD;K;6;CP$UIDd;3;211E;E;D;K;6;$classD;K;6;CP$UIDd;3;181E;K;4;nameD;K;6;CP$UIDd;3;212E;K;6;valuesD;K;6;CP$UIDd;3;214E;E;D;K;10;$classnameS;21;_CPKeyedArchiverValueK;8;$classesA;S;21;_CPKeyedArchiverValueS;7;CPValueS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;184E;K;15;CPValueValueKeyD;K;6;CP$UIDd;3;215E;E;S;0;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;216E;E;E;D;K;6;$classD;K;6;CP$UIDd;3;181E;K;4;nameD;K;6;CP$UIDd;3;209E;K;5;stateD;K;6;CP$UIDd;3;210E;K;5;valueD;K;6;CP$UIDd;3;211E;E;D;K;6;$classD;K;6;CP$UIDd;3;181E;K;4;nameD;K;6;CP$UIDd;3;212E;K;6;valuesD;K;6;CP$UIDd;3;217E;E;D;K;6;$classD;K;6;CP$UIDd;3;184E;K;15;CPValueValueKeyD;K;6;CP$UIDd;3;215E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;218E;D;K;6;CP$UIDd;3;218E;D;K;6;CP$UIDd;3;218E;D;K;6;CP$UIDd;3;108E;E;E;S;22;{{885, 225}, {16, 23}}S;18;{{0, 0}, {16, 23}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;3;108E;E;E;S;20;{{1, 1}, {899, 231}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;41E;E;E;D;K;6;$classD;K;6;CP$UIDd;3;137E;K;20;CPColorComponentsKeyD;K;6;CP$UIDd;3;219E;E;S;21;{{1, 232}, {899, 17}}S;19;{{0, 0}, {899, 17}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;36E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;220E;E;E;S;8;Column 1D;K;6;$classD;K;6;CP$UIDd;3;181E;K;4;nameD;K;6;CP$UIDd;3;209E;K;5;stateD;K;6;CP$UIDd;3;210E;K;5;valueD;K;6;CP$UIDd;3;211E;E;D;K;6;$classD;K;6;CP$UIDd;3;181E;K;4;nameD;K;6;CP$UIDd;3;212E;K;6;valuesD;K;6;CP$UIDd;3;221E;E;D;K;6;$classD;K;6;CP$UIDd;3;184E;K;15;CPValueValueKeyD;K;6;CP$UIDd;3;215E;E;D;K;10;$classnameS;19;_CPImageAndTextViewK;8;$classesA;S;19;_CPImageAndTextViewS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;206E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;3;103E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;175E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;175E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;3;103E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;158E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;E;S;32;Lucida Grande, Arial, sans-serifS;4;fontS;21;selectedTableDataViewD;K;6;$classD;K;6;CP$UIDd;3;178E;K;13;CPFontNameKeyD;K;6;CP$UIDd;3;208E;K;13;CPFontSizeKeyD;K;6;CP$UIDd;3;113E;K;15;CPFontIsBoldKeyD;K;6;CP$UIDd;3;160E;E;S;10;text-colorD;K;10;$classnameS;19;CPMutableDictionaryK;8;$classesA;S;19;CPMutableDictionaryS;12;CPDictionaryS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;213E;K;10;CP.objectsD;K;21;selectedTableDataViewD;K;6;CP$UIDd;3;197E;K;6;normalD;K;6;CP$UIDd;3;222E;E;E;S;39;{"top":0,"right":0,"bottom":0,"left":5}D;K;6;$classD;K;6;CP$UIDd;3;206E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;3;119E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;175E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;175E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;3;119E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;158E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;E;D;K;6;$classD;K;6;CP$UIDd;3;213E;K;10;CP.objectsD;K;21;selectedTableDataViewD;K;6;CP$UIDd;3;197E;K;6;normalD;K;6;CP$UIDd;3;223E;E;E;f;18;0.8980392156862745D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;108E;E;E;D;K;6;$classD;K;6;CP$UIDd;3;206E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;3;163E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;175E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;175E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;3;163E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;158E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;3;124E;E;D;K;6;$classD;K;6;CP$UIDd;3;213E;K;10;CP.objectsD;K;21;selectedTableDataViewD;K;6;CP$UIDd;3;197E;K;6;normalD;K;6;CP$UIDd;3;224E;E;E;D;K;6;$classD;K;6;CP$UIDd;3;137E;K;20;CPColorComponentsKeyD;K;6;CP$UIDd;3;225E;E;D;K;6;$classD;K;6;CP$UIDd;3;137E;K;20;CPColorComponentsKeyD;K;6;CP$UIDd;3;226E;E;D;K;6;$classD;K;6;CP$UIDd;3;137E;K;20;CPColorComponentsKeyD;K;6;CP$UIDd;3;227E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;228E;D;K;6;CP$UIDd;3;228E;D;K;6;CP$UIDd;3;228E;D;K;6;CP$UIDd;3;108E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;228E;D;K;6;CP$UIDd;3;228E;D;K;6;CP$UIDd;3;228E;D;K;6;CP$UIDd;3;108E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;228E;D;K;6;CP$UIDd;3;228E;D;K;6;CP$UIDd;3;228E;D;K;6;CP$UIDd;3;108E;E;E;f;3;0.2E;K;9;$archiverS;15;CPKeyedArchiverK;8;$versionS;6;100000E;
\ No newline at end of file
diff --git a/Tests/Manual/TableTest/BorderTableTest/Resources/MainMenu.xib b/Tests/Manual/TableTest/BorderTableTest/Resources/MainMenu.xib
new file mode 100644
index 000000000..a6706fa49
--- /dev/null
+++ b/Tests/Manual/TableTest/BorderTableTest/Resources/MainMenu.xib
@@ -0,0 +1,845 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+	<data>
+		<int key="IBDocument.SystemTarget">1050</int>
+		<string key="IBDocument.SystemVersion">10F569</string>
+		<string key="IBDocument.InterfaceBuilderVersion">762</string>
+		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">762</string>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys" id="0">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSCustomObject" id="1021">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="1014">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1050">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="972006081">
+				<int key="NSWindowStyleMask">7</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{335, 157}, {941, 593}}</string>
+				<int key="NSWTFlags">1946157056</int>
+				<string key="NSWindowTitle">Window</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<object class="NSView" key="NSWindowView" id="439893737">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSScrollView" id="1048514227">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">274</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSClipView" id="331394667">
+									<reference key="NSNextResponder" ref="1048514227"/>
+									<int key="NSvFlags">2304</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSTableView" id="86489736">
+											<reference key="NSNextResponder" ref="331394667"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{899, 231}</string>
+											<reference key="NSSuperview" ref="331394667"/>
+											<reference key="NSWindow"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="167965817">
+												<reference key="NSNextResponder" ref="222547745"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{899, 17}</string>
+												<reference key="NSSuperview" ref="222547745"/>
+												<reference key="NSWindow"/>
+												<reference key="NSTableView" ref="86489736"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="167646100">
+												<reference key="NSNextResponder" ref="1048514227"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{885, 1}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="1048514227"/>
+												<reference key="NSWindow"/>
+											</object>
+											<object class="NSMutableArray" key="NSTableColumns">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSTableColumn" id="534516850">
+													<string key="NSIdentifier">1</string>
+													<double key="NSWidth">101</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Column 1</string>
+														<object class="NSFont" key="NSSupport" id="26">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">11</double>
+															<int key="NSfFlags">3100</int>
+														</object>
+														<object class="NSColor" key="NSBackgroundColor" id="1073356944">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="678139720">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<object class="NSColor" key="NSColor" id="1051576378">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MAA</bytes>
+															</object>
+														</object>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="279840144">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Cell</string>
+														<object class="NSFont" key="NSSupport" id="390959245">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">13</double>
+															<int key="NSfFlags">1044</int>
+														</object>
+														<reference key="NSControlView" ref="86489736"/>
+														<object class="NSColor" key="NSBackgroundColor" id="979654510">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<object class="NSColor" key="NSColor" id="866026629">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+															</object>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="356911255">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlTextColor</string>
+															<reference key="NSColor" ref="1051576378"/>
+														</object>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="86489736"/>
+												</object>
+												<object class="NSTableColumn" id="870554271">
+													<string key="NSIdentifier">2</string>
+													<double key="NSWidth">154</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Two</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="1073356944"/>
+														<reference key="NSTextColor" ref="678139720"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="642682655">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="390959245"/>
+														<reference key="NSControlView" ref="86489736"/>
+														<reference key="NSBackgroundColor" ref="979654510"/>
+														<reference key="NSTextColor" ref="356911255"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="86489736"/>
+												</object>
+												<object class="NSTableColumn" id="192893327">
+													<string key="NSIdentifier">3</string>
+													<double key="NSWidth">188</double>
+													<double key="NSMinWidth">10</double>
+													<double key="NSMaxWidth">3.4028234663852886e+38</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">3</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerColor</string>
+															<object class="NSColor" key="NSColor" id="854376192">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MQA</bytes>
+															</object>
+														</object>
+														<reference key="NSTextColor" ref="678139720"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="37625341">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="390959245"/>
+														<reference key="NSControlView" ref="86489736"/>
+														<reference key="NSBackgroundColor" ref="979654510"/>
+														<reference key="NSTextColor" ref="356911255"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="86489736"/>
+												</object>
+											</object>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="854376192"/>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">23</double>
+											<int key="NSTvFlags">35651584</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+										</object>
+									</object>
+									<string key="NSFrame">{{1, 17}, {899, 231}}</string>
+									<reference key="NSSuperview" ref="1048514227"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="86489736"/>
+									<reference key="NSDocView" ref="86489736"/>
+									<reference key="NSBGColor" ref="979654510"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="347610108">
+									<reference key="NSNextResponder" ref="1048514227"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{885, 18}, {15, 215}}</string>
+									<reference key="NSSuperview" ref="1048514227"/>
+									<reference key="NSWindow"/>
+									<reference key="NSTarget" ref="1048514227"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99568965517241381</double>
+								</object>
+								<object class="NSScroller" id="480583225">
+									<reference key="NSNextResponder" ref="1048514227"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 233}, {884, 15}}</string>
+									<reference key="NSSuperview" ref="1048514227"/>
+									<reference key="NSWindow"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="1048514227"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99888888888888894</double>
+								</object>
+								<object class="NSClipView" id="222547745">
+									<reference key="NSNextResponder" ref="1048514227"/>
+									<int key="NSvFlags">2304</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<reference ref="167965817"/>
+									</object>
+									<string key="NSFrame">{{1, 0}, {899, 17}}</string>
+									<reference key="NSSuperview" ref="1048514227"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="167965817"/>
+									<reference key="NSDocView" ref="167965817"/>
+									<reference key="NSBGColor" ref="979654510"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="167646100"/>
+							</object>
+							<string key="NSFrame">{{20, 324}, {901, 249}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="331394667"/>
+							<int key="NSsFlags">562</int>
+							<reference key="NSVScroller" ref="347610108"/>
+							<reference key="NSHScroller" ref="480583225"/>
+							<reference key="NSContentView" ref="331394667"/>
+							<reference key="NSHeaderClipView" ref="222547745"/>
+							<reference key="NSCornerView" ref="167646100"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABByAAAQcgAAA</bytes>
+						</object>
+						<object class="NSTextField" id="143146522">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{25, 288}, {109, 17}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="634421729">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Visual Attributes</string>
+								<reference key="NSSupport" ref="390959245"/>
+								<reference key="NSControlView" ref="143146522"/>
+								<object class="NSColor" key="NSBackgroundColor" id="645374340">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<reference key="NSColor" ref="866026629"/>
+								</object>
+								<reference key="NSTextColor" ref="356911255"/>
+							</object>
+						</object>
+						<object class="NSPopUpButton" id="58498892">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{104, 256}, {147, 26}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="842790643">
+								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags2">2048</int>
+								<reference key="NSSupport" ref="390959245"/>
+								<reference key="NSControlView" ref="58498892"/>
+								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<object class="NSMenuItem" key="NSMenuItem" id="827836258">
+									<reference key="NSMenu" ref="757443978"/>
+									<string key="NSTitle">None</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<int key="NSState">1</int>
+									<object class="NSCustomResource" key="NSOnImage" id="484937074">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSMenuCheckmark</string>
+									</object>
+									<object class="NSCustomResource" key="NSMixedImage" id="139942345">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSMenuMixedState</string>
+									</object>
+									<string key="NSAction">_popUpItemAction:</string>
+									<reference key="NSTarget" ref="842790643"/>
+								</object>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="757443978">
+									<string key="NSTitle">Border</string>
+									<object class="NSMutableArray" key="NSMenuItems">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<reference ref="827836258"/>
+										<object class="NSMenuItem" id="835742243">
+											<reference key="NSMenu" ref="757443978"/>
+											<string key="NSTitle">Line</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="484937074"/>
+											<reference key="NSMixedImage" ref="139942345"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<int key="NSTag">1</int>
+											<reference key="NSTarget" ref="842790643"/>
+										</object>
+										<object class="NSMenuItem" id="804763005">
+											<reference key="NSMenu" ref="757443978"/>
+											<string key="NSTitle">Bezel</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="484937074"/>
+											<reference key="NSMixedImage" ref="139942345"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<int key="NSTag">2</int>
+											<reference key="NSTarget" ref="842790643"/>
+										</object>
+										<object class="NSMenuItem" id="990137379">
+											<reference key="NSMenu" ref="757443978"/>
+											<string key="NSTitle">Groove</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="484937074"/>
+											<reference key="NSMixedImage" ref="139942345"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<int key="NSTag">3</int>
+											<reference key="NSTarget" ref="842790643"/>
+										</object>
+									</object>
+									<reference key="NSMenuFont" ref="390959245"/>
+								</object>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+								<int key="NSArrowPosition">2</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="672027023">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{45, 260}, {57, 17}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="735275389">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">4195328</int>
+								<string key="NSContents">Border:</string>
+								<reference key="NSSupport" ref="390959245"/>
+								<reference key="NSControlView" ref="672027023"/>
+								<reference key="NSBackgroundColor" ref="645374340"/>
+								<reference key="NSTextColor" ref="356911255"/>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{941, 593}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+			</object>
+			<object class="NSCustomObject" id="635946545">
+				<string key="NSClassName">AppController</string>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="635946545"/>
+					</object>
+					<int key="connectionID">451</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">theWindow</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="972006081"/>
+					</object>
+					<int key="connectionID">459</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="86489736"/>
+						<reference key="destination" ref="635946545"/>
+					</object>
+					<int key="connectionID">500</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setBorder:</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="58498892"/>
+					</object>
+					<int key="connectionID">518</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">theTableView</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="86489736"/>
+					</object>
+					<int key="connectionID">519</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">theScrollView</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="1048514227"/>
+					</object>
+					<int key="connectionID">520</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">theBorderTypePopup</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="58498892"/>
+					</object>
+					<int key="connectionID">521</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<reference key="object" ref="0"/>
+						<reference key="children" ref="1048"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1021"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1014"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1050"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="972006081"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="439893737"/>
+						</object>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">372</int>
+						<reference key="object" ref="439893737"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1048514227"/>
+							<reference ref="143146522"/>
+							<reference ref="672027023"/>
+							<reference ref="58498892"/>
+						</object>
+						<reference key="parent" ref="972006081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">450</int>
+						<reference key="object" ref="635946545"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">489</int>
+						<reference key="object" ref="1048514227"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="347610108"/>
+							<reference ref="480583225"/>
+							<reference ref="86489736"/>
+							<reference ref="167965817"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">490</int>
+						<reference key="object" ref="347610108"/>
+						<reference key="parent" ref="1048514227"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">491</int>
+						<reference key="object" ref="480583225"/>
+						<reference key="parent" ref="1048514227"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">492</int>
+						<reference key="object" ref="86489736"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="534516850"/>
+							<reference ref="870554271"/>
+							<reference ref="192893327"/>
+						</object>
+						<reference key="parent" ref="1048514227"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">494</int>
+						<reference key="object" ref="534516850"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="279840144"/>
+						</object>
+						<reference key="parent" ref="86489736"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">495</int>
+						<reference key="object" ref="870554271"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="642682655"/>
+						</object>
+						<reference key="parent" ref="86489736"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">496</int>
+						<reference key="object" ref="642682655"/>
+						<reference key="parent" ref="870554271"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">497</int>
+						<reference key="object" ref="279840144"/>
+						<reference key="parent" ref="534516850"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">501</int>
+						<reference key="object" ref="192893327"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="37625341"/>
+						</object>
+						<reference key="parent" ref="86489736"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">502</int>
+						<reference key="object" ref="37625341"/>
+						<reference key="parent" ref="192893327"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">504</int>
+						<reference key="object" ref="167965817"/>
+						<reference key="parent" ref="1048514227"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">512</int>
+						<reference key="object" ref="143146522"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="634421729"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">513</int>
+						<reference key="object" ref="634421729"/>
+						<reference key="parent" ref="143146522"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">505</int>
+						<reference key="object" ref="58498892"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="842790643"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">506</int>
+						<reference key="object" ref="842790643"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="757443978"/>
+						</object>
+						<reference key="parent" ref="58498892"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">507</int>
+						<reference key="object" ref="757443978"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="990137379"/>
+							<reference ref="827836258"/>
+							<reference ref="835742243"/>
+							<reference ref="804763005"/>
+						</object>
+						<reference key="parent" ref="842790643"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">516</int>
+						<reference key="object" ref="990137379"/>
+						<reference key="parent" ref="757443978"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">508</int>
+						<reference key="object" ref="827836258"/>
+						<reference key="parent" ref="757443978"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">509</int>
+						<reference key="object" ref="835742243"/>
+						<reference key="parent" ref="757443978"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">510</int>
+						<reference key="object" ref="804763005"/>
+						<reference key="parent" ref="757443978"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">514</int>
+						<reference key="object" ref="672027023"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="735275389"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">515</int>
+						<reference key="object" ref="735275389"/>
+						<reference key="parent" ref="672027023"/>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-3.IBPluginDependency</string>
+					<string>371.IBEditorWindowLastContentRect</string>
+					<string>371.IBPluginDependency</string>
+					<string>371.IBWindowTemplateEditedContentRect</string>
+					<string>371.NSWindowTemplate.visibleAtLaunch</string>
+					<string>371.editorWindowContentRectSynchronizationRect</string>
+					<string>371.windowTemplate.maxSize</string>
+					<string>372.IBPluginDependency</string>
+					<string>489.IBPluginDependency</string>
+					<string>490.IBPluginDependency</string>
+					<string>491.IBPluginDependency</string>
+					<string>492.IBPluginDependency</string>
+					<string>494.IBPluginDependency</string>
+					<string>495.IBPluginDependency</string>
+					<string>496.IBPluginDependency</string>
+					<string>497.IBPluginDependency</string>
+					<string>505.IBPluginDependency</string>
+					<string>506.IBPluginDependency</string>
+					<string>507.IBEditorWindowLastContentRect</string>
+					<string>507.IBPluginDependency</string>
+					<string>508.IBPluginDependency</string>
+					<string>509.IBPluginDependency</string>
+					<string>510.IBPluginDependency</string>
+					<string>512.IBPluginDependency</string>
+					<string>513.IBPluginDependency</string>
+					<string>514.IBPluginDependency</string>
+					<string>515.IBPluginDependency</string>
+					<string>516.IBPluginDependency</string>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{387, 319}, {941, 593}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{387, 319}, {941, 593}}</string>
+					<integer value="1"/>
+					<string>{{33, 99}, {480, 360}}</string>
+					<string>{3.40282e+38, 3.40282e+38}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{465, 510}, {147, 83}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">521</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">AppController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">setBorder:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>theBorderTypePopup</string>
+							<string>theScrollView</string>
+							<string>theTableView</string>
+							<string>theWindow</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSPopUpButton</string>
+							<string>NSScrollView</string>
+							<string>NSTableView</string>
+							<string>NSWindow</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1050" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="3000" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../adsfsdf.xcodeproj</string>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>NSMenuCheckmark</string>
+				<string>NSMenuMixedState</string>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{9, 8}</string>
+				<string>{7, 2}</string>
+			</object>
+		</object>
+	</data>
+</archive>
diff --git a/Tests/Manual/TableTest/BorderTableTest/Resources/spinner.gif b/Tests/Manual/TableTest/BorderTableTest/Resources/spinner.gif
new file mode 100644
index 000000000..06dbc2bc2
Binary files /dev/null and b/Tests/Manual/TableTest/BorderTableTest/Resources/spinner.gif differ
diff --git a/Tests/Manual/TableTest/BorderTableTest/index-debug.html b/Tests/Manual/TableTest/BorderTableTest/index-debug.html
new file mode 100644
index 000000000..14ce2f14a
--- /dev/null
+++ b/Tests/Manual/TableTest/BorderTableTest/index-debug.html
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">
+<!--
+ index-debug.html
+ TableCibTest
+
+ Created by Francisco Tolmasky on July 5, 2009.
+ Copyright 2009, 280 North, Inc. All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+
+        <title>NewTableTest</title>
+
+        <script type = "text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
+        </script>
+
+        <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+        </script>
+
+        <style type = "text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="loadingcontainer" style=" background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+            <script type = "text/javascript">
+                document.write("<div id='container'><p id='content'>" +
+                               "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                               "Loading TableCibTest...</p></div>");
+            </script>
+
+            <noscript>
+                <div id="container">
+                    <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                        <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                        <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                            <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                            <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                            <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                            <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                            <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+
+</html>
diff --git a/Tests/Manual/TableTest/BorderTableTest/index.html b/Tests/Manual/TableTest/BorderTableTest/index.html
new file mode 100644
index 000000000..fe0f6139c
--- /dev/null
+++ b/Tests/Manual/TableTest/BorderTableTest/index.html
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">
+<!--
+ index.html
+ TableCibTest
+
+ Created by Francisco Tolmasky on July 5, 2009.
+ Copyright 2009, 280 North, Inc. All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+
+        <title>NewTableTest</title>
+
+        <script type = "text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+        </script>
+
+        <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
+
+        <style type = "text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="loadingcontainer" style=" background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+            <script type = "text/javascript">
+                document.write("<div id='container'><p id='content'>" +
+                               "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                               "Loading TableCibTest...</p></div>");
+            </script>
+
+            <noscript>
+                <div id="container">
+                    <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                        <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                        <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                            <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                            <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                            <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                            <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                            <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+
+</html>
diff --git a/Tests/Manual/TableTest/BorderTableTest/main.j b/Tests/Manual/TableTest/BorderTableTest/main.j
new file mode 100755
index 000000000..af6279da3
--- /dev/null
+++ b/Tests/Manual/TableTest/BorderTableTest/main.j
@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * TableCibTest
+ *
+ * Created by Francisco Tolmasky on July 5, 2009.
+ * Copyright 2009, 280 North, Inc. All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}
diff --git a/Tests/Manual/TableTest/DrawRowTest/AppController.j b/Tests/Manual/TableTest/DrawRowTest/AppController.j
new file mode 100644
index 000000000..d096ce002
--- /dev/null
+++ b/Tests/Manual/TableTest/DrawRowTest/AppController.j
@@ -0,0 +1,108 @@
+/*
+ * AppController.j
+ * TestTemplate
+ *
+ * Created by You on August 10, 2010.
+ * Copyright 2010, Your Company All rights reserved.
+ */
+
+@import <Foundation/CPObject.j>
+
+
+@implementation AppController : CPObject
+{
+    CPTableView table;
+    CPTableColumn columnA;
+    CPTableColumn columnB;
+    CPTableColumn columnC;
+    CPTableColumn columnD;
+
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask],
+        contentView = [theWindow contentView];
+
+    var scroll = [[CPScrollView alloc] initWithFrame:CGRectMake(100,100,700,400)];
+
+    table = [[TableViewDrawRow alloc] initWithFrame:CGRectMakeZero()];
+    [table setDataSource:self];
+
+    columnA = [[CPTableColumn alloc] initWithIdentifier:"A"];
+    [table addTableColumn:columnA];
+    [[columnA headerView] setStringValue:"A"];
+    [columnA setWidth:175];
+
+    columnB = [[CPTableColumn alloc] initWithIdentifier:"B"];
+    [table addTableColumn:columnB];
+    [[columnB headerView] setStringValue:"B"];
+    [columnB setWidth:175]
+
+    columnC = [[CPTableColumn alloc] initWithIdentifier:"C"];
+    [table addTableColumn:columnC];
+    [[columnC headerView] setStringValue:"C"];
+    [columnC setWidth:175];
+
+    columnD = [[CPTableColumn alloc] initWithIdentifier:"D"];
+    [table addTableColumn:columnD];
+    [[columnD headerView] setStringValue:"D"];
+    [columnD setWidth:175];
+
+    columnE = [[CPTableColumn alloc] initWithIdentifier:"E"];
+    [table addTableColumn:columnE];
+    [[columnE headerView] setStringValue:"E"];
+    [columnE setWidth:175];
+
+    [scroll setDocumentView:table];
+
+    [contentView addSubview:scroll];
+
+    [theWindow orderFront:self];
+
+}
+
+- (int)numberOfRowsInTableView:(id)tableView
+{
+    return 10000;
+}
+
+- (id)tableView:(id)tableView objectValueForTableColumn:(CPTableColumn)aColumn row:(int)aRow
+{
+    return "Column " + [aColumn identifier] + " Row " + aRow;
+}
+
+@end
+
+var BADGE_HEIGHT = 15.0,
+    ROW_RIGHT_MARGIN = 10.0;
+var randomColors = {};
+
+@implementation TableViewDrawRow : CPTableView
+
++ (CPColor)colorForRow:(CPInteger)aRow
+{
+    var rowStr = String(aRow);
+    if (randomColors[rowStr] == nil)
+        randomColors[rowStr] = [CPColor randomColor];
+
+    return randomColors[rowStr];
+}
+
+- (void)drawRow:(CPInteger)aRow clipRect:(CGRect)clipRect
+{
+    var viewRect = [self frameOfDataViewAtColumn:[self columnWithIdentifier:@"A"] row:aRow],
+        badgeWidth = CGRectGetWidth(viewRect)/5,
+        badgePath = [CPBezierPath bezierPath];
+
+	var badgeFrame = CGRectMake(CGRectGetMaxX(viewRect) - badgeWidth - ROW_RIGHT_MARGIN,
+	    					   CGRectGetMidY(viewRect) - BADGE_HEIGHT / 2.0,
+	    					   badgeWidth,
+	    					   BADGE_HEIGHT);
+
+    [badgePath appendBezierPathWithRoundedRect:badgeFrame xRadius:(BADGE_HEIGHT/2.0) yRadius:(BADGE_HEIGHT/2.0)];
+    [[TableViewDrawRow colorForRow:aRow] setFill];
+    [badgePath fill];
+}
+
+@end
diff --git a/Tests/Manual/TableTest/DrawRowTest/Info.plist b/Tests/Manual/TableTest/DrawRowTest/Info.plist
new file mode 100644
index 000000000..b66b60433
--- /dev/null
+++ b/Tests/Manual/TableTest/DrawRowTest/Info.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CPApplicationDelegateClass</key>
+	<string>AppController</string>
+	<key>CPBundleName</key>
+	<string>DrawRowTest</string>
+	<key>CPPrincipalClass</key>
+	<string>CPApplication</string>
+</dict>
+</plist>
diff --git a/Tests/Manual/TableTest/DrawRowTest/Jakefile b/Tests/Manual/TableTest/DrawRowTest/Jakefile
new file mode 100644
index 000000000..a1ef79223
--- /dev/null
+++ b/Tests/Manual/TableTest/DrawRowTest/Jakefile
@@ -0,0 +1,93 @@
+/*
+ * Jakefile
+ * DrawRowTest
+ *
+ * Created by You on August 11, 2010.
+ * Copyright 2010, Your Company All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os");
+
+app ("DrawRowTest", function(task)
+{
+    task.setBuildIntermediatesPath(FILE.join("Build", "DrawRowTest.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("DrawRowTest");
+    task.setIdentifier("com.yourcompany.DrawRowTest");
+    task.setVersion("1.0");
+    task.setAuthor("Your Company");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("DrawRowTest");
+    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O");
+});
+
+task ("default", ["DrawRowTest"], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"]);
+
+task ("debug", function()
+{
+    ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", "DrawRowTest", "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", "DrawRowTest", "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", "DrawRowTest"));
+    OS.system(["press", "-f", FILE.join("Build", "Release", "DrawRowTest"), FILE.join("Build", "Deployment", "DrawRowTest")]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "DrawRowTest"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "DrawRowTest"), FILE.join("Build", "Desktop", "DrawRowTest", "DrawRowTest.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "DrawRowTest", "DrawRowTest.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "DrawRowTest"));
+    print("----------------------------");
+}
diff --git a/Tests/Manual/TableTest/DrawRowTest/Resources/spinner.gif b/Tests/Manual/TableTest/DrawRowTest/Resources/spinner.gif
new file mode 100644
index 000000000..06dbc2bc2
Binary files /dev/null and b/Tests/Manual/TableTest/DrawRowTest/Resources/spinner.gif differ
diff --git a/Tests/Manual/TableTest/DrawRowTest/index-debug.html b/Tests/Manual/TableTest/DrawRowTest/index-debug.html
new file mode 100644
index 000000000..16dfa3e38
--- /dev/null
+++ b/Tests/Manual/TableTest/DrawRowTest/index-debug.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index-debug.html
+ DrawRowTest
+
+ Created by You on August 11, 2010.
+ Copyright 2010, Your Company All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>DrawRowTest</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
+        </script>
+
+        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+        </script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading DrawRowTest...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>
diff --git a/Tests/Manual/TableTest/DrawRowTest/index.html b/Tests/Manual/TableTest/DrawRowTest/index.html
new file mode 100644
index 000000000..1cbe48ef3
--- /dev/null
+++ b/Tests/Manual/TableTest/DrawRowTest/index.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index.html
+ DrawRowTest
+
+ Created by You on August 11, 2010.
+ Copyright 2010, Your Company All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>DrawRowTest</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading DrawRowTest...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>
+
diff --git a/Tests/Manual/TableTest/DrawRowTest/main.j b/Tests/Manual/TableTest/DrawRowTest/main.j
new file mode 100644
index 000000000..48abc83d4
--- /dev/null
+++ b/Tests/Manual/TableTest/DrawRowTest/main.j
@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * DrawRowTest
+ *
+ * Created by You on August 11, 2010.
+ * Copyright 2010, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}
diff --git a/Tools/nib2cib/NSFont.j b/Tools/nib2cib/NSFont.j
index dfa337925..648764d2e 100644
--- a/Tools/nib2cib/NSFont.j
+++ b/Tools/nib2cib/NSFont.j
@@ -33,7 +33,7 @@
         fontName = [aCoder decodeObjectForKey:@"NSName"],
         size = [aCoder decodeDoubleForKey:@"NSSize"];
 
-    if ((fontName === "LucidaGrande" || fontName === "LucidaGrande-Bold") && size === 13)
+    if (fontName === "LucidaGrande" && size === 13)
     {
         CPLog.debug("Removing default IB font: <"+fontName+", "+size+"> for theme default font.");
         return nil;
@@ -42,7 +42,7 @@
     // FIXME: Is this always true?
     if (fontName.indexOf("-Bold") === fontName.length - "-Bold".length)
         isBold = YES;
-        
+
     if (fontName === "LucidaGrande" || fontName === "LucidaGrande-Bold")
         fontName = [CPFont systemFontFace];