From c34a884b1791acd23727176a13790e4f165c3594 Mon Sep 17 00:00:00 2001
From: Jonathan Willing <j@jwilling.com>
Date: Thu, 12 Nov 2015 22:59:43 -0600
Subject: [PATCH] remove all submodules except for JNWScrollView

---
 .gitmodules                                   |  10 -
 .../project.pbxproj                           |  50 +-
 .../JNWCollectionViewDemo/DemoTableCellView.m |  11 +-
 .../DemoWindowController.m                    |  13 +-
 .../DemoWindowController.xib                  | 336 +++----------
 demo/JNWCollectionViewDemo/GridCell.m         |   2 +-
 .../GridDemoViewController.xib                |  23 +-
 .../JNWCollectionViewDemo-Info.plist          |   2 +-
 demo/JNWCollectionViewDemo/Label.h            |  13 +
 demo/JNWCollectionViewDemo/Label.m            |  34 ++
 demo/JNWCollectionViewDemo/ListCell.m         |   8 +-
 .../NSTableViewDemoViewController.xib         | 450 ++++--------------
 demo/external/JNWLabel                        |   1 -
 external/Expecta                              |   1 -
 external/Specta                               |   1 -
 15 files changed, 234 insertions(+), 721 deletions(-)
 create mode 100644 demo/JNWCollectionViewDemo/Label.h
 create mode 100644 demo/JNWCollectionViewDemo/Label.m
 delete mode 160000 demo/external/JNWLabel
 delete mode 160000 external/Expecta
 delete mode 160000 external/Specta

diff --git a/.gitmodules b/.gitmodules
index 1433d2b..ada12ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,13 +1,3 @@
-[submodule "demo/external/JNWLabel"]
-	path = demo/external/JNWLabel
-	url = https://github.com/jwilling/JNWLabel.git
-[submodule "external/Expecta"]
-	path = external/Expecta
-	url = https://github.com/petejkim/expecta.git
-[submodule "external/Specta"]
-	path = external/Specta
-	url = https://github.com/petejkim/specta.git
-
 [submodule "external/JNWScrollView"]
 	path = external/JNWScrollView
 	url = https://github.com/jwilling/JNWScrollView.git
diff --git a/demo/JNWCollectionViewDemo.xcodeproj/project.pbxproj b/demo/JNWCollectionViewDemo.xcodeproj/project.pbxproj
index c90967d..dea1f70 100644
--- a/demo/JNWCollectionViewDemo.xcodeproj/project.pbxproj
+++ b/demo/JNWCollectionViewDemo.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		AB15147F171511DD00871248 /* JNWCollectionView.framework in Copy Framework */ = {isa = PBXBuildFile; fileRef = AB2E9603170CB107004678DC /* JNWCollectionView.framework */; };
+		AB15147F171511DD00871248 /* JNWCollectionView.framework in Copy Framework */ = {isa = PBXBuildFile; fileRef = AB2E9603170CB107004678DC /* JNWCollectionView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		AB29A69016FEFE1B00C9A941 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB29A68F16FEFE1B00C9A941 /* QuartzCore.framework */; };
 		AB2E9606170CB116004678DC /* JNWCollectionView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB2E9603170CB107004678DC /* JNWCollectionView.framework */; };
 		AB2E960B170CB196004678DC /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB2E9609170CB196004678DC /* MainMenu.xib */; };
@@ -24,13 +24,12 @@
 		ABA276AB171D146D005C8E56 /* NSTableViewDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABA276A9171D146D005C8E56 /* NSTableViewDemoViewController.m */; };
 		ABA276AC171D146D005C8E56 /* NSTableViewDemoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABA276AA171D146D005C8E56 /* NSTableViewDemoViewController.xib */; };
 		ABA276AF171D14E8005C8E56 /* DemoTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = ABA276AE171D14E8005C8E56 /* DemoTableCellView.m */; };
-		ABAF155B1718C39C00658A1D /* JNWLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAF15581718C39C00658A1D /* JNWLabel.m */; };
-		ABAF155C1718C39C00658A1D /* JNWLabel+Accessibility.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAF155A1718C39C00658A1D /* JNWLabel+Accessibility.m */; };
 		ABAF15691718E67C00658A1D /* DemoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAF15671718E67C00658A1D /* DemoWindowController.m */; };
 		ABAF156A1718E67C00658A1D /* DemoWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABAF15681718E67C00658A1D /* DemoWindowController.xib */; };
 		ABAF156D1718F6D000658A1D /* ListDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAF156C1718F6D000658A1D /* ListDemoViewController.m */; };
 		ABB0F2F716FD7D19002004F5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABB0F2F616FD7D19002004F5 /* Cocoa.framework */; };
 		ABB1B207171E095B009B9270 /* NSImage+DemoAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = ABB1B206171E095B009B9270 /* NSImage+DemoAdditions.m */; };
+		ABF854121BF5A1FC001087FE /* Label.m in Sources */ = {isa = PBXBuildFile; fileRef = ABF854111BF5A1FC001087FE /* Label.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -41,13 +40,6 @@
 			remoteGlobalIDString = ABB023F1170791D300537A92;
 			remoteInfo = JNWCollectionView;
 		};
-		AB2E9604170CB107004678DC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = AB2E95FD170CB107004678DC /* JNWCollectionView.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = ABB02409170791D300537A92;
-			remoteInfo = JNWCollectionViewTests;
-		};
 		AB2E9607170CB11D004678DC /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = AB2E95FD170CB107004678DC /* JNWCollectionView.xcodeproj */;
@@ -98,10 +90,6 @@
 		ABA276AA171D146D005C8E56 /* NSTableViewDemoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = NSTableViewDemoViewController.xib; path = JNWCollectionViewDemo/NSTableViewDemoViewController.xib; sourceTree = SOURCE_ROOT; };
 		ABA276AD171D14E8005C8E56 /* DemoTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DemoTableCellView.h; path = JNWCollectionViewDemo/DemoTableCellView.h; sourceTree = SOURCE_ROOT; };
 		ABA276AE171D14E8005C8E56 /* DemoTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DemoTableCellView.m; path = JNWCollectionViewDemo/DemoTableCellView.m; sourceTree = SOURCE_ROOT; };
-		ABAF15571718C39C00658A1D /* JNWLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JNWLabel.h; path = external/JNWLabel/JNWLabel.h; sourceTree = SOURCE_ROOT; };
-		ABAF15581718C39C00658A1D /* JNWLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JNWLabel.m; path = external/JNWLabel/JNWLabel.m; sourceTree = SOURCE_ROOT; };
-		ABAF15591718C39C00658A1D /* JNWLabel+Accessibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "JNWLabel+Accessibility.h"; path = "external/JNWLabel/JNWLabel+Accessibility.h"; sourceTree = SOURCE_ROOT; };
-		ABAF155A1718C39C00658A1D /* JNWLabel+Accessibility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "JNWLabel+Accessibility.m"; path = "external/JNWLabel/JNWLabel+Accessibility.m"; sourceTree = SOURCE_ROOT; };
 		ABAF15661718E67C00658A1D /* DemoWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DemoWindowController.h; path = JNWCollectionViewDemo/DemoWindowController.h; sourceTree = SOURCE_ROOT; };
 		ABAF15671718E67C00658A1D /* DemoWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DemoWindowController.m; path = JNWCollectionViewDemo/DemoWindowController.m; sourceTree = SOURCE_ROOT; };
 		ABAF15681718E67C00658A1D /* DemoWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = DemoWindowController.xib; path = JNWCollectionViewDemo/DemoWindowController.xib; sourceTree = SOURCE_ROOT; };
@@ -114,6 +102,8 @@
 		ABB0F2FB16FD7D19002004F5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		ABB1B205171E095B009B9270 /* NSImage+DemoAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSImage+DemoAdditions.h"; path = "JNWCollectionViewDemo/NSImage+DemoAdditions.h"; sourceTree = SOURCE_ROOT; };
 		ABB1B206171E095B009B9270 /* NSImage+DemoAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSImage+DemoAdditions.m"; path = "JNWCollectionViewDemo/NSImage+DemoAdditions.m"; sourceTree = SOURCE_ROOT; };
+		ABF854101BF5A1FC001087FE /* Label.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Label.h; path = JNWCollectionViewDemo/Label.h; sourceTree = SOURCE_ROOT; };
+		ABF854111BF5A1FC001087FE /* Label.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Label.m; path = JNWCollectionViewDemo/Label.m; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -134,7 +124,6 @@
 			isa = PBXGroup;
 			children = (
 				AB2E9603170CB107004678DC /* JNWCollectionView.framework */,
-				AB2E9605170CB107004678DC /* JNWCollectionViewTests.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -163,17 +152,6 @@
 			name = "NSTableView (Comparison) Demo";
 			sourceTree = "<group>";
 		};
-		ABAF15551718C39300658A1D /* JNWLabel */ = {
-			isa = PBXGroup;
-			children = (
-				ABAF15571718C39C00658A1D /* JNWLabel.h */,
-				ABAF15581718C39C00658A1D /* JNWLabel.m */,
-				ABAF15591718C39C00658A1D /* JNWLabel+Accessibility.h */,
-				ABAF155A1718C39C00658A1D /* JNWLabel+Accessibility.m */,
-			);
-			name = JNWLabel;
-			sourceTree = "<group>";
-		};
 		ABB0F2EA16FD7D19002004F5 = {
 			isa = PBXGroup;
 			children = (
@@ -215,7 +193,6 @@
 		ABB0F2FC16FD7D19002004F5 /* JNWCollectionViewDemo */ = {
 			isa = PBXGroup;
 			children = (
-				ABAF15551718C39300658A1D /* JNWLabel */,
 				AB3C722F170CABFF004A91DB /* AppDelegate.h */,
 				AB3C7230170CABFF004A91DB /* AppDelegate.m */,
 				AB2E9609170CB196004678DC /* MainMenu.xib */,
@@ -230,6 +207,8 @@
 				ABB1B206171E095B009B9270 /* NSImage+DemoAdditions.m */,
 				AB666C711749258D00545290 /* DemoImageCache.h */,
 				AB666C721749258D00545290 /* DemoImageCache.m */,
+				ABF854101BF5A1FC001087FE /* Label.h */,
+				ABF854111BF5A1FC001087FE /* Label.m */,
 			);
 			name = JNWCollectionViewDemo;
 			path = JNWTableViewDemo;
@@ -288,7 +267,7 @@
 		ABB0F2EB16FD7D19002004F5 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = AppJon;
 			};
 			buildConfigurationList = ABB0F2EE16FD7D19002004F5 /* Build configuration list for PBXProject "JNWCollectionViewDemo" */;
@@ -322,13 +301,6 @@
 			remoteRef = AB2E9602170CB107004678DC /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		AB2E9605170CB107004678DC /* JNWCollectionViewTests.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = JNWCollectionViewTests.octest;
-			remoteRef = AB2E9604170CB107004678DC /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -356,13 +328,12 @@
 				AB3C7238170CABFF004A91DB /* ListCell.m in Sources */,
 				AB3C7239170CABFF004A91DB /* ListHeader.m in Sources */,
 				AB3C7244170CAC32004A91DB /* main.m in Sources */,
-				ABAF155B1718C39C00658A1D /* JNWLabel.m in Sources */,
-				ABAF155C1718C39C00658A1D /* JNWLabel+Accessibility.m in Sources */,
 				ABAF15691718E67C00658A1D /* DemoWindowController.m in Sources */,
 				ABAF156D1718F6D000658A1D /* ListDemoViewController.m in Sources */,
 				ABA2769D171CFC80005C8E56 /* GridDemoViewController.m in Sources */,
 				ABA276A3171D0130005C8E56 /* GridCell.m in Sources */,
 				ABA276AB171D146D005C8E56 /* NSTableViewDemoViewController.m in Sources */,
+				ABF854121BF5A1FC001087FE /* Label.m in Sources */,
 				ABA276AF171D14E8005C8E56 /* DemoTableCellView.m in Sources */,
 				ABB1B207171E095B009B9270 /* NSImage+DemoAdditions.m in Sources */,
 				AB666C731749258D00545290 /* DemoImageCache.m in Sources */,
@@ -420,6 +391,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -433,7 +405,6 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 			};
@@ -459,7 +430,6 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				SDKROOT = macosx;
 			};
 			name = Release;
@@ -477,6 +447,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/JNWCollectionViewDemo/JNWCollectionViewDemo-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.AppJon.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = JNWCollectionViewDemo;
 				WRAPPER_EXTENSION = app;
 			};
@@ -495,6 +466,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/JNWCollectionViewDemo/JNWCollectionViewDemo-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.AppJon.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = JNWCollectionViewDemo;
 				WRAPPER_EXTENSION = app;
 			};
diff --git a/demo/JNWCollectionViewDemo/DemoTableCellView.m b/demo/JNWCollectionViewDemo/DemoTableCellView.m
index 57b560a..476152e 100644
--- a/demo/JNWCollectionViewDemo/DemoTableCellView.m
+++ b/demo/JNWCollectionViewDemo/DemoTableCellView.m
@@ -9,10 +9,10 @@
 #import "DemoTableCellView.h"
 #import "NSImage+DemoAdditions.h"
 #import "DemoImageCache.h"
-#import "JNWLabel.h"
+#import "Label.h"
 
 @interface DemoTableCellView()
-@property (nonatomic, strong) JNWLabel *label;
+@property (nonatomic, strong) Label *label;
 @end
 
 @implementation DemoTableCellView
@@ -20,10 +20,11 @@ @implementation DemoTableCellView
 - (void)commonInit {
 	self.wantsLayer = YES;
 	self.layer.backgroundColor = [NSColor redColor].CGColor;
-	self.label = [[JNWLabel alloc] initWithFrame:self.bounds];
+	self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawOnSetNeedsDisplay;
+	
+	self.label = [[Label alloc] initWithFrame:self.bounds];
 	self.label.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
 	[self addSubview:self.label];
-	self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawOnSetNeedsDisplay;
 }
 
 - (id)initWithCoder:(NSCoder *)aDecoder {
@@ -43,7 +44,7 @@ - (id)initWithFrame:(NSRect)frame {
 - (void)setLabelText:(NSString *)labelText {
 	_labelText = labelText;
 	
-	self.label.text = labelText;
+	self.label.stringValue = labelText;
 }
 
 - (BOOL)wantsUpdateLayer {
diff --git a/demo/JNWCollectionViewDemo/DemoWindowController.m b/demo/JNWCollectionViewDemo/DemoWindowController.m
index 0c9403d..b2e1a98 100644
--- a/demo/JNWCollectionViewDemo/DemoWindowController.m
+++ b/demo/JNWCollectionViewDemo/DemoWindowController.m
@@ -9,12 +9,11 @@
 #import "DemoWindowController.h"
 #import "ListDemoViewController.h"
 #import "GridDemoViewController.h"
-
 #import "NSTableViewDemoViewController.h"
 
 typedef enum {
-	ListLayout = 0,
-	GridLayout = 1,
+	GridLayout = 0,
+	ListLayout = 1,
 	NSTableViewLayout = 2
 } LayoutType;
 
@@ -27,7 +26,7 @@ @implementation DemoWindowController
 
 - (void)windowDidLoad {
     [super windowDidLoad];
-	self.currentViewController = [[ListDemoViewController alloc] init];
+	self.currentViewController = [[GridDemoViewController alloc] init];
 }
 
 - (id)init {
@@ -41,10 +40,10 @@ - (void)selectLayout:(id)sender {
 		return;
 	self.layoutType = layout;
 	
-	if (layout == ListLayout) {
-		self.currentViewController = [[ListDemoViewController alloc] init];
-	} else if (layout == GridLayout) {
+	if (layout == GridLayout) {
 		self.currentViewController = [[GridDemoViewController alloc] init];
+	} else if (layout == ListLayout) {
+		self.currentViewController = [[ListDemoViewController alloc] init];
 	} else if (layout == NSTableViewLayout) {
 		self.currentViewController = [[NSTableViewDemoViewController alloc] init];
 	}
diff --git a/demo/JNWCollectionViewDemo/DemoWindowController.xib b/demo/JNWCollectionViewDemo/DemoWindowController.xib
index d90a3b0..29b14f6 100644
--- a/demo/JNWCollectionViewDemo/DemoWindowController.xib
+++ b/demo/JNWCollectionViewDemo/DemoWindowController.xib
@@ -1,273 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSBox</string>
-			<string>NSCustomObject</string>
-			<string>NSSegmentedCell</string>
-			<string>NSSegmentedControl</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">DemoWindowController</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {572, 386}}</string>
-				<int key="NSWTFlags">544735232</int>
-				<string key="NSWindowTitle">JNWCollectionView Demo</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{500, 300}</string>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSSegmentedControl" id="562638209">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">293</int>
-							<string key="NSFrame">{{141, 18}, {290, 24}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSNextKeyView"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<int key="NSTag">1</int>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSSegmentedCell" key="NSCell" id="516852012">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<object class="NSFont" key="NSSupport">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="562638209"/>
-								<array class="NSMutableArray" key="NSSegmentImages">
-									<object class="NSSegmentItem">
-										<string key="NSSegmentItemLabel">List Layout</string>
-										<bool key="NSSegmentItemSelected">YES</bool>
-										<int key="NSSegmentItemImageScaling">0</int>
-									</object>
-									<object class="NSSegmentItem">
-										<string key="NSSegmentItemLabel">Grid Layout</string>
-										<int key="NSSegmentItemImageScaling">0</int>
-									</object>
-									<object class="NSSegmentItem">
-										<string key="NSSegmentItemLabel">NSTableView</string>
-										<int key="NSSegmentItemImageScaling">0</int>
-									</object>
-								</array>
-								<int key="NSSegmentStyle">1</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSBox" id="964467112">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">18</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSView" id="629445701">
-									<reference key="NSNextResponder" ref="964467112"/>
-									<int key="NSvFlags">274</int>
-									<array class="NSMutableArray" key="NSSubviews"/>
-									<string key="NSFrame">{{1, 1}, {570, 335}}</string>
-									<reference key="NSSuperview" ref="964467112"/>
-									<reference key="NSNextKeyView" ref="562638209"/>
-									<string key="NSReuseIdentifierKey">_NS:11</string>
-								</object>
-							</array>
-							<string key="NSFrame">{{0, 49}, {572, 337}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSNextKeyView" ref="629445701"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<object class="NSFont" key="NSSupport">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">11</double>
-									<int key="NSfFlags">3100</int>
-								</object>
-								<object class="NSColor" key="NSBackgroundColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textBackgroundColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MQA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
-								</object>
-							</object>
-							<reference key="NSContentView" ref="629445701"/>
-							<int key="NSBorderType">1</int>
-							<int key="NSBoxType">4</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-						</object>
-					</array>
-					<string key="NSFrameSize">{572, 386}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSNextKeyView" ref="964467112"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMinSize">{500, 322}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectLayout:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="562638209"/>
-					</object>
-					<int key="connectionID">25</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">containerBox</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="964467112"/>
-					</object>
-					<int key="connectionID">27</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">4</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1006"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="964467112"/>
-							<reference ref="562638209"/>
-						</array>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="562638209"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="516852012"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="516852012"/>
-						<reference key="parent" ref="562638209"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">26</int>
-						<reference key="object" ref="964467112"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
-				<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="0" key="15.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
-				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">27</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
+        <capability name="box content view" minToolsVersion="7.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="DemoWindowController">
+            <connections>
+                <outlet property="containerBox" destination="26" id="27"/>
+                <outlet property="window" destination="1" id="3"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <window title="JNWCollectionView Demo" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" animationBehavior="default" id="1">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="240" width="572" height="386"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
+            <value key="minSize" type="size" width="500" height="300"/>
+            <view key="contentView" id="2">
+                <rect key="frame" x="0.0" y="0.0" width="572" height="386"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <segmentedControl verticalHuggingPriority="750" tag="1" id="14">
+                        <rect key="frame" x="144" y="18" width="284" height="24"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <animations/>
+                        <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="15">
+                            <font key="font" metaFont="system"/>
+                            <segments>
+                                <segment label="Grid Layout" selected="YES"/>
+                                <segment label="List Layout"/>
+                                <segment label="NSTableView"/>
+                            </segments>
+                        </segmentedCell>
+                        <connections>
+                            <action selector="selectLayout:" target="-2" id="25"/>
+                        </connections>
+                    </segmentedControl>
+                    <box autoresizesSubviews="NO" title="Box" boxType="custom" borderType="line" titlePosition="noTitle" id="26">
+                        <rect key="frame" x="0.0" y="49" width="572" height="337"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <view key="contentView" id="NbD-VU-xdc">
+                            <rect key="frame" x="1" y="1" width="570" height="335"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <animations/>
+                        </view>
+                        <animations/>
+                        <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+                        <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    </box>
+                </subviews>
+                <animations/>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="4"/>
+            </connections>
+        </window>
+    </objects>
+</document>
diff --git a/demo/JNWCollectionViewDemo/GridCell.m b/demo/JNWCollectionViewDemo/GridCell.m
index 41cbf05..e00a139 100644
--- a/demo/JNWCollectionViewDemo/GridCell.m
+++ b/demo/JNWCollectionViewDemo/GridCell.m
@@ -7,9 +7,9 @@
 //
 
 #import "GridCell.h"
-#import "JNWLabel.h"
 #import "NSImage+DemoAdditions.h"
 #import "DemoImageCache.h"
+#import "Label.h"
 
 @implementation GridCell
 
diff --git a/demo/JNWCollectionViewDemo/GridDemoViewController.xib b/demo/JNWCollectionViewDemo/GridDemoViewController.xib
index 01fea74..8fda2e2 100644
--- a/demo/JNWCollectionViewDemo/GridDemoViewController.xib
+++ b/demo/JNWCollectionViewDemo/GridDemoViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4511" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment version="1070" defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4511"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="GridDemoViewController">
@@ -13,7 +13,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="1">
             <rect key="frame" x="0.0" y="0.0" width="529" height="303"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -28,27 +28,34 @@
                             <view id="4">
                                 <rect key="frame" x="0.0" y="0.0" width="529" height="283"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <animations/>
                             </view>
                         </subviews>
+                        <animations/>
                     </clipView>
-                    <scroller key="horizontalScroller" verticalHuggingPriority="750" id="5">
+                    <animations/>
+                    <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="5">
                         <rect key="frame" x="0.0" y="267" width="529" height="16"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
                     </scroller>
-                    <scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" id="6">
-                        <rect key="frame" x="513" y="0.0" width="16" height="283"/>
+                    <scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="6">
+                        <rect key="frame" x="514" y="0.0" width="15" height="283"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
                     </scroller>
                 </scrollView>
                 <slider verticalHuggingPriority="750" id="8gF-4O-Suf">
                     <rect key="frame" x="-2" y="-2" width="533" height="20"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
+                    <animations/>
                     <sliderCell key="cell" continuous="YES" state="on" alignment="left" minValue="40" maxValue="800" doubleValue="200" tickMarkPosition="above" sliderType="linear" id="af6-ar-9YV"/>
                     <connections>
                         <action selector="updateSizeSliderValue:" target="-2" id="aE6-hM-8Ch"/>
                     </connections>
                 </slider>
             </subviews>
+            <animations/>
         </customView>
     </objects>
-</document>
\ No newline at end of file
+</document>
diff --git a/demo/JNWCollectionViewDemo/JNWCollectionViewDemo-Info.plist b/demo/JNWCollectionViewDemo/JNWCollectionViewDemo-Info.plist
index 8e4239f..0da1b34 100644
--- a/demo/JNWCollectionViewDemo/JNWCollectionViewDemo-Info.plist
+++ b/demo/JNWCollectionViewDemo/JNWCollectionViewDemo-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.AppJon.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/demo/JNWCollectionViewDemo/Label.h b/demo/JNWCollectionViewDemo/Label.h
new file mode 100644
index 0000000..8d9cfbc
--- /dev/null
+++ b/demo/JNWCollectionViewDemo/Label.h
@@ -0,0 +1,13 @@
+//
+//  Label.h
+//  JNWCollectionViewDemo
+//
+//  Created by Jonathan Willing on 11/12/15.
+//  Copyright © 2015 AppJon. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface Label : NSTextField
+
+@end
diff --git a/demo/JNWCollectionViewDemo/Label.m b/demo/JNWCollectionViewDemo/Label.m
new file mode 100644
index 0000000..a6342c9
--- /dev/null
+++ b/demo/JNWCollectionViewDemo/Label.m
@@ -0,0 +1,34 @@
+//
+//  Label.m
+//  JNWCollectionViewDemo
+//
+//  Created by Jonathan Willing on 11/12/15.
+//  Copyright © 2015 AppJon. All rights reserved.
+//
+
+#import "Label.h"
+
+@implementation Label
+
+- (instancetype)initWithFrame:(NSRect)frameRect {
+	self = [super initWithFrame:frameRect];
+	[self commonInit];
+	
+	return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder {
+	self = [super initWithCoder:coder];
+	[self commonInit];
+	
+	return self;
+}
+
+- (void)commonInit {
+	self.bordered = NO;
+	self.editable = NO;
+	self.selectable = NO;
+	self.drawsBackground = NO;
+}
+
+@end
diff --git a/demo/JNWCollectionViewDemo/ListCell.m b/demo/JNWCollectionViewDemo/ListCell.m
index e0c610d..8eb9685 100644
--- a/demo/JNWCollectionViewDemo/ListCell.m
+++ b/demo/JNWCollectionViewDemo/ListCell.m
@@ -8,11 +8,11 @@
 
 #import "ListCell.h"
 #import "NSImage+DemoAdditions.h"
-#import "JNWLabel.h"
 #import "DemoImageCache.h"
+#import "Label.h"
 
 @interface ListCell()
-@property (nonatomic, strong) JNWLabel *label;
+@property (nonatomic, strong) Label *label;
 @end
 
 @implementation ListCell
@@ -21,7 +21,7 @@ - (instancetype)initWithFrame:(NSRect)frameRect {
 	self = [super initWithFrame:frameRect];
 	if (self == nil) return nil;
 	
-	self.label = [[JNWLabel alloc] initWithFrame:CGRectZero];
+	self.label = [[Label alloc] initWithFrame:CGRectZero];
 	[self.contentView addSubview:self.label];
 	
 	return self;
@@ -38,7 +38,7 @@ - (void)layout {
 
 - (void)setCellLabelText:(NSString *)cellLabelText {
 	_cellLabelText = cellLabelText;
-	self.label.text = cellLabelText;
+	self.label.stringValue = cellLabelText;
 }
 
 - (void)setSelected:(BOOL)selected {
diff --git a/demo/JNWCollectionViewDemo/NSTableViewDemoViewController.xib b/demo/JNWCollectionViewDemo/NSTableViewDemoViewController.xib
index 9d88bde..6e66c64 100644
--- a/demo/JNWCollectionViewDemo/NSTableViewDemoViewController.xib
+++ b/demo/JNWCollectionViewDemo/NSTableViewDemoViewController.xib
@@ -1,370 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">13A558</string>
-		<string key="IBDocument.InterfaceBuilderVersion">4488.1</string>
-		<string key="IBDocument.AppKitVersion">1249.11</string>
-		<string key="IBDocument.HIToolboxVersion">691.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">4488.1</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSCustomObject</string>
-			<string>NSCustomView</string>
-			<string>NSScrollView</string>
-			<string>NSScroller</string>
-			<string>NSTableCellView</string>
-			<string>NSTableColumn</string>
-			<string>NSTableView</string>
-			<string>NSTextFieldCell</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">NSTableViewDemoViewController</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomView" id="1005">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">268</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSScrollView" id="676957184">
-						<reference key="NSNextResponder" ref="1005"/>
-						<int key="NSvFlags">274</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSClipView" id="98781123">
-								<reference key="NSNextResponder" ref="676957184"/>
-								<int key="NSvFlags">2322</int>
-								<array class="NSMutableArray" key="NSSubviews">
-									<object class="NSTableView" id="227039770">
-										<reference key="NSNextResponder" ref="98781123"/>
-										<int key="NSvFlags">256</int>
-										<array class="NSMutableArray" key="NSSubviews"/>
-										<string key="NSFrameSize">{471, 292}</string>
-										<reference key="NSSuperview" ref="98781123"/>
-										<reference key="NSNextKeyView" ref="923244072"/>
-										<string key="NSReuseIdentifierKey">_NS:13</string>
-										<bool key="NSEnabled">YES</bool>
-										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
-										<object class="_NSCornerView" key="NSCornerView">
-											<nil key="NSNextResponder"/>
-											<int key="NSvFlags">-2147483392</int>
-											<string key="NSFrame">{{224, 0}, {16, 17}}</string>
-											<reference key="NSNextKeyView" ref="98781123"/>
-											<string key="NSReuseIdentifierKey">_NS:19</string>
-										</object>
-										<array class="NSMutableArray" key="NSTableColumns">
-											<object class="NSTableColumn" id="437715673">
-												<double key="NSWidth">463</double>
-												<double key="NSMinWidth">40</double>
-												<double key="NSMaxWidth">2000</double>
-												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75497536</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents"/>
-													<object class="NSFont" key="NSSupport">
-														<string key="NSName">.LucidaGrandeUI</string>
-														<double key="NSSize">11</double>
-														<int key="NSfFlags">3100</int>
-													</object>
-													<object class="NSColor" key="NSBackgroundColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
-													</object>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">headerTextColor</string>
-														<object class="NSColor" key="NSColor" id="562957434">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MAA</bytes>
-														</object>
-													</object>
-												</object>
-												<object class="NSTextFieldCell" key="NSDataCell" id="432600342">
-													<int key="NSCellFlags">337641536</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents">Text Cell</string>
-													<object class="NSFont" key="NSSupport">
-														<string key="NSName">.LucidaGrandeUI</string>
-														<double key="NSSize">13</double>
-														<int key="NSfFlags">1044</int>
-													</object>
-													<reference key="NSControlView" ref="227039770"/>
-													<object class="NSColor" key="NSBackgroundColor" id="994350263">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">controlBackgroundColor</string>
-														<object class="NSColor" key="NSColor">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-														</object>
-													</object>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">controlTextColor</string>
-														<reference key="NSColor" ref="562957434"/>
-													</object>
-												</object>
-												<int key="NSResizingMask">1</int>
-												<bool key="NSIsResizeable">YES</bool>
-												<bool key="NSIsEditable">YES</bool>
-												<reference key="NSTableView" ref="227039770"/>
-											</object>
-										</array>
-										<double key="NSIntercellSpacingWidth">8</double>
-										<double key="NSIntercellSpacingHeight">0.0</double>
-										<object class="NSColor" key="NSBackgroundColor">
-											<int key="NSColorSpace">3</int>
-											<bytes key="NSWhite">MQA</bytes>
-										</object>
-										<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">44</double>
-										<int key="NSTvFlags">373293056</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>
-										<int key="NSTableViewGroupRowStyle">1</int>
-									</object>
-								</array>
-								<string key="NSFrame">{{1, 1}, {471, 292}}</string>
-								<reference key="NSSuperview" ref="676957184"/>
-								<reference key="NSNextKeyView" ref="227039770"/>
-								<string key="NSReuseIdentifierKey">_NS:11</string>
-								<reference key="NSDocView" ref="227039770"/>
-								<reference key="NSBGColor" ref="994350263"/>
-								<int key="NScvFlags">4</int>
-							</object>
-							<object class="NSScroller" id="698796869">
-								<reference key="NSNextResponder" ref="676957184"/>
-								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{224, 17}, {15, 102}}</string>
-								<reference key="NSSuperview" ref="676957184"/>
-								<reference key="NSNextKeyView" ref="929143980"/>
-								<string key="NSReuseIdentifierKey">_NS:58</string>
-								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								<reference key="NSTarget" ref="676957184"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.99722991689750695</double>
-							</object>
-							<object class="NSScroller" id="929143980">
-								<reference key="NSNextResponder" ref="676957184"/>
-								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{1, 345}, {475, 16}}</string>
-								<reference key="NSSuperview" ref="676957184"/>
-								<string key="NSReuseIdentifierKey">_NS:60</string>
-								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								<int key="NSsFlags">1</int>
-								<reference key="NSTarget" ref="676957184"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.58787128712871284</double>
-							</object>
-						</array>
-						<string key="NSFrameSize">{473, 294}</string>
-						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSNextKeyView" ref="98781123"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<int key="NSsFlags">133682</int>
-						<reference key="NSVScroller" ref="698796869"/>
-						<reference key="NSHScroller" ref="929143980"/>
-						<reference key="NSContentView" ref="98781123"/>
-						<bytes key="NSScrollAmts">QSAAAEEgAABCMAAAQjAAAA</bytes>
-						<double key="NSMinMagnification">0.25</double>
-						<double key="NSMaxMagnification">4</double>
-						<double key="NSMagnification">1</double>
-					</object>
-				</array>
-				<string key="NSFrameSize">{473, 294}</string>
-				<reference key="NSNextKeyView" ref="676957184"/>
-				<string key="NSClassName">NSView</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<bool key="usesAutoincrementingIDs">NO</bool>
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<string key="id">2</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="227039770"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<string key="id">25</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="227039770"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<string key="id">24</string>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<string key="id">0</string>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">-2</string>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">-1</string>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">-3</string>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">1</string>
-						<reference key="object" ref="1005"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="676957184"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">3</string>
-						<reference key="object" ref="676957184"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="698796869"/>
-							<reference ref="929143980"/>
-							<reference ref="227039770"/>
-						</array>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">4</string>
-						<reference key="object" ref="698796869"/>
-						<reference key="parent" ref="676957184"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">5</string>
-						<reference key="object" ref="929143980"/>
-						<reference key="parent" ref="676957184"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">6</string>
-						<reference key="object" ref="227039770"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="437715673"/>
-						</array>
-						<reference key="parent" ref="676957184"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">7</string>
-						<reference key="object" ref="437715673"/>
-						<array class="NSMutableArray" key="children">
-							<object class="NSTableCellView" id="923244072">
-								<nil key="NSNextResponder"/>
-								<int key="NSvFlags">274</int>
-								<array class="NSMutableArray" key="NSSubviews"/>
-								<string key="NSFrame">{{4, 0}, {463, 120}}</string>
-								<reference key="NSNextKeyView" ref="698796869"/>
-							</object>
-							<reference ref="432600342"/>
-						</array>
-						<reference key="parent" ref="227039770"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">8</string>
-						<reference key="object" ref="923244072"/>
-						<reference key="parent" ref="437715673"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">9</string>
-						<reference key="object" ref="432600342"/>
-						<reference key="parent" ref="437715673"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3.CustomClassName">BTRScrollView</string>
-				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="7.isInViewBasedMode"/>
-				<array key="7.prototypeCellViews">
-					<reference ref="923244072"/>
-				</array>
-				<string key="8.CustomClassName">DemoTableCellView</string>
-				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="8.userInterfaceItemIdentifier">Cell</string>
-				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1070" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1080" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="4600" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSTableViewDemoViewController">
+            <connections>
+                <outlet property="view" destination="1" id="2"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <customView id="1">
+            <rect key="frame" x="0.0" y="0.0" width="473" height="294"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <scrollView autohidesScrollers="YES" horizontalLineScroll="44" horizontalPageScroll="10" verticalLineScroll="44" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="3" customClass="JNWScrollView">
+                    <rect key="frame" x="0.0" y="0.0" width="473" height="294"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <clipView key="contentView" id="SQb-Od-D2V">
+                        <rect key="frame" x="1" y="1" width="471" height="292"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="44" viewBased="YES" id="6">
+                                <rect key="frame" x="0.0" y="0.0" width="471" height="292"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <size key="intercellSpacing" width="8" height="0.0"/>
+                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                <tableColumns>
+                                    <tableColumn width="463" minWidth="40" maxWidth="2000" id="7">
+                                        <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
+                                        </tableHeaderCell>
+                                        <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="9">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                        <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
+                                        <prototypeCellViews>
+                                            <tableCellView identifier="Cell" id="8" customClass="DemoTableCellView">
+                                                <rect key="frame" x="4" y="0.0" width="463" height="120"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <animations/>
+                                            </tableCellView>
+                                        </prototypeCellViews>
+                                    </tableColumn>
+                                </tableColumns>
+                                <connections>
+                                    <outlet property="dataSource" destination="-2" id="24"/>
+                                    <outlet property="delegate" destination="-2" id="25"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <animations/>
+                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </clipView>
+                    <animations/>
+                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="5">
+                        <rect key="frame" x="1" y="345" width="475" height="16"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
+                    </scroller>
+                    <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="4">
+                        <rect key="frame" x="224" y="17" width="15" height="102"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
+                    </scroller>
+                </scrollView>
+            </subviews>
+            <animations/>
+        </customView>
+    </objects>
+</document>
diff --git a/demo/external/JNWLabel b/demo/external/JNWLabel
deleted file mode 160000
index 5406249..0000000
--- a/demo/external/JNWLabel
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 54062494a1fed4c7033fdfd91d285134ab6b4747
diff --git a/external/Expecta b/external/Expecta
deleted file mode 160000
index abc3d83..0000000
--- a/external/Expecta
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit abc3d83283fdc3942413e2f3603be6dbb2fe44b8
diff --git a/external/Specta b/external/Specta
deleted file mode 160000
index ba69738..0000000
--- a/external/Specta
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ba69738f1fabd07d3842c338334871ec0af0225b