From 702a3875c5c7c5c937e55d50039ccb0c7bced754 Mon Sep 17 00:00:00 2001
From: Johan Paulsson <gonz@users.sourceforge.net>
Date: Thu, 24 Jan 2013 16:30:02 +0000
Subject: Anchor support for the parser and osx gui

---
 tikzit/English.lproj/PropertyInspector.xib   | 2264 ++++++++++++++++----------
 tikzit/English.lproj/StylePalette.xib        | 1417 +++++++---------
 tikzit/TikZiT-Info.plist                     |    8 +-
 tikzit/TikZiT.xcodeproj/project.pbxproj      |   46 +-
 tikzit/src/common/Edge.h                     |   14 +
 tikzit/src/common/Edge.m                     |   23 +
 tikzit/src/common/Graph.m                    |    4 +-
 tikzit/src/common/TikzGraphAssembler.h       |    3 +-
 tikzit/src/common/TikzGraphAssembler.m       |   25 +-
 tikzit/src/common/test/parser.m              |   11 +-
 tikzit/src/common/test/test.m                |    2 +-
 tikzit/src/common/tikzlexer.lm               |    4 +-
 tikzit/src/common/tikzparser.ym              |   39 +-
 tikzit/src/osx/PropertyInspectorController.h |   10 +
 tikzit/src/osx/PropertyInspectorController.m |    7 +-
 15 files changed, 2135 insertions(+), 1742 deletions(-)

diff --git a/tikzit/English.lproj/PropertyInspector.xib b/tikzit/English.lproj/PropertyInspector.xib
index b22b186..4ba24a7 100644
--- a/tikzit/English.lproj/PropertyInspector.xib
+++ b/tikzit/English.lproj/PropertyInspector.xib
@@ -1,43 +1,42 @@
 <?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">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12C60</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2844</string>
+		<string key="IBDocument.AppKitVersion">1187.34</string>
+		<string key="IBDocument.HIToolboxVersion">625.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1617</string>
+			<string key="NS.object.0">2844</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSScroller</string>
-			<string>NSTableHeaderView</string>
-			<string>NSButton</string>
 			<string>NSArrayController</string>
-			<string>NSScrollView</string>
-			<string>NSButtonCell</string>
-			<string>NSTextFieldCell</string>
 			<string>NSBox</string>
-			<string>NSTableView</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSComboBox</string>
+			<string>NSComboBoxCell</string>
 			<string>NSCustomObject</string>
 			<string>NSCustomView</string>
+			<string>NSScrollView</string>
+			<string>NSScroller</string>
 			<string>NSTableColumn</string>
-			<string>NSWindowTemplate</string>
+			<string>NSTableHeaderView</string>
+			<string>NSTableView</string>
 			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
 			<string>NSView</string>
+			<string>NSWindowTemplate</string>
 		</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>
-			<reference key="dict.values" ref="0"/>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -70,23 +69,20 @@
 							<int key="NSvFlags">274</int>
 							<string key="NSFrameSize">{193, 256}</string>
 							<reference key="NSSuperview" ref="299507146"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
 							<string key="NSClassName">SFBInspectorView</string>
 						</object>
 					</object>
 					<string key="NSFrameSize">{193, 256}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="767543822"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1600, 1200}}</string>
 				<string key="NSMinSize">{200, 246}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSCustomView" id="725040895">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -107,6 +103,8 @@
 										<reference key="NSSuperview" ref="160409253"/>
 										<reference key="NSNextKeyView" ref="61166500"/>
 										<bool key="NSEnabled">YES</bool>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 										<object class="NSTableHeaderView" key="NSHeaderView" id="633188190">
 											<reference key="NSNextResponder" ref="61166500"/>
 											<int key="NSvFlags">256</int>
@@ -128,7 +126,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Key/Atom</string>
 													<object class="NSFont" key="NSSupport" id="26">
@@ -151,7 +149,7 @@
 													</object>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="1010542831">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<object class="NSFont" key="NSSupport" id="47520286">
@@ -186,7 +184,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Value</string>
 													<reference key="NSSupport" ref="26"/>
@@ -194,7 +192,7 @@
 													<reference key="NSTextColor" ref="291467374"/>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="138783933">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<reference key="NSSupport" ref="47520286"/>
@@ -248,6 +246,7 @@
 								<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 								<reference key="NSSuperview" ref="987989050"/>
 								<reference key="NSNextKeyView" ref="969856497"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<reference key="NSTarget" ref="987989050"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.87903225806451613</double>
@@ -258,6 +257,7 @@
 								<string key="NSFrame">{{1, 126}, {181, 15}}</string>
 								<reference key="NSSuperview" ref="987989050"/>
 								<reference key="NSNextKeyView" ref="480495865"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="987989050"/>
 								<string key="NSAction">_doScroller:</string>
@@ -287,6 +287,9 @@
 						<reference key="NSContentView" ref="160409253"/>
 						<reference key="NSHeaderClipView" ref="61166500"/>
 						<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						<double key="NSMinMagnification">0.25</double>
+						<double key="NSMaxMagnification">4</double>
+						<double key="NSMagnification">1</double>
 					</object>
 					<object class="NSTextField" id="924106352">
 						<reference key="NSNextResponder" ref="725040895"/>
@@ -296,7 +299,7 @@
 						<reference key="NSNextKeyView" ref="987989050"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="943184796">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="47520286"/>
@@ -315,6 +318,7 @@
 								<reference key="NSColor" ref="43177969"/>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="503141179">
 						<reference key="NSNextResponder" ref="725040895"/>
@@ -323,7 +327,7 @@
 						<reference key="NSSuperview" ref="725040895"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="240925324">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<object class="NSFont" key="NSSupport" id="926794154">
@@ -332,7 +336,7 @@
 								<int key="NSfFlags">1044</int>
 							</object>
 							<reference key="NSControlView" ref="503141179"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<object class="NSCustomResource" key="NSNormalImage" id="837063931">
 								<string key="NSClassName">NSImage</string>
@@ -343,6 +347,7 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="762974559">
 						<reference key="NSNextResponder" ref="725040895"/>
@@ -352,7 +357,7 @@
 						<reference key="NSNextKeyView" ref="503141179"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="87705550">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">     a</string>
 							<object class="NSFont" key="NSSupport" id="302348148">
@@ -361,7 +366,7 @@
 								<int key="NSfFlags">16</int>
 							</object>
 							<reference key="NSControlView" ref="762974559"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<object class="NSCustomResource" key="NSNormalImage" id="679966900">
 								<string key="NSClassName">NSImage</string>
@@ -372,6 +377,7 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="480495865">
 						<reference key="NSNextResponder" ref="725040895"/>
@@ -381,12 +387,12 @@
 						<reference key="NSNextKeyView" ref="762974559"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="135835921">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="302348148"/>
 							<reference key="NSControlView" ref="480495865"/>
-							<int key="NSButtonFlags">-2032385793</int>
+							<int key="NSButtonFlags">-2032386048</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="679966900"/>
 							<string key="NSAlternateContents"/>
@@ -394,6 +400,7 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="574444329">
 						<reference key="NSNextResponder" ref="725040895"/>
@@ -403,7 +410,7 @@
 						<reference key="NSNextKeyView" ref="924106352"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="610764175">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents">Label</string>
 							<object class="NSFont" key="NSSupport" id="811392858">
@@ -420,14 +427,16 @@
 							</object>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</object>
 				<string key="NSFrameSize">{193, 152}</string>
+				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="574444329"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="1063930747">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -448,6 +457,8 @@
 										<reference key="NSSuperview" ref="10985668"/>
 										<reference key="NSNextKeyView" ref="442374025"/>
 										<bool key="NSEnabled">YES</bool>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 										<object class="NSTableHeaderView" key="NSHeaderView" id="741880171">
 											<reference key="NSNextResponder" ref="442374025"/>
 											<int key="NSvFlags">256</int>
@@ -469,7 +480,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Key/Atom</string>
 													<reference key="NSSupport" ref="26"/>
@@ -480,7 +491,7 @@
 													<reference key="NSTextColor" ref="291467374"/>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="812884518">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<reference key="NSSupport" ref="47520286"/>
@@ -498,7 +509,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Value</string>
 													<reference key="NSSupport" ref="26"/>
@@ -506,7 +517,7 @@
 													<reference key="NSTextColor" ref="291467374"/>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="973656885">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<reference key="NSSupport" ref="47520286"/>
@@ -549,6 +560,7 @@
 								<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 								<reference key="NSSuperview" ref="114363066"/>
 								<reference key="NSNextKeyView" ref="878278571"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<reference key="NSTarget" ref="114363066"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.87903225806451613</double>
@@ -559,6 +571,7 @@
 								<string key="NSFrame">{{1, 126}, {181, 15}}</string>
 								<reference key="NSSuperview" ref="114363066"/>
 								<reference key="NSNextKeyView" ref="763774819"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="114363066"/>
 								<string key="NSAction">_doScroller:</string>
@@ -588,6 +601,9 @@
 						<reference key="NSContentView" ref="10985668"/>
 						<reference key="NSHeaderClipView" ref="442374025"/>
 						<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						<double key="NSMinMagnification">0.25</double>
+						<double key="NSMaxMagnification">4</double>
+						<double key="NSMagnification">1</double>
 					</object>
 					<object class="NSButton" id="855960268">
 						<reference key="NSNextResponder" ref="1063930747"/>
@@ -596,12 +612,12 @@
 						<reference key="NSSuperview" ref="1063930747"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="934918825">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="926794154"/>
 							<reference key="NSControlView" ref="855960268"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="837063931"/>
 							<string key="NSAlternateContents"/>
@@ -609,6 +625,7 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="985476901">
 						<reference key="NSNextResponder" ref="1063930747"/>
@@ -618,12 +635,12 @@
 						<reference key="NSNextKeyView" ref="855960268"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="1007212304">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">     a</string>
 							<reference key="NSSupport" ref="302348148"/>
 							<reference key="NSControlView" ref="985476901"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="679966900"/>
 							<string key="NSAlternateContents"/>
@@ -631,6 +648,7 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="763774819">
 						<reference key="NSNextResponder" ref="1063930747"/>
@@ -640,12 +658,12 @@
 						<reference key="NSNextKeyView" ref="985476901"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="471795027">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="302348148"/>
 							<reference key="NSControlView" ref="763774819"/>
-							<int key="NSButtonFlags">-2032385793</int>
+							<int key="NSButtonFlags">-2032386048</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="679966900"/>
 							<string key="NSAlternateContents"/>
@@ -653,26 +671,198 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</object>
 				<string key="NSFrameSize">{193, 130}</string>
+				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="114363066"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="924183072">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSComboBox" id="725142441">
+						<reference key="NSNextResponder" ref="924183072"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{59, 152}, {133, 26}}</string>
+						<reference key="NSSuperview" ref="924183072"/>
+						<reference key="NSNextKeyView" ref="224516704"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSComboBoxCell" key="NSCell" id="829332788">
+							<int key="NSCellFlags">342884416</int>
+							<int key="NSCellFlags2">272630784</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="926794154"/>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="725142441"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="754384975"/>
+							<reference key="NSTextColor" ref="44900598"/>
+							<int key="NSVisibleItemCount">5</int>
+							<bool key="NSHasVerticalScroller">YES</bool>
+							<bool key="NSCompletes">YES</bool>
+							<reference key="NSDelegate" ref="725142441"/>
+							<object class="NSComboTableView" key="NSTableView" id="1017409934">
+								<reference key="NSNextResponder"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{13, 0}</string>
+								<reference key="NSSuperview"/>
+								<reference key="NSWindow"/>
+								<string key="NSReuseIdentifierKey">_NS:24</string>
+								<bool key="NSEnabled">YES</bool>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								<bool key="NSControlAllowsExpansionToolTips">YES</bool>
+								<object class="NSMutableArray" key="NSTableColumns">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<object class="NSTableColumn">
+										<double key="NSWidth">10</double>
+										<double key="NSMinWidth">10</double>
+										<double key="NSMaxWidth">1000</double>
+										<object class="NSTableHeaderCell" key="NSHeaderCell">
+											<int key="NSCellFlags">75497472</int>
+											<int key="NSCellFlags2">0</int>
+											<string key="NSContents"/>
+											<object class="NSFont" key="NSSupport" id="184548833">
+												<string key="NSName">LucidaGrande</string>
+												<double key="NSSize">12</double>
+												<int key="NSfFlags">16</int>
+											</object>
+											<object class="NSColor" key="NSBackgroundColor">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+											</object>
+											<reference key="NSTextColor" ref="25166299"/>
+										</object>
+										<object class="NSTextFieldCell" key="NSDataCell">
+											<int key="NSCellFlags">338690112</int>
+											<int key="NSCellFlags2">1024</int>
+											<reference key="NSSupport" ref="926794154"/>
+											<reference key="NSControlView" ref="1017409934"/>
+											<bool key="NSDrawsBackground">YES</bool>
+											<reference key="NSBackgroundColor" ref="154397349"/>
+											<reference key="NSTextColor" ref="44900598"/>
+										</object>
+										<int key="NSResizingMask">3</int>
+										<bool key="NSIsResizeable">YES</bool>
+										<reference key="NSTableView" ref="1017409934"/>
+									</object>
+								</object>
+								<double key="NSIntercellSpacingWidth">3</double>
+								<double key="NSIntercellSpacingHeight">2</double>
+								<reference key="NSBackgroundColor" ref="154397349"/>
+								<reference key="NSGridColor" ref="498197732"/>
+								<double key="NSRowHeight">19</double>
+								<string key="NSAction">tableViewAction:</string>
+								<int key="NSTvFlags">-765427712</int>
+								<reference key="NSDelegate" ref="829332788"/>
+								<reference key="NSDataSource" ref="829332788"/>
+								<reference key="NSTarget" ref="829332788"/>
+								<int key="NSColumnAutoresizingStyle">1</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>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSComboBox" id="559516931">
+						<reference key="NSNextResponder" ref="924183072"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{59, 178}, {133, 26}}</string>
+						<reference key="NSSuperview" ref="924183072"/>
+						<reference key="NSNextKeyView" ref="586903912"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSComboBoxCell" key="NSCell" id="714570294">
+							<int key="NSCellFlags">342884416</int>
+							<int key="NSCellFlags2">272630784</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="926794154"/>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="559516931"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="754384975"/>
+							<reference key="NSTextColor" ref="44900598"/>
+							<int key="NSVisibleItemCount">5</int>
+							<bool key="NSHasVerticalScroller">YES</bool>
+							<bool key="NSCompletes">YES</bool>
+							<reference key="NSDelegate" ref="559516931"/>
+							<object class="NSComboTableView" key="NSTableView" id="117913078">
+								<reference key="NSNextResponder"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{13, 0}</string>
+								<reference key="NSSuperview"/>
+								<reference key="NSWindow"/>
+								<string key="NSReuseIdentifierKey">_NS:24</string>
+								<bool key="NSEnabled">YES</bool>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								<bool key="NSControlAllowsExpansionToolTips">YES</bool>
+								<object class="NSMutableArray" key="NSTableColumns">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<object class="NSTableColumn">
+										<double key="NSWidth">10</double>
+										<double key="NSMinWidth">10</double>
+										<double key="NSMaxWidth">1000</double>
+										<object class="NSTableHeaderCell" key="NSHeaderCell">
+											<int key="NSCellFlags">75497472</int>
+											<int key="NSCellFlags2">0</int>
+											<string key="NSContents"/>
+											<reference key="NSSupport" ref="184548833"/>
+											<object class="NSColor" key="NSBackgroundColor">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+											</object>
+											<reference key="NSTextColor" ref="25166299"/>
+										</object>
+										<object class="NSTextFieldCell" key="NSDataCell">
+											<int key="NSCellFlags">338690112</int>
+											<int key="NSCellFlags2">1024</int>
+											<reference key="NSSupport" ref="926794154"/>
+											<reference key="NSControlView" ref="117913078"/>
+											<bool key="NSDrawsBackground">YES</bool>
+											<reference key="NSBackgroundColor" ref="154397349"/>
+											<reference key="NSTextColor" ref="44900598"/>
+										</object>
+										<int key="NSResizingMask">3</int>
+										<bool key="NSIsResizeable">YES</bool>
+										<reference key="NSTableView" ref="117913078"/>
+									</object>
+								</object>
+								<double key="NSIntercellSpacingWidth">3</double>
+								<double key="NSIntercellSpacingHeight">2</double>
+								<reference key="NSBackgroundColor" ref="154397349"/>
+								<reference key="NSGridColor" ref="498197732"/>
+								<double key="NSRowHeight">19</double>
+								<string key="NSAction">tableViewAction:</string>
+								<int key="NSTvFlags">-765427712</int>
+								<reference key="NSDelegate" ref="714570294"/>
+								<reference key="NSDataSource" ref="714570294"/>
+								<reference key="NSTarget" ref="714570294"/>
+								<int key="NSColumnAutoresizingStyle">1</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>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
 					<object class="NSBox" id="224516704">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">12</int>
-						<string key="NSFrame">{{4, 143}, {185, 5}}</string>
+						<string key="NSFrame">{{4, 146}, {185, 5}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="841146514"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Box</string>
 							<reference key="NSSupport" ref="926794154"/>
@@ -690,12 +880,12 @@
 					<object class="NSTextField" id="906988363">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{55, 104}, {134, 19}}</string>
+						<string key="NSFrame">{{55, 107}, {134, 19}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="385790439"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="239596808">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="47520286"/>
@@ -704,16 +894,71 @@
 							<reference key="NSBackgroundColor" ref="754384975"/>
 							<reference key="NSTextColor" ref="120602981"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="586903912">
+						<reference key="NSNextResponder" ref="924183072"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{12, 159}, {42, 14}}</string>
+						<reference key="NSSuperview" ref="924183072"/>
+						<reference key="NSNextKeyView" ref="725142441"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="187890294">
+							<int key="NSCellFlags">68157504</int>
+							<int key="NSCellFlags2">272630784</int>
+							<string key="NSContents">Target</string>
+							<reference key="NSSupport" ref="811392858"/>
+							<reference key="NSControlView" ref="586903912"/>
+							<reference key="NSBackgroundColor" ref="43977021"/>
+							<reference key="NSTextColor" ref="44900598"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="1062338922">
+						<reference key="NSNextResponder" ref="924183072"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{12, 185}, {42, 14}}</string>
+						<reference key="NSSuperview" ref="924183072"/>
+						<reference key="NSNextKeyView" ref="559516931"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="825166761">
+							<int key="NSCellFlags">68157504</int>
+							<int key="NSCellFlags2">272630784</int>
+							<string key="NSContents">Source</string>
+							<reference key="NSSupport" ref="811392858"/>
+							<reference key="NSControlView" ref="1062338922"/>
+							<reference key="NSBackgroundColor" ref="43977021"/>
+							<reference key="NSTextColor" ref="44900598"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="786681620">
+						<reference key="NSNextResponder" ref="924183072"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{4, 202}, {51, 14}}</string>
+						<reference key="NSSuperview" ref="924183072"/>
+						<reference key="NSNextKeyView" ref="1062338922"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="78896067">
+							<int key="NSCellFlags">68157504</int>
+							<int key="NSCellFlags2">272630784</int>
+							<string key="NSContents">Anchors</string>
+							<reference key="NSSupport" ref="811392858"/>
+							<reference key="NSControlView" ref="786681620"/>
+							<reference key="NSBackgroundColor" ref="43977021"/>
+							<reference key="NSTextColor" ref="44900598"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="381359914">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{8, 104}, {38, 14}}</string>
+						<string key="NSFrame">{{8, 107}, {38, 14}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="906988363"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="847027582">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents">Label</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -721,21 +966,22 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="841146514">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{3, 123}, {82, 18}}</string>
+						<string key="NSFrame">{{3, 126}, {82, 18}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="381359914"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="1043816572">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Child Node</string>
 							<reference key="NSSupport" ref="47520286"/>
 							<reference key="NSControlView" ref="841146514"/>
-							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
@@ -749,6 +995,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSScrollView" id="385790439">
 						<reference key="NSNextResponder" ref="924183072"/>
@@ -767,6 +1014,8 @@
 										<reference key="NSSuperview" ref="1014547104"/>
 										<reference key="NSNextKeyView" ref="290050466"/>
 										<bool key="NSEnabled">YES</bool>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 										<object class="NSTableHeaderView" key="NSHeaderView" id="276248098">
 											<reference key="NSNextResponder" ref="290050466"/>
 											<int key="NSvFlags">256</int>
@@ -787,7 +1036,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Key/Atom</string>
 													<reference key="NSSupport" ref="26"/>
@@ -798,7 +1047,7 @@
 													<reference key="NSTextColor" ref="291467374"/>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="649398657">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<reference key="NSSupport" ref="47520286"/>
@@ -816,7 +1065,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Value</string>
 													<reference key="NSSupport" ref="26"/>
@@ -824,7 +1073,7 @@
 													<reference key="NSTextColor" ref="291467374"/>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="1018253149">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<reference key="NSSupport" ref="47520286"/>
@@ -867,6 +1116,7 @@
 								<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 								<reference key="NSSuperview" ref="385790439"/>
 								<reference key="NSNextKeyView" ref="1039219660"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<reference key="NSTarget" ref="385790439"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.87903225806451613</double>
@@ -877,6 +1127,7 @@
 								<string key="NSFrame">{{1, 126}, {181, 15}}</string>
 								<reference key="NSSuperview" ref="385790439"/>
 								<reference key="NSNextKeyView" ref="417977631"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="385790439"/>
 								<string key="NSAction">_doScroller:</string>
@@ -897,7 +1148,7 @@
 								<int key="NScvFlags">4</int>
 							</object>
 						</object>
-						<string key="NSFrame">{{4, 34}, {185, 62}}</string>
+						<string key="NSFrame">{{4, 37}, {185, 62}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="1014547104"/>
 						<int key="NSsFlags">133682</int>
@@ -906,6 +1157,9 @@
 						<reference key="NSContentView" ref="1014547104"/>
 						<reference key="NSHeaderClipView" ref="290050466"/>
 						<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						<double key="NSMinMagnification">0.25</double>
+						<double key="NSMaxMagnification">4</double>
+						<double key="NSMagnification">1</double>
 					</object>
 					<object class="NSScrollView" id="393903553">
 						<reference key="NSNextResponder" ref="924183072"/>
@@ -924,6 +1178,8 @@
 										<reference key="NSSuperview" ref="998119817"/>
 										<reference key="NSNextKeyView" ref="868431369"/>
 										<bool key="NSEnabled">YES</bool>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 										<object class="NSTableHeaderView" key="NSHeaderView" id="879414039">
 											<reference key="NSNextResponder" ref="868431369"/>
 											<int key="NSvFlags">256</int>
@@ -945,7 +1201,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Key/Atom</string>
 													<reference key="NSSupport" ref="26"/>
@@ -956,7 +1212,7 @@
 													<reference key="NSTextColor" ref="291467374"/>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="543003888">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<reference key="NSSupport" ref="47520286"/>
@@ -974,7 +1230,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Value</string>
 													<reference key="NSSupport" ref="26"/>
@@ -982,7 +1238,7 @@
 													<reference key="NSTextColor" ref="291467374"/>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="558414852">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<reference key="NSSupport" ref="47520286"/>
@@ -1025,6 +1281,7 @@
 								<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 								<reference key="NSSuperview" ref="393903553"/>
 								<reference key="NSNextKeyView" ref="401297526"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<reference key="NSTarget" ref="393903553"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.87903225806451613</double>
@@ -1035,6 +1292,7 @@
 								<string key="NSFrame">{{1, 126}, {181, 15}}</string>
 								<reference key="NSSuperview" ref="393903553"/>
 								<reference key="NSNextKeyView" ref="329712707"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="393903553"/>
 								<string key="NSAction">_doScroller:</string>
@@ -1055,7 +1313,7 @@
 								<int key="NScvFlags">4</int>
 							</object>
 						</object>
-						<string key="NSFrame">{{4, 179}, {185, 92}}</string>
+						<string key="NSFrame">{{4, 247}, {185, 92}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="998119817"/>
 						<int key="NSsFlags">133682</int>
@@ -1064,20 +1322,23 @@
 						<reference key="NSContentView" ref="998119817"/>
 						<reference key="NSHeaderClipView" ref="868431369"/>
 						<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						<double key="NSMinMagnification">0.25</double>
+						<double key="NSMaxMagnification">4</double>
+						<double key="NSMagnification">1</double>
 					</object>
 					<object class="NSButton" id="494601848">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{53, 5}, {26, 26}}</string>
+						<string key="NSFrame">{{53, 8}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="527874463">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="926794154"/>
 							<reference key="NSControlView" ref="494601848"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="837063931"/>
 							<string key="NSAlternateContents"/>
@@ -1085,21 +1346,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="324179323">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{28, 5}, {26, 26}}</string>
+						<string key="NSFrame">{{28, 8}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="494601848"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="1007421740">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">     a</string>
 							<reference key="NSSupport" ref="302348148"/>
 							<reference key="NSControlView" ref="324179323"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="679966900"/>
 							<string key="NSAlternateContents"/>
@@ -1107,21 +1369,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="417977631">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{4, 5}, {26, 26}}</string>
+						<string key="NSFrame">{{4, 8}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="324179323"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="888126559">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="302348148"/>
 							<reference key="NSControlView" ref="417977631"/>
-							<int key="NSButtonFlags">-2032385793</int>
+							<int key="NSButtonFlags">-2032386048</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="679966900"/>
 							<string key="NSAlternateContents"/>
@@ -1129,21 +1392,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="299136596">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{53, 150}, {26, 26}}</string>
+						<string key="NSFrame">{{53, 218}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
-						<reference key="NSNextKeyView" ref="224516704"/>
+						<reference key="NSNextKeyView" ref="786681620"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="719117552">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="926794154"/>
 							<reference key="NSControlView" ref="299136596"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="837063931"/>
 							<string key="NSAlternateContents"/>
@@ -1151,21 +1415,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="106397766">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{28, 150}, {26, 26}}</string>
+						<string key="NSFrame">{{28, 218}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="299136596"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="140438221">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">     a</string>
 							<reference key="NSSupport" ref="302348148"/>
 							<reference key="NSControlView" ref="106397766"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="679966900"/>
 							<string key="NSAlternateContents"/>
@@ -1173,21 +1438,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="329712707">
 						<reference key="NSNextResponder" ref="924183072"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{4, 150}, {26, 26}}</string>
+						<string key="NSFrame">{{4, 218}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="924183072"/>
 						<reference key="NSNextKeyView" ref="106397766"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="218825565">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="302348148"/>
 							<reference key="NSControlView" ref="329712707"/>
-							<int key="NSButtonFlags">-2032385793</int>
+							<int key="NSButtonFlags">-2032386048</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="679966900"/>
 							<string key="NSAlternateContents"/>
@@ -1195,9 +1461,11 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</object>
-				<string key="NSFrameSize">{193, 276}</string>
+				<string key="NSFrameSize">{193, 344}</string>
+				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="393903553"/>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -1293,6 +1561,58 @@
 				<bool key="NSFilterRestrictsInsertion">YES</bool>
 				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
 			</object>
+			<object class="NSTextField" id="513522177">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">268</int>
+				<string key="NSFrameSize">{51, 14}</string>
+				<reference key="NSNextKeyView" ref="664436771"/>
+				<bool key="NSEnabled">YES</bool>
+				<object class="NSTextFieldCell" key="NSCell" id="522971083">
+					<int key="NSCellFlags">68157504</int>
+					<int key="NSCellFlags2">272630784</int>
+					<string key="NSContents">Anchors</string>
+					<reference key="NSSupport" ref="811392858"/>
+					<reference key="NSControlView" ref="513522177"/>
+					<reference key="NSBackgroundColor" ref="43977021"/>
+					<reference key="NSTextColor" ref="44900598"/>
+				</object>
+				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+			</object>
+			<object class="NSTextField" id="664436771">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">268</int>
+				<string key="NSFrameSize">{134, 19}</string>
+				<bool key="NSEnabled">YES</bool>
+				<object class="NSTextFieldCell" key="NSCell" id="579604223">
+					<int key="NSCellFlags">-1804599231</int>
+					<int key="NSCellFlags2">272630784</int>
+					<string key="NSContents"/>
+					<reference key="NSSupport" ref="47520286"/>
+					<reference key="NSControlView" ref="664436771"/>
+					<bool key="NSDrawsBackground">YES</bool>
+					<reference key="NSBackgroundColor" ref="754384975"/>
+					<reference key="NSTextColor" ref="120602981"/>
+				</object>
+				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+			</object>
+			<object class="NSArrayController" id="717478128">
+				<bool key="NSEditable">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSAvoidsEmptySelection">YES</bool>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
+			<object class="NSArrayController" id="410054055">
+				<bool key="NSEditable">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSAvoidsEmptySelection">YES</bool>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -1305,74 +1625,6 @@
 					</object>
 					<int key="connectionID">188</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.key</string>
-						<reference key="source" ref="952219629"/>
-						<reference key="destination" ref="155693011"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="952219629"/>
-							<reference key="NSDestination" ref="155693011"/>
-							<string key="NSLabel">value: arrangedObjects.key</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.key</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">274</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.value</string>
-						<reference key="source" ref="913349665"/>
-						<reference key="destination" ref="155693011"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="913349665"/>
-							<reference key="NSDestination" ref="155693011"/>
-							<string key="NSLabel">value: arrangedObjects.value</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.value</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">277</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects</string>
-						<reference key="source" ref="555379611"/>
-						<reference key="destination" ref="155693011"/>
-						<object class="NSNibBindingConnector" key="connector" id="769667344">
-							<reference key="NSSource" ref="555379611"/>
-							<reference key="NSDestination" ref="155693011"/>
-							<string key="NSLabel">content: arrangedObjects</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">278</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.isAtom</string>
-						<reference key="source" ref="913349665"/>
-						<reference key="destination" ref="155693011"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="913349665"/>
-							<reference key="NSDestination" ref="155693011"/>
-							<string key="NSLabel">enabled: arrangedObjects.isAtom</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.isAtom</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NSNegateBoolean</string>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">281</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">nodeDataArrayController</string>
@@ -1381,70 +1633,6 @@
 					</object>
 					<int key="connectionID">282</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="555379611"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">290</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canRemove</string>
-						<reference key="source" ref="503141179"/>
-						<reference key="destination" ref="155693011"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="503141179"/>
-							<reference key="NSDestination" ref="155693011"/>
-							<string key="NSLabel">enabled: canRemove</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canRemove</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">297</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="280174442"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">331</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects</string>
-						<reference key="source" ref="280174442"/>
-						<reference key="destination" ref="785464170"/>
-						<object class="NSNibBindingConnector" key="connector" id="547382491">
-							<reference key="NSSource" ref="280174442"/>
-							<reference key="NSDestination" ref="785464170"/>
-							<string key="NSLabel">content: arrangedObjects</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">346</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canRemove</string>
-						<reference key="source" ref="855960268"/>
-						<reference key="destination" ref="785464170"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="855960268"/>
-							<reference key="NSDestination" ref="785464170"/>
-							<string key="NSLabel">enabled: canRemove</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canRemove</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">347</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">addNodeProperty:</string>
@@ -1493,42 +1681,6 @@
 					</object>
 					<int key="connectionID">354</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.isAtom</string>
-						<reference key="source" ref="680754354"/>
-						<reference key="destination" ref="785464170"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="680754354"/>
-							<reference key="NSDestination" ref="785464170"/>
-							<string key="NSLabel">enabled: arrangedObjects.isAtom</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.isAtom</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NSNegateBoolean</string>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">356</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.value</string>
-						<reference key="source" ref="680754354"/>
-						<reference key="destination" ref="785464170"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="680754354"/>
-							<reference key="NSDestination" ref="785464170"/>
-							<string key="NSLabel">value: arrangedObjects.value</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.value</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">357</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">removeGraphProperty:</string>
@@ -1545,14 +1697,6 @@
 					</object>
 					<int key="connectionID">359</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="384092475"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">382</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">edgePropertiesView</string>
@@ -1593,102 +1737,6 @@
 					</object>
 					<int key="connectionID">393</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canRemove</string>
-						<reference key="source" ref="299136596"/>
-						<reference key="destination" ref="97510786"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="299136596"/>
-							<reference key="NSDestination" ref="97510786"/>
-							<string key="NSLabel">enabled: canRemove</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canRemove</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">394</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects</string>
-						<reference key="source" ref="384092475"/>
-						<reference key="destination" ref="97510786"/>
-						<object class="NSNibBindingConnector" key="connector" id="587304532">
-							<reference key="NSSource" ref="384092475"/>
-							<reference key="NSDestination" ref="97510786"/>
-							<string key="NSLabel">content: arrangedObjects</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">401</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.value</string>
-						<reference key="source" ref="970801822"/>
-						<reference key="destination" ref="97510786"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="970801822"/>
-							<reference key="NSDestination" ref="97510786"/>
-							<string key="NSLabel">value: arrangedObjects.value</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.value</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">405</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="755303575"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">421</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="906988363"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">440</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects</string>
-						<reference key="source" ref="755303575"/>
-						<reference key="destination" ref="852813361"/>
-						<object class="NSNibBindingConnector" key="connector" id="369577392">
-							<reference key="NSSource" ref="755303575"/>
-							<reference key="NSDestination" ref="852813361"/>
-							<string key="NSLabel">content: arrangedObjects</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">443</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.value</string>
-						<reference key="source" ref="173306098"/>
-						<reference key="destination" ref="852813361"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="173306098"/>
-							<reference key="NSDestination" ref="852813361"/>
-							<string key="NSLabel">value: arrangedObjects.value</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.value</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">445</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">addEdgeNodeProperty:</string>
@@ -1737,42 +1785,6 @@
 					</object>
 					<int key="connectionID">454</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.isAtom</string>
-						<reference key="source" ref="173306098"/>
-						<reference key="destination" ref="852813361"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="173306098"/>
-							<reference key="NSDestination" ref="852813361"/>
-							<string key="NSLabel">enabled: arrangedObjects.isAtom</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.isAtom</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NSNegateBoolean</string>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">459</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canRemove</string>
-						<reference key="source" ref="494601848"/>
-						<reference key="destination" ref="852813361"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="494601848"/>
-							<reference key="NSDestination" ref="852813361"/>
-							<string key="NSLabel">enabled: canRemove</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canRemove</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">460</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">propertyInspectorView</string>
@@ -1781,26 +1793,6 @@
 					</object>
 					<int key="connectionID">464</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.isAtom</string>
-						<reference key="source" ref="970801822"/>
-						<reference key="destination" ref="97510786"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="970801822"/>
-							<reference key="NSDestination" ref="97510786"/>
-							<string key="NSLabel">enabled: arrangedObjects.isAtom</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.isAtom</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NSNegateBoolean</string>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">467</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">window</string>
@@ -1809,22 +1801,6 @@
 					</object>
 					<int key="connectionID">567</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: selectedNodes</string>
-						<reference key="source" ref="238023931"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="238023931"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">contentArray: selectedNodes</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">selectedNodes</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">577</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">selectedNodesArrayController</string>
@@ -1833,14 +1809,6 @@
 					</object>
 					<int key="connectionID">583</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="924106352"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">584</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">selectedEdgesArrayController</string>
@@ -1850,51 +1818,406 @@
 					<int key="connectionID">586</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: selectedEdges</string>
-						<reference key="source" ref="146523955"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="146523955"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">contentArray: selectedEdges</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">selectedEdges</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">refreshDocument:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="841146514"/>
 					</object>
-					<int key="connectionID">589</int>
+					<int key="connectionID">596</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.hasEdgeNode</string>
-						<reference key="source" ref="841146514"/>
-						<reference key="destination" ref="146523955"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="841146514"/>
-							<reference key="NSDestination" ref="146523955"/>
-							<string key="NSLabel">value: selection.hasEdgeNode</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.hasEdgeNode</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sourceAnchorNamesArrayController</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="717478128"/>
 					</object>
-					<int key="connectionID">595</int>
+					<int key="connectionID">678</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">refreshDocument:</string>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">targetAnchorNamesArrayController</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="841146514"/>
+						<reference key="destination" ref="410054055"/>
 					</object>
-					<int key="connectionID">596</int>
+					<int key="connectionID">682</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canAdd</string>
-						<reference key="source" ref="329712707"/>
-						<reference key="destination" ref="97510786"/>
-						<object class="NSNibBindingConnector" key="connector">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sourceAnchorComboBox</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="559516931"/>
+					</object>
+					<int key="connectionID">716</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">targetAnchorComboBox</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="725142441"/>
+					</object>
+					<int key="connectionID">717</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="924106352"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">584</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.label</string>
+						<reference key="source" ref="924106352"/>
+						<reference key="destination" ref="238023931"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="924106352"/>
+							<reference key="NSDestination" ref="238023931"/>
+							<string key="NSLabel">value: selection.label</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.label</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSMultipleValuesPlaceholder</string>
+									<string>NSValueTransformerName</string>
+								</object>
+								<object class="NSArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>Multiple Values</string>
+									<string>NilToEmptyStringTransformer</string>
+								</object>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">644</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canAdd</string>
+						<reference key="source" ref="480495865"/>
+						<reference key="destination" ref="155693011"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="480495865"/>
+							<reference key="NSDestination" ref="155693011"/>
+							<string key="NSLabel">enabled: canAdd</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canAdd</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">615</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canRemove</string>
+						<reference key="source" ref="503141179"/>
+						<reference key="destination" ref="155693011"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="503141179"/>
+							<reference key="NSDestination" ref="155693011"/>
+							<string key="NSLabel">enabled: canRemove</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canRemove</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">297</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="555379611"/>
+						<reference key="destination" ref="155693011"/>
+						<object class="NSNibBindingConnector" key="connector" id="769667344">
+							<reference key="NSSource" ref="555379611"/>
+							<reference key="NSDestination" ref="155693011"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">278</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="555379611"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">290</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: isEditable</string>
+						<reference key="source" ref="555379611"/>
+						<reference key="destination" ref="155693011"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="555379611"/>
+							<reference key="NSDestination" ref="155693011"/>
+							<string key="NSLabel">enabled: isEditable</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">isEditable</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">622</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectionIndexes: selectionIndexes</string>
+						<reference key="source" ref="555379611"/>
+						<reference key="destination" ref="155693011"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="555379611"/>
+							<reference key="NSDestination" ref="155693011"/>
+							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
+							<string key="NSBinding">selectionIndexes</string>
+							<string key="NSKeyPath">selectionIndexes</string>
+							<reference key="NSPreviousConnector" ref="769667344"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">650</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.key</string>
+						<reference key="source" ref="952219629"/>
+						<reference key="destination" ref="155693011"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="952219629"/>
+							<reference key="NSDestination" ref="155693011"/>
+							<string key="NSLabel">value: arrangedObjects.key</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.key</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">274</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.value</string>
+						<reference key="source" ref="913349665"/>
+						<reference key="destination" ref="155693011"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="913349665"/>
+							<reference key="NSDestination" ref="155693011"/>
+							<string key="NSLabel">value: arrangedObjects.value</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.value</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">277</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: arrangedObjects.isAtom</string>
+						<reference key="source" ref="913349665"/>
+						<reference key="destination" ref="155693011"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="913349665"/>
+							<reference key="NSDestination" ref="155693011"/>
+							<string key="NSLabel">enabled: arrangedObjects.isAtom</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">arrangedObjects.isAtom</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">281</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canAdd</string>
+						<reference key="source" ref="762974559"/>
+						<reference key="destination" ref="155693011"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="762974559"/>
+							<reference key="NSDestination" ref="155693011"/>
+							<string key="NSLabel">enabled: canAdd</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canAdd</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">618</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canRemove</string>
+						<reference key="source" ref="855960268"/>
+						<reference key="destination" ref="785464170"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="855960268"/>
+							<reference key="NSDestination" ref="785464170"/>
+							<string key="NSLabel">enabled: canRemove</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canRemove</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">347</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canAdd</string>
+						<reference key="source" ref="985476901"/>
+						<reference key="destination" ref="785464170"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="985476901"/>
+							<reference key="NSDestination" ref="785464170"/>
+							<string key="NSLabel">enabled: canAdd</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canAdd</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">643</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canAdd</string>
+						<reference key="source" ref="763774819"/>
+						<reference key="destination" ref="785464170"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="763774819"/>
+							<reference key="NSDestination" ref="785464170"/>
+							<string key="NSLabel">enabled: canAdd</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canAdd</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">640</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="280174442"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">331</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="280174442"/>
+						<reference key="destination" ref="785464170"/>
+						<object class="NSNibBindingConnector" key="connector" id="547382491">
+							<reference key="NSSource" ref="280174442"/>
+							<reference key="NSDestination" ref="785464170"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">346</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: isEditable</string>
+						<reference key="source" ref="280174442"/>
+						<reference key="destination" ref="785464170"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="280174442"/>
+							<reference key="NSDestination" ref="785464170"/>
+							<string key="NSLabel">enabled: isEditable</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">isEditable</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">638</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectionIndexes: selectionIndexes</string>
+						<reference key="source" ref="280174442"/>
+						<reference key="destination" ref="785464170"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="280174442"/>
+							<reference key="NSDestination" ref="785464170"/>
+							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
+							<string key="NSBinding">selectionIndexes</string>
+							<string key="NSKeyPath">selectionIndexes</string>
+							<reference key="NSPreviousConnector" ref="547382491"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">652</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: arrangedObjects.isAtom</string>
+						<reference key="source" ref="680754354"/>
+						<reference key="destination" ref="785464170"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="680754354"/>
+							<reference key="NSDestination" ref="785464170"/>
+							<string key="NSLabel">enabled: arrangedObjects.isAtom</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">arrangedObjects.isAtom</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">356</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.value</string>
+						<reference key="source" ref="680754354"/>
+						<reference key="destination" ref="785464170"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="680754354"/>
+							<reference key="NSDestination" ref="785464170"/>
+							<string key="NSLabel">value: arrangedObjects.value</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.value</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">357</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.key</string>
+						<reference key="source" ref="537051925"/>
+						<reference key="destination" ref="785464170"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="537051925"/>
+							<reference key="NSDestination" ref="785464170"/>
+							<string key="NSLabel">value: arrangedObjects.key</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.key</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NilToEmptyStringTransformer</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">645</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canAdd</string>
+						<reference key="source" ref="329712707"/>
+						<reference key="destination" ref="97510786"/>
+						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="329712707"/>
 							<reference key="NSDestination" ref="97510786"/>
 							<string key="NSLabel">enabled: canAdd</string>
@@ -1908,66 +2231,260 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">enabled: canAdd</string>
-						<reference key="source" ref="480495865"/>
-						<reference key="destination" ref="155693011"/>
+						<reference key="source" ref="106397766"/>
+						<reference key="destination" ref="97510786"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="480495865"/>
-							<reference key="NSDestination" ref="155693011"/>
+							<reference key="NSSource" ref="106397766"/>
+							<reference key="NSDestination" ref="97510786"/>
 							<string key="NSLabel">enabled: canAdd</string>
 							<string key="NSBinding">enabled</string>
 							<string key="NSKeyPath">canAdd</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">615</int>
+					<int key="connectionID">624</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canRemove</string>
+						<reference key="source" ref="299136596"/>
+						<reference key="destination" ref="97510786"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="299136596"/>
+							<reference key="NSDestination" ref="97510786"/>
+							<string key="NSLabel">enabled: canRemove</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canRemove</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="384092475"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">382</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="384092475"/>
+						<reference key="destination" ref="97510786"/>
+						<object class="NSNibBindingConnector" key="connector" id="587304532">
+							<reference key="NSSource" ref="384092475"/>
+							<reference key="NSDestination" ref="97510786"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">401</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: isEditable</string>
+						<reference key="source" ref="384092475"/>
+						<reference key="destination" ref="97510786"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="384092475"/>
+							<reference key="NSDestination" ref="97510786"/>
+							<string key="NSLabel">enabled: isEditable</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">isEditable</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">630</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectionIndexes: selectionIndexes</string>
+						<reference key="source" ref="384092475"/>
+						<reference key="destination" ref="97510786"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="384092475"/>
+							<reference key="NSDestination" ref="97510786"/>
+							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
+							<string key="NSBinding">selectionIndexes</string>
+							<string key="NSKeyPath">selectionIndexes</string>
+							<reference key="NSPreviousConnector" ref="587304532"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">654</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.key</string>
+						<reference key="source" ref="477855207"/>
+						<reference key="destination" ref="97510786"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="477855207"/>
+							<reference key="NSDestination" ref="97510786"/>
+							<string key="NSLabel">value: arrangedObjects.key</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.key</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NilToEmptyStringTransformer</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">646</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.value</string>
+						<reference key="source" ref="970801822"/>
+						<reference key="destination" ref="97510786"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="970801822"/>
+							<reference key="NSDestination" ref="97510786"/>
+							<string key="NSLabel">value: arrangedObjects.value</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.value</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">405</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: arrangedObjects.isAtom</string>
+						<reference key="source" ref="970801822"/>
+						<reference key="destination" ref="97510786"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="970801822"/>
+							<reference key="NSDestination" ref="97510786"/>
+							<string key="NSLabel">enabled: arrangedObjects.isAtom</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">arrangedObjects.isAtom</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">467</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="755303575"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">421</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="755303575"/>
+						<reference key="destination" ref="852813361"/>
+						<object class="NSNibBindingConnector" key="connector" id="369577392">
+							<reference key="NSSource" ref="755303575"/>
+							<reference key="NSDestination" ref="852813361"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">443</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: isEditable</string>
+						<reference key="source" ref="755303575"/>
+						<reference key="destination" ref="852813361"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="755303575"/>
+							<reference key="NSDestination" ref="852813361"/>
+							<string key="NSLabel">enabled: isEditable</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">isEditable</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">632</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectionIndexes: selectionIndexes</string>
+						<reference key="source" ref="755303575"/>
+						<reference key="destination" ref="852813361"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="755303575"/>
+							<reference key="NSDestination" ref="852813361"/>
+							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
+							<string key="NSBinding">selectionIndexes</string>
+							<string key="NSKeyPath">selectionIndexes</string>
+							<reference key="NSPreviousConnector" ref="369577392"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">656</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canAdd</string>
-						<reference key="source" ref="762974559"/>
-						<reference key="destination" ref="155693011"/>
+						<string key="label">value: arrangedObjects.value</string>
+						<reference key="source" ref="173306098"/>
+						<reference key="destination" ref="852813361"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="762974559"/>
-							<reference key="NSDestination" ref="155693011"/>
-							<string key="NSLabel">enabled: canAdd</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canAdd</string>
+							<reference key="NSSource" ref="173306098"/>
+							<reference key="NSDestination" ref="852813361"/>
+							<string key="NSLabel">value: arrangedObjects.value</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.value</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">618</int>
+					<int key="connectionID">445</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: isEditable</string>
-						<reference key="source" ref="555379611"/>
-						<reference key="destination" ref="155693011"/>
+						<string key="label">enabled: arrangedObjects.isAtom</string>
+						<reference key="source" ref="173306098"/>
+						<reference key="destination" ref="852813361"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="555379611"/>
-							<reference key="NSDestination" ref="155693011"/>
-							<string key="NSLabel">enabled: isEditable</string>
+							<reference key="NSSource" ref="173306098"/>
+							<reference key="NSDestination" ref="852813361"/>
+							<string key="NSLabel">enabled: arrangedObjects.isAtom</string>
 							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">isEditable</string>
+							<string key="NSKeyPath">arrangedObjects.isAtom</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">622</int>
+					<int key="connectionID">459</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canAdd</string>
-						<reference key="source" ref="106397766"/>
-						<reference key="destination" ref="97510786"/>
+						<string key="label">value: arrangedObjects.key</string>
+						<reference key="source" ref="314771163"/>
+						<reference key="destination" ref="852813361"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="106397766"/>
-							<reference key="NSDestination" ref="97510786"/>
-							<string key="NSLabel">enabled: canAdd</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canAdd</string>
+							<reference key="NSSource" ref="314771163"/>
+							<reference key="NSDestination" ref="852813361"/>
+							<string key="NSLabel">value: arrangedObjects.key</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.key</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NilToEmptyStringTransformer</string>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">624</int>
+					<int key="connectionID">647</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
@@ -2003,35 +2520,43 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: isEditable</string>
-						<reference key="source" ref="384092475"/>
-						<reference key="destination" ref="97510786"/>
+						<string key="label">enabled: canRemove</string>
+						<reference key="source" ref="494601848"/>
+						<reference key="destination" ref="852813361"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="384092475"/>
-							<reference key="NSDestination" ref="97510786"/>
-							<string key="NSLabel">enabled: isEditable</string>
+							<reference key="NSSource" ref="494601848"/>
+							<reference key="NSDestination" ref="852813361"/>
+							<string key="NSLabel">enabled: canRemove</string>
 							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">isEditable</string>
+							<string key="NSKeyPath">canRemove</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">630</int>
+					<int key="connectionID">460</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: isEditable</string>
-						<reference key="source" ref="755303575"/>
-						<reference key="destination" ref="852813361"/>
+						<string key="label">value: selection.hasEdgeNode</string>
+						<reference key="source" ref="841146514"/>
+						<reference key="destination" ref="146523955"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="755303575"/>
-							<reference key="NSDestination" ref="852813361"/>
-							<string key="NSLabel">enabled: isEditable</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">isEditable</string>
+							<reference key="NSSource" ref="841146514"/>
+							<reference key="NSDestination" ref="146523955"/>
+							<string key="NSLabel">value: selection.hasEdgeNode</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.hasEdgeNode</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">632</int>
+					<int key="connectionID">595</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="906988363"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">440</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
@@ -2051,92 +2576,83 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: isEditable</string>
-						<reference key="source" ref="280174442"/>
-						<reference key="destination" ref="785464170"/>
+						<string key="label">value: selection.edgeNode.label</string>
+						<reference key="source" ref="906988363"/>
+						<reference key="destination" ref="146523955"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="280174442"/>
-							<reference key="NSDestination" ref="785464170"/>
-							<string key="NSLabel">enabled: isEditable</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">isEditable</string>
+							<reference key="NSSource" ref="906988363"/>
+							<reference key="NSDestination" ref="146523955"/>
+							<string key="NSLabel">value: selection.edgeNode.label</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.edgeNode.label</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NilToEmptyStringTransformer</string>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">638</int>
+					<int key="connectionID">648</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canAdd</string>
-						<reference key="source" ref="763774819"/>
-						<reference key="destination" ref="785464170"/>
+						<string key="label">contentArray: selectedNodes</string>
+						<reference key="source" ref="238023931"/>
+						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="763774819"/>
-							<reference key="NSDestination" ref="785464170"/>
-							<string key="NSLabel">enabled: canAdd</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canAdd</string>
+							<reference key="NSSource" ref="238023931"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: selectedNodes</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">selectedNodes</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">640</int>
+					<int key="connectionID">577</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canAdd</string>
-						<reference key="source" ref="985476901"/>
-						<reference key="destination" ref="785464170"/>
+						<string key="label">contentArray: selectedEdges</string>
+						<reference key="source" ref="146523955"/>
+						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="985476901"/>
-							<reference key="NSDestination" ref="785464170"/>
-							<string key="NSLabel">enabled: canAdd</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canAdd</string>
+							<reference key="NSSource" ref="146523955"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: selectedEdges</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">selectedEdges</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">643</int>
+					<int key="connectionID">589</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.label</string>
-						<reference key="source" ref="924106352"/>
-						<reference key="destination" ref="238023931"/>
+						<string key="label">enabled: selection.hasEdgeNode</string>
+						<reference key="source" ref="664436771"/>
+						<reference key="destination" ref="146523955"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="924106352"/>
-							<reference key="NSDestination" ref="238023931"/>
-							<string key="NSLabel">value: selection.label</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.label</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>Multiple Values</string>
-									<string>NilToEmptyStringTransformer</string>
-								</object>
-							</object>
+							<reference key="NSSource" ref="664436771"/>
+							<reference key="NSDestination" ref="146523955"/>
+							<string key="NSLabel">enabled: selection.hasEdgeNode</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">selection.hasEdgeNode</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">644</int>
+					<int key="connectionID">661</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.key</string>
-						<reference key="source" ref="537051925"/>
-						<reference key="destination" ref="785464170"/>
+						<string key="label">value: selection.edgeNode.label</string>
+						<reference key="source" ref="664436771"/>
+						<reference key="destination" ref="146523955"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="537051925"/>
-							<reference key="NSDestination" ref="785464170"/>
-							<string key="NSLabel">value: arrangedObjects.key</string>
+							<reference key="NSSource" ref="664436771"/>
+							<reference key="NSDestination" ref="146523955"/>
+							<string key="NSLabel">value: selection.edgeNode.label</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.key</string>
+							<string key="NSKeyPath">selection.edgeNode.label</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NilToEmptyStringTransformer</string>
@@ -2144,135 +2660,171 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">645</int>
+					<int key="connectionID">662</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="664436771"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">663</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.key</string>
-						<reference key="source" ref="477855207"/>
-						<reference key="destination" ref="97510786"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="477855207"/>
-							<reference key="NSDestination" ref="97510786"/>
-							<string key="NSLabel">value: arrangedObjects.key</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.key</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NilToEmptyStringTransformer</string>
-							</object>
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="559516931"/>
+						<reference key="destination" ref="717478128"/>
+						<object class="NSNibBindingConnector" key="connector" id="474578804">
+							<reference key="NSSource" ref="559516931"/>
+							<reference key="NSDestination" ref="717478128"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">646</int>
+					<int key="connectionID">707</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.key</string>
-						<reference key="source" ref="314771163"/>
-						<reference key="destination" ref="852813361"/>
+						<string key="label">contentValues: arrangedObjects</string>
+						<reference key="source" ref="559516931"/>
+						<reference key="destination" ref="717478128"/>
+						<object class="NSNibBindingConnector" key="connector" id="270039432">
+							<reference key="NSSource" ref="559516931"/>
+							<reference key="NSDestination" ref="717478128"/>
+							<string key="NSLabel">contentValues: arrangedObjects</string>
+							<string key="NSBinding">contentValues</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<reference key="NSPreviousConnector" ref="474578804"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">708</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.sourceAnchor</string>
+						<reference key="source" ref="559516931"/>
+						<reference key="destination" ref="146523955"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="314771163"/>
-							<reference key="NSDestination" ref="852813361"/>
-							<string key="NSLabel">value: arrangedObjects.key</string>
+							<reference key="NSSource" ref="559516931"/>
+							<reference key="NSDestination" ref="146523955"/>
+							<string key="NSLabel">value: selection.sourceAnchor</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.key</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NilToEmptyStringTransformer</string>
-							</object>
+							<string key="NSKeyPath">selection.sourceAnchor</string>
+							<reference key="NSPreviousConnector" ref="270039432"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">647</int>
+					<int key="connectionID">709</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="559516931"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">714</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.edgeNode.label</string>
-						<reference key="source" ref="906988363"/>
-						<reference key="destination" ref="146523955"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="906988363"/>
-							<reference key="NSDestination" ref="146523955"/>
-							<string key="NSLabel">value: selection.edgeNode.label</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.edgeNode.label</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NilToEmptyStringTransformer</string>
-							</object>
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="725142441"/>
+						<reference key="destination" ref="410054055"/>
+						<object class="NSNibBindingConnector" key="connector" id="170699728">
+							<reference key="NSSource" ref="725142441"/>
+							<reference key="NSDestination" ref="410054055"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">648</int>
+					<int key="connectionID">710</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectionIndexes: selectionIndexes</string>
-						<reference key="source" ref="555379611"/>
-						<reference key="destination" ref="155693011"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="555379611"/>
-							<reference key="NSDestination" ref="155693011"/>
-							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
-							<string key="NSBinding">selectionIndexes</string>
-							<string key="NSKeyPath">selectionIndexes</string>
-							<reference key="NSPreviousConnector" ref="769667344"/>
+						<string key="label">contentValues: arrangedObjects</string>
+						<reference key="source" ref="725142441"/>
+						<reference key="destination" ref="410054055"/>
+						<object class="NSNibBindingConnector" key="connector" id="501407626">
+							<reference key="NSSource" ref="725142441"/>
+							<reference key="NSDestination" ref="410054055"/>
+							<string key="NSLabel">contentValues: arrangedObjects</string>
+							<string key="NSBinding">contentValues</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<reference key="NSPreviousConnector" ref="170699728"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">650</int>
+					<int key="connectionID">711</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectionIndexes: selectionIndexes</string>
-						<reference key="source" ref="280174442"/>
-						<reference key="destination" ref="785464170"/>
+						<string key="label">value: selection.targetAnchor</string>
+						<reference key="source" ref="725142441"/>
+						<reference key="destination" ref="146523955"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="280174442"/>
-							<reference key="NSDestination" ref="785464170"/>
-							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
-							<string key="NSBinding">selectionIndexes</string>
-							<string key="NSKeyPath">selectionIndexes</string>
-							<reference key="NSPreviousConnector" ref="547382491"/>
+							<reference key="NSSource" ref="725142441"/>
+							<reference key="NSDestination" ref="146523955"/>
+							<string key="NSLabel">value: selection.targetAnchor</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.targetAnchor</string>
+							<reference key="NSPreviousConnector" ref="501407626"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">652</int>
+					<int key="connectionID">713</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="725142441"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">715</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">content</string>
+						<reference key="source" ref="717478128"/>
+						<reference key="destination" ref="559516931"/>
+					</object>
+					<int key="connectionID">675</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectionIndexes: selectionIndexes</string>
-						<reference key="source" ref="384092475"/>
-						<reference key="destination" ref="97510786"/>
+						<string key="label">contentArray: sourceAnchorNames</string>
+						<reference key="source" ref="717478128"/>
+						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="384092475"/>
-							<reference key="NSDestination" ref="97510786"/>
-							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
-							<string key="NSBinding">selectionIndexes</string>
-							<string key="NSKeyPath">selectionIndexes</string>
-							<reference key="NSPreviousConnector" ref="587304532"/>
+							<reference key="NSSource" ref="717478128"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: sourceAnchorNames</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">sourceAnchorNames</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">654</int>
+					<int key="connectionID">680</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectionIndexes: selectionIndexes</string>
-						<reference key="source" ref="755303575"/>
-						<reference key="destination" ref="852813361"/>
+						<string key="label">contentArray: targetAnchorNames</string>
+						<reference key="source" ref="410054055"/>
+						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="755303575"/>
-							<reference key="NSDestination" ref="852813361"/>
-							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
-							<string key="NSBinding">selectionIndexes</string>
-							<string key="NSKeyPath">selectionIndexes</string>
-							<reference key="NSPreviousConnector" ref="369577392"/>
+							<reference key="NSSource" ref="410054055"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: targetAnchorNames</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">targetAnchorNames</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">656</int>
+					<int key="connectionID">684</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2280,7 +2832,9 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
@@ -2607,6 +3161,11 @@
 							<reference ref="381359914"/>
 							<reference ref="224516704"/>
 							<reference ref="906988363"/>
+							<reference ref="786681620"/>
+							<reference ref="1062338922"/>
+							<reference ref="586903912"/>
+							<reference ref="559516931"/>
+							<reference ref="725142441"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Edge Properties View</string>
@@ -2913,6 +3472,116 @@
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Selected Edges Array Controller</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">657</int>
+						<reference key="object" ref="513522177"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="522971083"/>
+						</object>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">658</int>
+						<reference key="object" ref="664436771"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="579604223"/>
+						</object>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">659</int>
+						<reference key="object" ref="579604223"/>
+						<reference key="parent" ref="664436771"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">660</int>
+						<reference key="object" ref="522971083"/>
+						<reference key="parent" ref="513522177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">664</int>
+						<reference key="object" ref="786681620"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="78896067"/>
+						</object>
+						<reference key="parent" ref="924183072"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">665</int>
+						<reference key="object" ref="78896067"/>
+						<reference key="parent" ref="786681620"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">666</int>
+						<reference key="object" ref="559516931"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="714570294"/>
+						</object>
+						<reference key="parent" ref="924183072"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">667</int>
+						<reference key="object" ref="714570294"/>
+						<reference key="parent" ref="559516931"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">668</int>
+						<reference key="object" ref="725142441"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="829332788"/>
+						</object>
+						<reference key="parent" ref="924183072"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">669</int>
+						<reference key="object" ref="829332788"/>
+						<reference key="parent" ref="725142441"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">670</int>
+						<reference key="object" ref="1062338922"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="825166761"/>
+						</object>
+						<reference key="parent" ref="924183072"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">671</int>
+						<reference key="object" ref="825166761"/>
+						<reference key="parent" ref="1062338922"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">672</int>
+						<reference key="object" ref="586903912"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="187890294"/>
+						</object>
+						<reference key="parent" ref="924183072"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">673</int>
+						<reference key="object" ref="187890294"/>
+						<reference key="parent" ref="586903912"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">674</int>
+						<reference key="object" ref="717478128"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Source Anchor Names Array Controller</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">681</int>
+						<reference key="object" ref="410054055"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Target Anchor Names Array Controller</string>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -3009,8 +3678,24 @@
 					<string>463.IBPluginDependency</string>
 					<string>575.IBPluginDependency</string>
 					<string>585.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
+					<string>657.IBPluginDependency</string>
+					<string>658.IBPluginDependency</string>
+					<string>659.IBPluginDependency</string>
+					<string>660.IBPluginDependency</string>
+					<string>664.IBPluginDependency</string>
+					<string>665.IBPluginDependency</string>
+					<string>666.IBPluginDependency</string>
+					<string>667.IBPluginDependency</string>
+					<string>668.IBPluginDependency</string>
+					<string>669.IBPluginDependency</string>
+					<string>670.IBPluginDependency</string>
+					<string>671.IBPluginDependency</string>
+					<string>672.IBPluginDependency</string>
+					<string>673.IBPluginDependency</string>
+					<string>674.IBPluginDependency</string>
+					<string>681.IBPluginDependency</string>
+				</object>
+				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3102,6 +3787,22 @@
 					<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>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">
@@ -3116,7 +3817,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">656</int>
+			<int key="maxID">717</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3130,7 +3831,7 @@
 							<string>applyStyleToSelectedNodes:</string>
 							<string>clearStyleOfSelectedNodes:</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
@@ -3143,7 +3844,7 @@
 							<string>applyStyleToSelectedNodes:</string>
 							<string>clearStyleOfSelectedNodes:</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBActionInfo">
 								<string key="name">applyStyleToSelectedNodes:</string>
@@ -3160,240 +3861,13 @@
 						<string key="minorKey"/>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PropertyInspectorController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addEdgeAtom:</string>
-							<string>addEdgeNodeAtom:</string>
-							<string>addEdgeNodeProperty:</string>
-							<string>addEdgeProperty:</string>
-							<string>addGraphAtom:</string>
-							<string>addGraphProperty:</string>
-							<string>addNodeAtom:</string>
-							<string>addNodeProperty:</string>
-							<string>refreshDocument:</string>
-							<string>removeEdgeNodeProperty:</string>
-							<string>removeEdgeProperty:</string>
-							<string>removeGraphProperty:</string>
-							<string>removeNodeProperty:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addEdgeAtom:</string>
-							<string>addEdgeNodeAtom:</string>
-							<string>addEdgeNodeProperty:</string>
-							<string>addEdgeProperty:</string>
-							<string>addGraphAtom:</string>
-							<string>addGraphProperty:</string>
-							<string>addNodeAtom:</string>
-							<string>addNodeProperty:</string>
-							<string>refreshDocument:</string>
-							<string>removeEdgeNodeProperty:</string>
-							<string>removeEdgeProperty:</string>
-							<string>removeGraphProperty:</string>
-							<string>removeNodeProperty:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">addEdgeAtom:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addEdgeNodeAtom:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addEdgeNodeProperty:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addEdgeProperty:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addGraphAtom:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addGraphProperty:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addNodeAtom:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addNodeProperty:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">refreshDocument:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">removeEdgeNodeProperty:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">removeEdgeProperty:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">removeGraphProperty:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">removeNodeProperty:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>edgeDataArrayController</string>
-							<string>edgeNodeCheckbox</string>
-							<string>edgeNodeDataArrayController</string>
-							<string>edgeNodeLabelField</string>
-							<string>edgePropertiesView</string>
-							<string>graphDataArrayController</string>
-							<string>graphPropertiesView</string>
-							<string>nodeDataArrayController</string>
-							<string>nodePropertiesView</string>
-							<string>propertyInspectorView</string>
-							<string>selectedEdgesArrayController</string>
-							<string>selectedNodesArrayController</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSArrayController</string>
-							<string>NSButton</string>
-							<string>NSArrayController</string>
-							<string>NSTextField</string>
-							<string>NSView</string>
-							<string>NSArrayController</string>
-							<string>NSView</string>
-							<string>NSArrayController</string>
-							<string>NSView</string>
-							<string>SFBInspectorView</string>
-							<string>NSArrayController</string>
-							<string>NSArrayController</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>edgeDataArrayController</string>
-							<string>edgeNodeCheckbox</string>
-							<string>edgeNodeDataArrayController</string>
-							<string>edgeNodeLabelField</string>
-							<string>edgePropertiesView</string>
-							<string>graphDataArrayController</string>
-							<string>graphPropertiesView</string>
-							<string>nodeDataArrayController</string>
-							<string>nodePropertiesView</string>
-							<string>propertyInspectorView</string>
-							<string>selectedEdgesArrayController</string>
-							<string>selectedNodesArrayController</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">edgeDataArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">edgeNodeCheckbox</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">edgeNodeDataArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">edgeNodeLabelField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">edgePropertiesView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">graphDataArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">graphPropertiesView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">nodeDataArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">nodePropertiesView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">propertyInspectorView</string>
-								<string key="candidateClassName">SFBInspectorView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">selectedEdgesArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">selectedNodesArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PropertyInspectorController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SFBInspectorView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/SFBInspectorView.h</string>
-					</object>
-				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
+			<real value="1070" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
@@ -3409,7 +3883,7 @@
 				<string>NSRemoveTemplate</string>
 				<string>NSSwitch</string>
 			</object>
-			<object class="NSMutableArray" key="dict.values">
+			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<string>{8, 8}</string>
 				<string>{8, 8}</string>
diff --git a/tikzit/English.lproj/StylePalette.xib b/tikzit/English.lproj/StylePalette.xib
index af04249..2d3472c 100644
--- a/tikzit/English.lproj/StylePalette.xib
+++ b/tikzit/English.lproj/StylePalette.xib
@@ -1,52 +1,49 @@
 <?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">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12C60</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2843</string>
+		<string key="IBDocument.AppKitVersion">1187.34</string>
+		<string key="IBDocument.HIToolboxVersion">625.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1617</string>
+			<string key="NS.object.0">2843</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSColorWell</string>
-			<string>NSMenu</string>
-			<string>NSSliderCell</string>
-			<string>NSButton</string>
-			<string>NSCustomObject</string>
 			<string>NSArrayController</string>
-			<string>NSSlider</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
 			<string>NSCollectionView</string>
-			<string>NSCustomView</string>
-			<string>NSTableView</string>
+			<string>NSCollectionViewItem</string>
+			<string>NSColorWell</string>
 			<string>NSComboBox</string>
-			<string>NSTextField</string>
 			<string>NSComboBoxCell</string>
-			<string>NSWindowTemplate</string>
-			<string>NSTextFieldCell</string>
-			<string>NSButtonCell</string>
-			<string>NSTableColumn</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSPopUpButton</string>
 			<string>NSPopUpButtonCell</string>
-			<string>NSCollectionViewItem</string>
-			<string>NSView</string>
 			<string>NSScrollView</string>
 			<string>NSScroller</string>
-			<string>NSPopUpButton</string>
-			<string>NSMenuItem</string>
+			<string>NSSlider</string>
+			<string>NSSliderCell</string>
+			<string>NSTableColumn</string>
+			<string>NSTableView</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
 		</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>
-			<reference key="dict.values" ref="0"/>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -79,27 +76,26 @@
 							<int key="NSvFlags">274</int>
 							<string key="NSFrameSize">{193, 313}</string>
 							<reference key="NSSuperview" ref="888499738"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView"/>
 							<string key="NSClassName">SFBInspectorView</string>
 						</object>
 					</object>
 					<string key="NSFrameSize">{193, 313}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="981650066"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1600, 1200}}</string>
 				<string key="NSMinSize">{200, 246}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSCustomView" id="608079500">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<string key="NSFrameSize">{33, 33}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSNextKeyView"/>
 				<bool key="NSViewIsLayerTreeHost">YES</bool>
-				<int key="NSViewLayerContentsRedrawPolicy">2</int>
 				<string key="NSClassName">SelectableNodeView</string>
 			</object>
 			<object class="NSCollectionViewItem" id="220154097"/>
@@ -113,11 +109,10 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{67, 164}, {122, 23}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="957194966"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSComboBoxCell" key="NSCell" id="148091316">
-							<int key="NSCellFlags">343014976</int>
+							<int key="NSCellFlags">342884416</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<object class="NSFont" key="NSSupport" id="24">
@@ -151,18 +146,20 @@
 							<object class="NSComboTableView" key="NSTableView" id="382976840">
 								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">274</int>
-								<string key="NSFrameSize">{15, 0}</string>
+								<string key="NSFrameSize">{13, 0}</string>
 								<reference key="NSSuperview"/>
 								<reference key="NSWindow"/>
 								<bool key="NSEnabled">YES</bool>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 								<object class="NSMutableArray" key="NSTableColumns">
 									<bool key="EncodedWithXMLCoder">YES</bool>
 									<object class="NSTableColumn">
-										<double key="NSWidth">12</double>
+										<double key="NSWidth">10</double>
 										<double key="NSMinWidth">10</double>
 										<double key="NSMaxWidth">1000</double>
 										<object class="NSTableHeaderCell" key="NSHeaderCell">
-											<int key="NSCellFlags">75628032</int>
+											<int key="NSCellFlags">75497472</int>
 											<int key="NSCellFlags2">0</int>
 											<string key="NSContents"/>
 											<object class="NSFont" key="NSSupport" id="705209814">
@@ -177,7 +174,7 @@
 											<reference key="NSTextColor" ref="136415388"/>
 										</object>
 										<object class="NSTextFieldCell" key="NSDataCell">
-											<int key="NSCellFlags">338820672</int>
+											<int key="NSCellFlags">338690112</int>
 											<int key="NSCellFlags2">1024</int>
 											<reference key="NSSupport" ref="24"/>
 											<reference key="NSControlView" ref="382976840"/>
@@ -212,7 +209,7 @@
 								</object>
 								<double key="NSRowHeight">15</double>
 								<string key="NSAction">tableViewAction:</string>
-								<int key="NSTvFlags">-767524864</int>
+								<int key="NSTvFlags">-765427712</int>
 								<reference key="NSDelegate" ref="148091316"/>
 								<reference key="NSDataSource" ref="148091316"/>
 								<reference key="NSTarget" ref="148091316"/>
@@ -224,17 +221,17 @@
 								<int key="NSTableViewGroupRowStyle">1</int>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="222281412">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{67, 193}, {28, 18}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="38833176"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="717779466">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="24"/>
@@ -248,17 +245,17 @@
 								<reference key="NSColor" ref="43177969"/>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSSlider" id="38833176">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{101, 188}, {87, 26}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="840928913"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSliderCell" key="NSCell" id="554953750">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents"/>
 							<reference key="NSControlView" ref="38833176"/>
@@ -271,17 +268,17 @@
 							<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
 							<bool key="NSVertical">NO</bool>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSPopUpButton" id="968796796">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{64, 269}, {125, 26}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="379213861"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="454038114">
-							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags">-2076180416</int>
 							<int key="NSCellFlags2">2048</int>
 							<object class="NSFont" key="NSSupport" id="47520286">
 								<string key="NSName">LucidaGrande</string>
@@ -289,7 +286,7 @@
 								<int key="NSfFlags">16</int>
 							</object>
 							<reference key="NSControlView" ref="968796796"/>
-							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags">109199360</int>
 							<int key="NSButtonFlags2">129</int>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
@@ -314,22 +311,22 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">2</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="424828094">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{97, 217}, {21, 22}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="945688463"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="584511638">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="926794154"/>
 							<reference key="NSControlView" ref="424828094"/>
-							<int key="NSButtonFlags">-2039201537</int>
+							<int key="NSButtonFlags">-2039201792</int>
 							<int key="NSButtonFlags2">6</int>
 							<object class="NSCustomResource" key="NSNormalImage" id="69868025">
 								<string key="NSClassName">NSImage</string>
@@ -340,22 +337,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="338115395">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{97, 243}, {21, 22}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="46641406"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="405590197">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="926794154"/>
 							<reference key="NSControlView" ref="338115395"/>
-							<int key="NSButtonFlags">-2039201537</int>
+							<int key="NSButtonFlags">-2039201792</int>
 							<int key="NSButtonFlags2">6</int>
 							<reference key="NSNormalImage" ref="69868025"/>
 							<string key="NSAlternateContents"/>
@@ -363,17 +360,17 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="840928913">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{4, 169}, {57, 14}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="254614675"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="331180695">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Category</string>
 							<object class="NSFont" key="NSSupport" id="811392858">
@@ -390,17 +387,17 @@
 							</object>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="945688463">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{5, 194}, {57, 14}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="222281412"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="896475164">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Scale</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -408,17 +405,17 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="161037776">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{67, 301}, {119, 19}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="665184364"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="345270966">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="47520286"/>
@@ -427,17 +424,17 @@
 							<reference key="NSBackgroundColor" ref="624542267"/>
 							<reference key="NSTextColor" ref="223583331"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="695838341">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{4, 303}, {57, 14}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="161037776"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="248476510">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Name</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -445,17 +442,17 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="665184364">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{4, 275}, {57, 14}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="968796796"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="530515050">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Shape</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -463,17 +460,17 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="46641406">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{4, 220}, {56, 14}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="745224580"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="200548157">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Fill</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -481,17 +478,17 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="379213861">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{4, 247}, {57, 14}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="402699060"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="602620784">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Stroke</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -499,6 +496,7 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSColorWell" id="745224580">
 						<reference key="NSNextResponder" ref="117500817"/>
@@ -512,9 +510,9 @@
 						</object>
 						<string key="NSFrame">{{67, 216}, {28, 23}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="424828094"/>
 						<bool key="NSEnabled">YES</bool>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						<bool key="NSIsBordered">YES</bool>
 						<object class="NSColor" key="NSColor">
 							<int key="NSColorSpace">1</int>
@@ -533,9 +531,9 @@
 						</object>
 						<string key="NSFrame">{{67, 243}, {28, 23}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="338115395"/>
 						<bool key="NSEnabled">YES</bool>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						<bool key="NSIsBordered">YES</bool>
 						<object class="NSColor" key="NSColor">
 							<int key="NSColorSpace">1</int>
@@ -547,15 +545,14 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{64, 137}, {125, 26}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="866550653"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="570007545">
-							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags">-2076180416</int>
 							<int key="NSCellFlags2">2048</int>
 							<reference key="NSSupport" ref="47520286"/>
 							<reference key="NSControlView" ref="160644086"/>
-							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags">109199360</int>
 							<int key="NSButtonFlags2">129</int>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
@@ -576,17 +573,17 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">2</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="957194966">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{4, 143}, {57, 14}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="160644086"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="456514276">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Show</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -594,22 +591,22 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="32314865">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{110, 5}, {52, 26}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="921132863">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">Clear</string>
 							<reference key="NSSupport" ref="47520286"/>
 							<reference key="NSControlView" ref="32314865"/>
-							<int key="NSButtonFlags">-2038021889</int>
+							<int key="NSButtonFlags">-2038022144</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSAlternateImage" ref="47520286"/>
 							<string key="NSAlternateContents"/>
@@ -617,22 +614,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="969326199">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{59, 5}, {52, 26}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="32314865"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="813291626">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">Apply</string>
 							<reference key="NSSupport" ref="47520286"/>
 							<reference key="NSControlView" ref="969326199"/>
-							<int key="NSButtonFlags">-2038021889</int>
+							<int key="NSButtonFlags">-2038022144</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSAlternateImage" ref="47520286"/>
 							<string key="NSAlternateContents"/>
@@ -640,22 +637,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="402171301">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{30, 5}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="969326199"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="978328677">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="926794154"/>
 							<reference key="NSControlView" ref="402171301"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<object class="NSCustomResource" key="NSNormalImage" id="503606675">
 								<string key="NSClassName">NSImage</string>
@@ -666,22 +663,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="574065805">
 						<reference key="NSNextResponder" ref="117500817"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{5, 5}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="402171301"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="851620269">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="926794154"/>
 							<reference key="NSControlView" ref="574065805"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<object class="NSCustomResource" key="NSNormalImage" id="132525375">
 								<string key="NSClassName">NSImage</string>
@@ -692,6 +689,7 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSScrollView" id="866550653">
 						<reference key="NSNextResponder" ref="117500817"/>
@@ -708,7 +706,6 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{181, 99}</string>
 										<reference key="NSSuperview" ref="635122780"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="60893639"/>
 										<string key="NSMinGridSize">{0, 0}</string>
 										<string key="NSMaxGridSize">{0, 0}</string>
@@ -725,7 +722,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {181, 99}}</string>
 								<reference key="NSSuperview" ref="866550653"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="334093702"/>
 								<reference key="NSDocView" ref="334093702"/>
 								<reference key="NSBGColor" ref="43977021"/>
@@ -736,8 +732,8 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{234, 1}, {15, 143}}</string>
 								<reference key="NSSuperview" ref="866550653"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="361788665"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<reference key="NSTarget" ref="866550653"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSCurValue">1</double>
@@ -748,8 +744,8 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{1, 144}, {233, 15}}</string>
 								<reference key="NSSuperview" ref="866550653"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="574065805"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="866550653"/>
 								<string key="NSAction">_doScroller:</string>
@@ -758,17 +754,18 @@
 						</object>
 						<string key="NSFrame">{{5, 34}, {183, 101}}</string>
 						<reference key="NSSuperview" ref="117500817"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="635122780"/>
 						<int key="NSsFlags">133682</int>
 						<reference key="NSVScroller" ref="60893639"/>
 						<reference key="NSHScroller" ref="361788665"/>
 						<reference key="NSContentView" ref="635122780"/>
+						<double key="NSMinMagnification">0.25</double>
+						<double key="NSMaxMagnification">4</double>
+						<double key="NSMagnification">1</double>
 					</object>
 				</object>
 				<string key="NSFrameSize">{193, 326}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="695838341"/>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -810,7 +807,7 @@
 				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
 			</object>
 			<object class="NSCustomView" id="108806395">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -819,15 +816,14 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{66, 105}, {125, 26}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="422353768"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="243044578">
-							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags">-2076180416</int>
 							<int key="NSCellFlags2">2048</int>
 							<reference key="NSSupport" ref="47520286"/>
 							<reference key="NSControlView" ref="544008847"/>
-							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags">109199360</int>
 							<int key="NSButtonFlags2">129</int>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
@@ -848,17 +844,17 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">2</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="223260441">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{6, 111}, {57, 14}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="544008847"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="974483488">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Show</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -866,6 +862,7 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSScrollView" id="422353768">
 						<reference key="NSNextResponder" ref="108806395"/>
@@ -882,10 +879,11 @@
 										<int key="NSvFlags">256</int>
 										<string key="NSFrameSize">{180, 68}</string>
 										<reference key="NSSuperview" ref="942697827"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="177619688"/>
 										<string key="NSReuseIdentifierKey">_NS:1197</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>
@@ -899,7 +897,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents"/>
 													<object class="NSFont" key="NSSupport">
@@ -919,7 +917,7 @@
 													</object>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="751672834">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<reference key="NSSupport" ref="926794154"/>
@@ -951,7 +949,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {180, 68}}</string>
 								<reference key="NSSuperview" ref="422353768"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="753354328"/>
 								<string key="NSReuseIdentifierKey">_NS:1195</string>
 								<reference key="NSDocView" ref="753354328"/>
@@ -963,9 +960,9 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 								<reference key="NSSuperview" ref="422353768"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="557846007"/>
 								<string key="NSReuseIdentifierKey">_NS:1214</string>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<reference key="NSTarget" ref="422353768"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.98863636363636365</double>
@@ -975,9 +972,9 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{1, 73}, {143, 15}}</string>
 								<reference key="NSSuperview" ref="422353768"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="487538038"/>
 								<string key="NSReuseIdentifierKey">_NS:1216</string>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="422353768"/>
 								<string key="NSAction">_doScroller:</string>
@@ -986,7 +983,6 @@
 						</object>
 						<string key="NSFrame">{{6, 33}, {182, 70}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="942697827"/>
 						<string key="NSReuseIdentifierKey">_NS:1193</string>
 						<int key="NSsFlags">133682</int>
@@ -994,23 +990,25 @@
 						<reference key="NSHScroller" ref="177619688"/>
 						<reference key="NSContentView" ref="942697827"/>
 						<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						<double key="NSMinMagnification">0.25</double>
+						<double key="NSMaxMagnification">4</double>
+						<double key="NSMagnification">1</double>
 					</object>
 					<object class="NSPopUpButton" id="1043573347">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{133, 155}, {60, 26}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="357854280"/>
 						<string key="NSReuseIdentifierKey">_NS:179</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="488427516">
-							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags">-2076180416</int>
 							<int key="NSCellFlags2">67110912</int>
 							<reference key="NSSupport" ref="926794154"/>
 							<string key="NSCellIdentifier">_NS:179</string>
 							<reference key="NSControlView" ref="1043573347"/>
-							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags">109199360</int>
 							<int key="NSButtonFlags2">129</int>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
@@ -1081,23 +1079,23 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">2</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSPopUpButton" id="131796564">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{2, 155}, {60, 26}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="735115134"/>
 						<string key="NSReuseIdentifierKey">_NS:179</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="424962110">
-							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags">-2076180416</int>
 							<int key="NSCellFlags2">2048</int>
 							<reference key="NSSupport" ref="926794154"/>
 							<string key="NSCellIdentifier">_NS:179</string>
 							<reference key="NSControlView" ref="131796564"/>
-							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags">109199360</int>
 							<int key="NSButtonFlags2">129</int>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
@@ -1159,17 +1157,17 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">2</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSComboBox" id="719659912">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{69, 132}, {122, 23}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="223260441"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSComboBoxCell" key="NSCell" id="314453059">
-							<int key="NSCellFlags">343014976</int>
+							<int key="NSCellFlags">342884416</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="24"/>
@@ -1183,18 +1181,20 @@
 							<object class="NSComboTableView" key="NSTableView" id="313552772">
 								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">274</int>
-								<string key="NSFrameSize">{15, 0}</string>
+								<string key="NSFrameSize">{13, 0}</string>
 								<reference key="NSSuperview"/>
 								<reference key="NSWindow"/>
 								<bool key="NSEnabled">YES</bool>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 								<object class="NSMutableArray" key="NSTableColumns">
 									<bool key="EncodedWithXMLCoder">YES</bool>
 									<object class="NSTableColumn">
-										<double key="NSWidth">12</double>
+										<double key="NSWidth">10</double>
 										<double key="NSMinWidth">10</double>
 										<double key="NSMaxWidth">1000</double>
 										<object class="NSTableHeaderCell" key="NSHeaderCell">
-											<int key="NSCellFlags">75628032</int>
+											<int key="NSCellFlags">75497472</int>
 											<int key="NSCellFlags2">0</int>
 											<string key="NSContents"/>
 											<reference key="NSSupport" ref="705209814"/>
@@ -1205,7 +1205,7 @@
 											<reference key="NSTextColor" ref="136415388"/>
 										</object>
 										<object class="NSTextFieldCell" key="NSDataCell">
-											<int key="NSCellFlags">338820672</int>
+											<int key="NSCellFlags">338690112</int>
 											<int key="NSCellFlags2">1024</int>
 											<reference key="NSSupport" ref="24"/>
 											<reference key="NSControlView" ref="313552772"/>
@@ -1224,7 +1224,7 @@
 								<reference key="NSGridColor" ref="953124220"/>
 								<double key="NSRowHeight">15</double>
 								<string key="NSAction">tableViewAction:</string>
-								<int key="NSTvFlags">-767524864</int>
+								<int key="NSTvFlags">-765427712</int>
 								<reference key="NSDelegate" ref="314453059"/>
 								<reference key="NSDataSource" ref="314453059"/>
 								<reference key="NSTarget" ref="314453059"/>
@@ -1236,17 +1236,17 @@
 								<int key="NSTableViewGroupRowStyle">1</int>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="357854280">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{6, 137}, {57, 14}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="719659912"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="400547930">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Category</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -1254,23 +1254,23 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSPopUpButton" id="735115134">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{59, 155}, {77, 26}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1043573347"/>
 						<string key="NSReuseIdentifierKey">_NS:179</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="745551246">
-							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags">-2076180416</int>
 							<int key="NSCellFlags2">2048</int>
 							<reference key="NSSupport" ref="926794154"/>
 							<string key="NSCellIdentifier">_NS:179</string>
 							<reference key="NSControlView" ref="735115134"/>
-							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags">109199360</int>
 							<int key="NSButtonFlags2">129</int>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
@@ -1335,17 +1335,17 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">2</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="69608560">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{69, 183}, {119, 19}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="131796564"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="376507453">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="47520286"/>
@@ -1354,17 +1354,17 @@
 							<reference key="NSBackgroundColor" ref="624542267"/>
 							<reference key="NSTextColor" ref="223583331"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="968810687">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{6, 185}, {57, 14}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="69608560"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="690404254">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">Name</string>
 							<reference key="NSSupport" ref="811392858"/>
@@ -1372,22 +1372,21 @@
 							<reference key="NSBackgroundColor" ref="43977021"/>
 							<reference key="NSTextColor" ref="44900598"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="247227248">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{111, 4}, {52, 26}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="184535284">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">Clear</string>
 							<reference key="NSSupport" ref="47520286"/>
 							<reference key="NSControlView" ref="247227248"/>
-							<int key="NSButtonFlags">-2038021889</int>
+							<int key="NSButtonFlags">-2038022144</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSAlternateImage" ref="47520286"/>
 							<string key="NSAlternateContents"/>
@@ -1395,22 +1394,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="648423191">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{60, 4}, {52, 26}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="247227248"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="715134143">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">Apply</string>
 							<reference key="NSSupport" ref="47520286"/>
 							<reference key="NSControlView" ref="648423191"/>
-							<int key="NSButtonFlags">-2038021889</int>
+							<int key="NSButtonFlags">-2038022144</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSAlternateImage" ref="47520286"/>
 							<string key="NSAlternateContents"/>
@@ -1418,22 +1417,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="485140228">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{31, 4}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="648423191"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="276141650">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="926794154"/>
 							<reference key="NSControlView" ref="485140228"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="503606675"/>
 							<string key="NSAlternateContents"/>
@@ -1441,22 +1440,22 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="557846007">
 						<reference key="NSNextResponder" ref="108806395"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{6, 4}, {26, 26}}</string>
 						<reference key="NSSuperview" ref="108806395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="485140228"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="885600316">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="926794154"/>
 							<reference key="NSControlView" ref="557846007"/>
-							<int key="NSButtonFlags">-2033434369</int>
+							<int key="NSButtonFlags">-2033434624</int>
 							<int key="NSButtonFlags2">162</int>
 							<reference key="NSNormalImage" ref="132525375"/>
 							<string key="NSAlternateContents"/>
@@ -1464,11 +1463,10 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</object>
 				<string key="NSFrameSize">{193, 208}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="968810687"/>
 				<string key="NSReuseIdentifierKey">_NS:499</string>
 				<string key="NSClassName">NSView</string>
@@ -1521,38 +1519,6 @@
 					</object>
 					<int key="connectionID">5</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="220154097"/>
-						<reference key="destination" ref="608079500"/>
-					</object>
-					<int key="connectionID">54</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">itemPrototype</string>
-						<reference key="source" ref="334093702"/>
-						<reference key="destination" ref="220154097"/>
-					</object>
-					<int key="connectionID">55</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: nodeStyles</string>
-						<reference key="source" ref="770792360"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="770792360"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">contentArray: nodeStyles</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">nodeStyles</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">58</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">collectionView</string>
@@ -1577,14 +1543,6 @@
 					</object>
 					<int key="connectionID">75</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">stylePaletteController</string>
-						<reference key="source" ref="220154097"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">108</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">setStrokeToClosestHashed:</string>
@@ -1610,403 +1568,390 @@
 					<int key="connectionID">497</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">toolTip: representedObject.name</string>
-						<reference key="source" ref="608079500"/>
-						<reference key="destination" ref="220154097"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="608079500"/>
-							<reference key="NSDestination" ref="220154097"/>
-							<string key="NSLabel">toolTip: representedObject.name</string>
-							<string key="NSBinding">toolTip</string>
-							<string key="NSKeyPath">representedObject.name</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nodeStyleView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="117500817"/>
 					</object>
-					<int key="connectionID">504</int>
+					<int key="connectionID">650</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="334093702"/>
-						<reference key="destination" ref="1001"/>
+						<string key="label">edgeStyleView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="108806395"/>
 					</object>
-					<int key="connectionID">505</int>
+					<int key="connectionID">651</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">filterPredicate: displayedNodeStylePredicate</string>
-						<reference key="source" ref="781827120"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="781827120"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">filterPredicate: displayedNodeStylePredicate</string>
-							<string key="NSBinding">filterPredicate</string>
-							<string key="NSKeyPath">displayedNodeStylePredicate</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nodeStyleArrayController</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="770792360"/>
 					</object>
-					<int key="connectionID">626</int>
+					<int key="connectionID">652</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
-						<reference key="source" ref="160644086"/>
-						<reference key="destination" ref="770792360"/>
-						<object class="NSNibBindingConnector" key="connector" id="227844687">
-							<reference key="NSSource" ref="160644086"/>
-							<reference key="NSDestination" ref="770792360"/>
-							<string key="NSLabel">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
-							<string key="NSBinding">contentValues</string>
-							<string key="NSKeyPath">arrangedObjects.@distinctUnionOfObjects.category</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSInsertsNullPlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<boolean value="YES"/>
-									<string>uncategorized</string>
-								</object>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nodeStyleInspectorView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="981650066"/>
 					</object>
-					<int key="connectionID">630</int>
+					<int key="connectionID">653</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedValue: displayedNodeStyleCategory</string>
-						<reference key="source" ref="160644086"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="160644086"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">selectedValue: displayedNodeStyleCategory</string>
-							<string key="NSBinding">selectedValue</string>
-							<string key="NSKeyPath">displayedNodeStyleCategory</string>
-							<reference key="NSPreviousConnector" ref="227844687"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addNodeStyle:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="574065805"/>
 					</object>
-					<int key="connectionID">631</int>
+					<int key="connectionID">727</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.name</string>
-						<reference key="source" ref="161037776"/>
-						<reference key="destination" ref="781827120"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="161037776"/>
-							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">value: selection.name</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.name</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">applyActiveNodeStyle:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="969326199"/>
 					</object>
-					<int key="connectionID">634</int>
+					<int key="connectionID">729</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedValue: selection.shapeName</string>
-						<reference key="source" ref="968796796"/>
-						<reference key="destination" ref="781827120"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="968796796"/>
-							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">selectedValue: selection.shapeName</string>
-							<string key="NSBinding">selectedValue</string>
-							<string key="NSKeyPath">selection.shapeName</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clearActiveNodeStyle:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="32314865"/>
 					</object>
-					<int key="connectionID">635</int>
+					<int key="connectionID">731</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.strokeColor</string>
-						<reference key="source" ref="402699060"/>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">filteredNodeStyleArrayController</string>
+						<reference key="source" ref="1001"/>
 						<reference key="destination" ref="781827120"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="402699060"/>
-							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">value: selection.strokeColor</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.strokeColor</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
 					</object>
-					<int key="connectionID">636</int>
+					<int key="connectionID">733</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: selection.strokeColorIsKnown</string>
-						<reference key="source" ref="338115395"/>
-						<reference key="destination" ref="781827120"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="338115395"/>
-							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">hidden: selection.strokeColorIsKnown</string>
-							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">selection.strokeColorIsKnown</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">edgeStyleArrayController</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="102354899"/>
 					</object>
-					<int key="connectionID">637</int>
+					<int key="connectionID">734</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.fillColor</string>
-						<reference key="source" ref="745224580"/>
-						<reference key="destination" ref="781827120"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="745224580"/>
-							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">value: selection.fillColor</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.fillColor</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addEdgeStyle:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="557846007"/>
 					</object>
-					<int key="connectionID">638</int>
+					<int key="connectionID">735</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">appleActiveEdgeStyle:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="648423191"/>
+					</object>
+					<int key="connectionID">737</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clearActiveEdgeStyle:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="247227248"/>
+					</object>
+					<int key="connectionID">738</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">filteredEdgeStyleArrayController</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="21786025"/>
+					</object>
+					<int key="connectionID">818</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: selection.fillColorIsKnown</string>
-						<reference key="source" ref="424828094"/>
+						<string key="label">value: selection.strokeColor</string>
+						<reference key="source" ref="402699060"/>
 						<reference key="destination" ref="781827120"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="424828094"/>
+							<reference key="NSSource" ref="402699060"/>
 							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">hidden: selection.fillColorIsKnown</string>
-							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">selection.fillColorIsKnown</string>
+							<string key="NSLabel">value: selection.strokeColor</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.strokeColor</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">639</int>
+					<int key="connectionID">636</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.scale</string>
-						<reference key="source" ref="222281412"/>
+						<string key="label">value: selection.fillColor</string>
+						<reference key="source" ref="745224580"/>
 						<reference key="destination" ref="781827120"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="222281412"/>
+							<reference key="NSSource" ref="745224580"/>
 							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">value: selection.scale</string>
+							<string key="NSLabel">value: selection.fillColor</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.scale</string>
+							<string key="NSKeyPath">selection.fillColor</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">640</int>
+					<int key="connectionID">638</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.scale</string>
-						<reference key="source" ref="38833176"/>
+						<string key="label">value: selection.name</string>
+						<reference key="source" ref="161037776"/>
 						<reference key="destination" ref="781827120"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="38833176"/>
+							<reference key="NSSource" ref="161037776"/>
 							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">value: selection.scale</string>
+							<string key="NSLabel">value: selection.name</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.scale</string>
+							<string key="NSKeyPath">selection.name</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">641</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nodeStyleView</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="117500817"/>
-					</object>
-					<int key="connectionID">650</int>
+					<int key="connectionID">634</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">edgeStyleView</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="108806395"/>
+						<string key="label">itemPrototype</string>
+						<reference key="source" ref="334093702"/>
+						<reference key="destination" ref="220154097"/>
 					</object>
-					<int key="connectionID">651</int>
+					<int key="connectionID">55</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">nodeStyleArrayController</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="770792360"/>
+						<string key="label">delegate</string>
+						<reference key="source" ref="334093702"/>
+						<reference key="destination" ref="1001"/>
 					</object>
-					<int key="connectionID">652</int>
+					<int key="connectionID">505</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nodeStyleInspectorView</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="981650066"/>
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="334093702"/>
+						<reference key="destination" ref="781827120"/>
+						<object class="NSNibBindingConnector" key="connector" id="649847086">
+							<reference key="NSSource" ref="334093702"/>
+							<reference key="NSDestination" ref="781827120"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
 					</object>
-					<int key="connectionID">653</int>
+					<int key="connectionID">840</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: edgeStyles</string>
-						<reference key="source" ref="102354899"/>
-						<reference key="destination" ref="1001"/>
+						<string key="label">selectionIndexes: selectionIndexes</string>
+						<reference key="source" ref="334093702"/>
+						<reference key="destination" ref="781827120"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="102354899"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">contentArray: edgeStyles</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">edgeStyles</string>
+							<reference key="NSSource" ref="334093702"/>
+							<reference key="NSDestination" ref="781827120"/>
+							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
+							<string key="NSBinding">selectionIndexes</string>
+							<string key="NSKeyPath">selectionIndexes</string>
+							<reference key="NSPreviousConnector" ref="649847086"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">725</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addNodeStyle:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="574065805"/>
-					</object>
-					<int key="connectionID">727</int>
+					<int key="connectionID">841</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">applyActiveNodeStyle:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="969326199"/>
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">toolTip: representedObject.name</string>
+						<reference key="source" ref="608079500"/>
+						<reference key="destination" ref="220154097"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="608079500"/>
+							<reference key="NSDestination" ref="220154097"/>
+							<string key="NSLabel">toolTip: representedObject.name</string>
+							<string key="NSBinding">toolTip</string>
+							<string key="NSKeyPath">representedObject.name</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
 					</object>
-					<int key="connectionID">729</int>
+					<int key="connectionID">504</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">clearActiveNodeStyle:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="32314865"/>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="220154097"/>
+						<reference key="destination" ref="608079500"/>
 					</object>
-					<int key="connectionID">731</int>
+					<int key="connectionID">54</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">filteredNodeStyleArrayController</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="781827120"/>
+						<string key="label">stylePaletteController</string>
+						<reference key="source" ref="220154097"/>
+						<reference key="destination" ref="1001"/>
 					</object>
-					<int key="connectionID">733</int>
+					<int key="connectionID">108</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">edgeStyleArrayController</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="102354899"/>
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentArray: nodeStyles</string>
+						<reference key="source" ref="770792360"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="770792360"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: nodeStyles</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">nodeStyles</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
 					</object>
-					<int key="connectionID">734</int>
+					<int key="connectionID">58</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addEdgeStyle:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="557846007"/>
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canRemove</string>
+						<reference key="source" ref="402171301"/>
+						<reference key="destination" ref="781827120"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="402171301"/>
+							<reference key="NSDestination" ref="781827120"/>
+							<string key="NSLabel">enabled: canRemove</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canRemove</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
 					</object>
-					<int key="connectionID">735</int>
+					<int key="connectionID">820</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">appleActiveEdgeStyle:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="648423191"/>
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: selection.strokeColorIsKnown</string>
+						<reference key="source" ref="338115395"/>
+						<reference key="destination" ref="781827120"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="338115395"/>
+							<reference key="NSDestination" ref="781827120"/>
+							<string key="NSLabel">hidden: selection.strokeColorIsKnown</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">selection.strokeColorIsKnown</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
 					</object>
-					<int key="connectionID">737</int>
+					<int key="connectionID">637</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">clearActiveEdgeStyle:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="247227248"/>
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: selection.fillColorIsKnown</string>
+						<reference key="source" ref="424828094"/>
+						<reference key="destination" ref="781827120"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="424828094"/>
+							<reference key="NSDestination" ref="781827120"/>
+							<string key="NSLabel">hidden: selection.fillColorIsKnown</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">selection.fillColorIsKnown</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
 					</object>
-					<int key="connectionID">738</int>
+					<int key="connectionID">639</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects</string>
-						<reference key="source" ref="753354328"/>
-						<reference key="destination" ref="21786025"/>
-						<object class="NSNibBindingConnector" key="connector" id="219377353">
-							<reference key="NSSource" ref="753354328"/>
-							<reference key="NSDestination" ref="21786025"/>
-							<string key="NSLabel">content: arrangedObjects</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects</string>
+						<string key="label">enabled: canRemove</string>
+						<reference key="source" ref="969326199"/>
+						<reference key="destination" ref="781827120"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="969326199"/>
+							<reference key="NSDestination" ref="781827120"/>
+							<string key="NSLabel">enabled: canRemove</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canRemove</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">823</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedValue: selection.shapeName</string>
+						<reference key="source" ref="968796796"/>
+						<reference key="destination" ref="781827120"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="968796796"/>
+							<reference key="NSDestination" ref="781827120"/>
+							<string key="NSLabel">selectedValue: selection.shapeName</string>
+							<string key="NSBinding">selectedValue</string>
+							<string key="NSKeyPath">selection.shapeName</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">759</int>
+					<int key="connectionID">635</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.name</string>
-						<reference key="source" ref="69608560"/>
-						<reference key="destination" ref="21786025"/>
+						<string key="label">value: selection.scale</string>
+						<reference key="source" ref="38833176"/>
+						<reference key="destination" ref="781827120"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="69608560"/>
-							<reference key="NSDestination" ref="21786025"/>
-							<string key="NSLabel">value: selection.name</string>
+							<reference key="NSSource" ref="38833176"/>
+							<reference key="NSDestination" ref="781827120"/>
+							<string key="NSLabel">value: selection.scale</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.name</string>
+							<string key="NSKeyPath">selection.scale</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">762</int>
+					<int key="connectionID">641</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.name</string>
-						<reference key="source" ref="1002335341"/>
-						<reference key="destination" ref="21786025"/>
+						<string key="label">value: selection.scale</string>
+						<reference key="source" ref="222281412"/>
+						<reference key="destination" ref="781827120"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1002335341"/>
-							<reference key="NSDestination" ref="21786025"/>
-							<string key="NSLabel">value: arrangedObjects.name</string>
+							<reference key="NSSource" ref="222281412"/>
+							<reference key="NSDestination" ref="781827120"/>
+							<string key="NSLabel">value: selection.scale</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.name</string>
+							<string key="NSKeyPath">selection.scale</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">780</int>
+					<int key="connectionID">640</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
-						<reference key="source" ref="719659912"/>
-						<reference key="destination" ref="102354899"/>
-						<object class="NSNibBindingConnector" key="connector" id="972677266">
-							<reference key="NSSource" ref="719659912"/>
-							<reference key="NSDestination" ref="102354899"/>
+						<reference key="source" ref="254614675"/>
+						<reference key="destination" ref="770792360"/>
+						<object class="NSNibBindingConnector" key="connector" id="382985563">
+							<reference key="NSSource" ref="254614675"/>
+							<reference key="NSDestination" ref="770792360"/>
 							<string key="NSLabel">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
 							<string key="NSBinding">contentValues</string>
 							<string key="NSKeyPath">arrangedObjects.@distinctUnionOfObjects.category</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">787</int>
+					<int key="connectionID">858</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: selection.category</string>
-						<reference key="source" ref="719659912"/>
-						<reference key="destination" ref="21786025"/>
+						<reference key="source" ref="254614675"/>
+						<reference key="destination" ref="781827120"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="719659912"/>
-							<reference key="NSDestination" ref="21786025"/>
+							<reference key="NSSource" ref="254614675"/>
+							<reference key="NSDestination" ref="781827120"/>
 							<string key="NSLabel">value: selection.category</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">selection.category</string>
@@ -2014,20 +1959,20 @@
 								<string key="NS.key.0">NSNullPlaceholder</string>
 								<string key="NS.object.0">uncategorized</string>
 							</object>
-							<reference key="NSPreviousConnector" ref="972677266"/>
+							<reference key="NSPreviousConnector" ref="382985563"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">788</int>
+					<int key="connectionID">859</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
-						<reference key="source" ref="544008847"/>
-						<reference key="destination" ref="102354899"/>
-						<object class="NSNibBindingConnector" key="connector" id="861457957">
-							<reference key="NSSource" ref="544008847"/>
-							<reference key="NSDestination" ref="102354899"/>
+						<reference key="source" ref="160644086"/>
+						<reference key="destination" ref="770792360"/>
+						<object class="NSNibBindingConnector" key="connector" id="227844687">
+							<reference key="NSSource" ref="160644086"/>
+							<reference key="NSDestination" ref="770792360"/>
 							<string key="NSLabel">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
 							<string key="NSBinding">contentValues</string>
 							<string key="NSKeyPath">arrangedObjects.@distinctUnionOfObjects.category</string>
@@ -2038,7 +1983,7 @@
 									<string>NSInsertsNullPlaceholder</string>
 									<string>NSNullPlaceholder</string>
 								</object>
-								<object class="NSMutableArray" key="dict.values">
+								<object class="NSArray" key="dict.values">
 									<bool key="EncodedWithXMLCoder">YES</bool>
 									<boolean value="YES"/>
 									<string>uncategorized</string>
@@ -2047,73 +1992,128 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">797</int>
+					<int key="connectionID">630</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedValue: displayedEdgeStyleCategory</string>
-						<reference key="source" ref="544008847"/>
+						<string key="label">selectedValue: displayedNodeStyleCategory</string>
+						<reference key="source" ref="160644086"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="544008847"/>
+							<reference key="NSSource" ref="160644086"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">selectedValue: displayedEdgeStyleCategory</string>
+							<string key="NSLabel">selectedValue: displayedNodeStyleCategory</string>
 							<string key="NSBinding">selectedValue</string>
-							<string key="NSKeyPath">displayedEdgeStyleCategory</string>
-							<reference key="NSPreviousConnector" ref="861457957"/>
+							<string key="NSKeyPath">displayedNodeStyleCategory</string>
+							<reference key="NSPreviousConnector" ref="227844687"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">798</int>
+					<int key="connectionID">631</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectionIndexes: selectionIndexes</string>
-						<reference key="source" ref="753354328"/>
-						<reference key="destination" ref="21786025"/>
+						<string key="label">filterPredicate: displayedNodeStylePredicate</string>
+						<reference key="source" ref="781827120"/>
+						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="753354328"/>
-							<reference key="NSDestination" ref="21786025"/>
-							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
-							<string key="NSBinding">selectionIndexes</string>
-							<string key="NSKeyPath">selectionIndexes</string>
-							<reference key="NSPreviousConnector" ref="219377353"/>
+							<reference key="NSSource" ref="781827120"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">filterPredicate: displayedNodeStylePredicate</string>
+							<string key="NSBinding">filterPredicate</string>
+							<string key="NSKeyPath">displayedNodeStylePredicate</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">800</int>
+					<int key="connectionID">626</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">remove:</string>
+						<reference key="source" ref="781827120"/>
+						<reference key="destination" ref="402171301"/>
+					</object>
+					<int key="connectionID">821</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">filterPredicate: displayedEdgeStylePredicate</string>
-						<reference key="source" ref="21786025"/>
+						<string key="label">contentArray: nodeStyles</string>
+						<reference key="source" ref="781827120"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="21786025"/>
+							<reference key="NSSource" ref="781827120"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">filterPredicate: displayedEdgeStylePredicate</string>
-							<string key="NSBinding">filterPredicate</string>
-							<string key="NSKeyPath">displayedEdgeStylePredicate</string>
+							<string key="NSLabel">contentArray: nodeStyles</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">nodeStyles</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">807</int>
+					<int key="connectionID">843</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedTag: selection.tailStyle</string>
-						<reference key="source" ref="131796564"/>
+						<string key="label">contentArray: edgeStyles</string>
+						<reference key="source" ref="102354899"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="102354899"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: edgeStyles</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">edgeStyles</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">725</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canRemove</string>
+						<reference key="source" ref="485140228"/>
 						<reference key="destination" ref="21786025"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="131796564"/>
+							<reference key="NSSource" ref="485140228"/>
 							<reference key="NSDestination" ref="21786025"/>
-							<string key="NSLabel">selectedTag: selection.tailStyle</string>
-							<string key="NSBinding">selectedTag</string>
-							<string key="NSKeyPath">selection.tailStyle</string>
+							<string key="NSLabel">enabled: canRemove</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canRemove</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">811</int>
+					<int key="connectionID">862</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: canRemove</string>
+						<reference key="source" ref="648423191"/>
+						<reference key="destination" ref="21786025"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="648423191"/>
+							<reference key="NSDestination" ref="21786025"/>
+							<string key="NSLabel">enabled: canRemove</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canRemove</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">864</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.name</string>
+						<reference key="source" ref="69608560"/>
+						<reference key="destination" ref="21786025"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="69608560"/>
+							<reference key="NSDestination" ref="21786025"/>
+							<string key="NSLabel">value: selection.name</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.name</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">762</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
@@ -2133,193 +2133,191 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedTag: selection.headStyle</string>
-						<reference key="source" ref="1043573347"/>
-						<reference key="destination" ref="21786025"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1043573347"/>
-							<reference key="NSDestination" ref="21786025"/>
-							<string key="NSLabel">selectedTag: selection.headStyle</string>
-							<string key="NSBinding">selectedTag</string>
-							<string key="NSKeyPath">selection.headStyle</string>
+						<string key="label">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
+						<reference key="source" ref="719659912"/>
+						<reference key="destination" ref="102354899"/>
+						<object class="NSNibBindingConnector" key="connector" id="972677266">
+							<reference key="NSSource" ref="719659912"/>
+							<reference key="NSDestination" ref="102354899"/>
+							<string key="NSLabel">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
+							<string key="NSBinding">contentValues</string>
+							<string key="NSKeyPath">arrangedObjects.@distinctUnionOfObjects.category</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">817</int>
+					<int key="connectionID">787</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">filteredEdgeStyleArrayController</string>
-						<reference key="source" ref="1001"/>
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.category</string>
+						<reference key="source" ref="719659912"/>
 						<reference key="destination" ref="21786025"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="719659912"/>
+							<reference key="NSDestination" ref="21786025"/>
+							<string key="NSLabel">value: selection.category</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.category</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSNullPlaceholder</string>
+								<string key="NS.object.0">uncategorized</string>
+							</object>
+							<reference key="NSPreviousConnector" ref="972677266"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
 					</object>
-					<int key="connectionID">818</int>
+					<int key="connectionID">788</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canRemove</string>
-						<reference key="source" ref="402171301"/>
-						<reference key="destination" ref="781827120"/>
+						<string key="label">selectedTag: selection.tailStyle</string>
+						<reference key="source" ref="131796564"/>
+						<reference key="destination" ref="21786025"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="402171301"/>
-							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">enabled: canRemove</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canRemove</string>
+							<reference key="NSSource" ref="131796564"/>
+							<reference key="NSDestination" ref="21786025"/>
+							<string key="NSLabel">selectedTag: selection.tailStyle</string>
+							<string key="NSBinding">selectedTag</string>
+							<string key="NSKeyPath">selection.tailStyle</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">820</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">remove:</string>
-						<reference key="source" ref="781827120"/>
-						<reference key="destination" ref="402171301"/>
-					</object>
-					<int key="connectionID">821</int>
+					<int key="connectionID">811</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canRemove</string>
-						<reference key="source" ref="969326199"/>
-						<reference key="destination" ref="781827120"/>
+						<string key="label">selectedTag: selection.headStyle</string>
+						<reference key="source" ref="1043573347"/>
+						<reference key="destination" ref="21786025"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="969326199"/>
-							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">enabled: canRemove</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canRemove</string>
+							<reference key="NSSource" ref="1043573347"/>
+							<reference key="NSDestination" ref="21786025"/>
+							<string key="NSLabel">selectedTag: selection.headStyle</string>
+							<string key="NSBinding">selectedTag</string>
+							<string key="NSKeyPath">selection.headStyle</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">823</int>
+					<int key="connectionID">817</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">content: arrangedObjects</string>
-						<reference key="source" ref="334093702"/>
-						<reference key="destination" ref="781827120"/>
-						<object class="NSNibBindingConnector" key="connector" id="649847086">
-							<reference key="NSSource" ref="334093702"/>
-							<reference key="NSDestination" ref="781827120"/>
+						<reference key="source" ref="753354328"/>
+						<reference key="destination" ref="21786025"/>
+						<object class="NSNibBindingConnector" key="connector" id="219377353">
+							<reference key="NSSource" ref="753354328"/>
+							<reference key="NSDestination" ref="21786025"/>
 							<string key="NSLabel">content: arrangedObjects</string>
 							<string key="NSBinding">content</string>
 							<string key="NSKeyPath">arrangedObjects</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">840</int>
+					<int key="connectionID">759</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">selectionIndexes: selectionIndexes</string>
-						<reference key="source" ref="334093702"/>
-						<reference key="destination" ref="781827120"/>
+						<reference key="source" ref="753354328"/>
+						<reference key="destination" ref="21786025"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="334093702"/>
-							<reference key="NSDestination" ref="781827120"/>
+							<reference key="NSSource" ref="753354328"/>
+							<reference key="NSDestination" ref="21786025"/>
 							<string key="NSLabel">selectionIndexes: selectionIndexes</string>
 							<string key="NSBinding">selectionIndexes</string>
 							<string key="NSKeyPath">selectionIndexes</string>
-							<reference key="NSPreviousConnector" ref="649847086"/>
+							<reference key="NSPreviousConnector" ref="219377353"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">841</int>
+					<int key="connectionID">800</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: nodeStyles</string>
-						<reference key="source" ref="781827120"/>
-						<reference key="destination" ref="1001"/>
+						<string key="label">value: arrangedObjects.name</string>
+						<reference key="source" ref="1002335341"/>
+						<reference key="destination" ref="21786025"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="781827120"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">contentArray: nodeStyles</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">nodeStyles</string>
+							<reference key="NSSource" ref="1002335341"/>
+							<reference key="NSDestination" ref="21786025"/>
+							<string key="NSLabel">value: arrangedObjects.name</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.name</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">843</int>
+					<int key="connectionID">780</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
-						<reference key="source" ref="254614675"/>
-						<reference key="destination" ref="770792360"/>
-						<object class="NSNibBindingConnector" key="connector" id="382985563">
-							<reference key="NSSource" ref="254614675"/>
-							<reference key="NSDestination" ref="770792360"/>
+						<reference key="source" ref="544008847"/>
+						<reference key="destination" ref="102354899"/>
+						<object class="NSNibBindingConnector" key="connector" id="861457957">
+							<reference key="NSSource" ref="544008847"/>
+							<reference key="NSDestination" ref="102354899"/>
 							<string key="NSLabel">contentValues: arrangedObjects.@distinctUnionOfObjects.category</string>
 							<string key="NSBinding">contentValues</string>
 							<string key="NSKeyPath">arrangedObjects.@distinctUnionOfObjects.category</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSInsertsNullPlaceholder</string>
+									<string>NSNullPlaceholder</string>
+								</object>
+								<object class="NSArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<boolean value="YES"/>
+									<string>uncategorized</string>
+								</object>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">858</int>
+					<int key="connectionID">797</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.category</string>
-						<reference key="source" ref="254614675"/>
-						<reference key="destination" ref="781827120"/>
+						<string key="label">selectedValue: displayedEdgeStyleCategory</string>
+						<reference key="source" ref="544008847"/>
+						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="254614675"/>
-							<reference key="NSDestination" ref="781827120"/>
-							<string key="NSLabel">value: selection.category</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.category</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSNullPlaceholder</string>
-								<string key="NS.object.0">uncategorized</string>
-							</object>
-							<reference key="NSPreviousConnector" ref="382985563"/>
+							<reference key="NSSource" ref="544008847"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">selectedValue: displayedEdgeStyleCategory</string>
+							<string key="NSBinding">selectedValue</string>
+							<string key="NSKeyPath">displayedEdgeStyleCategory</string>
+							<reference key="NSPreviousConnector" ref="861457957"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">859</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">remove:</string>
-						<reference key="source" ref="21786025"/>
-						<reference key="destination" ref="485140228"/>
-					</object>
-					<int key="connectionID">860</int>
+					<int key="connectionID">798</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canRemove</string>
-						<reference key="source" ref="485140228"/>
-						<reference key="destination" ref="21786025"/>
+						<string key="label">filterPredicate: displayedEdgeStylePredicate</string>
+						<reference key="source" ref="21786025"/>
+						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="485140228"/>
-							<reference key="NSDestination" ref="21786025"/>
-							<string key="NSLabel">enabled: canRemove</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canRemove</string>
+							<reference key="NSSource" ref="21786025"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">filterPredicate: displayedEdgeStylePredicate</string>
+							<string key="NSBinding">filterPredicate</string>
+							<string key="NSKeyPath">displayedEdgeStylePredicate</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">862</int>
+					<int key="connectionID">807</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canRemove</string>
-						<reference key="source" ref="648423191"/>
-						<reference key="destination" ref="21786025"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="648423191"/>
-							<reference key="NSDestination" ref="21786025"/>
-							<string key="NSLabel">enabled: canRemove</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canRemove</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">remove:</string>
+						<reference key="source" ref="21786025"/>
+						<reference key="destination" ref="485140228"/>
 					</object>
-					<int key="connectionID">864</int>
+					<int key="connectionID">860</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
@@ -2343,7 +2341,9 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
@@ -3244,7 +3244,7 @@
 					<string>96.IBPluginDependency</string>
 					<string>97.IBPluginDependency</string>
 				</object>
-				<object class="NSMutableArray" key="dict.values">
+				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3386,7 +3386,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">866</int>
+			<int key="maxID">869</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3400,7 +3400,7 @@
 							<string>applyStyleToSelectedNodes:</string>
 							<string>clearStyleOfSelectedNodes:</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
@@ -3413,7 +3413,7 @@
 							<string>applyStyleToSelectedNodes:</string>
 							<string>clearStyleOfSelectedNodes:</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBActionInfo">
 								<string key="name">applyStyleToSelectedNodes:</string>
@@ -3430,218 +3430,13 @@
 						<string key="minorKey"/>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SFBInspectorView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/SFBInspectorView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SelectableCollectionViewItem</string>
-					<string key="superclassName">NSCollectionViewItem</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">stylePaletteController</string>
-						<string key="NS.object.0">StylePaletteController</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">stylePaletteController</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">stylePaletteController</string>
-							<string key="candidateClassName">StylePaletteController</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/SelectableCollectionViewItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SelectableNodeView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/SelectableNodeView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">StylePaletteController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addEdgeStyle:</string>
-							<string>addNodeStyle:</string>
-							<string>appleActiveEdgeStyle:</string>
-							<string>applyActiveNodeStyle:</string>
-							<string>clearActiveEdgeStyle:</string>
-							<string>clearActiveNodeStyle:</string>
-							<string>refreshCollection:</string>
-							<string>setFillToClosestHashed:</string>
-							<string>setStrokeToClosestHashed:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addEdgeStyle:</string>
-							<string>addNodeStyle:</string>
-							<string>appleActiveEdgeStyle:</string>
-							<string>applyActiveNodeStyle:</string>
-							<string>clearActiveEdgeStyle:</string>
-							<string>clearActiveNodeStyle:</string>
-							<string>refreshCollection:</string>
-							<string>setFillToClosestHashed:</string>
-							<string>setStrokeToClosestHashed:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">addEdgeStyle:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addNodeStyle:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">appleActiveEdgeStyle:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">applyActiveNodeStyle:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">clearActiveEdgeStyle:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">clearActiveNodeStyle:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">refreshCollection:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">setFillToClosestHashed:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">setStrokeToClosestHashed:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>collectionView</string>
-							<string>edgeStyleArrayController</string>
-							<string>edgeStyleView</string>
-							<string>filteredEdgeStyleArrayController</string>
-							<string>filteredNodeStyleArrayController</string>
-							<string>nodeStyleArrayController</string>
-							<string>nodeStyleInspectorView</string>
-							<string>nodeStyleView</string>
-							<string>shapeDropdown</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSCollectionView</string>
-							<string>NSArrayController</string>
-							<string>NSView</string>
-							<string>NSArrayController</string>
-							<string>NSArrayController</string>
-							<string>NSArrayController</string>
-							<string>SFBInspectorView</string>
-							<string>NSView</string>
-							<string>NSPopUpButton</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>collectionView</string>
-							<string>edgeStyleArrayController</string>
-							<string>edgeStyleView</string>
-							<string>filteredEdgeStyleArrayController</string>
-							<string>filteredNodeStyleArrayController</string>
-							<string>nodeStyleArrayController</string>
-							<string>nodeStyleInspectorView</string>
-							<string>nodeStyleView</string>
-							<string>shapeDropdown</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">collectionView</string>
-								<string key="candidateClassName">NSCollectionView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">edgeStyleArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">edgeStyleView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">filteredEdgeStyleArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">filteredNodeStyleArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">nodeStyleArrayController</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">nodeStyleInspectorView</string>
-								<string key="candidateClassName">SFBInspectorView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">nodeStyleView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">shapeDropdown</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/StylePaletteController.h</string>
-					</object>
-				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
+			<real value="1070" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
@@ -3667,19 +3462,19 @@
 				<string>NSRemoveTemplate</string>
 				<string>emblem-important</string>
 			</object>
-			<object class="NSMutableArray" key="dict.values">
+			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<string>{26, 12}</string>
 				<string>{26, 12}</string>
-				<string>{26, 2}</string>
+				<string>{26, 12}</string>
 				<string>{26, 14}</string>
 				<string>{26, 14}</string>
 				<string>{58, 14}</string>
-				<string>{58, 2}</string>
-				<string>{58, 13}</string>
+				<string>{58, 14}</string>
+				<string>{58, 14}</string>
 				<string>{8, 8}</string>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
+				<string>{11, 11}</string>
+				<string>{10, 3}</string>
 				<string>{8, 8}</string>
 				<string>{12.801422684151452, 12.801422684151452}</string>
 			</object>
diff --git a/tikzit/TikZiT-Info.plist b/tikzit/TikZiT-Info.plist
index 7345266..a495c5b 100644
--- a/tikzit/TikZiT-Info.plist
+++ b/tikzit/TikZiT-Info.plist
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>SUPublicDSAKeyFile</key>
-	<string>tikzit_dsa_pub.pem</string>
-	<key>SUFeedURL</key>
-	<string>http://tikzit.sourceforge.net/appcast/tikzit.xml</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDocumentTypes</key>
@@ -57,5 +53,9 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>SUFeedURL</key>
+	<string>http://tikzit.sourceforge.net/appcast/tikzit.xml</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>tikzit_dsa_pub.pem</string>
 </dict>
 </plist>
diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj
index 7b73ab4..1cc67ab 100644
--- a/tikzit/TikZiT.xcodeproj/project.pbxproj
+++ b/tikzit/TikZiT.xcodeproj/project.pbxproj
@@ -116,6 +116,19 @@
 		55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; };
 		55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; };
 		55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; };
+		7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; };
+		7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; };
+		7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; };
+		7F6E2C8016B0083300BFE20D /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; };
+		7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; };
+		7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; };
+		7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; };
+		7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; };
+		7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; };
+		7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; };
+		7F6E2C8916B0091300BFE20D /* maths.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F6E2C8716B0091300BFE20D /* maths.m */; };
+		7F6E2C8A16B0096000BFE20D /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; };
+		7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; };
 		8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; };
 		8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165FFE840EACC02AAC07 /* InfoPlist.strings */; };
 		8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; };
@@ -159,6 +172,16 @@
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		7F6E2C8B16B00A9200BFE20D /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -314,6 +337,7 @@
 		55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+LatexConstants.h"; path = "src/common/NSString+LatexConstants.h"; sourceTree = "<group>"; };
 		55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = "<group>"; };
 		55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
+		7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = "<group>"; };
 		8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TikZiT-Info.plist"; sourceTree = "<group>"; };
 		8D15AC370486D014006FF6A4 /* TikZiT.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TikZiT.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -470,6 +494,7 @@
 				5504C82B11D23595002A1478 /* parser.m */,
 				5504C82C11D23595002A1478 /* test.h */,
 				5504C82D11D23595002A1478 /* test.m */,
+				7F6E2C8716B0091300BFE20D /* maths.m */,
 			);
 			name = Test;
 			sourceTree = "<group>";
@@ -655,6 +680,7 @@
 			buildPhases = (
 				5589AA6211C5429C0064D310 /* Sources */,
 				5589AA6311C5429C0064D310 /* Frameworks */,
+				7F6E2C8B16B00A9200BFE20D /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -768,16 +794,28 @@
 				5589AA8011C542E60064D310 /* NodeStyle.m in Sources */,
 				5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */,
 				5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */,
+				7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */,
+				7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */,
+				7F6E2C8A16B0096000BFE20D /* SupportDir.m in Sources */,
+				7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */,
+				7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */,
+				7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */,
+				7F6E2C8016B0083300BFE20D /* Shape.m in Sources */,
+				7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */,
 				5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */,
 				5504C82E11D23595002A1478 /* common.m in Sources */,
 				5504C82F11D23595002A1478 /* parser.m in Sources */,
 				5504C83011D23595002A1478 /* test.m in Sources */,
+				7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */,
 				5504C83211D23685002A1478 /* main.m in Sources */,
 				5504C93F11D39422002A1478 /* osx.m in Sources */,
 				555B313511D8C6DA00CAECF5 /* color.m in Sources */,
+				7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */,
+				7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */,
 				55CA9ACA12F831E5008F0368 /* RColor.m in Sources */,
 				552202C4135F15FD007EA086 /* MultiField.m in Sources */,
 				55900AA1135FA918002DD28E /* MultiCombo.m in Sources */,
+				7F6E2C8916B0091300BFE20D /* maths.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -940,6 +978,7 @@
 					AppKit,
 				);
 				PRODUCT_NAME = tests;
+				SDKROOT = macosx10.7;
 			};
 			name = Debug;
 		};
@@ -964,6 +1003,7 @@
 					AppKit,
 				);
 				PRODUCT_NAME = tests;
+				SDKROOT = macosx10.7;
 				ZERO_LINK = NO;
 			};
 			name = Release;
@@ -986,8 +1026,9 @@
 				INFOPLIST_FILE = "TikZiT-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = TikZiT;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx10.7;
 			};
 			name = Debug;
 		};
@@ -1007,8 +1048,9 @@
 				INFOPLIST_FILE = "TikZiT-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = TikZiT;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx10.7;
 			};
 			name = Release;
 		};
diff --git a/tikzit/src/common/Edge.h b/tikzit/src/common/Edge.h
index 607fcc6..cc636dd 100644
--- a/tikzit/src/common/Edge.h
+++ b/tikzit/src/common/Edge.h
@@ -58,6 +58,8 @@ typedef enum {
 	float weight;
     EdgeStyle *style;
 	GraphElementData *data;
+    NSString *sourceAnchor;
+    NSString *targetAnchor;
 	
     // When set to YES, lazily create the edge node, and keep it around when set
     // to NO (at least until saved/loaded).
@@ -114,6 +116,18 @@ typedef enum {
  */
 @property (retain) Node *edgeNode;
 
+/*!
+ @property   sourceAnchor
+ @brief      The source node anchor point, as in north or center.
+ */
+@property (copy) NSString *sourceAnchor;
+
+/*!
+ @property   targetAnchor
+ @brief      The target node anchor point, as in north or center.
+ */
+@property (copy) NSString *targetAnchor;
+
 /*!
  @property   hasEdgeNode
  @brief      A read/write property. When set to true, a new edge node is actually constructed.
diff --git a/tikzit/src/common/Edge.m b/tikzit/src/common/Edge.m
index 2514fc1..3e25888 100644
--- a/tikzit/src/common/Edge.m
+++ b/tikzit/src/common/Edge.m
@@ -39,6 +39,8 @@
 	source = nil;
 	target = nil;
 	edgeNode = nil;
+    sourceAnchor = [[NSString alloc] initWithString:@""];
+    targetAnchor = [[NSString alloc] initWithString:@""];
 	
 	return self;
 }
@@ -389,6 +391,25 @@
     [self didChangeValueForKey:@"hasEdgeNode"];
 }
 
+@synthesize sourceAnchor;
+@synthesize targetAnchor;
+
+- (void)setSourceAnchor:(NSString *)_sourceAnchor{
+    if(_sourceAnchor != nil){
+        sourceAnchor = _sourceAnchor;
+    }else{
+        sourceAnchor = @"";
+    }
+}
+
+- (void)setTargetAnchor:(NSString *)_targetAnchor{
+    if(_targetAnchor != nil){
+        targetAnchor = _targetAnchor;
+    }else{
+        targetAnchor = @"";
+    }
+}
+
 @synthesize data;
 - (void) insertObject:(GraphElementProperty*)gep
 		inDataAtIndex:(NSUInteger)index {
@@ -587,6 +608,8 @@
 	[source release];
 	[target release];
 	[data release];
+    [sourceAnchor release];
+    [targetAnchor release];
 	[super dealloc];
 }
 
diff --git a/tikzit/src/common/Graph.m b/tikzit/src/common/Graph.m
index 7f7345c..c8da128 100644
--- a/tikzit/src/common/Graph.m
+++ b/tikzit/src/common/Graph.m
@@ -726,10 +726,10 @@
 		[code appendFormat:@"\t\t\\draw%@ (%@%@) to %@(%@%@);\n",
 			([edata isEqual:@""]) ? @"" : [NSString stringWithFormat:@" %@", edata],
 			[[e source] name],
-			([[e source] style] == nil) ? @".center" : @"",
+         ([[e source] style] == nil) ? @".center" : ([e sourceAnchor] == @"") ? @"" : [NSString stringWithFormat:@".%@", [e sourceAnchor]],
 			nodeStr,
 			([e source] == [e target]) ? @"" : [[e target] name],
-			([e source] != [e target] && [[e target] style] == nil) ? @".center" : @""
+			([e source] != [e target] && [[e target] style] == nil) ? @".center" : ([e targetAnchor] == @"") ? @"" : [NSString stringWithFormat:@".%@", [e targetAnchor]]
 		];
 	}
 	
diff --git a/tikzit/src/common/TikzGraphAssembler.h b/tikzit/src/common/TikzGraphAssembler.h
index 1b006dd..adaf443 100644
--- a/tikzit/src/common/TikzGraphAssembler.h
+++ b/tikzit/src/common/TikzGraphAssembler.h
@@ -45,7 +45,8 @@
 - (void)finishNode;
 
 - (void)prepareEdge;
-- (void)setEdgeSource:(NSString*)src target:(NSString*)targ;
+- (void)setEdgeSource:(NSString*)edge anchor:(NSString*)anch;
+- (void)setEdgeTarget:(NSString*)edge anchor:(NSString*)anch;
 - (void)finishEdge;
 
 - (void)invalidate;
diff --git a/tikzit/src/common/TikzGraphAssembler.m b/tikzit/src/common/TikzGraphAssembler.m
index 5e60b05..7d8d0e7 100644
--- a/tikzit/src/common/TikzGraphAssembler.m
+++ b/tikzit/src/common/TikzGraphAssembler.m
@@ -37,9 +37,9 @@ static id currentAssembler = nil;
 void yyerror(const char *str) {
 	NSLog(@"Parse error: %s", str);
 	if (currentAssembler != nil) {
-		NSError *error = [NSError
-			errorWithMessage:[NSString stringWithCString:str]
-						code:TZ_ERR_PARSE];
+        NSError *error = [NSError errorWithDomain:@"net.sourceforge.tikzit"
+                                     code:TZ_ERR_PARSE
+                                         userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithCString:str] forKey: NSLocalizedDescriptionKey]];
 		[currentAssembler invalidateWithError:error];
 	}
 }
@@ -137,14 +137,19 @@ int yywrap() {
 	currentEdge = nil;
 }
 
-- (void)setEdgeSource:(NSString*)src target:(NSString*)targ {
-	if (![targ isEqualToString:@""]) {
-		[currentEdge setSource:[nodeMap objectForKey:src]];
-		[currentEdge setTarget:[nodeMap objectForKey:targ]];
+- (void)setEdgeSource:(NSString*)edge anchor:(NSString*)anch {
+    Node *s = [nodeMap objectForKey:edge];
+    [currentEdge setSource:s];
+    [currentEdge setSourceAnchor:anch];
+}
+
+- (void)setEdgeTarget:(NSString*)edge anchor:(NSString*)anch {
+	if (![edge isEqualToString:@""]) {
+		[currentEdge setTarget:[nodeMap objectForKey:edge]];
+        [currentEdge setTargetAnchor:anch];
 	} else {
-		Node *s = [nodeMap objectForKey:src];
-		[currentEdge setSource:s];
-		[currentEdge setTarget:s];
+        [currentEdge setTargetAnchor:anch];
+        [currentEdge setTarget:[currentEdge source]];
 	}
 }
 
diff --git a/tikzit/src/common/test/parser.m b/tikzit/src/common/test/parser.m
index 29dabe7..3346acd 100644
--- a/tikzit/src/common/test/parser.m
+++ b/tikzit/src/common/test/parser.m
@@ -34,7 +34,7 @@ void testParser() {
 	
 	[TikzGraphAssembler setup];
 	
-	NodeStyle *rn = [NodeStyle defaultStyleWithName:@"rn"];
+	NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"];
 	NSArray *styles = [NSArray arrayWithObject:rn];
 	
 	NSString *tikz =
@@ -74,9 +74,12 @@ void testParser() {
 	
 	TEST(@"Edge has edge node", [e1 edgeNode]!=nil);
 	TEST(@"Edge node labeled correctly", [[[e1 edgeNode] label] isEqualToString:@"-"]);
-	NSString *sty = [[[[[e1 edgeNode] data] atoms] objectEnumerator] nextObject];
-	TEST(@"Edge node styled correctly", sty!=nil && [sty isEqualToString:@"tick"]);
-	
+//	NSString *sty = [[[[[e1 edgeNode] data] atoms] objectEnumerator] nextObject];
+//	TEST(@"Edge node styled correctly", sty!=nil && [sty isEqualToString:@"tick"]);
+    
+    PUTS(@"Source anchor: %@",[e1 sourceAnchor]);
+    PUTS(@"Target anchor: %@",[e1 targetAnchor]);
+    
 	endTestBlock(@"parser");
 	
 	[pool drain];
diff --git a/tikzit/src/common/test/test.m b/tikzit/src/common/test/test.m
index 8437646..9afcd67 100644
--- a/tikzit/src/common/test/test.m
+++ b/tikzit/src/common/test/test.m
@@ -160,7 +160,7 @@ void runTests();
 int main() {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-	setColorEnabled (YES);
+	setColorEnabled (NO);
 	startTests();
 
 	runTests();
diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm
index 9418d83..9af0c8d 100644
--- a/tikzit/src/common/tikzlexer.lm
+++ b/tikzit/src/common/tikzlexer.lm
@@ -39,13 +39,13 @@
 \\end                          return LATEXEND;
 \{tikzpicture\}                return TIKZPICTURE;
 \{pgfonlayer\}                 return PGFONLAYER;
-\.center                       return ANCHORCENTER;
 \(                             return LEFTPARENTHESIS;
 \)                             return RIGHTPARENTHESIS;		       
 \[                             return LEFTBRACKET;
 \]                             return RIGHTBRACKET;
 ;                              return SEMICOLON;
 ,                              return COMMA;
+\.                             return FULLSTOP;
 =                              return EQUALS;
 \\draw                         return DRAW;
 to                             return TO;
@@ -65,7 +65,7 @@ at                             return AT;
 	return REALNUMBER;
 }
 
-\\?[a-zA-Z<>\-\']+ { //'
+\\?[a-zA-Z<>\-\'][a-zA-Z<>\-\'0-9]* { //'
 	yylval.nsstr=[NSString stringWithUTF8String:yytext];
 	return LWORD;
 }
diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym
index 57f0600..532b6c8 100644
--- a/tikzit/src/common/tikzparser.ym
+++ b/tikzit/src/common/tikzparser.ym
@@ -39,17 +39,19 @@ extern void yyerror(const char *str);
 	NSString *nsstr;
 };
 
+%error-verbose
+
 %token LATEXBEGIN
 %token LATEXEND
 %token TIKZPICTURE
 %token PGFONLAYER
-%token ANCHORCENTER
 %token LEFTPARENTHESIS
 %token RIGHTPARENTHESIS
 %token LEFTBRACKET
 %token RIGHTBRACKET
 %token SEMICOLON
 %token COMMA
+%token FULLSTOP
 %token EQUALS
 %token DRAW
 %token TO
@@ -65,9 +67,10 @@ extern void yyerror(const char *str);
 %token DELIMITEDSTRING
 
 %type<nsstr> nodename
+%type<nsstr> anchor
+%type<nsstr> optanchor
 %type<nsstr> nodeid
 %type<pt> coords
-%type<nsstr> target
 %type<nsstr> propsym
 %type<nsstr> propsyms
 %type<nsstr> val
@@ -119,6 +122,8 @@ propsym:
 
 nodecmd : NODE { [[TikzGraphAssembler currentAssembler] prepareNode]; };
 
+nodename: LEFTPARENTHESIS nodeid RIGHTPARENTHESIS { $$ = $<nsstr>2; };
+
 node:
 	nodecmd optproperties nodename AT coords nodelabel SEMICOLON
 	{
@@ -135,8 +140,17 @@ nodelabel:
 		[n setLabel:$<nsstr>1];
 	}
 
-optanchor: | ANCHORCENTER;
-nodename: LEFTPARENTHESIS nodeid optanchor RIGHTPARENTHESIS { $$ = $<nsstr>2; };
+anchor: LWORD { $$ = $<nsstr>1; } | NATURALNUMBER { $$ = $<nsstr>1; };
+
+optanchor:  { $$ = @""; } | FULLSTOP anchor { $$ = $<nsstr>2; };
+
+source: LEFTPARENTHESIS nodeid optanchor RIGHTPARENTHESIS
+    {
+        TikzGraphAssembler *a = [TikzGraphAssembler currentAssembler];
+        [a setEdgeSource:$<nsstr>2
+        anchor:$<nsstr>3];
+    };
+
 nodeid: LWORD { $$ = $<nsstr>1; } | NATURALNUMBER { $$ = $<nsstr>1; };
 
 coords:
@@ -147,14 +161,23 @@ coords:
 
 edgecmd : DRAW { [[TikzGraphAssembler currentAssembler] prepareEdge]; };
 edge:
-	edgecmd optproperties nodename TO optedgenode target SEMICOLON 
+	edgecmd optproperties source TO optedgenode target SEMICOLON
 	{
 		TikzGraphAssembler *a = [TikzGraphAssembler currentAssembler];
-		[a setEdgeSource:$<nsstr>3
-				  target:$<nsstr>6];
 		[a finishEdge];
 	};
-target: nodename { $$=$<nsstr>1; } | selfloop { $$=@""; };
+target: LEFTPARENTHESIS nodeid optanchor RIGHTPARENTHESIS
+    {
+        TikzGraphAssembler *a = [TikzGraphAssembler currentAssembler];
+        [a setEdgeTarget:$<nsstr>2
+        anchor:$<nsstr>3];
+    }
+    | selfloop
+    {
+        TikzGraphAssembler *a = [TikzGraphAssembler currentAssembler];
+        [a setEdgeTarget:@""
+        anchor:@""];
+    };
 selfloop: LEFTPARENTHESIS RIGHTPARENTHESIS;
 
 altnodecmd: ALTNODE { [[TikzGraphAssembler currentAssembler] prepareNode]; };
diff --git a/tikzit/src/osx/PropertyInspectorController.h b/tikzit/src/osx/PropertyInspectorController.h
index cb14021..0625f9b 100644
--- a/tikzit/src/osx/PropertyInspectorController.h
+++ b/tikzit/src/osx/PropertyInspectorController.h
@@ -18,6 +18,8 @@
 	IBOutlet NSView *nodePropertiesView;
 	IBOutlet NSView *graphPropertiesView;
 	IBOutlet NSView *edgePropertiesView;
+    IBOutlet NSComboBox *sourceAnchorComboBox;
+    IBOutlet NSComboBox *targetAnchorComboBox;
 	IBOutlet NSTextField *edgeNodeLabelField;
 	IBOutlet NSButton *edgeNodeCheckbox;
 	IBOutlet NSArrayController *nodeDataArrayController;
@@ -25,6 +27,12 @@
 	IBOutlet NSArrayController *edgeDataArrayController;
 	IBOutlet NSArrayController *edgeNodeDataArrayController;
 	
+    NSMutableArray *sourceAnchorNames;
+    IBOutlet NSArrayController *sourceAnchorNamesArrayController;
+    
+    NSMutableArray *targetAnchorNames;
+    IBOutlet NSArrayController *targetAnchorNamesArrayController;
+    
     NSMutableArray *selectedNodes;
     IBOutlet NSArrayController *selectedNodesArrayController;
     
@@ -46,6 +54,8 @@
 //@property (readonly) BOOL enableEdgeDataControls;
 @property (retain) NSMutableArray *selectedNodes;
 @property (retain) NSMutableArray *selectedEdges;
+@property (retain) NSMutableArray *sourceAnchorNames;
+@property (retain) NSMutableArray *targetAnchorNames;
 @property (retain) StylePaletteController *stylePaletteController;
 
 - (id)initWithWindowNibName:(NSString *)windowNibName;
diff --git a/tikzit/src/osx/PropertyInspectorController.m b/tikzit/src/osx/PropertyInspectorController.m
index 8254949..1411549 100644
--- a/tikzit/src/osx/PropertyInspectorController.m
+++ b/tikzit/src/osx/PropertyInspectorController.m
@@ -22,6 +22,7 @@
 
 @synthesize stylePaletteController;
 @synthesize selectedNodes, selectedEdges;
+@synthesize sourceAnchorNames, targetAnchorNames;
 
 - (id)initWithWindowNibName:(NSString *)windowNibName {
 	[super initWithWindowNibName:windowNibName];
@@ -50,8 +51,10 @@
                                                  name:@"NSWindowDidBecomeMainNotification"
                                                object:nil];
     
-    
-    
+    [self setSourceAnchorNames: [[NSMutableArray alloc] initWithArray: [@"north south west east" componentsSeparatedByString:@" "]]];
+
+    [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]];
+
     
     [[self window] setLevel:NSNormalWindowLevel];
     [self showWindow:self];
-- 
cgit v1.2.3