From 4a950f357fb29640b2732ca34c80f81c0b23fbe6 Mon Sep 17 00:00:00 2001
From: stuconnolly <stuart02@gmail.com>
Date: Tue, 8 Mar 2011 20:41:11 +0000
Subject: Bring outline view branch up to date with trunk (r3227:r3233).

---
 Interfaces/English.lproj/ConnectionErrorDialog.xib |   58 +-
 Interfaces/English.lproj/DBView.xib                |  351 +++---
 Interfaces/English.lproj/DataMigrationDialog.xib   | 1260 +++++++-------------
 .../English.lproj/DatabaseServerVariables.xib      |   97 +-
 Interfaces/English.lproj/ExportDialog.xib          |  145 ++-
 Interfaces/English.lproj/Preferences.xib           |  386 ++++--
 Interfaces/English.lproj/UserManagerView.xib       |  196 +--
 7 files changed, 1181 insertions(+), 1312 deletions(-)

(limited to 'Interfaces')

diff --git a/Interfaces/English.lproj/ConnectionErrorDialog.xib b/Interfaces/English.lproj/ConnectionErrorDialog.xib
index 03a586e3..9e63a2b6 100644
--- a/Interfaces/English.lproj/ConnectionErrorDialog.xib
+++ b/Interfaces/English.lproj/ConnectionErrorDialog.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.SystemVersion">10J567</string>
+		<string key="IBDocument.InterfaceBuilderVersion">804</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">788</string>
+			<string key="NS.object.0">804</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -91,7 +91,7 @@
 						<object class="NSButton" id="725257225">
 							<reference key="NSNextResponder" ref="552671949"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{414, 12}, {105, 32}}</string>
+							<string key="NSFrame">{{365, 12}, {154, 32}}</string>
 							<reference key="NSSuperview" ref="552671949"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
@@ -112,7 +112,7 @@
 						<object class="NSButton" id="946689239">
 							<reference key="NSNextResponder" ref="552671949"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{266, 12}, {148, 32}}</string>
+							<string key="NSFrame">{{198, 12}, {167, 32}}</string>
 							<reference key="NSSuperview" ref="552671949"/>
 							<int key="NSTag">2</int>
 							<bool key="NSEnabled">YES</bool>
@@ -398,8 +398,10 @@
 					<string>1.IBWindowTemplateEditedContentRect</string>
 					<string>1.NSWindowTemplate.visibleAtLaunch</string>
 					<string>11.IBPluginDependency</string>
+					<string>11.IBViewBoundsToFrameTransform</string>
 					<string>12.IBPluginDependency</string>
 					<string>13.IBPluginDependency</string>
+					<string>13.IBViewBoundsToFrameTransform</string>
 					<string>14.IBPluginDependency</string>
 					<string>2.IBPluginDependency</string>
 					<string>26.IBPluginDependency</string>
@@ -414,13 +416,19 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{469, 495}, {533, 147}}</string>
+					<string>{{433, 866}, {533, 147}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{469, 495}, {533, 147}}</string>
+					<string>{{433, 866}, {533, 147}}</string>
 					<boolean value="NO"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDwwAAwigAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDTQAAwigAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -462,10 +470,10 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
+					<string key="className">NSMenu</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h</string>
+						<string key="minorKey">Source/SPMenuAdditions.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -489,6 +497,13 @@
 						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarControl.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -975,6 +990,27 @@
 						<string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRValidator.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index bd064e22..ca4d7a86 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -3,7 +3,7 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
 		<string key="IBDocument.SystemVersion">10J567</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
 		<string key="IBDocument.AppKitVersion">1038.35</string>
 		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
@@ -16,20 +16,24 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>788</string>
-				<string>788</string>
+				<string>823</string>
+				<string>823</string>
 				<string>1.2.5</string>
 			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="5322"/>
+			<integer value="27"/>
+			<integer value="6180"/>
+			<integer value="6126"/>
 			<integer value="3994"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>com.brandonwalkin.BWToolkit</string>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string>com.apple.WebKitIBPlugin</string>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
 			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
@@ -71,7 +75,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{-1, -1}, {32, 24}}</string>
 												<reference key="NSSuperview" ref="28219887"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="BWAnchoredButtonCell" key="NSCell" id="283448047">
 													<int key="NSCellFlags">67239424</int>
@@ -100,7 +103,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{30, -1}, {32, 24}}</string>
 												<reference key="NSSuperview" ref="28219887"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="BWAnchoredPopUpButtonCell" key="NSCell" id="321871356">
 													<int key="NSCellFlags">71433792</int>
@@ -302,7 +304,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{61, -1}, {32, 24}}</string>
 												<reference key="NSSuperview" ref="28219887"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="BWAnchoredButtonCell" key="NSCell" id="227511715">
 													<int key="NSCellFlags">67239424</int>
@@ -327,7 +328,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{92, -1}, {32, 24}}</string>
 												<reference key="NSSuperview" ref="28219887"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="BWAnchoredButtonCell" key="NSCell" id="708016222">
 													<int key="NSCellFlags">-2080244224</int>
@@ -354,7 +354,6 @@
 										</object>
 										<string key="NSFrame">{{0, 1}, {214, 23}}</string>
 										<reference key="NSSuperview" ref="1053680279"/>
-										<reference key="NSWindow"/>
 										<bool key="BWABBIsResizable">YES</bool>
 										<bool key="BWABBIsAtBottom">YES</bool>
 										<bool key="BWABBHandleIsRightAligned">NO</bool>
@@ -385,7 +384,6 @@
 																		<int key="NSvFlags">290</int>
 																		<string key="NSFrame">{{5, 2}, {204, 19}}</string>
 																		<reference key="NSSuperview" ref="801427893"/>
-																		<reference key="NSWindow"/>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSSearchFieldCell" key="NSCell" id="134854992">
 																			<int key="NSCellFlags">343014976</int>
@@ -474,7 +472,6 @@
 																						<int key="NSvFlags">4362</int>
 																						<string key="NSFrameSize">{218, 38}</string>
 																						<reference key="NSSuperview" ref="494991824"/>
-																						<reference key="NSWindow"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="_NSCornerView" key="NSCornerView">
 																							<nil key="NSNextResponder"/>
@@ -515,7 +512,7 @@
 																										<string key="NSColorName">controlColor</string>
 																										<object class="NSColor" key="NSColor" id="1001122760">
 																											<int key="NSColorSpace">3</int>
-																											<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+																											<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
 																										</object>
 																									</object>
 																									<reference key="NSTextColor" ref="454249633"/>
@@ -560,7 +557,6 @@
 																				</object>
 																				<string key="NSFrame">{{1, 1}, {218, 38}}</string>
 																				<reference key="NSSuperview" ref="607475905"/>
-																				<reference key="NSWindow"/>
 																				<reference key="NSNextKeyView" ref="970881282"/>
 																				<reference key="NSDocView" ref="970881282"/>
 																				<object class="NSColor" key="NSBGColor" id="1024678221">
@@ -576,7 +572,6 @@
 																				<int key="NSvFlags">-2147483392</int>
 																				<string key="NSFrame">{{-100, -100}, {15, 8}}</string>
 																				<reference key="NSSuperview" ref="607475905"/>
-																				<reference key="NSWindow"/>
 																				<reference key="NSTarget" ref="607475905"/>
 																				<string key="NSAction">_doScroller:</string>
 																				<double key="NSPercent">0.42105263471603394</double>
@@ -586,7 +581,6 @@
 																				<int key="NSvFlags">-2147483392</int>
 																				<string key="NSFrame">{{-100, -100}, {223, 15}}</string>
 																				<reference key="NSSuperview" ref="607475905"/>
-																				<reference key="NSWindow"/>
 																				<int key="NSsFlags">1</int>
 																				<reference key="NSTarget" ref="607475905"/>
 																				<string key="NSAction">_doScroller:</string>
@@ -595,7 +589,6 @@
 																		</object>
 																		<string key="NSFrame">{{-1, -13}, {220, 40}}</string>
 																		<reference key="NSSuperview" ref="801427893"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="494991824"/>
 																		<int key="NSsFlags">2</int>
 																		<reference key="NSVScroller" ref="196112633"/>
@@ -606,7 +599,6 @@
 																</object>
 																<string key="NSFrameSize">{214, 26}</string>
 																<reference key="NSSuperview" ref="213762440"/>
-																<reference key="NSWindow"/>
 																<string key="NSClassName">NSView</string>
 															</object>
 															<object class="BWCustomView" id="1017775084">
@@ -629,7 +621,6 @@
 																						<int key="NSvFlags">4352</int>
 																						<string key="NSFrameSize">{214, 352}</string>
 																						<reference key="NSSuperview" ref="73685676"/>
-																						<reference key="NSWindow"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="_NSCornerView" key="NSCornerView">
 																							<nil key="NSNextResponder"/>
@@ -696,7 +687,6 @@
 																				</object>
 																				<string key="NSFrameSize">{214, 352}</string>
 																				<reference key="NSSuperview" ref="233472824"/>
-																				<reference key="NSWindow"/>
 																				<reference key="NSNextKeyView" ref="251040077"/>
 																				<reference key="NSDocView" ref="251040077"/>
 																				<reference key="NSBGColor" ref="1024678221"/>
@@ -707,7 +697,6 @@
 																				<int key="NSvFlags">-2147483392</int>
 																				<string key="NSFrame">{{197, 0}, {15, 292}}</string>
 																				<reference key="NSSuperview" ref="233472824"/>
-																				<reference key="NSWindow"/>
 																				<reference key="NSTarget" ref="233472824"/>
 																				<string key="NSAction">_doScroller:</string>
 																				<double key="NSCurValue">0.096045196056365967</double>
@@ -718,7 +707,6 @@
 																				<int key="NSvFlags">-2147483392</int>
 																				<string key="NSFrame">{{-100, -100}, {141, 11}}</string>
 																				<reference key="NSSuperview" ref="233472824"/>
-																				<reference key="NSWindow"/>
 																				<int key="NSsFlags">257</int>
 																				<reference key="NSTarget" ref="233472824"/>
 																				<string key="NSAction">_doScroller:</string>
@@ -727,7 +715,6 @@
 																		</object>
 																		<string key="NSFrameSize">{214, 352}</string>
 																		<reference key="NSSuperview" ref="1017775084"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="73685676"/>
 																		<int key="NSsFlags">528</int>
 																		<reference key="NSVScroller" ref="693168867"/>
@@ -738,13 +725,11 @@
 																</object>
 																<string key="NSFrame">{{0, 27}, {214, 352}}</string>
 																<reference key="NSSuperview" ref="213762440"/>
-																<reference key="NSWindow"/>
 																<string key="NSClassName">NSView</string>
 															</object>
 														</object>
 														<string key="NSFrameSize">{214, 379}</string>
 														<reference key="NSSuperview" ref="131633443"/>
-														<reference key="NSWindow"/>
 														<int key="NSDividerStyle">2</int>
 														<object class="NSColor" key="BWSVColor">
 															<int key="NSColorSpace">6</int>
@@ -778,7 +763,6 @@
 												</object>
 												<string key="NSFrameSize">{214, 379}</string>
 												<reference key="NSSuperview" ref="298095498"/>
-												<reference key="NSWindow"/>
 												<string key="NSClassName">NSView</string>
 											</object>
 											<object class="BWCustomView" id="192579410">
@@ -801,7 +785,6 @@
 																		<int key="NSvFlags">4352</int>
 																		<string key="NSFrameSize">{216, 145}</string>
 																		<reference key="NSSuperview" ref="242523705"/>
-																		<reference key="NSWindow"/>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="_NSCornerView" key="NSCornerView">
 																			<nil key="NSNextResponder"/>
@@ -868,7 +851,6 @@
 																</object>
 																<string key="NSFrameSize">{216, 145}</string>
 																<reference key="NSSuperview" ref="561874764"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="794785393"/>
 																<reference key="NSDocView" ref="794785393"/>
 																<reference key="NSBGColor" ref="1024678221"/>
@@ -879,7 +861,6 @@
 																<int key="NSvFlags">-2147483392</int>
 																<string key="NSFrame">{{-100, -100}, {15, 20}}</string>
 																<reference key="NSSuperview" ref="561874764"/>
-																<reference key="NSWindow"/>
 																<reference key="NSTarget" ref="561874764"/>
 																<string key="NSAction">_doScroller:</string>
 																<double key="NSPercent">0.99315071105957031</double>
@@ -889,7 +870,6 @@
 																<int key="NSvFlags">-2147483392</int>
 																<string key="NSFrame">{{-100, -100}, {141, 11}}</string>
 																<reference key="NSSuperview" ref="561874764"/>
-																<reference key="NSWindow"/>
 																<int key="NSsFlags">257</int>
 																<reference key="NSTarget" ref="561874764"/>
 																<string key="NSAction">_doScroller:</string>
@@ -898,7 +878,6 @@
 														</object>
 														<string key="NSFrame">{{-1, 0}, {216, 145}}</string>
 														<reference key="NSSuperview" ref="192579410"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="242523705"/>
 														<int key="NSsFlags">528</int>
 														<reference key="NSVScroller" ref="313695606"/>
@@ -921,7 +900,6 @@
 																		<int key="NSvFlags">4352</int>
 																		<string key="NSFrameSize">{214, 145}</string>
 																		<reference key="NSSuperview" ref="685057119"/>
-																		<reference key="NSWindow"/>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="_NSCornerView" key="NSCornerView">
 																			<nil key="NSNextResponder"/>
@@ -988,7 +966,6 @@
 																</object>
 																<string key="NSFrameSize">{214, 145}</string>
 																<reference key="NSSuperview" ref="298226231"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="347093764"/>
 																<reference key="NSDocView" ref="347093764"/>
 																<reference key="NSBGColor" ref="1024678221"/>
@@ -999,7 +976,6 @@
 																<int key="NSvFlags">-2147483392</int>
 																<string key="NSFrame">{{-100, -100}, {15, 20}}</string>
 																<reference key="NSSuperview" ref="298226231"/>
-																<reference key="NSWindow"/>
 																<reference key="NSTarget" ref="298226231"/>
 																<string key="NSAction">_doScroller:</string>
 																<double key="NSCurValue">0.48965516686439514</double>
@@ -1010,7 +986,6 @@
 																<int key="NSvFlags">-2147483392</int>
 																<string key="NSFrame">{{-100, -100}, {141, 11}}</string>
 																<reference key="NSSuperview" ref="298226231"/>
-																<reference key="NSWindow"/>
 																<int key="NSsFlags">257</int>
 																<reference key="NSTarget" ref="298226231"/>
 																<string key="NSAction">_doScroller:</string>
@@ -1019,7 +994,6 @@
 														</object>
 														<string key="NSFrameSize">{214, 145}</string>
 														<reference key="NSSuperview" ref="192579410"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="685057119"/>
 														<int key="NSsFlags">512</int>
 														<reference key="NSVScroller" ref="245346414"/>
@@ -1030,13 +1004,11 @@
 												</object>
 												<string key="NSFrame">{{0, 380}, {214, 145}}</string>
 												<reference key="NSSuperview" ref="298095498"/>
-												<reference key="NSWindow"/>
 												<string key="NSClassName">NSView</string>
 											</object>
 										</object>
 										<string key="NSFrame">{{0, 24}, {214, 525}}</string>
 										<reference key="NSSuperview" ref="1053680279"/>
-										<reference key="NSWindow"/>
 										<int key="NSDividerStyle">2</int>
 										<reference key="BWSVColor" ref="304829493"/>
 										<bool key="BWSVColorIsEnabled">NO</bool>
@@ -1080,7 +1052,6 @@
 								</object>
 								<string key="NSFrameSize">{214, 549}</string>
 								<reference key="NSSuperview" ref="162770193"/>
-								<reference key="NSWindow"/>
 								<string key="NSClassName">NSView</string>
 							</object>
 							<object class="BWCustomView" id="882258892">
@@ -1093,13 +1064,12 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrame">{{-7, -10}, {741, 564}}</string>
 										<reference key="NSSuperview" ref="882258892"/>
-										<reference key="NSWindow"/>
 										<object class="NSMutableArray" key="NSTabViewItems">
 											<bool key="EncodedWithXMLCoder">YES</bool>
 											<object class="NSTabViewItem" id="831053945">
 												<string key="NSIdentifier">source</string>
 												<object class="NSView" key="NSView" id="461236772">
-													<reference key="NSNextResponder" ref="714795046"/>
+													<nil key="NSNextResponder"/>
 													<int key="NSvFlags">256</int>
 													<object class="NSMutableArray" key="NSSubviews">
 														<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1118,7 +1088,6 @@
 																			<int key="NSvFlags">289</int>
 																			<string key="NSFrame">{{662, -1}, {32, 24}}</string>
 																			<reference key="NSSuperview" ref="220777809"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="BWAnchoredPopUpButtonCell" key="NSCell" id="688701059">
 																				<int key="NSCellFlags">71433792</int>
@@ -1226,7 +1195,6 @@
 																			<int key="NSvFlags">-2147483356</int>
 																			<string key="NSFrame">{{124, -1}, {33, 25}}</string>
 																			<reference key="NSSuperview" ref="220777809"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSButtonCell" key="NSCell" id="598509241">
 																				<int key="NSCellFlags">-2080244224</int>
@@ -1261,14 +1229,12 @@
 																							<int key="NSvFlags">4352</int>
 																							<string key="NSFrameSize">{694, 288}</string>
 																							<reference key="NSSuperview" ref="16936123"/>
-																							<reference key="NSWindow"/>
 																							<bool key="NSEnabled">YES</bool>
 																							<object class="NSTableHeaderView" key="NSHeaderView" id="926883367">
 																								<reference key="NSNextResponder" ref="639957061"/>
 																								<int key="NSvFlags">256</int>
 																								<string key="NSFrameSize">{694, 17}</string>
 																								<reference key="NSSuperview" ref="639957061"/>
-																								<reference key="NSWindow"/>
 																								<reference key="NSTableView" ref="715508012"/>
 																							</object>
 																							<object class="_NSCornerView" key="NSCornerView" id="868771861">
@@ -1276,7 +1242,6 @@
 																								<int key="NSvFlags">-2147483392</int>
 																								<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
 																								<reference key="NSSuperview" ref="22340145"/>
-																								<reference key="NSWindow"/>
 																							</object>
 																							<object class="NSMutableArray" key="NSTableColumns">
 																								<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1830,7 +1795,6 @@
 																					</object>
 																					<string key="NSFrame">{{1, 17}, {694, 288}}</string>
 																					<reference key="NSSuperview" ref="22340145"/>
-																					<reference key="NSWindow"/>
 																					<reference key="NSNextKeyView" ref="715508012"/>
 																					<reference key="NSDocView" ref="715508012"/>
 																					<reference key="NSBGColor" ref="1024678221"/>
@@ -1841,7 +1805,6 @@
 																					<int key="NSvFlags">-2147483392</int>
 																					<string key="NSFrame">{{674, 17}, {15, 274}}</string>
 																					<reference key="NSSuperview" ref="22340145"/>
-																					<reference key="NSWindow"/>
 																					<reference key="NSTarget" ref="22340145"/>
 																					<string key="NSAction">_doScroller:</string>
 																					<double key="NSPercent">0.9480968713760376</double>
@@ -1851,7 +1814,6 @@
 																					<int key="NSvFlags">-2147483392</int>
 																					<string key="NSFrame">{{1, 291}, {694, 15}}</string>
 																					<reference key="NSSuperview" ref="22340145"/>
-																					<reference key="NSWindow"/>
 																					<int key="NSsFlags">1</int>
 																					<reference key="NSTarget" ref="22340145"/>
 																					<string key="NSAction">_doScroller:</string>
@@ -1867,7 +1829,6 @@
 																					</object>
 																					<string key="NSFrame">{{1, 0}, {694, 17}}</string>
 																					<reference key="NSSuperview" ref="22340145"/>
-																					<reference key="NSWindow"/>
 																					<reference key="NSNextKeyView" ref="926883367"/>
 																					<reference key="NSDocView" ref="926883367"/>
 																					<reference key="NSBGColor" ref="1024678221"/>
@@ -1877,7 +1838,6 @@
 																			</object>
 																			<string key="NSFrame">{{-1, 22}, {696, 306}}</string>
 																			<reference key="NSSuperview" ref="220777809"/>
-																			<reference key="NSWindow"/>
 																			<reference key="NSNextKeyView" ref="16936123"/>
 																			<int key="NSsFlags">562</int>
 																			<reference key="NSVScroller" ref="943144555"/>
@@ -1892,7 +1852,6 @@
 																			<int key="NSvFlags">292</int>
 																			<string key="NSFrame">{{-1, -1}, {32, 25}}</string>
 																			<reference key="NSSuperview" ref="220777809"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSButtonCell" key="NSCell" id="413143172">
 																				<int key="NSCellFlags">-1543373312</int>
@@ -1917,7 +1876,6 @@
 																			<int key="NSvFlags">292</int>
 																			<string key="NSFrame">{{93, -1}, {32, 25}}</string>
 																			<reference key="NSSuperview" ref="220777809"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSButtonCell" key="NSCell" id="917381158">
 																				<int key="NSCellFlags">-2080244224</int>
@@ -1942,7 +1900,6 @@
 																			<int key="NSvFlags">292</int>
 																			<string key="NSFrame">{{30, -1}, {32, 25}}</string>
 																			<reference key="NSSuperview" ref="220777809"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSButtonCell" key="NSCell" id="578226656">
 																				<int key="NSCellFlags">-1543373312</int>
@@ -1967,7 +1924,6 @@
 																			<int key="NSvFlags">292</int>
 																			<string key="NSFrame">{{61, -1}, {32, 25}}</string>
 																			<reference key="NSSuperview" ref="220777809"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSButtonCell" key="NSCell" id="626480887">
 																				<int key="NSCellFlags">-1543373312</int>
@@ -2004,7 +1960,6 @@
 																			</object>
 																			<string key="NSFrame">{{125, 0}, {507, 23}}</string>
 																			<reference key="NSSuperview" ref="220777809"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSImageCell" key="NSCell" id="4715">
 																				<int key="NSCellFlags">130560</int>
@@ -2025,7 +1980,6 @@
 																			<int key="NSvFlags">289</int>
 																			<string key="NSFrame">{{632, -1}, {32, 25}}</string>
 																			<reference key="NSSuperview" ref="220777809"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSButtonCell" key="NSCell" id="1072754876">
 																				<int key="NSCellFlags">-1543373312</int>
@@ -2048,7 +2002,6 @@
 																	</object>
 																	<string key="NSFrameSize">{695, 328}</string>
 																	<reference key="NSSuperview" ref="628830973"/>
-																	<reference key="NSWindow"/>
 																	<string key="NSClassName">NSView</string>
 																</object>
 																<object class="NSCustomView" id="1063281455">
@@ -2066,7 +2019,6 @@
 																					<int key="NSvFlags">268</int>
 																					<string key="NSFrame">{{3, 3}, {49, 14}}</string>
 																					<reference key="NSSuperview" ref="813716908"/>
-																					<reference key="NSWindow"/>
 																					<bool key="NSEnabled">YES</bool>
 																					<object class="NSTextFieldCell" key="NSCell" id="907218783">
 																						<int key="NSCellFlags">68288064</int>
@@ -2105,7 +2057,6 @@
 																					</object>
 																					<string key="NSFrame">{{678, 4}, {10, 13}}</string>
 																					<reference key="NSSuperview" ref="813716908"/>
-																					<reference key="NSWindow"/>
 																					<bool key="NSEnabled">YES</bool>
 																					<object class="NSImageCell" key="NSCell" id="545156725">
 																						<int key="NSCellFlags">130560</int>
@@ -2124,7 +2075,6 @@
 																			</object>
 																			<string key="NSFrame">{{0, 181}, {695, 20}}</string>
 																			<reference key="NSSuperview" ref="1063281455"/>
-																			<reference key="NSWindow"/>
 																			<object class="NSColor" key="BWGBFillStartingColor">
 																				<int key="NSColorSpace">1</int>
 																				<bytes key="NSRGB">MC42NzU3Njg0OTQ2IDAuNzIxOTQ4MTQ2OCAwLjc2NTMwNjExNTIAA</bytes>
@@ -2167,14 +2117,12 @@
 																							<int key="NSvFlags">4352</int>
 																							<string key="NSFrameSize">{694, 140}</string>
 																							<reference key="NSSuperview" ref="794929378"/>
-																							<reference key="NSWindow"/>
 																							<bool key="NSEnabled">YES</bool>
 																							<object class="NSTableHeaderView" key="NSHeaderView" id="459548655">
 																								<reference key="NSNextResponder" ref="1038672854"/>
 																								<int key="NSvFlags">256</int>
 																								<string key="NSFrameSize">{694, 17}</string>
 																								<reference key="NSSuperview" ref="1038672854"/>
-																								<reference key="NSWindow"/>
 																								<reference key="NSTableView" ref="584834515"/>
 																							</object>
 																							<object class="_NSCornerView" key="NSCornerView" id="476444025">
@@ -2182,7 +2130,6 @@
 																								<int key="NSvFlags">-2147483392</int>
 																								<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
 																								<reference key="NSSuperview" ref="376224367"/>
-																								<reference key="NSWindow"/>
 																							</object>
 																							<object class="NSMutableArray" key="NSTableColumns">
 																								<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2438,7 +2385,6 @@
 																					</object>
 																					<string key="NSFrame">{{1, 17}, {694, 140}}</string>
 																					<reference key="NSSuperview" ref="376224367"/>
-																					<reference key="NSWindow"/>
 																					<reference key="NSNextKeyView" ref="584834515"/>
 																					<reference key="NSDocView" ref="584834515"/>
 																					<reference key="NSBGColor" ref="1024678221"/>
@@ -2449,7 +2395,6 @@
 																					<int key="NSvFlags">-2147483392</int>
 																					<string key="NSFrame">{{611, 17}, {15, 126}}</string>
 																					<reference key="NSSuperview" ref="376224367"/>
-																					<reference key="NSWindow"/>
 																					<reference key="NSTarget" ref="376224367"/>
 																					<string key="NSAction">_doScroller:</string>
 																					<double key="NSPercent">0.97794115543365479</double>
@@ -2459,7 +2404,6 @@
 																					<int key="NSvFlags">-2147483392</int>
 																					<string key="NSFrame">{{1, 143}, {610, 15}}</string>
 																					<reference key="NSSuperview" ref="376224367"/>
-																					<reference key="NSWindow"/>
 																					<int key="NSsFlags">1</int>
 																					<reference key="NSTarget" ref="376224367"/>
 																					<string key="NSAction">_doScroller:</string>
@@ -2474,7 +2418,6 @@
 																					</object>
 																					<string key="NSFrame">{{1, 0}, {694, 17}}</string>
 																					<reference key="NSSuperview" ref="376224367"/>
-																					<reference key="NSWindow"/>
 																					<reference key="NSNextKeyView" ref="459548655"/>
 																					<reference key="NSDocView" ref="459548655"/>
 																					<reference key="NSBGColor" ref="1024678221"/>
@@ -2484,7 +2427,6 @@
 																			</object>
 																			<string key="NSFrame">{{-1, 23}, {696, 158}}</string>
 																			<reference key="NSSuperview" ref="1063281455"/>
-																			<reference key="NSWindow"/>
 																			<reference key="NSNextKeyView" ref="794929378"/>
 																			<int key="NSsFlags">562</int>
 																			<reference key="NSVScroller" ref="1019209947"/>
@@ -2499,7 +2441,6 @@
 																			<int key="NSvFlags">292</int>
 																			<string key="NSFrame">{{-1, 0}, {32, 25}}</string>
 																			<reference key="NSSuperview" ref="1063281455"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSButtonCell" key="NSCell" id="326048025">
 																				<int key="NSCellFlags">-1543373312</int>
@@ -2521,7 +2462,6 @@
 																			<int key="NSvFlags">292</int>
 																			<string key="NSFrame">{{61, 0}, {32, 25}}</string>
 																			<reference key="NSSuperview" ref="1063281455"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSButtonCell" key="NSCell" id="153146827">
 																				<int key="NSCellFlags">-2080244224</int>
@@ -2543,7 +2483,6 @@
 																			<int key="NSvFlags">292</int>
 																			<string key="NSFrame">{{30, 0}, {32, 25}}</string>
 																			<reference key="NSSuperview" ref="1063281455"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSButtonCell" key="NSCell" id="345927225">
 																				<int key="NSCellFlags">-1543373312</int>
@@ -2577,7 +2516,6 @@
 																			</object>
 																			<string key="NSFrame">{{93, 1}, {602, 23}}</string>
 																			<reference key="NSSuperview" ref="1063281455"/>
-																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSImageCell" key="NSCell" id="372723860">
 																				<int key="NSCellFlags">130560</int>
@@ -2593,19 +2531,15 @@
 																	</object>
 																	<string key="NSFrame">{{0, 329}, {695, 201}}</string>
 																	<reference key="NSSuperview" ref="628830973"/>
-																	<reference key="NSWindow"/>
 																	<string key="NSClassName">NSView</string>
 																</object>
 															</object>
 															<string key="NSFrame">{{7, 10}, {695, 530}}</string>
 															<reference key="NSSuperview" ref="461236772"/>
-															<reference key="NSWindow"/>
 															<int key="NSDividerStyle">2</int>
 														</object>
 													</object>
 													<string key="NSFrame">{{10, 7}, {706, 544}}</string>
-													<reference key="NSSuperview" ref="714795046"/>
-													<reference key="NSWindow"/>
 												</object>
 												<string key="NSLabel">Structure</string>
 												<reference key="NSColor" ref="62854682"/>
@@ -2614,7 +2548,7 @@
 											<object class="NSTabViewItem" id="624106058">
 												<string key="NSIdentifier">content</string>
 												<object class="NSView" key="NSView" id="1013108064">
-													<nil key="NSNextResponder"/>
+													<reference key="NSNextResponder" ref="714795046"/>
 													<int key="NSvFlags">256</int>
 													<object class="NSMutableArray" key="NSSubviews">
 														<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3067,7 +3001,7 @@
 																		<object class="NSPopUpButton" id="830088955">
 																			<reference key="NSNextResponder" ref="795017229"/>
 																			<int key="NSvFlags">266</int>
-																			<string key="NSFrame">{{50, 3}, {160, 20}}</string>
+																			<string key="NSFrame">{{79, 3}, {131, 20}}</string>
 																			<reference key="NSSuperview" ref="795017229"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSPopUpButtonCell" key="NSCell" id="376863254">
@@ -3115,12 +3049,12 @@
 																		<object class="NSTextField" id="905386082">
 																			<reference key="NSNextResponder" ref="795017229"/>
 																			<int key="NSvFlags">264</int>
-																			<string key="NSFrame">{{7, 6}, {43, 14}}</string>
+																			<string key="NSFrame">{{7, 6}, {67, 14}}</string>
 																			<reference key="NSSuperview" ref="795017229"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="NSTextFieldCell" key="NSCell" id="314592665">
 																				<int key="NSCellFlags">67239488</int>
-																				<int key="NSCellFlags2">272761856</int>
+																				<int key="NSCellFlags2">71435264</int>
 																				<string key="NSContents">Search:</string>
 																				<reference key="NSSupport" ref="26"/>
 																				<reference key="NSControlView" ref="905386082"/>
@@ -3353,6 +3287,7 @@
 														</object>
 													</object>
 													<string key="NSFrame">{{10, 7}, {706, 544}}</string>
+													<reference key="NSSuperview" ref="714795046"/>
 												</object>
 												<string key="NSLabel">Content</string>
 												<reference key="NSColor" ref="62854682"/>
@@ -5216,7 +5151,7 @@
 														<object class="NSTextField" id="412060569">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">270</int>
-															<string key="NSFrame">{{152, 400}, {152, 14}}</string>
+															<string key="NSFrame">{{175, 400}, {101, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="632489290">
@@ -5232,7 +5167,7 @@
 														<object class="NSTextField" id="795265894">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">270</int>
-															<string key="NSFrame">{{152, 378}, {152, 14}}</string>
+															<string key="NSFrame">{{175, 378}, {101, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="246518824">
@@ -5248,7 +5183,7 @@
 														<object class="NSTextField" id="747426446">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">270</int>
-															<string key="NSFrame">{{152, 356}, {152, 14}}</string>
+															<string key="NSFrame">{{175, 356}, {101, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="738092126">
@@ -5264,7 +5199,7 @@
 														<object class="NSTextField" id="140378338">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{152, 334}, {152, 14}}</string>
+															<string key="NSFrame">{{175, 334}, {101, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="71975986">
@@ -5350,7 +5285,7 @@
 														<object class="NSTextField" id="803209800">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">270</int>
-															<string key="NSFrame">{{418, 400}, {256, 14}}</string>
+															<string key="NSFrame">{{401, 398}, {273, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="1035416348">
@@ -5366,7 +5301,7 @@
 														<object class="NSTextField" id="6005445">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">270</int>
-															<string key="NSFrame">{{418, 378}, {256, 14}}</string>
+															<string key="NSFrame">{{401, 376}, {273, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="502320319">
@@ -5382,7 +5317,7 @@
 														<object class="NSTextField" id="531020960">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">266</int>
-															<string key="NSFrame">{{418, 356}, {256, 14}}</string>
+															<string key="NSFrame">{{401, 354}, {273, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="686395978">
@@ -5398,7 +5333,7 @@
 														<object class="NSTextField" id="35887466">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">266</int>
-															<string key="NSFrame">{{418, 334}, {256, 14}}</string>
+															<string key="NSFrame">{{401, 332}, {273, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="314352793">
@@ -5487,7 +5422,7 @@
 														<object class="NSTextField" id="587008251">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{53, 334}, {97, 14}}</string>
+															<string key="NSFrame">{{50, 334}, {123, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="679833695">
@@ -5503,7 +5438,7 @@
 														<object class="NSTextField" id="986860589">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{21, 356}, {129, 14}}</string>
+															<string key="NSFrame">{{23, 356}, {150, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="472283040">
@@ -5519,7 +5454,7 @@
 														<object class="NSTextField" id="656261728">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{21, 378}, {129, 14}}</string>
+															<string key="NSFrame">{{23, 378}, {150, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="1466046">
@@ -5535,7 +5470,7 @@
 														<object class="NSTextField" id="196361793">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{21, 400}, {129, 14}}</string>
+															<string key="NSFrame">{{23, 400}, {150, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="995017127">
@@ -5551,7 +5486,7 @@
 														<object class="NSTextField" id="307672983">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{304, 400}, {113, 14}}</string>
+															<string key="NSFrame">{{286, 398}, {113, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="428052689">
@@ -5599,7 +5534,7 @@
 														<object class="NSTextField" id="988950867">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{304, 378}, {113, 14}}</string>
+															<string key="NSFrame">{{286, 376}, {113, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="103576616">
@@ -5615,7 +5550,7 @@
 														<object class="NSTextField" id="333563212">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{304, 356}, {113, 14}}</string>
+															<string key="NSFrame">{{286, 354}, {113, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="958047642">
@@ -5631,7 +5566,7 @@
 														<object class="NSTextField" id="993399156">
 															<reference key="NSNextResponder" ref="730602982"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{304, 334}, {113, 14}}</string>
+															<string key="NSFrame">{{286, 332}, {113, 14}}</string>
 															<reference key="NSSuperview" ref="730602982"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="662360258">
@@ -6325,7 +6260,7 @@
 																	<reference key="NSSuperview" ref="207402382"/>
 																	<reference key="NSTarget" ref="207402382"/>
 																	<string key="NSAction">_doScroller:</string>
-																	<double key="NSPercent">0.96696035242290745</double>
+																	<double key="NSPercent">0.9669603705406189</double>
 																</object>
 																<object class="NSScroller" id="134580221">
 																	<reference key="NSNextResponder" ref="207402382"/>
@@ -6335,7 +6270,7 @@
 																	<int key="NSsFlags">1</int>
 																	<reference key="NSTarget" ref="207402382"/>
 																	<string key="NSAction">_doScroller:</string>
-																	<double key="NSPercent">0.99856115107913668</double>
+																	<double key="NSPercent">0.99856114387512207</double>
 																</object>
 																<object class="NSClipView" id="1062933180">
 																	<reference key="NSNextResponder" ref="207402382"/>
@@ -6480,26 +6415,24 @@
 												<reference key="NSTabView" ref="714795046"/>
 											</object>
 										</object>
-										<reference key="NSSelectedTabViewItem" ref="831053945"/>
+										<reference key="NSSelectedTabViewItem" ref="624106058"/>
 										<reference key="NSFont" ref="26"/>
 										<int key="NSTvFlags">134217731</int>
 										<bool key="NSAllowTruncatedLabels">YES</bool>
 										<bool key="NSDrawsBackground">YES</bool>
 										<object class="NSMutableArray" key="NSSubviews">
 											<bool key="EncodedWithXMLCoder">YES</bool>
-											<reference ref="461236772"/>
+											<reference ref="1013108064"/>
 										</object>
 									</object>
 								</object>
 								<string key="NSFrame">{{215, 0}, {728, 549}}</string>
 								<reference key="NSSuperview" ref="162770193"/>
-								<reference key="NSWindow"/>
 								<string key="NSClassName">NSView</string>
 							</object>
 						</object>
 						<string key="NSFrameSize">{943, 549}</string>
 						<reference key="NSSuperview" ref="632807581"/>
-						<reference key="NSWindow"/>
 						<bool key="NSIsVertical">YES</bool>
 						<int key="NSDividerStyle">2</int>
 						<string key="NSAutosaveName">DBViewSplitter</string>
@@ -6548,7 +6481,6 @@
 				</object>
 				<string key="NSFrameSize">{943, 549}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSWindowTemplate" id="554105051">
@@ -6939,7 +6871,7 @@
 			<object class="NSWindowTemplate" id="291331305">
 				<int key="NSWindowStyleMask">9</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{343, 453}, {269, 142}}</string>
+				<string key="NSWindowRect">{{343, 453}, {308, 142}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">New Table</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -6947,16 +6879,16 @@
 					<characters key="NS.bytes">View</characters>
 				</object>
 				<string key="NSWindowContentMaxSize">{600, 142}</string>
-				<string key="NSWindowContentMinSize">{269, 142}</string>
+				<string key="NSWindowContentMinSize">{308, 142}</string>
 				<object class="NSView" key="NSWindowView" id="846512394">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSTextField" id="353717720">
 							<reference key="NSNextResponder" ref="846512394"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{36, 105}, {71, 14}}</string>
+							<string key="NSFrame">{{5, 105}, {128, 14}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="967312779">
@@ -6972,7 +6904,7 @@
 						<object class="NSTextField" id="686153551">
 							<reference key="NSNextResponder" ref="846512394"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{17, 80}, {90, 14}}</string>
+							<string key="NSFrame">{{5, 80}, {128, 14}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="308586219">
@@ -6988,7 +6920,7 @@
 						<object class="NSTextField" id="49938431">
 							<reference key="NSNextResponder" ref="846512394"/>
 							<int key="NSvFlags">258</int>
-							<string key="NSFrame">{{112, 104}, {137, 18}}</string>
+							<string key="NSFrame">{{138, 104}, {150, 18}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="39963071">
@@ -7005,7 +6937,7 @@
 						<object class="NSButton" id="590415376">
 							<reference key="NSNextResponder" ref="846512394"/>
 							<int key="NSvFlags">257</int>
-							<string key="NSFrame">{{184, 13}, {70, 28}}</string>
+							<string key="NSFrame">{{215, 13}, {78, 28}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
@@ -7027,8 +6959,8 @@
 						</object>
 						<object class="NSPopUpButton" id="224999534">
 							<reference key="NSNextResponder" ref="846512394"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{109, 75}, {143, 22}}</string>
+							<int key="NSvFlags">258</int>
+							<string key="NSFrame">{{135, 75}, {156, 22}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="285868883">
@@ -7063,7 +6995,7 @@
 						<object class="NSTextField" id="464161453">
 							<reference key="NSNextResponder" ref="846512394"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{41, 54}, {66, 14}}</string>
+							<string key="NSFrame">{{5, 54}, {128, 14}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="193977111">
@@ -7078,8 +7010,8 @@
 						</object>
 						<object class="NSPopUpButton" id="742772304">
 							<reference key="NSNextResponder" ref="846512394"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{109, 50}, {143, 22}}</string>
+							<int key="NSvFlags">258</int>
+							<string key="NSFrame">{{135, 50}, {156, 22}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="285541065">
@@ -7114,7 +7046,7 @@
 						<object class="NSButton" id="799840790">
 							<reference key="NSNextResponder" ref="846512394"/>
 							<int key="NSvFlags">257</int>
-							<string key="NSFrame">{{116, 13}, {70, 28}}</string>
+							<string key="NSFrame">{{133, 13}, {84, 28}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="783843620">
@@ -7133,10 +7065,11 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{269, 142}</string>
+					<string key="NSFrameSize">{308, 142}</string>
+					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMinSize">{269, 164}</string>
+				<string key="NSMinSize">{308, 164}</string>
 				<string key="NSMaxSize">{600, 164}</string>
 			</object>
 			<object class="NSWindowTemplate" id="308103881">
@@ -7271,7 +7204,7 @@
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
 				<object class="NSView" key="NSWindowView" id="234287744">
 					<nil key="NSNextResponder"/>
@@ -7416,7 +7349,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSWindowTemplate" id="423199625">
 				<int key="NSWindowStyleMask">7</int>
@@ -7426,7 +7359,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSWindowTitle">Reset Auto Increment</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{255, 95}</string>
 				<object class="NSView" key="NSWindowView" id="748618982">
 					<nil key="NSNextResponder"/>
@@ -7589,7 +7522,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
 				<string key="NSMinSize">{255, 117}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSWindowTemplate" id="787219800">
 				<int key="NSWindowStyleMask">1</int>
@@ -7599,7 +7532,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSWindowTitle">New Relation</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<object class="NSView" key="NSWindowView" id="842408319">
 					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -8200,7 +8133,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string key="NSFrameSize">{302, 307}</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSWindowTemplate" id="437271354">
 				<int key="NSWindowStyleMask">9</int>
@@ -8210,7 +8143,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSWindowTitle">New Trigger</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{360, 348}</string>
 				<object class="NSView" key="NSWindowView" id="729080358">
 					<nil key="NSNextResponder"/>
@@ -8617,7 +8550,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{360, 370}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSWindowTemplate" id="1066802919">
 				<int key="NSWindowStyleMask">3</int>
@@ -8629,10 +8562,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{213, 50}</string>
 				<object class="NSView" key="NSWindowView" id="525490268">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8670,7 +8603,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<object class="NSButton" id="375206554">
 							<reference key="NSNextResponder" ref="525490268"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{279, 12}, {83, 32}}</string>
+							<string key="NSFrame">{{257, 12}, {108, 32}}</string>
 							<reference key="NSSuperview" ref="525490268"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="851386817">
@@ -8746,10 +8679,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						</object>
 					</object>
 					<string key="NSFrameSize">{379, 139}</string>
+					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{213, 72}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSWindowTemplate" id="553728448">
 				<int key="NSWindowStyleMask">9</int>
@@ -8761,7 +8695,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
 				<object class="NSView" key="NSWindowView" id="1052076676">
 					<nil key="NSNextResponder"/>
@@ -8896,7 +8830,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSWindowTemplate" id="828950706">
 				<int key="NSWindowStyleMask">15</int>
@@ -8908,7 +8842,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{350, 200}</string>
 				<object class="NSView" key="NSWindowView" id="749598685">
 					<nil key="NSNextResponder"/>
@@ -9131,7 +9065,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{350, 222}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSFrameAutosaveName">SPCreateSyntaxSheet</string>
 			</object>
 			<object class="NSWindowTemplate" id="466147946">
@@ -9144,7 +9078,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
 				<object class="NSView" key="NSWindowView" id="860968037">
 					<nil key="NSNextResponder"/>
@@ -9314,7 +9248,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSWindowTemplate" id="78186995">
 				<int key="NSWindowStyleMask">31</int>
@@ -9324,7 +9258,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSWindowTitle">MySQL Help</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{351, 120}</string>
 				<object class="NSView" key="NSWindowView" id="539508428">
 					<nil key="NSNextResponder"/>
@@ -9722,7 +9656,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
 				<string key="NSMinSize">{351, 136}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSFrameAutosaveName">MYSQL_HELP_WINDOW</string>
 			</object>
 			<object class="NSWindowTemplate" id="633448481">
@@ -9733,7 +9667,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSWindowTitle">Filter</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{380, 170}</string>
 				<object class="NSView" key="NSWindowView" id="257361103">
 					<nil key="NSNextResponder"/>
@@ -10375,7 +10309,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
 				<string key="NSMinSize">{380, 192}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSFrameAutosaveName">SPTableFilterPanel</string>
 			</object>
 			<object class="NSWindowTemplate" id="923391973">
@@ -10875,7 +10809,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 				<string key="NSWindowTitle">Secure Text Input Sheet</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<object class="NSView" key="NSWindowView" id="978976687">
 					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -10979,7 +10913,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string key="NSFrameSize">{338, 150}</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSCustomView" id="884983195">
 				<reference key="NSNextResponder"/>
@@ -11163,7 +11097,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 								<string key="NSColorName">disabledControlTextColor</string>
 								<object class="NSColor" key="NSColor">
 									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
+									<bytes key="NSWhite">MC4zMzMzMzMzNDMzAA</bytes>
 								</object>
 							</object>
 						</object>
@@ -11648,6 +11582,16 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 						<reference key="NSOnImage" ref="450876295"/>
 						<reference key="NSMixedImage" ref="414351669"/>
 					</object>
+					<object class="NSMenuItem" id="159633392">
+						<reference key="NSMenu" ref="556141845"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="450876295"/>
+						<reference key="NSMixedImage" ref="414351669"/>
+					</object>
 					<object class="NSMenuItem" id="985474865">
 						<reference key="NSMenu" ref="556141845"/>
 						<string key="NSTitle">Export</string>
@@ -18135,6 +18079,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							<reference ref="985474865"/>
 							<reference ref="262885074"/>
 							<reference ref="530477407"/>
+							<reference ref="159633392"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Table List Menu</string>
@@ -21804,10 +21749,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							<reference ref="1066106318"/>
 							<reference ref="501779393"/>
 							<reference ref="795265894"/>
-							<reference ref="35887466"/>
-							<reference ref="531020960"/>
-							<reference ref="6005445"/>
-							<reference ref="803209800"/>
 							<reference ref="412060569"/>
 							<reference ref="349710554"/>
 							<reference ref="140378338"/>
@@ -21821,15 +21762,19 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							<reference ref="1051713811"/>
 							<reference ref="708355647"/>
 							<reference ref="459419226"/>
+							<reference ref="1047204509"/>
+							<reference ref="69053511"/>
 							<reference ref="986860589"/>
 							<reference ref="656261728"/>
 							<reference ref="196361793"/>
+							<reference ref="803209800"/>
+							<reference ref="6005445"/>
+							<reference ref="531020960"/>
+							<reference ref="35887466"/>
 							<reference ref="307672983"/>
 							<reference ref="988950867"/>
 							<reference ref="333563212"/>
 							<reference ref="993399156"/>
-							<reference ref="1047204509"/>
-							<reference ref="69053511"/>
 						</object>
 						<reference key="parent" ref="94659530"/>
 					</object>
@@ -23188,6 +23133,11 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 						<reference key="object" ref="667596795"/>
 						<reference key="parent" ref="377771536"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7783</int>
+						<reference key="object" ref="159633392"/>
+						<reference key="parent" ref="556141845"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -23515,6 +23465,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>5202.IBPluginDependency</string>
 					<string>5322.IBEditorWindowLastContentRect</string>
 					<string>5322.IBPluginDependency</string>
+					<string>5322.IBViewEditorWindowController.showingBoundsRectangles</string>
 					<string>5322.IBWindowTemplateEditedContentRect</string>
 					<string>5322.ImportedFromIB2</string>
 					<string>5322.windowTemplate.hasMaxSize</string>
@@ -23532,6 +23483,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>5327.IBPluginDependency</string>
 					<string>5327.ImportedFromIB2</string>
 					<string>5328.IBPluginDependency</string>
+					<string>5328.IBViewBoundsToFrameTransform</string>
 					<string>5328.ImportedFromIB2</string>
 					<string>5331.IBPluginDependency</string>
 					<string>5332.IBPluginDependency</string>
@@ -23689,6 +23641,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>5659.IBPluginDependency</string>
 					<string>5660.IBPluginDependency</string>
 					<string>5701.IBPluginDependency</string>
+					<string>5701.IBViewBoundsToFrameTransform</string>
 					<string>5701.ImportedFromIB2</string>
 					<string>5702.IBPluginDependency</string>
 					<string>5713.IBPluginDependency</string>
@@ -23735,9 +23688,13 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>579.IBViewBoundsToFrameTransform</string>
 					<string>579.ImportedFromIB2</string>
 					<string>5790.IBPluginDependency</string>
+					<string>5790.IBViewBoundsToFrameTransform</string>
 					<string>5791.IBPluginDependency</string>
+					<string>5791.IBViewBoundsToFrameTransform</string>
 					<string>5792.IBPluginDependency</string>
+					<string>5792.IBViewBoundsToFrameTransform</string>
 					<string>5793.IBPluginDependency</string>
+					<string>5793.IBViewBoundsToFrameTransform</string>
 					<string>5794.IBPluginDependency</string>
 					<string>5795.IBPluginDependency</string>
 					<string>5796.IBPluginDependency</string>
@@ -23791,6 +23748,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>6127.IBPluginDependency</string>
 					<string>6127.ImportedFromIB2</string>
 					<string>6129.IBPluginDependency</string>
+					<string>6129.IBViewBoundsToFrameTransform</string>
 					<string>6129.ImportedFromIB2</string>
 					<string>6130.IBPluginDependency</string>
 					<string>6130.ImportedFromIB2</string>
@@ -24344,18 +24302,25 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>7429.IBPluginDependency</string>
 					<string>7430.IBPluginDependency</string>
 					<string>7438.IBPluginDependency</string>
+					<string>7438.IBViewBoundsToFrameTransform</string>
 					<string>7439.IBPluginDependency</string>
 					<string>7440.IBPluginDependency</string>
+					<string>7440.IBViewBoundsToFrameTransform</string>
 					<string>7441.IBPluginDependency</string>
 					<string>7442.IBPluginDependency</string>
+					<string>7442.IBViewBoundsToFrameTransform</string>
 					<string>7443.IBPluginDependency</string>
 					<string>7444.IBPluginDependency</string>
+					<string>7444.IBViewBoundsToFrameTransform</string>
 					<string>7445.IBPluginDependency</string>
 					<string>7446.IBPluginDependency</string>
+					<string>7446.IBViewBoundsToFrameTransform</string>
 					<string>7447.IBPluginDependency</string>
 					<string>7448.IBPluginDependency</string>
+					<string>7448.IBViewBoundsToFrameTransform</string>
 					<string>7449.IBPluginDependency</string>
 					<string>7450.IBPluginDependency</string>
+					<string>7450.IBViewBoundsToFrameTransform</string>
 					<string>7451.IBPluginDependency</string>
 					<string>7452.IBPluginDependency</string>
 					<string>7453.IBPluginDependency</string>
@@ -24504,6 +24469,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>7777.IBPluginDependency</string>
 					<string>7778.IBPluginDependency</string>
 					<string>7779.IBPluginDependency</string>
+					<string>7783.IBPluginDependency</string>
 					<string>858.IBPluginDependency</string>
 					<string>858.ImportedFromIB2</string>
 					<string>959.IBEditorWindowLastContentRect</string>
@@ -24971,14 +24937,15 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{471, 382}, {269, 142}}</string>
+					<string>{{530, 765}, {308, 142}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{471, 382}, {269, 142}}</string>
+					<boolean value="YES"/>
+					<string>{{530, 765}, {308, 142}}</string>
 					<integer value="1"/>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{600, 142}</string>
-					<string>{269, 142}</string>
+					<string>{308, 142}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -24990,6 +24957,9 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDNAAAwhwAAA</bytes>
+					</object>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -25180,6 +25150,9 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCqAAAwhwAAA</bytes>
+					</object>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -25228,9 +25201,21 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					</object>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABD3gAAw60AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABD3gAAw7gAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABD3gAAw8MAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABD3gAAw84AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -25282,9 +25267,9 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
-					<string>{{717, 615}, {379, 139}}</string>
+					<string>{{515, 364}, {379, 139}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{717, 615}, {379, 139}}</string>
+					<string>{{515, 364}, {379, 139}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{213, 50}</string>
@@ -25293,6 +25278,9 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDhYAAwigAAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -25379,7 +25367,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
-					<string>{{574, 389}, {241, 173}}</string>
+					<string>{{574, 379}, {241, 183}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
@@ -25842,7 +25830,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{59, 207}, {943, 549}}</string>
+					<string>{{45, 286}, {943, 549}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -26093,18 +26081,39 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCLAAAw7gAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCLAAAw8MAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCLAAAw84AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDpIAAw84AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDpIAAw8MAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDpIAAw7gAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDpIAAw60AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -26317,6 +26326,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{265, 489}, {405, 267}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -26354,7 +26364,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">7782</int>
+			<int key="maxID">7783</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -26429,6 +26439,13 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarControl.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -27000,7 +27017,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>NSButton</string>
-							<string>id</string>
+							<string>NSButton</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>id</string>
@@ -27252,7 +27269,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">saveQueryFavoriteGlobal</string>
-								<string key="candidateClassName">id</string>
+								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">shiftLeftMenuItem</string>
@@ -30360,8 +30377,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							<string>NSMenuItem</string>
 							<string>NSButton</string>
 							<string>NSMenuItem</string>
-							<string>id</string>
-							<string>id</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSPanel</string>
 							<string>NSComboBox</string>
 							<string>SPCopyTable</string>
@@ -30384,7 +30401,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							<string>SPHistoryController</string>
 							<string>SPCopyTable</string>
 							<string>id</string>
-							<string>id</string>
+							<string>SPDatabaseDocument</string>
 							<string>SPTableInfo</string>
 							<string>id</string>
 							<string>id</string>
@@ -30497,11 +30514,11 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">filterTableLiveSearchCheckbox</string>
-								<string key="candidateClassName">id</string>
+								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">filterTableNegateCheckbox</string>
-								<string key="candidateClassName">id</string>
+								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">filterTableSetDefaultOperatorSheet</string>
@@ -30593,7 +30610,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">tableDocumentInstance</string>
-								<string key="candidateClassName">id</string>
+								<string key="candidateClassName">SPDatabaseDocument</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">tableInfoInstance</string>
@@ -31625,7 +31642,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
+							<string>NSButton</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
@@ -31732,7 +31749,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">copyTableContentSwitch</string>
-								<string key="candidateClassName">id</string>
+								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">copyTableMessageField</string>
diff --git a/Interfaces/English.lproj/DataMigrationDialog.xib b/Interfaces/English.lproj/DataMigrationDialog.xib
index 1a7c25b6..d1c0fee3 100644
--- a/Interfaces/English.lproj/DataMigrationDialog.xib
+++ b/Interfaces/English.lproj/DataMigrationDialog.xib
@@ -3,29 +3,24 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
 		<string key="IBDocument.SystemVersion">10J567</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.InterfaceBuilderVersion">804</string>
 		<string key="IBDocument.AppKitVersion">1038.35</string>
 		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">788</string>
+			<string key="NS.object.0">804</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="11"/>
+			<integer value="12"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
+			<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>
@@ -41,15 +36,15 @@
 			<object class="NSWindowTemplate" id="420604405">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{366, 230}, {522, 348}}</string>
+				<string key="NSWindowRect">{{366, 230}, {634, 348}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">CSV Field Mapping</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<string key="NSWindowContentMinSize">{522, 348}</string>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMinSize">{634, 348}</string>
 				<object class="NSView" key="NSWindowView" id="78582513">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">274</int>
@@ -63,12 +58,12 @@
 								<object class="NSView" id="196610401">
 									<reference key="NSNextResponder" ref="412235166"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{1, 2.5}, {544, 0}}</string>
+									<string key="NSFrame">{{1, 2.5}, {656, 0}}</string>
 									<reference key="NSSuperview" ref="412235166"/>
 								</object>
 							</object>
-							<string key="NSFrame">{{-12, 53}, {546, 2}}</string>
-							<string key="NSBounds">{{0, 1.5}, {546, 0}}</string>
+							<string key="NSFrame">{{-12, 53}, {658, 2}}</string>
+							<string key="NSBounds">{{0, 1.5}, {658, 2}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
@@ -117,7 +112,7 @@
 										<object class="NSTextField" id="1052916804">
 											<reference key="NSNextResponder" ref="297364507"/>
 											<int key="NSvFlags">271</int>
-											<string key="NSFrame">{{12, 12}, {498, 17}}</string>
+											<string key="NSFrame">{{14, 12}, {604, 17}}</string>
 											<reference key="NSSuperview" ref="297364507"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="922239869">
@@ -136,7 +131,7 @@
 													<string key="NSColorName">controlColor</string>
 													<object class="NSColor" key="NSColor" id="240513327">
 														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+														<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 													</object>
 												</object>
 												<object class="NSColor" key="NSTextColor" id="263116164">
@@ -153,7 +148,7 @@
 										<object class="NSButton" id="436297995">
 											<reference key="NSNextResponder" ref="297364507"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{400, 51}, {226, 32}}</string>
+											<string key="NSFrame">{{512, 51}, {226, 32}}</string>
 											<reference key="NSSuperview" ref="297364507"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="712024433">
@@ -173,7 +168,7 @@
 										<object class="NSButton" id="863317681">
 											<reference key="NSNextResponder" ref="297364507"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{552, 1}, {226, 32}}</string>
+											<string key="NSFrame">{{664, 1}, {226, 32}}</string>
 											<reference key="NSSuperview" ref="297364507"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="240320447">
@@ -193,7 +188,7 @@
 										<object class="NSButton" id="1021918763">
 											<reference key="NSNextResponder" ref="297364507"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{556, 1}, {226, 32}}</string>
+											<string key="NSFrame">{{668, 1}, {226, 32}}</string>
 											<reference key="NSSuperview" ref="297364507"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="760384053">
@@ -211,11 +206,11 @@
 											</object>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 1}, {522, 39}}</string>
+									<string key="NSFrame">{{1, 1}, {634, 39}}</string>
 									<reference key="NSSuperview" ref="617902336"/>
 								</object>
 							</object>
-							<string key="NSFrame">{{-1, 308}, {524, 41}}</string>
+							<string key="NSFrame">{{-1, 308}, {636, 41}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
@@ -252,13 +247,13 @@
 										<object class="NSTableView" id="678921094">
 											<reference key="NSNextResponder" ref="929465390"/>
 											<int key="NSvFlags">288</int>
-											<string key="NSFrameSize">{522, 126}</string>
+											<string key="NSFrameSize">{634, 126}</string>
 											<reference key="NSSuperview" ref="929465390"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="1025336439">
 												<reference key="NSNextResponder" ref="622202999"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{522, 17}</string>
+												<string key="NSFrameSize">{634, 17}</string>
 												<reference key="NSSuperview" ref="622202999"/>
 												<reference key="NSTableView" ref="678921094"/>
 											</object>
@@ -272,7 +267,7 @@
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="790992768">
 													<string key="NSIdentifier">import_value</string>
-													<double key="NSWidth">121</double>
+													<double key="NSWidth">233</double>
 													<double key="NSMinWidth">15</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -515,7 +510,7 @@
 											<int key="NSTableViewDraggingDestinationStyle">1</int>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {522, 126}}</string>
+									<string key="NSFrame">{{1, 17}, {634, 126}}</string>
 									<reference key="NSSuperview" ref="495172082"/>
 									<reference key="NSNextKeyView" ref="678921094"/>
 									<reference key="NSDocView" ref="678921094"/>
@@ -555,7 +550,7 @@
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<reference ref="1025336439"/>
 									</object>
-									<string key="NSFrame">{{1, 0}, {522, 17}}</string>
+									<string key="NSFrame">{{1, 0}, {634, 17}}</string>
 									<reference key="NSSuperview" ref="495172082"/>
 									<reference key="NSNextKeyView" ref="1025336439"/>
 									<reference key="NSDocView" ref="1025336439"/>
@@ -564,7 +559,7 @@
 								</object>
 								<reference ref="20192669"/>
 							</object>
-							<string key="NSFrame">{{-1, 129}, {524, 144}}</string>
+							<string key="NSFrame">{{-1, 129}, {636, 144}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<reference key="NSNextKeyView" ref="929465390"/>
 							<int key="NSsFlags">530</int>
@@ -578,7 +573,7 @@
 						<object class="NSButton" id="920273776">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{303, 12}, {102, 32}}</string>
+							<string key="NSFrame">{{415, 12}, {102, 32}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="977848648">
@@ -603,7 +598,7 @@
 						<object class="NSButton" id="341819846">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{405, 12}, {102, 32}}</string>
+							<string key="NSFrame">{{517, 12}, {102, 32}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
@@ -676,7 +671,7 @@
 						<object class="NSTextField" id="186404366">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">294</int>
-							<string key="NSFrame">{{88, 23}, {155, 14}}</string>
+							<string key="NSFrame">{{88, 23}, {195, 14}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="929441265">
@@ -692,7 +687,7 @@
 						<object class="NSPopUpButton" id="549705971">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">267</int>
-							<string key="NSFrame">{{290, 278}, {166, 22}}</string>
+							<string key="NSFrame">{{361, 278}, {200, 22}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="107647973">
@@ -724,7 +719,7 @@
 						<object class="NSPopUpButton" id="599385609">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{372, 97}, {133, 22}}</string>
+							<string key="NSFrame">{{484, 97}, {133, 22}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="1033308908">
@@ -788,7 +783,7 @@
 						<object class="NSTextField" id="228203205">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{258, 102}, {112, 14}}</string>
+							<string key="NSFrame">{{302, 102}, {180, 14}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="869323357">
@@ -812,7 +807,7 @@
 									<string>NSFilenamesPboardType</string>
 								</object>
 							</object>
-							<string key="NSFrame">{{5, 280}, {260, 20}}</string>
+							<string key="NSFrame">{{5, 280}, {316, 20}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPathCell" key="NSCell" id="183652084">
@@ -833,7 +828,7 @@
 						<object class="NSButton" id="397227507">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{17, 100}, {238, 18}}</string>
+							<string key="NSFrame">{{17, 100}, {275, 18}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="413696615">
@@ -860,7 +855,7 @@
 						<object class="NSPopUpButton" id="573115956">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{372, 73}, {133, 22}}</string>
+							<string key="NSFrame">{{484, 73}, {133, 22}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="940205369">
@@ -942,7 +937,7 @@
 						<object class="NSTextField" id="155260473">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{213, 79}, {157, 14}}</string>
+							<string key="NSFrame">{{302, 79}, {180, 14}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="498123343">
@@ -958,7 +953,7 @@
 						<object class="NSButton" id="148795893">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{214, 12}, {82, 32}}</string>
+							<string key="NSFrame">{{326, 12}, {82, 32}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="538595338">
@@ -1047,7 +1042,7 @@
 									</object>
 								</object>
 							</object>
-							<string key="NSFrame">{{145, 20}, {230, 44}}</string>
+							<string key="NSFrame">{{200, 20}, {230, 44}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<string key="NSClassName">NSView</string>
 						</object>
@@ -1348,7 +1343,7 @@
 									</object>
 								</object>
 							</object>
-							<string key="NSFrame">{{39, -57}, {442, 121}}</string>
+							<string key="NSFrame">{{93, -57}, {442, 121}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<string key="NSClassName">NSView</string>
 						</object>
@@ -1424,7 +1419,7 @@
 									</object>
 								</object>
 							</object>
-							<string key="NSFrame">{{59.5, 20}, {390, 44}}</string>
+							<string key="NSFrame">{{110, 20}, {390, 44}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<string key="NSClassName">NSView</string>
 						</object>
@@ -1451,7 +1446,7 @@
 						<object class="NSTextField" id="806234307">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">265</int>
-							<string key="NSFrame">{{375, 280}, {106, 19}}</string>
+							<string key="NSFrame">{{487, 280}, {106, 19}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="752604777">
@@ -1473,7 +1468,7 @@
 						<object class="NSTextField" id="426092195">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">265</int>
-							<string key="NSFrame">{{290, 283}, {80, 14}}</string>
+							<string key="NSFrame">{{402, 283}, {80, 14}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="696977787">
@@ -1489,7 +1484,7 @@
 						<object class="NSButton" id="584318360">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">265</int>
-							<string key="NSFrame">{{487, 280}, {20, 20}}</string>
+							<string key="NSFrame">{{599, 280}, {20, 20}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="544229418">
@@ -1513,7 +1508,7 @@
 						<object class="NSButton" id="720243489">
 							<reference key="NSNextResponder" ref="78582513"/>
 							<int key="NSvFlags">265</int>
-							<string key="NSFrame">{{461, 281}, {46, 17}}</string>
+							<string key="NSFrame">{{566, 281}, {61, 17}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1019413032">
@@ -1531,12 +1526,12 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{522, 348}</string>
+					<string key="NSFrameSize">{634, 348}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
-				<string key="NSMinSize">{522, 370}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSMinSize">{634, 370}</string>
+				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSFrameAutosaveName">SPCSVFieldMappingSheet</string>
 			</object>
 			<object class="NSWindowTemplate" id="280523396">
@@ -1547,10 +1542,10 @@
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{311, 186}</string>
 				<object class="NSView" key="NSWindowView" id="803374494">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">274</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1569,14 +1564,12 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{311, 111}</string>
 											<reference key="NSSuperview" ref="153719181"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="293135471">
 												<reference key="NSNextResponder" ref="236935166"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{311, 17}</string>
 												<reference key="NSSuperview" ref="236935166"/>
-												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="666379639"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="535120964">
@@ -1584,7 +1577,6 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="466562755"/>
-												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1704,8 +1696,6 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {311, 111}}</string>
 									<reference key="NSSuperview" ref="466562755"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="666379639"/>
 									<reference key="NSDocView" ref="666379639"/>
 									<reference key="NSBGColor" ref="518286732"/>
 									<int key="NScvFlags">4</int>
@@ -1715,7 +1705,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {15, 102}}</string>
 									<reference key="NSSuperview" ref="466562755"/>
-									<reference key="NSWindow"/>
 									<reference key="NSTarget" ref="466562755"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.99065423011779785</double>
@@ -1725,7 +1714,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {238, 15}}</string>
 									<reference key="NSSuperview" ref="466562755"/>
-									<reference key="NSWindow"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="466562755"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1741,8 +1729,6 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {311, 17}}</string>
 									<reference key="NSSuperview" ref="466562755"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="293135471"/>
 									<reference key="NSDocView" ref="293135471"/>
 									<reference key="NSBGColor" ref="518286732"/>
 									<int key="NScvFlags">4</int>
@@ -1751,8 +1737,6 @@
 							</object>
 							<string key="NSFrame">{{-1, 71}, {313, 129}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="153719181"/>
 							<int key="NSsFlags">530</int>
 							<reference key="NSVScroller" ref="818055239"/>
 							<reference key="NSHScroller" ref="180324869"/>
@@ -1766,7 +1750,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{17, 42}, {22, 22}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1062542413">
 								<int key="NSCellFlags">-2080244224</int>
@@ -1791,7 +1774,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{38, 42}, {22, 22}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="87720389">
 								<int key="NSCellFlags">-2080244224</int>
@@ -1816,7 +1798,6 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{216, 13}, {80, 28}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="360762154">
@@ -1838,7 +1819,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{18, 17}, {197, 18}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="574058264">
 								<int key="NSCellFlags">-2080244224</int>
@@ -1861,7 +1841,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{70, 42}, {105, 22}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="514571508">
 								<int key="NSCellFlags">-2076049856</int>
@@ -1946,7 +1925,6 @@
 									</object>
 									<reference key="NSMenuFont" ref="388072550"/>
 								</object>
-								<int key="NSSelectedIndex">3</int>
 								<bool key="NSPullDown">YES</bool>
 								<int key="NSPreferredEdge">1</int>
 								<bool key="NSUsesItemFromMenu">YES</bool>
@@ -1956,12 +1934,10 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{311, 210}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
 				<string key="NSMinSize">{311, 208}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSFrameAutosaveName"/>
 			</object>
 			<object class="NSUserDefaultsController" id="443551699">
@@ -2105,7 +2081,7 @@
 				<string key="NSWindowContentMaxSize">{269, 120}</string>
 				<string key="NSWindowContentMinSize">{269, 120}</string>
 				<object class="NSView" key="NSWindowView" id="433154275">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2114,6 +2090,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{17, 80}, {90, 14}}</string>
 							<reference key="NSSuperview" ref="433154275"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="761535209">
 								<int key="NSCellFlags">68288064</int>
@@ -2130,6 +2107,7 @@
 							<int key="NSvFlags">257</int>
 							<string key="NSFrame">{{184, 13}, {70, 28}}</string>
 							<reference key="NSSuperview" ref="433154275"/>
+							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="54071997">
@@ -2157,6 +2135,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{109, 75}, {143, 22}}</string>
 							<reference key="NSSuperview" ref="433154275"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="14316349">
 								<int key="NSCellFlags">-2076049856</int>
@@ -2192,6 +2171,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{41, 54}, {66, 14}}</string>
 							<reference key="NSSuperview" ref="433154275"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="192925040">
 								<int key="NSCellFlags">68288064</int>
@@ -2208,6 +2188,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{109, 50}, {143, 22}}</string>
 							<reference key="NSSuperview" ref="433154275"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="756472380">
 								<int key="NSCellFlags">-2076049856</int>
@@ -2243,6 +2224,7 @@
 							<int key="NSvFlags">257</int>
 							<string key="NSFrame">{{116, 12}, {70, 28}}</string>
 							<reference key="NSSuperview" ref="433154275"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="906976144">
 								<int key="NSCellFlags">67239424</int>
@@ -2261,6 +2243,8 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{269, 120}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
 				<string key="NSMinSize">{269, 142}</string>
@@ -3044,7 +3028,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>
@@ -4550,16 +4536,16 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{343, 83}, {522, 348}}</string>
+					<string>{{597, 562}, {634, 348}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>{{343, 83}, {522, 348}}</string>
+					<string>{{597, 562}, {634, 348}}</string>
 					<integer value="1"/>
 					<string>{{387, 725}, {432, 282}}</string>
 					<boolean value="NO"/>
 					<integer value="1"/>
 					<string>{10000, 500}</string>
-					<string>{522, 348}</string>
+					<string>{634, 348}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4617,9 +4603,9 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{60, 533}, {311, 210}}</string>
+					<string>{{329, 533}, {311, 210}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{60, 533}, {311, 210}}</string>
+					<string>{{329, 533}, {311, 210}}</string>
 					<boolean value="NO"/>
 					<boolean value="YES"/>
 					<string>{311, 186}</string>
@@ -4943,10 +4929,10 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
+					<string key="className">NSMenu</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h</string>
+						<string key="minorKey">Source/SPMenuAdditions.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -4970,6 +4956,13 @@
 						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarControl.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -5045,7 +5038,10 @@
 							<string>doSelectionTitleCase:</string>
 							<string>doSelectionUpperCase:</string>
 							<string>doTranspose:</string>
+							<string>executeBundleItemForInputField:</string>
 							<string>insertNULLvalue:</string>
+							<string>moveSelectionLineDown:</string>
+							<string>moveSelectionLineUp:</string>
 							<string>selectCurrentLine:</string>
 							<string>selectCurrentWord:</string>
 							<string>selectEnclosingBrackets:</string>
@@ -5065,6 +5061,9 @@
 							<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">
@@ -5080,7 +5079,10 @@
 							<string>doSelectionTitleCase:</string>
 							<string>doSelectionUpperCase:</string>
 							<string>doTranspose:</string>
+							<string>executeBundleItemForInputField:</string>
 							<string>insertNULLvalue:</string>
+							<string>moveSelectionLineDown:</string>
+							<string>moveSelectionLineUp:</string>
 							<string>selectCurrentLine:</string>
 							<string>selectCurrentWord:</string>
 							<string>selectEnclosingBrackets:</string>
@@ -5123,10 +5125,22 @@
 								<string key="name">doTranspose:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">executeBundleItemForInputField:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">insertNULLvalue:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">moveSelectionLineDown:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">moveSelectionLineUp:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">selectCurrentLine:</string>
 								<string key="candidateClassName">id</string>
@@ -5157,14 +5171,35 @@
 					<string key="className">SPCopyTable</string>
 					<string key="superclassName">SPTableView</string>
 					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">copy:</string>
-						<string key="NS.object.0">id</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>copy:</string>
+							<string>executeBundleItemForDataTable:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">copy:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">copy:</string>
-							<string key="candidateClassName">id</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>copy:</string>
+							<string>executeBundleItemForDataTable:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">copy:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">executeBundleItemForDataTable:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -5405,6 +5440,7 @@
 							<string>editorFontMenuItem</string>
 							<string>encodingPopUp</string>
 							<string>errorText</string>
+							<string>errorTextScrollView</string>
 							<string>helpNavigator</string>
 							<string>helpSearchField</string>
 							<string>helpSearchFieldCell</string>
@@ -5460,6 +5496,7 @@
 							<string>NSMenuItem</string>
 							<string>NSPopUpButton</string>
 							<string>id</string>
+							<string>NSScrollView</string>
 							<string>NSSegmentedControl</string>
 							<string>NSSearchField</string>
 							<string>NSSearchFieldCell</string>
@@ -5489,7 +5526,7 @@
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>NSButton</string>
-							<string>id</string>
+							<string>NSButton</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>id</string>
@@ -5518,6 +5555,7 @@
 							<string>editorFontMenuItem</string>
 							<string>encodingPopUp</string>
 							<string>errorText</string>
+							<string>errorTextScrollView</string>
 							<string>helpNavigator</string>
 							<string>helpSearchField</string>
 							<string>helpSearchFieldCell</string>
@@ -5618,6 +5656,10 @@
 								<string key="name">errorText</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">errorTextScrollView</string>
+								<string key="candidateClassName">NSScrollView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">helpNavigator</string>
 								<string key="candidateClassName">NSSegmentedControl</string>
@@ -5736,7 +5778,7 @@
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">saveQueryFavoriteGlobal</string>
-								<string key="candidateClassName">id</string>
+								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">shiftLeftMenuItem</string>
@@ -5812,7 +5854,9 @@
 							<string>import:</string>
 							<string>importFromClipboard:</string>
 							<string>openCurrentConnectionInNewWindow:</string>
+							<string>openDatabaseInNewTab:</string>
 							<string>optimizeTable:</string>
+							<string>refreshTables:</string>
 							<string>removeDatabase:</string>
 							<string>renameDatabase:</string>
 							<string>repairTable:</string>
@@ -5829,12 +5873,6 @@
 							<string>toggleNavigator:</string>
 							<string>updateWindowTitle:</string>
 							<string>validateSaveConnectionAccessory:</string>
-							<string>viewContent:</string>
-							<string>viewQuery:</string>
-							<string>viewRelations:</string>
-							<string>viewStatus:</string>
-							<string>viewStructure:</string>
-							<string>viewTriggers:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -5882,10 +5920,6 @@
 							<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">
@@ -5917,7 +5951,9 @@
 							<string>import:</string>
 							<string>importFromClipboard:</string>
 							<string>openCurrentConnectionInNewWindow:</string>
+							<string>openDatabaseInNewTab:</string>
 							<string>optimizeTable:</string>
+							<string>refreshTables:</string>
 							<string>removeDatabase:</string>
 							<string>renameDatabase:</string>
 							<string>repairTable:</string>
@@ -5934,12 +5970,6 @@
 							<string>toggleNavigator:</string>
 							<string>updateWindowTitle:</string>
 							<string>validateSaveConnectionAccessory:</string>
-							<string>viewContent:</string>
-							<string>viewQuery:</string>
-							<string>viewRelations:</string>
-							<string>viewStatus:</string>
-							<string>viewStructure:</string>
-							<string>viewTriggers:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -6043,10 +6073,18 @@
 								<string key="name">openCurrentConnectionInNewWindow:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">openDatabaseInNewTab:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">optimizeTable:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">refreshTables:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">removeDatabase:</string>
 								<string key="candidateClassName">id</string>
@@ -6111,36 +6149,13 @@
 								<string key="name">validateSaveConnectionAccessory:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewContent:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewQuery:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewRelations:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewStatus:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewStructure:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewTriggers:</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>activitiesScrollView</string>
 							<string>addDatabaseButton</string>
 							<string>chooseDatabaseButton</string>
 							<string>connectionErrorDialog</string>
@@ -6194,6 +6209,7 @@
 							<string>tableDataInstance</string>
 							<string>tableDumpInstance</string>
 							<string>tableInfoCollapseButton</string>
+							<string>tableInfoScrollView</string>
 							<string>tableInfoTable</string>
 							<string>tableListSplitter</string>
 							<string>tableRelationsInstance</string>
@@ -6212,6 +6228,7 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSScrollView</string>
 							<string>id</string>
 							<string>id</string>
 							<string>NSWindow</string>
@@ -6265,6 +6282,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>NSButton</string>
+							<string>NSScrollView</string>
 							<string>NSTableView</string>
 							<string>NSSplitView</string>
 							<string>id</string>
@@ -6286,6 +6304,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>activitiesScrollView</string>
 							<string>addDatabaseButton</string>
 							<string>chooseDatabaseButton</string>
 							<string>connectionErrorDialog</string>
@@ -6339,6 +6358,7 @@
 							<string>tableDataInstance</string>
 							<string>tableDumpInstance</string>
 							<string>tableInfoCollapseButton</string>
+							<string>tableInfoScrollView</string>
 							<string>tableInfoTable</string>
 							<string>tableListSplitter</string>
 							<string>tableRelationsInstance</string>
@@ -6357,6 +6377,10 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">activitiesScrollView</string>
+								<string key="candidateClassName">NSScrollView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">addDatabaseButton</string>
 								<string key="candidateClassName">id</string>
@@ -6569,6 +6593,10 @@
 								<string key="name">tableInfoCollapseButton</string>
 								<string key="candidateClassName">NSButton</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">tableInfoScrollView</string>
+								<string key="candidateClassName">NSScrollView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">tableInfoTable</string>
 								<string key="candidateClassName">NSTableView</string>
@@ -6636,6 +6664,73 @@
 						<string key="minorKey">Source/SPDatabaseDocument.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SPDatabaseDocument</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>viewContent:</string>
+							<string>viewQuery:</string>
+							<string>viewRelations:</string>
+							<string>viewStatus:</string>
+							<string>viewStructure:</string>
+							<string>viewTriggers:</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>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>viewContent:</string>
+							<string>viewQuery:</string>
+							<string>viewRelations:</string>
+							<string>viewStatus:</string>
+							<string>viewStructure:</string>
+							<string>viewTriggers:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">viewContent:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewQuery:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewRelations:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewStatus:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewStructure:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewTriggers:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Source/SPDatabaseViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">SPDatabaseDocument</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -6662,7 +6757,10 @@
 							<string>closeInfoSheet:</string>
 							<string>closeSheet:</string>
 							<string>goBackToFileChooser:</string>
+							<string>goBackToFileChooserFromPathControl:</string>
 							<string>insertNULLValue:</string>
+							<string>insertPulldownValue:</string>
+							<string>insertRecentGlobalValue:</string>
 							<string>newTable:</string>
 							<string>newTableInfo:</string>
 							<string>openAdvancedSheet:</string>
@@ -6693,6 +6791,9 @@
 							<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">
@@ -6711,7 +6812,10 @@
 							<string>closeInfoSheet:</string>
 							<string>closeSheet:</string>
 							<string>goBackToFileChooser:</string>
+							<string>goBackToFileChooserFromPathControl:</string>
 							<string>insertNULLValue:</string>
+							<string>insertPulldownValue:</string>
+							<string>insertRecentGlobalValue:</string>
 							<string>newTable:</string>
 							<string>newTableInfo:</string>
 							<string>openAdvancedSheet:</string>
@@ -6770,10 +6874,22 @@
 								<string key="name">goBackToFileChooser:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">goBackToFileChooserFromPathControl:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">insertNULLValue:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">insertPulldownValue:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">insertRecentGlobalValue:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">newTable:</string>
 								<string key="candidateClassName">id</string>
@@ -6829,6 +6945,7 @@
 							<string>fileSourcePath</string>
 							<string>globalValuesSheet</string>
 							<string>globalValuesTableView</string>
+							<string>gobackButton</string>
 							<string>highPriorityCheckBox</string>
 							<string>ignoreCheckBox</string>
 							<string>ignoreUpdateCheckBox</string>
@@ -6837,6 +6954,7 @@
 							<string>importMethodLabel</string>
 							<string>importMethodPopup</string>
 							<string>insertNULLValueButton</string>
+							<string>insertPullDownButton</string>
 							<string>lowPriorityCheckBox</string>
 							<string>lowPriorityReplaceCheckBox</string>
 							<string>lowPriorityUpdateCheckBox</string>
@@ -6850,6 +6968,7 @@
 							<string>newTableNameTextField</string>
 							<string>onupdateCheckBox</string>
 							<string>onupdateTextView</string>
+							<string>recentGlobalValueMenu</string>
 							<string>recordCountLabel</string>
 							<string>removeGlobalValueButton</string>
 							<string>replaceAfterSavingCheckBox</string>
@@ -6891,8 +7010,10 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 							<string>NSPopUpButton</string>
 							<string>NSButton</string>
+							<string>NSPopUpButton</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
@@ -6906,6 +7027,7 @@
 							<string>NSTextField</string>
 							<string>id</string>
 							<string>SPTextView</string>
+							<string>NSMenu</string>
 							<string>id</string>
 							<string>NSButton</string>
 							<string>id</string>
@@ -6944,6 +7066,7 @@
 							<string>fileSourcePath</string>
 							<string>globalValuesSheet</string>
 							<string>globalValuesTableView</string>
+							<string>gobackButton</string>
 							<string>highPriorityCheckBox</string>
 							<string>ignoreCheckBox</string>
 							<string>ignoreUpdateCheckBox</string>
@@ -6952,6 +7075,7 @@
 							<string>importMethodLabel</string>
 							<string>importMethodPopup</string>
 							<string>insertNULLValueButton</string>
+							<string>insertPullDownButton</string>
 							<string>lowPriorityCheckBox</string>
 							<string>lowPriorityReplaceCheckBox</string>
 							<string>lowPriorityUpdateCheckBox</string>
@@ -6965,6 +7089,7 @@
 							<string>newTableNameTextField</string>
 							<string>onupdateCheckBox</string>
 							<string>onupdateTextView</string>
+							<string>recentGlobalValueMenu</string>
 							<string>recordCountLabel</string>
 							<string>removeGlobalValueButton</string>
 							<string>replaceAfterSavingCheckBox</string>
@@ -7063,6 +7188,10 @@
 								<string key="name">globalValuesTableView</string>
 								<string key="candidateClassName">NSTableView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">gobackButton</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">highPriorityCheckBox</string>
 								<string key="candidateClassName">id</string>
@@ -7095,6 +7224,10 @@
 								<string key="name">insertNULLValueButton</string>
 								<string key="candidateClassName">NSButton</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">insertPullDownButton</string>
+								<string key="candidateClassName">NSPopUpButton</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">lowPriorityCheckBox</string>
 								<string key="candidateClassName">id</string>
@@ -7147,6 +7280,10 @@
 								<string key="name">onupdateTextView</string>
 								<string key="candidateClassName">SPTextView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">recentGlobalValueMenu</string>
+								<string key="candidateClassName">NSMenu</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">recordCountLabel</string>
 								<string key="candidateClassName">id</string>
@@ -7267,6 +7404,7 @@
 							<string>addTable:</string>
 							<string>closeSheet:</string>
 							<string>copyTable:</string>
+							<string>openTableInNewTab:</string>
 							<string>removeTable:</string>
 							<string>renameTable:</string>
 							<string>togglePaneCollapse:</string>
@@ -7285,6 +7423,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -7294,6 +7433,7 @@
 							<string>addTable:</string>
 							<string>closeSheet:</string>
 							<string>copyTable:</string>
+							<string>openTableInNewTab:</string>
 							<string>removeTable:</string>
 							<string>renameTable:</string>
 							<string>togglePaneCollapse:</string>
@@ -7315,6 +7455,10 @@
 								<string key="name">copyTable:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">openTableInNewTab:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">removeTable:</string>
 								<string key="candidateClassName">id</string>
@@ -7357,6 +7501,8 @@
 							<string>duplicateTableMenuItem</string>
 							<string>extendedTableInfoInstance</string>
 							<string>listFilterField</string>
+							<string>openTableInNewTabContextMenuItem</string>
+							<string>openTableInNewTabMenuItem</string>
 							<string>removeTableContextMenuItem</string>
 							<string>removeTableMenuItem</string>
 							<string>renameTableContextMenuItem</string>
@@ -7368,7 +7514,6 @@
 							<string>showCreateSyntaxContextMenuItem</string>
 							<string>showCreateSyntaxMenuItem</string>
 							<string>spHistoryControllerInstance</string>
-							<string>tabView</string>
 							<string>tableContentInstance</string>
 							<string>tableDataInstance</string>
 							<string>tableDocumentInstance</string>
@@ -7388,13 +7533,13 @@
 							<string>toolbarAddButton</string>
 							<string>toolbarReloadButton</string>
 							<string>truncateTableButton</string>
-							<string>truncateTableContextButton</string>
+							<string>truncateTableContextMenuItem</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
+							<string>NSButton</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
@@ -7414,13 +7559,14 @@
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
+							<string>NSMenuItem</string>
+							<string>NSMenuItem</string>
 							<string>SPHistoryController</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 							<string>NSButton</string>
 							<string>id</string>
 							<string>NSSplitView</string>
@@ -7435,7 +7581,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
+							<string>NSMenuItem</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -7454,6 +7600,8 @@
 							<string>duplicateTableMenuItem</string>
 							<string>extendedTableInfoInstance</string>
 							<string>listFilterField</string>
+							<string>openTableInNewTabContextMenuItem</string>
+							<string>openTableInNewTabMenuItem</string>
 							<string>removeTableContextMenuItem</string>
 							<string>removeTableMenuItem</string>
 							<string>renameTableContextMenuItem</string>
@@ -7465,7 +7613,6 @@
 							<string>showCreateSyntaxContextMenuItem</string>
 							<string>showCreateSyntaxMenuItem</string>
 							<string>spHistoryControllerInstance</string>
-							<string>tabView</string>
 							<string>tableContentInstance</string>
 							<string>tableDataInstance</string>
 							<string>tableDocumentInstance</string>
@@ -7485,7 +7632,7 @@
 							<string>toolbarAddButton</string>
 							<string>toolbarReloadButton</string>
 							<string>truncateTableButton</string>
-							<string>truncateTableContextButton</string>
+							<string>truncateTableContextMenuItem</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7499,7 +7646,7 @@
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">copyTableContentSwitch</string>
-								<string key="candidateClassName">id</string>
+								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">copyTableMessageField</string>
@@ -7538,808 +7685,212 @@
 								<string key="candidateClassName">NSSearchField</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">removeTableContextMenuItem</string>
+								<string key="name">openTableInNewTabContextMenuItem</string>
 								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">removeTableMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">renameTableContextMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">renameTableMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">separatorTableContextMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">separatorTableContextMenuItem2</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">separatorTableMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">separatorTableMenuItem2</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">showCreateSyntaxContextMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">showCreateSyntaxMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">spHistoryControllerInstance</string>
-								<string key="candidateClassName">SPHistoryController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tabView</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableContentInstance</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableDataInstance</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableDocumentInstance</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableDumpInstance</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableEncodingButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableInfoCollapseButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableInfoInstance</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableListFilterSplitView</string>
-								<string key="candidateClassName">NSSplitView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableListSplitView</string>
-								<string key="candidateClassName">NSSplitView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableNameField</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableSheet</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableSourceInstance</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableTriggersInstance</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableTypeButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tablesListView</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">toolbarActionsButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">toolbarAddButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">toolbarReloadButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">truncateTableButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">truncateTableContextButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<reference key="sourceIdentifier" ref="456410403"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SPTextView</string>
-					<string key="superclassName">NSTextView</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">showMySQLHelpForCurrentWord:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">showMySQLHelpForCurrentWord:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">showMySQLHelpForCurrentWord:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>customQueryInstance</string>
-							<string>scrollView</string>
-							<string>tableDocumentInstance</string>
-							<string>tablesListInstance</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>SPCustomQuery</string>
-							<string>NSScrollView</string>
-							<string>SPDatabaseDocument</string>
-							<string>SPTablesList</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>customQueryInstance</string>
-							<string>scrollView</string>
-							<string>tableDocumentInstance</string>
-							<string>tablesListInstance</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">customQueryInstance</string>
-								<string key="candidateClassName">SPCustomQuery</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">scrollView</string>
-								<string key="candidateClassName">NSScrollView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableDocumentInstance</string>
-								<string key="candidateClassName">SPDatabaseDocument</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tablesListInstance</string>
-								<string key="candidateClassName">SPTablesList</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Source/SPTextView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SPTextView</string>
-					<string key="superclassName">NSTextView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">SPFieldMapperController</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>addGlobalSourceVariable:</string>
-							<string>addGlobalValue:</string>
-							<string>addNewColumn:</string>
-							<string>advancedCheckboxValidation:</string>
-							<string>changeFieldAlignment:</string>
-							<string>changeHasHeaderCheckbox:</string>
-							<string>changeImportMethod:</string>
-							<string>changeTableTarget:</string>
-							<string>closeGlobalValuesSheet:</string>
-							<string>closeInfoSheet:</string>
-							<string>closeSheet:</string>
-							<string>goBackToFileChooser:</string>
-							<string>goBackToFileChooserFromPathControl:</string>
-							<string>insertNULLValue:</string>
-							<string>insertPulldownValue:</string>
-							<string>insertRecentGlobalValue:</string>
-							<string>newTable:</string>
-							<string>newTableInfo:</string>
-							<string>openAdvancedSheet:</string>
-							<string>removeGlobalValue:</string>
-							<string>removeNewColumn:</string>
-							<string>setAllTypesTo:</string>
-							<string>stepRow:</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>
-							<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>addGlobalSourceVariable:</string>
-							<string>addGlobalValue:</string>
-							<string>addNewColumn:</string>
-							<string>advancedCheckboxValidation:</string>
-							<string>changeFieldAlignment:</string>
-							<string>changeHasHeaderCheckbox:</string>
-							<string>changeImportMethod:</string>
-							<string>changeTableTarget:</string>
-							<string>closeGlobalValuesSheet:</string>
-							<string>closeInfoSheet:</string>
-							<string>closeSheet:</string>
-							<string>goBackToFileChooser:</string>
-							<string>goBackToFileChooserFromPathControl:</string>
-							<string>insertNULLValue:</string>
-							<string>insertPulldownValue:</string>
-							<string>insertRecentGlobalValue:</string>
-							<string>newTable:</string>
-							<string>newTableInfo:</string>
-							<string>openAdvancedSheet:</string>
-							<string>removeGlobalValue:</string>
-							<string>removeNewColumn:</string>
-							<string>setAllTypesTo:</string>
-							<string>stepRow:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">addGlobalSourceVariable:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addGlobalValue:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addNewColumn:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">advancedCheckboxValidation:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">changeFieldAlignment:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">changeHasHeaderCheckbox:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">changeImportMethod:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">changeTableTarget:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">closeGlobalValuesSheet:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">closeInfoSheet:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">closeSheet:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">goBackToFileChooser:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">goBackToFileChooserFromPathControl:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">insertNULLValue:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">insertPulldownValue:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">insertRecentGlobalValue:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">newTable:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">newTableInfo:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openAdvancedSheet:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">removeGlobalValue:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">removeNewColumn:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">setAllTypesTo:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">stepRow:</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>addGlobalValueButton</string>
-							<string>addNewColumnMenuItem</string>
-							<string>addRemainingDataSwitch</string>
-							<string>advancedBox</string>
-							<string>advancedButton</string>
-							<string>advancedInsertView</string>
-							<string>advancedLabel</string>
-							<string>advancedReplaceView</string>
-							<string>advancedUpdateView</string>
-							<string>alignByPopup</string>
-							<string>alignByPopupLabel</string>
-							<string>customQueryInstance</string>
-							<string>databaseDataInstance</string>
-							<string>delayedCheckBox</string>
-							<string>delayedReplaceCheckBox</string>
-							<string>fieldMapperTableScrollView</string>
-							<string>fieldMapperTableView</string>
-							<string>fieldMappingImportArray</string>
-							<string>fileSourcePath</string>
-							<string>globalValuesSheet</string>
-							<string>globalValuesTableView</string>
-							<string>gobackButton</string>
-							<string>highPriorityCheckBox</string>
-							<string>ignoreCheckBox</string>
-							<string>ignoreUpdateCheckBox</string>
-							<string>importButton</string>
-							<string>importFieldNamesHeaderSwitch</string>
-							<string>importMethodLabel</string>
-							<string>importMethodPopup</string>
-							<string>insertNULLValueButton</string>
-							<string>insertPullDownButton</string>
-							<string>lowPriorityCheckBox</string>
-							<string>lowPriorityReplaceCheckBox</string>
-							<string>lowPriorityUpdateCheckBox</string>
-							<string>matchingNameMenuItem</string>
-							<string>newTableButton</string>
-							<string>newTableInfoEncodingPopup</string>
-							<string>newTableInfoEnginePopup</string>
-							<string>newTableInfoWindow</string>
-							<string>newTableNameInfoButton</string>
-							<string>newTableNameLabel</string>
-							<string>newTableNameTextField</string>
-							<string>onupdateCheckBox</string>
-							<string>onupdateTextView</string>
-							<string>recentGlobalValueMenu</string>
-							<string>recordCountLabel</string>
-							<string>removeGlobalValueButton</string>
-							<string>replaceAfterSavingCheckBox</string>
-							<string>rowDownButton</string>
-							<string>rowUpButton</string>
-							<string>setAllTypesToMenuItem</string>
-							<string>skipexistingRowsCheckBox</string>
-							<string>tableTargetPopup</string>
-							<string>tablesListInstance</string>
-							<string>theDelegate</string>
-							<string>typeComboxBox</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSButton</string>
-							<string>NSMenuItem</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSPopUpButton</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>SPTableView</string>
-							<string>id</string>
-							<string>NSPathControl</string>
-							<string>id</string>
-							<string>NSTableView</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSPopUpButton</string>
-							<string>NSButton</string>
-							<string>NSPopUpButton</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSMenuItem</string>
-							<string>NSButton</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>id</string>
-							<string>SPTextView</string>
-							<string>NSMenu</string>
-							<string>id</string>
-							<string>NSButton</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSMenuItem</string>
-							<string>id</string>
-							<string>NSPopUpButton</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSComboBoxCell</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>addGlobalValueButton</string>
-							<string>addNewColumnMenuItem</string>
-							<string>addRemainingDataSwitch</string>
-							<string>advancedBox</string>
-							<string>advancedButton</string>
-							<string>advancedInsertView</string>
-							<string>advancedLabel</string>
-							<string>advancedReplaceView</string>
-							<string>advancedUpdateView</string>
-							<string>alignByPopup</string>
-							<string>alignByPopupLabel</string>
-							<string>customQueryInstance</string>
-							<string>databaseDataInstance</string>
-							<string>delayedCheckBox</string>
-							<string>delayedReplaceCheckBox</string>
-							<string>fieldMapperTableScrollView</string>
-							<string>fieldMapperTableView</string>
-							<string>fieldMappingImportArray</string>
-							<string>fileSourcePath</string>
-							<string>globalValuesSheet</string>
-							<string>globalValuesTableView</string>
-							<string>gobackButton</string>
-							<string>highPriorityCheckBox</string>
-							<string>ignoreCheckBox</string>
-							<string>ignoreUpdateCheckBox</string>
-							<string>importButton</string>
-							<string>importFieldNamesHeaderSwitch</string>
-							<string>importMethodLabel</string>
-							<string>importMethodPopup</string>
-							<string>insertNULLValueButton</string>
-							<string>insertPullDownButton</string>
-							<string>lowPriorityCheckBox</string>
-							<string>lowPriorityReplaceCheckBox</string>
-							<string>lowPriorityUpdateCheckBox</string>
-							<string>matchingNameMenuItem</string>
-							<string>newTableButton</string>
-							<string>newTableInfoEncodingPopup</string>
-							<string>newTableInfoEnginePopup</string>
-							<string>newTableInfoWindow</string>
-							<string>newTableNameInfoButton</string>
-							<string>newTableNameLabel</string>
-							<string>newTableNameTextField</string>
-							<string>onupdateCheckBox</string>
-							<string>onupdateTextView</string>
-							<string>recentGlobalValueMenu</string>
-							<string>recordCountLabel</string>
-							<string>removeGlobalValueButton</string>
-							<string>replaceAfterSavingCheckBox</string>
-							<string>rowDownButton</string>
-							<string>rowUpButton</string>
-							<string>setAllTypesToMenuItem</string>
-							<string>skipexistingRowsCheckBox</string>
-							<string>tableTargetPopup</string>
-							<string>tablesListInstance</string>
-							<string>theDelegate</string>
-							<string>typeComboxBox</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">addGlobalValueButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">addNewColumnMenuItem</string>
+								<string key="name">openTableInNewTabMenuItem</string>
 								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">addRemainingDataSwitch</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">advancedBox</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">advancedButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">advancedInsertView</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">advancedLabel</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">advancedReplaceView</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">advancedUpdateView</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">alignByPopup</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">alignByPopupLabel</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">removeTableContextMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">customQueryInstance</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">removeTableMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">databaseDataInstance</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">renameTableContextMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">delayedCheckBox</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">renameTableMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">delayedReplaceCheckBox</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">separatorTableContextMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">fieldMapperTableScrollView</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">separatorTableContextMenuItem2</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">fieldMapperTableView</string>
-								<string key="candidateClassName">SPTableView</string>
+								<string key="name">separatorTableMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">fieldMappingImportArray</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">separatorTableMenuItem2</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">fileSourcePath</string>
-								<string key="candidateClassName">NSPathControl</string>
+								<string key="name">showCreateSyntaxContextMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">globalValuesSheet</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">showCreateSyntaxMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">globalValuesTableView</string>
-								<string key="candidateClassName">NSTableView</string>
+								<string key="name">spHistoryControllerInstance</string>
+								<string key="candidateClassName">SPHistoryController</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">gobackButton</string>
+								<string key="name">tableContentInstance</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">highPriorityCheckBox</string>
+								<string key="name">tableDataInstance</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">ignoreCheckBox</string>
+								<string key="name">tableDocumentInstance</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">ignoreUpdateCheckBox</string>
+								<string key="name">tableDumpInstance</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">importButton</string>
+								<string key="name">tableEncodingButton</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">importFieldNamesHeaderSwitch</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">tableInfoCollapseButton</string>
+								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">importMethodLabel</string>
+								<string key="name">tableInfoInstance</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">importMethodPopup</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">insertNULLValueButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">insertPullDownButton</string>
-								<string key="candidateClassName">NSPopUpButton</string>
+								<string key="name">tableListFilterSplitView</string>
+								<string key="candidateClassName">NSSplitView</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">lowPriorityCheckBox</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">tableListSplitView</string>
+								<string key="candidateClassName">NSSplitView</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">lowPriorityReplaceCheckBox</string>
+								<string key="name">tableNameField</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">lowPriorityUpdateCheckBox</string>
+								<string key="name">tableSheet</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">matchingNameMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">newTableButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">newTableInfoEncodingPopup</string>
+								<string key="name">tableSourceInstance</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">newTableInfoEnginePopup</string>
+								<string key="name">tableTriggersInstance</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">newTableInfoWindow</string>
+								<string key="name">tableTypeButton</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">newTableNameInfoButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">newTableNameLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">newTableNameTextField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">onupdateCheckBox</string>
+								<string key="name">tablesListView</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">onupdateTextView</string>
-								<string key="candidateClassName">SPTextView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">recentGlobalValueMenu</string>
-								<string key="candidateClassName">NSMenu</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">recordCountLabel</string>
+								<string key="name">toolbarActionsButton</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">removeGlobalValueButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">replaceAfterSavingCheckBox</string>
+								<string key="name">toolbarAddButton</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">rowDownButton</string>
+								<string key="name">toolbarReloadButton</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">rowUpButton</string>
+								<string key="name">truncateTableButton</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">setAllTypesToMenuItem</string>
+								<string key="name">truncateTableContextMenuItem</string>
 								<string key="candidateClassName">NSMenuItem</string>
 							</object>
+						</object>
+					</object>
+					<reference key="sourceIdentifier" ref="456410403"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SPTextView</string>
+					<string key="superclassName">NSTextView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">showMySQLHelpForCurrentWord:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">showMySQLHelpForCurrentWord:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">showMySQLHelpForCurrentWord:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>customQueryInstance</string>
+							<string>scrollView</string>
+							<string>tableDocumentInstance</string>
+							<string>tablesListInstance</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>SPCustomQuery</string>
+							<string>NSScrollView</string>
+							<string>SPDatabaseDocument</string>
+							<string>SPTablesList</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>customQueryInstance</string>
+							<string>scrollView</string>
+							<string>tableDocumentInstance</string>
+							<string>tablesListInstance</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
-								<string key="name">skipexistingRowsCheckBox</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tableTargetPopup</string>
-								<string key="candidateClassName">NSPopUpButton</string>
+								<string key="name">customQueryInstance</string>
+								<string key="candidateClassName">SPCustomQuery</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">tablesListInstance</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">scrollView</string>
+								<string key="candidateClassName">NSScrollView</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">theDelegate</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">tableDocumentInstance</string>
+								<string key="candidateClassName">SPDatabaseDocument</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">typeComboxBox</string>
-								<string key="candidateClassName">NSComboBoxCell</string>
+								<string key="name">tablesListInstance</string>
+								<string key="candidateClassName">SPTablesList</string>
 							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBDocumentRelativeSource</string>
-						<string key="minorKey">../../Source/SPFieldMapperController.h</string>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Source/SPTextView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SPTextView</string>
+					<string key="superclassName">NSTextView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
 					</object>
 				</object>
 			</object>
@@ -8775,6 +8326,27 @@
 						<string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRValidator.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Interfaces/English.lproj/DatabaseServerVariables.xib b/Interfaces/English.lproj/DatabaseServerVariables.xib
index 6981e74d..6164b81c 100644
--- a/Interfaces/English.lproj/DatabaseServerVariables.xib
+++ b/Interfaces/English.lproj/DatabaseServerVariables.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.SystemVersion">10J567</string>
+		<string key="IBDocument.InterfaceBuilderVersion">804</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
@@ -15,14 +15,14 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>788</string>
+				<string>804</string>
 				<string>1.2.2</string>
 			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="33"/>
 			<integer value="2"/>
+			<integer value="33"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -30,13 +30,8 @@
 			<string>com.brandonwalkin.BWToolkit</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
+			<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>
@@ -52,7 +47,7 @@
 			<object class="NSWindowTemplate" id="314035875">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{386, 508}, {411, 341}}</string>
+				<string key="NSWindowRect">{{386, 508}, {433, 341}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">Variables</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -60,7 +55,7 @@
 					<characters key="NS.bytes">View</characters>
 				</object>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<string key="NSWindowContentMinSize">{400, 200}</string>
+				<string key="NSWindowContentMinSize">{433, 341}</string>
 				<object class="NSView" key="NSWindowView" id="605976451">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -79,27 +74,27 @@
 										<object class="NSTableView" id="567086457">
 											<reference key="NSNextResponder" ref="892724959"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{399, 251}</string>
+											<string key="NSFrameSize">{421, 251}</string>
 											<reference key="NSSuperview" ref="892724959"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="710723896">
 												<reference key="NSNextResponder" ref="551149994"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{399, 17}</string>
+												<string key="NSFrameSize">{421, 17}</string>
 												<reference key="NSSuperview" ref="551149994"/>
 												<reference key="NSTableView" ref="567086457"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="682935021">
 												<reference key="NSNextResponder" ref="365271629"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{400, 0}, {12, 17}}</string>
+												<string key="NSFrame">{{422, 0}, {12, 17}}</string>
 												<reference key="NSSuperview" ref="365271629"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="1016923668">
 													<string key="NSIdentifier">Variable_name</string>
-													<double key="NSWidth">202</double>
+													<double key="NSWidth">224</double>
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -204,7 +199,7 @@
 											<int key="NSTableViewDraggingDestinationStyle">0</int>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {399, 251}}</string>
+									<string key="NSFrame">{{1, 17}, {421, 251}}</string>
 									<reference key="NSSuperview" ref="365271629"/>
 									<reference key="NSNextKeyView" ref="567086457"/>
 									<reference key="NSDocView" ref="567086457"/>
@@ -214,7 +209,7 @@
 								<object class="NSScroller" id="935382091">
 									<reference key="NSNextResponder" ref="365271629"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{400, 17}, {11, 251}}</string>
+									<string key="NSFrame">{{422, 17}, {11, 251}}</string>
 									<reference key="NSSuperview" ref="365271629"/>
 									<int key="NSsFlags">256</int>
 									<reference key="NSTarget" ref="365271629"/>
@@ -238,7 +233,7 @@
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<reference ref="710723896"/>
 									</object>
-									<string key="NSFrame">{{1, 0}, {399, 17}}</string>
+									<string key="NSFrame">{{1, 0}, {421, 17}}</string>
 									<reference key="NSSuperview" ref="365271629"/>
 									<reference key="NSNextKeyView" ref="710723896"/>
 									<reference key="NSDocView" ref="710723896"/>
@@ -247,7 +242,7 @@
 								</object>
 								<reference ref="682935021"/>
 							</object>
-							<string key="NSFrame">{{-1, 39}, {412, 269}}</string>
+							<string key="NSFrame">{{-1, 39}, {434, 269}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<reference key="NSNextKeyView" ref="892724959"/>
 							<int key="NSsFlags">18</int>
@@ -261,7 +256,7 @@
 						<object class="NSButton" id="980756321">
 							<reference key="NSNextResponder" ref="605976451"/>
 							<int key="NSvFlags">257</int>
-							<string key="NSFrame">{{320, 5}, {76, 28}}</string>
+							<string key="NSFrame">{{342, 5}, {77, 28}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="183553689">
@@ -306,7 +301,7 @@
 						<object class="BWInsetTextField" id="708108585">
 							<reference key="NSNextResponder" ref="605976451"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{9, 316}, {140, 14}}</string>
+							<string key="NSFrame">{{9, 316}, {156, 14}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="395355434">
@@ -331,7 +326,7 @@
 						<object class="NSSearchField" id="674859294">
 							<reference key="NSNextResponder" ref="605976451"/>
 							<int key="NSvFlags">265</int>
-							<string key="NSFrame">{{229, 314}, {170, 19}}</string>
+							<string key="NSFrame">{{251, 314}, {170, 19}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSearchFieldCell" key="NSCell" id="623709875">
@@ -399,7 +394,7 @@
 						<object class="NSTextField" id="393483135">
 							<reference key="NSNextResponder" ref="605976451"/>
 							<int key="NSvFlags">-2147483382</int>
-							<string key="NSFrame">{{151, 316}, {73, 14}}</string>
+							<string key="NSFrame">{{167, 316}, {79, 14}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="690211055">
@@ -413,11 +408,11 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{411, 341}</string>
+					<string key="NSFrameSize">{433, 341}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMinSize">{400, 222}</string>
+				<string key="NSMinSize">{433, 363}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 			</object>
 			<object class="NSMenu" id="136439297">
@@ -596,7 +591,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>
@@ -819,6 +816,7 @@
 					<string>-3.IBPluginDependency</string>
 					<string>1.IBEditorWindowLastContentRect</string>
 					<string>1.IBPluginDependency</string>
+					<string>1.IBViewEditorWindowController.showingBoundsRectangles</string>
 					<string>1.IBWindowTemplateEditedContentRect</string>
 					<string>1.ImportedFromIB2</string>
 					<string>1.editorWindowContentRectSynchronizationRect</string>
@@ -867,15 +865,16 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{426, 162}, {411, 341}}</string>
+					<string>{{440, 258}, {433, 341}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{426, 162}, {411, 341}}</string>
+					<boolean value="YES"/>
+					<string>{{440, 258}, {433, 341}}</string>
 					<integer value="1"/>
 					<string>{{321, 508}, {411, 341}}</string>
 					<integer value="0"/>
 					<integer value="1"/>
 					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>{400, 200}</string>
+					<string>{433, 341}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -944,10 +943,10 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
+					<string key="className">NSMenu</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h</string>
+						<string key="minorKey">Source/SPMenuAdditions.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -971,6 +970,13 @@
 						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarControl.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1535,6 +1541,27 @@
 						<string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRValidator.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib
index 16c7be68..50a42201 100644
--- a/Interfaces/English.lproj/ExportDialog.xib
+++ b/Interfaces/English.lproj/ExportDialog.xib
@@ -21,7 +21,8 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1088"/>
+			<integer value="1086"/>
+			<integer value="1"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -46,22 +47,22 @@
 			<object class="NSWindowTemplate" id="834889278">
 				<int key="NSWindowStyleMask">4111</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{610, 291}, {451, 480}}</string>
+				<string key="NSWindowRect">{{610, 291}, {517, 480}}</string>
 				<int key="NSWTFlags">611845120</int>
 				<string key="NSWindowTitle">Export</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<string key="NSWindowContentMinSize">{449, 480}</string>
+				<string key="NSWindowContentMinSize">{517, 480}</string>
 				<object class="NSView" key="NSWindowView" id="13817034">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSTabView" id="109227463">
 							<reference key="NSNextResponder" ref="13817034"/>
 							<int key="NSvFlags">18</int>
-							<string key="NSFrame">{{-8, 69}, {467, 405}}</string>
+							<string key="NSFrame">{{-8, 69}, {533, 405}}</string>
 							<reference key="NSSuperview" ref="13817034"/>
 							<object class="NSMutableArray" key="NSTabViewItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
@@ -70,7 +71,7 @@
 									<object class="NSView" key="NSView" id="254508059">
 										<reference key="NSNextResponder" ref="109227463"/>
 										<int key="NSvFlags">256</int>
-										<string key="NSFrame">{{10, 33}, {447, 359}}</string>
+										<string key="NSFrame">{{10, 33}, {513, 359}}</string>
 										<reference key="NSSuperview" ref="109227463"/>
 									</object>
 									<string key="NSLabel">SQL</string>
@@ -135,7 +136,7 @@
 						<object class="NSButton" id="842573327">
 							<reference key="NSNextResponder" ref="13817034"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{331, 12}, {104, 32}}</string>
+							<string key="NSFrame">{{397, 12}, {104, 32}}</string>
 							<reference key="NSSuperview" ref="13817034"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
@@ -156,7 +157,7 @@
 						<object class="NSButton" id="840756827">
 							<reference key="NSNextResponder" ref="13817034"/>
 							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{227, 12}, {104, 32}}</string>
+							<string key="NSFrame">{{293, 12}, {104, 32}}</string>
 							<reference key="NSSuperview" ref="13817034"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="460096525">
@@ -318,11 +319,11 @@
 													</object>
 												</object>
 											</object>
-											<string key="NSFrame">{{1, 1}, {412, 65}}</string>
+											<string key="NSFrame">{{1, 1}, {478, 65}}</string>
 											<reference key="NSSuperview" ref="75303935"/>
 										</object>
 									</object>
-									<string key="NSFrame">{{-3, -4}, {414, 67}}</string>
+									<string key="NSFrame">{{-3, -4}, {480, 67}}</string>
 									<reference key="NSSuperview" ref="184955131"/>
 									<string key="NSOffsets">{0, 0}</string>
 									<object class="NSTextFieldCell" key="NSTitleCell">
@@ -373,7 +374,7 @@
 									</object>
 								</object>
 							</object>
-							<string key="NSFrame">{{21, -16}, {408, 61}}</string>
+							<string key="NSFrame">{{21, -16}, {474, 61}}</string>
 							<reference key="NSSuperview" ref="13817034"/>
 							<string key="NSClassName">NSView</string>
 						</object>
@@ -424,10 +425,11 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{451, 480}</string>
+					<string key="NSFrameSize">{517, 480}</string>
+					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMinSize">{449, 502}</string>
+				<string key="NSMinSize">{517, 502}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSFrameAutosaveName">SPExportWindow</string>
 			</object>
@@ -857,7 +859,7 @@
 											<object class="NSTextField" id="369138387">
 												<reference key="NSNextResponder" ref="814282894"/>
 												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{29, 59}, {411, 19}}</string>
+												<string key="NSFrame">{{29, 59}, {482, 19}}</string>
 												<reference key="NSSuperview" ref="814282894"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="1053336717">
@@ -879,7 +881,7 @@
 											<object class="NSTextField" id="642404234">
 												<reference key="NSNextResponder" ref="814282894"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{29, 86}, {414, 14}}</string>
+												<string key="NSFrame">{{29, 86}, {485, 14}}</string>
 												<reference key="NSSuperview" ref="814282894"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="136682379">
@@ -905,7 +907,7 @@
 															<object class="NSTextField" id="844630128">
 																<reference key="NSNextResponder" ref="197574806"/>
 																<int key="NSvFlags">258</int>
-																<string key="NSFrame">{{21, 4}, {383, 22}}</string>
+																<string key="NSFrame">{{21, 4}, {450, 22}}</string>
 																<reference key="NSSuperview" ref="197574806"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSTextFieldCell" key="NSCell" id="872070930">
@@ -919,11 +921,11 @@
 																</object>
 															</object>
 														</object>
-														<string key="NSFrame">{{1, 1}, {415, 38}}</string>
+														<string key="NSFrame">{{1, 1}, {486, 38}}</string>
 														<reference key="NSSuperview" ref="134032144"/>
 													</object>
 												</object>
-												<string key="NSFrame">{{26, 10}, {417, 40}}</string>
+												<string key="NSFrame">{{26, 10}, {488, 40}}</string>
 												<reference key="NSSuperview" ref="814282894"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -944,11 +946,11 @@
 												<bool key="NSTransparent">NO</bool>
 											</object>
 										</object>
-										<string key="NSFrame">{{1, 1}, {468, 112}}</string>
+										<string key="NSFrame">{{1, 1}, {529, 112}}</string>
 										<reference key="NSSuperview" ref="593000452"/>
 									</object>
 								</object>
-								<string key="NSFrame">{{-11, -4}, {470, 114}}</string>
+								<string key="NSFrame">{{-11, -4}, {531, 114}}</string>
 								<reference key="NSSuperview" ref="185191090"/>
 								<string key="NSOffsets">{0, 0}</string>
 								<object class="NSTextFieldCell" key="NSTitleCell">
@@ -969,14 +971,14 @@
 								<bool key="NSTransparent">NO</bool>
 							</object>
 						</object>
-						<string key="NSFrame">{{0, 188}, {450, 108}}</string>
+						<string key="NSFrame">{{0, 188}, {517, 108}}</string>
 						<reference key="NSSuperview" ref="1039688935"/>
 						<string key="NSClassName">NSView</string>
 					</object>
 					<object class="NSButton" id="93580453">
 						<reference key="NSNextResponder" ref="1039688935"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{32, 297}, {400, 28}}</string>
+						<string key="NSFrame">{{32, 297}, {467, 28}}</string>
 						<reference key="NSSuperview" ref="1039688935"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="704057245">
@@ -1104,7 +1106,7 @@
 					<object class="NSButton" id="1058029781">
 						<reference key="NSNextResponder" ref="1039688935"/>
 						<int key="NSvFlags">265</int>
-						<string key="NSFrame">{{341, 325}, {94, 28}}</string>
+						<string key="NSFrame">{{408, 325}, {94, 28}}</string>
 						<reference key="NSSuperview" ref="1039688935"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="808873518">
@@ -1124,7 +1126,7 @@
 					<object class="NSBox" id="212414565">
 						<reference key="NSNextResponder" ref="1039688935"/>
 						<int key="NSvFlags">10</int>
-						<string key="NSFrame">{{20, 293}, {410, 5}}</string>
+						<string key="NSFrame">{{20, 293}, {477, 5}}</string>
 						<reference key="NSSuperview" ref="1039688935"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1146,7 +1148,7 @@
 					<object class="NSTextField" id="412690578">
 						<reference key="NSNextResponder" ref="1039688935"/>
 						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{53, 330}, {285, 19}}</string>
+						<string key="NSFrame">{{73, 330}, {332, 19}}</string>
 						<reference key="NSSuperview" ref="1039688935"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="291144691">
@@ -1163,12 +1165,12 @@
 					<object class="NSTextField" id="85590559">
 						<reference key="NSNextResponder" ref="1039688935"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{17, 332}, {31, 14}}</string>
+						<string key="NSFrame">{{17, 332}, {51, 14}}</string>
 						<reference key="NSSuperview" ref="1039688935"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="869459931">
 							<int key="NSCellFlags">68288064</int>
-							<int key="NSCellFlags2">272761856</int>
+							<int key="NSCellFlags2">71435264</int>
 							<string key="NSContents">Path:</string>
 							<reference key="NSSupport" ref="26"/>
 							<reference key="NSControlView" ref="85590559"/>
@@ -1179,7 +1181,7 @@
 					<object class="NSButton" id="238794017">
 						<reference key="NSNextResponder" ref="1039688935"/>
 						<int key="NSvFlags">-2147483380</int>
-						<string key="NSFrame">{{226, 269}, {160, 18}}</string>
+						<string key="NSFrame">{{226, 269}, {273, 18}}</string>
 						<reference key="NSSuperview" ref="1039688935"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="328323922">
@@ -1201,21 +1203,21 @@
 					<object class="NSTabView" id="683006936">
 						<reference key="NSNextResponder" ref="1039688935"/>
 						<int key="NSvFlags">17</int>
-						<string key="NSFrame">{{225, 16}, {209, 249}}</string>
+						<string key="NSFrame">{{225, 16}, {276, 249}}</string>
 						<reference key="NSSuperview" ref="1039688935"/>
 						<object class="NSMutableArray" key="NSTabViewItems">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="NSTabViewItem" id="286086449">
 								<string key="NSIdentifier">sql</string>
 								<object class="NSView" key="NSView" id="311280472">
-									<reference key="NSNextResponder" ref="683006936"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<object class="NSButton" id="896448830">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{11, 176}, {179, 18}}</string>
+											<string key="NSFrame">{{11, 176}, {233, 18}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="1070796296">
@@ -1237,7 +1239,7 @@
 										<object class="NSTextField" id="868197026">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{12, 200}, {180, 14}}</string>
+											<string key="NSFrame">{{12, 200}, {233, 14}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="882864517">
@@ -1253,7 +1255,7 @@
 										<object class="NSTextField" id="904279924">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{12, 96}, {180, 14}}</string>
+											<string key="NSFrame">{{12, 96}, {233, 14}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="460496284">
@@ -1269,7 +1271,7 @@
 										<object class="NSButton" id="636989900">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{12, 136}, {179, 18}}</string>
+											<string key="NSFrame">{{12, 136}, {232, 18}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="1026671526">
@@ -1291,7 +1293,7 @@
 										<object class="NSButton" id="163591590">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{12, 116}, {179, 18}}</string>
+											<string key="NSFrame">{{12, 116}, {232, 18}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="902213604">
@@ -1313,7 +1315,7 @@
 										<object class="NSButton" id="472940336">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{12, 156}, {179, 18}}</string>
+											<string key="NSFrame">{{12, 156}, {232, 18}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="619630097">
@@ -1335,7 +1337,7 @@
 										<object class="NSButton" id="771021044">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{12, 72}, {179, 18}}</string>
+											<string key="NSFrame">{{12, 72}, {232, 18}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="302595793">
@@ -1357,7 +1359,7 @@
 										<object class="NSButton" id="243826641">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{12, 52}, {179, 18}}</string>
+											<string key="NSFrame">{{12, 52}, {232, 18}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="595529721">
@@ -1379,7 +1381,7 @@
 										<object class="NSTextField" id="864598499">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{12, 32}, {180, 14}}</string>
+											<string key="NSFrame">{{12, 32}, {233, 14}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="618129698">
@@ -1481,7 +1483,7 @@
 										<object class="NSPopUpButton" id="137273930">
 											<reference key="NSNextResponder" ref="311280472"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{80, 2}, {98, 22}}</string>
+											<string key="NSFrame">{{80, 2}, {117, 22}}</string>
 											<reference key="NSSuperview" ref="311280472"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="341187036">
@@ -1534,8 +1536,7 @@
 											</object>
 										</object>
 									</object>
-									<string key="NSFrame">{{10, 7}, {189, 229}}</string>
-									<reference key="NSSuperview" ref="683006936"/>
+									<string key="NSFrame">{{10, 7}, {256, 229}}</string>
 								</object>
 								<string key="NSLabel">SQL</string>
 								<reference key="NSColor" ref="683790803"/>
@@ -1778,7 +1779,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											</object>
 										</object>
 									</object>
-									<string key="NSFrame">{{10, 7}, {189, 229}}</string>
+									<string key="NSFrame">{{10, 7}, {256, 229}}</string>
 								</object>
 								<string key="NSLabel">Excel</string>
 								<reference key="NSColor" ref="683790803"/>
@@ -1787,14 +1788,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<object class="NSTabViewItem" id="566176242">
 								<string key="NSIdentifier">csv</string>
 								<object class="NSView" key="NSView" id="251397907">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder" ref="683006936"/>
 									<int key="NSvFlags">256</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<object class="NSTextField" id="431819810">
 											<reference key="NSNextResponder" ref="251397907"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{5, 178}, {120, 14}}</string>
+											<string key="NSFrame">{{5, 178}, {240, 14}}</string>
 											<reference key="NSSuperview" ref="251397907"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="704779797">
@@ -1810,7 +1811,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSTextField" id="154639832">
 											<reference key="NSNextResponder" ref="251397907"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{5, 79}, {120, 14}}</string>
+											<string key="NSFrame">{{5, 79}, {240, 14}}</string>
 											<reference key="NSSuperview" ref="251397907"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="476159630">
@@ -1826,7 +1827,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSTextField" id="118891385">
 											<reference key="NSNextResponder" ref="251397907"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{46, 125}, {110, 17}}</string>
+											<string key="NSFrame">{{46, 125}, {199, 17}}</string>
 											<reference key="NSSuperview" ref="251397907"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="677830525">
@@ -1842,7 +1843,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSTextField" id="897158083">
 											<reference key="NSNextResponder" ref="251397907"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{46, 150}, {110, 17}}</string>
+											<string key="NSFrame">{{46, 150}, {199, 17}}</string>
 											<reference key="NSSuperview" ref="251397907"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="51337104">
@@ -2123,7 +2124,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSTextField" id="291048492">
 											<reference key="NSNextResponder" ref="251397907"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{46, 98}, {110, 17}}</string>
+											<string key="NSFrame">{{46, 98}, {199, 17}}</string>
 											<reference key="NSSuperview" ref="251397907"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="725186903">
@@ -2222,7 +2223,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSTextField" id="17832185">
 											<reference key="NSNextResponder" ref="251397907"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{46, 51}, {110, 17}}</string>
+											<string key="NSFrame">{{46, 51}, {199, 17}}</string>
 											<reference key="NSSuperview" ref="251397907"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="188018483">
@@ -2238,7 +2239,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSButton" id="586747972">
 											<reference key="NSNextResponder" ref="251397907"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{5, 198}, {172, 18}}</string>
+											<string key="NSFrame">{{5, 198}, {259, 18}}</string>
 											<reference key="NSSuperview" ref="251397907"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="306434977">
@@ -2259,7 +2260,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSTextField" id="768545032">
 											<reference key="NSNextResponder" ref="251397907"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{5, 29}, {120, 14}}</string>
+											<string key="NSFrame">{{5, 29}, {240, 14}}</string>
 											<reference key="NSSuperview" ref="251397907"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="112977810">
@@ -2290,7 +2291,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											</object>
 										</object>
 									</object>
-									<string key="NSFrame">{{10, 7}, {189, 229}}</string>
+									<string key="NSFrame">{{10, 7}, {256, 229}}</string>
+									<reference key="NSSuperview" ref="683006936"/>
 								</object>
 								<string key="NSLabel">CSV</string>
 								<reference key="NSColor" ref="683790803"/>
@@ -2301,7 +2303,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<object class="NSView" key="NSView" id="701209678">
 									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{10, 7}, {189, 229}}</string>
+									<string key="NSFrame">{{10, 7}, {256, 229}}</string>
 								</object>
 								<string key="NSLabel">HTML</string>
 								<reference key="NSColor" ref="683790803"/>
@@ -2479,7 +2481,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											</object>
 										</object>
 									</object>
-									<string key="NSFrame">{{10, 7}, {189, 229}}</string>
+									<string key="NSFrame">{{10, 7}, {256, 229}}</string>
 								</object>
 								<string key="NSLabel">XML</string>
 								<reference key="NSColor" ref="683790803"/>
@@ -2490,7 +2492,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<object class="NSView" key="NSView" id="1016607584">
 									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{10, 7}, {189, 229}}</string>
+									<string key="NSFrame">{{10, 7}, {256, 229}}</string>
 								</object>
 								<string key="NSLabel">PDF</string>
 								<reference key="NSColor" ref="683790803"/>
@@ -2506,7 +2508,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSButton" id="227266718">
 											<reference key="NSNextResponder" ref="243567307"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{2, 198}, {186, 18}}</string>
+											<string key="NSFrame">{{2, 198}, {262, 18}}</string>
 											<reference key="NSSuperview" ref="243567307"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="464364038">
@@ -2525,21 +2527,21 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											</object>
 										</object>
 									</object>
-									<string key="NSFrame">{{10, 7}, {189, 229}}</string>
+									<string key="NSFrame">{{10, 7}, {256, 229}}</string>
 								</object>
 								<string key="NSLabel">Dot</string>
 								<reference key="NSColor" ref="683790803"/>
 								<reference key="NSTabView" ref="683006936"/>
 							</object>
 						</object>
-						<reference key="NSSelectedTabViewItem" ref="286086449"/>
+						<reference key="NSSelectedTabViewItem" ref="566176242"/>
 						<reference key="NSFont" ref="695505032"/>
 						<int key="NSTvFlags">4</int>
 						<bool key="NSAllowTruncatedLabels">YES</bool>
 						<bool key="NSDrawsBackground">YES</bool>
 						<object class="NSMutableArray" key="NSSubviews">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="311280472"/>
+							<reference ref="251397907"/>
 						</object>
 					</object>
 					<object class="NSScrollView" id="505274803">
@@ -2784,7 +2786,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 					</object>
 				</object>
-				<string key="NSFrameSize">{450, 359}</string>
+				<string key="NSFrameSize">{517, 359}</string>
 				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -3720,12 +3722,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="85590559"/>
 							<reference ref="412690578"/>
 							<reference ref="212414565"/>
-							<reference ref="1058029781"/>
 							<reference ref="468430644"/>
 							<reference ref="585337816"/>
 							<reference ref="93580453"/>
 							<reference ref="185191090"/>
 							<reference ref="429080228"/>
+							<reference ref="1058029781"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Exporter View</string>
@@ -5000,6 +5002,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>1094.IBPluginDependency</string>
 					<string>1095.IBPluginDependency</string>
 					<string>1096.IBPluginDependency</string>
+					<string>1096.IBViewBoundsToFrameTransform</string>
 					<string>1097.IBPluginDependency</string>
 					<string>1100.IBAttributePlaceholdersKey</string>
 					<string>1100.IBPluginDependency</string>
@@ -5268,15 +5271,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{354, 248}, {451, 480}}</string>
+					<string>{{354, 248}, {517, 480}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="NO"/>
 					<boolean value="NO"/>
-					<string>{{354, 248}, {451, 480}}</string>
+					<string>{{354, 248}, {517, 480}}</string>
 					<boolean value="NO"/>
 					<boolean value="YES"/>
-					<string>{449, 480}</string>
-					<string>{{872, 645}, {450, 359}}</string>
+					<string>{517, 480}</string>
+					<string>{{872, 645}, {517, 359}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
@@ -5296,6 +5299,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDqoAAw6+AAA</bytes>
+					</object>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
@@ -5764,6 +5770,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarControl.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib
index e3b85901..6e90ea65 100644
--- a/Interfaces/English.lproj/Preferences.xib
+++ b/Interfaces/English.lproj/Preferences.xib
@@ -21,6 +21,8 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="641"/>
+			<integer value="802"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2387,14 +2389,14 @@ AQAAAAA</bytes>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="769132533">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="NSTextField" id="746894224">
 						<reference key="NSNextResponder" ref="769132533"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{11, 56}, {188, 17}}</string>
+						<string key="NSFrame">{{17, 56}, {204, 17}}</string>
 						<reference key="NSSuperview" ref="769132533"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1057393276">
@@ -2410,7 +2412,7 @@ AQAAAAA</bytes>
 					<object class="NSButton" id="64545568">
 						<reference key="NSNextResponder" ref="769132533"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{202, 18}, {360, 18}}</string>
+						<string key="NSFrame">{{224, 19}, {338, 18}}</string>
 						<reference key="NSSuperview" ref="769132533"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="151662644">
@@ -2432,7 +2434,7 @@ AQAAAAA</bytes>
 					<object class="NSTextField" id="591009529">
 						<reference key="NSNextResponder" ref="769132533"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{204, 53}, {50, 22}}</string>
+						<string key="NSFrame">{{226, 54}, {50, 22}}</string>
 						<reference key="NSSuperview" ref="769132533"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="170658213">
@@ -2494,7 +2496,7 @@ AQAAAAA</bytes>
 					<object class="NSTextField" id="794722267">
 						<reference key="NSNextResponder" ref="769132533"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{259, 56}, {304, 17}}</string>
+						<string key="NSFrame">{{281, 57}, {282, 17}}</string>
 						<reference key="NSSuperview" ref="769132533"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="619604330">
@@ -2510,7 +2512,7 @@ AQAAAAA</bytes>
 					<object class="NSBox" id="688014148">
 						<reference key="NSNextResponder" ref="769132533"/>
 						<int key="NSvFlags">12</int>
-						<string key="NSFrame">{{204, 42}, {356, 5}}</string>
+						<string key="NSFrame">{{226, 43}, {334, 5}}</string>
 						<reference key="NSSuperview" ref="769132533"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
@@ -2531,10 +2533,11 @@ AQAAAAA</bytes>
 					</object>
 				</object>
 				<string key="NSFrameSize">{580, 93}</string>
+				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="1033452264">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2650,12 +2653,12 @@ AQAAAAA</bytes>
 					<object class="NSTextField" id="187965597">
 						<reference key="NSNextResponder" ref="1033452264"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{124, 21}, {121, 14}}</string>
+						<string key="NSFrame">{{144, 21}, {101, 14}}</string>
 						<reference key="NSSuperview" ref="1033452264"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="983858855">
 							<int key="NSCellFlags">68288064</int>
-							<int key="NSCellFlags2">272761856</int>
+							<int key="NSCellFlags2">71435264</int>
 							<string key="NSContents">theme name</string>
 							<reference key="NSSupport" ref="26"/>
 							<reference key="NSControlView" ref="187965597"/>
@@ -2666,7 +2669,7 @@ AQAAAAA</bytes>
 					<object class="NSTextField" id="919512780">
 						<reference key="NSNextResponder" ref="1033452264"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{49, 21}, {83, 14}}</string>
+						<string key="NSFrame">{{49, 21}, {93, 14}}</string>
 						<reference key="NSSuperview" ref="1033452264"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="133660147">
@@ -2776,6 +2779,7 @@ AQAAAAA</bytes>
 								</object>
 								<string key="NSFrame">{{1, 1}, {220, 249}}</string>
 								<reference key="NSSuperview" ref="288292400"/>
+								<reference key="NSNextKeyView" ref="953919633"/>
 								<reference key="NSDocView" ref="953919633"/>
 								<reference key="NSBGColor" ref="887465699"/>
 								<int key="NScvFlags">2</int>
@@ -2802,6 +2806,7 @@ AQAAAAA</bytes>
 						</object>
 						<string key="NSFrame">{{20, 47}, {222, 251}}</string>
 						<reference key="NSSuperview" ref="1033452264"/>
+						<reference key="NSNextKeyView" ref="25515031"/>
 						<int key="NSsFlags">2</int>
 						<reference key="NSVScroller" ref="662661535"/>
 						<reference key="NSHScroller" ref="913479800"/>
@@ -3537,47 +3542,108 @@ AQAAAAA</bytes>
 					</object>
 				</object>
 				<string key="NSFrameSize">{580, 360}</string>
+				<reference key="NSSuperview"/>
+				<string key="NSClassName">NSView</string>
+			</object>
+			<object class="NSCustomView" id="301032184">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSTextField" id="200831972">
+						<reference key="NSNextResponder" ref="301032184"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{2, 10}, {575, 34}}</string>
+						<reference key="NSSuperview" ref="301032184"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="219723569">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">138674176</int>
+							<string key="NSContents">Choose a custom SSH key file to use with this connection. Note that standard locations like ~/.ssh are checked automatically, as are any files in your SSH configuration.</string>
+							<reference key="NSSupport" ref="718282869"/>
+							<reference key="NSControlView" ref="200831972"/>
+							<reference key="NSBackgroundColor" ref="700609571"/>
+							<reference key="NSTextColor" ref="1035618107"/>
+						</object>
+					</object>
+				</object>
+				<string key="NSFrameSize">{579, 51}</string>
+				<string key="NSClassName">NSView</string>
+			</object>
+			<object class="NSCustomView" id="46104894">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSTextField" id="532539071">
+						<reference key="NSNextResponder" ref="46104894"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{2, 10}, {575, 17}}</string>
+						<reference key="NSSuperview" ref="46104894"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="925838195">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">138674176</int>
+							<string key="NSContents">Please select the SSL key file to use when establishing a secure connection.</string>
+							<reference key="NSSupport" ref="718282869"/>
+							<reference key="NSControlView" ref="532539071"/>
+							<reference key="NSBackgroundColor" ref="700609571"/>
+							<reference key="NSTextColor" ref="1035618107"/>
+						</object>
+					</object>
+				</object>
+				<string key="NSFrameSize">{579, 34}</string>
 				<string key="NSClassName">NSView</string>
 			</object>
-			<object class="NSMenu" id="982657201">
-				<string key="NSTitle"/>
-				<object class="NSMutableArray" key="NSMenuItems">
+			<object class="NSCustomView" id="962978272">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="30395779">
-						<reference key="NSMenu" ref="982657201"/>
-						<string key="NSTitle">Remove</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="1039721224"/>
-						<reference key="NSMixedImage" ref="720177216"/>
-					</object>
-					<object class="NSMenuItem" id="580038192">
-						<reference key="NSMenu" ref="982657201"/>
-						<string key="NSTitle">Duplicate</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="1039721224"/>
-						<reference key="NSMixedImage" ref="720177216"/>
-					</object>
-					<object class="NSMenuItem" id="102426580">
-						<reference key="NSMenu" ref="982657201"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<bool key="NSIsSeparator">YES</bool>
-						<string key="NSTitle"/>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="1039721224"/>
-						<reference key="NSMixedImage" ref="720177216"/>
-					</object>
-					<object class="NSMenuItem" id="512106570">
-						<reference key="NSMenu" ref="982657201"/>
-						<string key="NSTitle">Make Default</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="1039721224"/>
-						<reference key="NSMixedImage" ref="720177216"/>
+					<object class="NSTextField" id="624133663">
+						<reference key="NSNextResponder" ref="962978272"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{2, 10}, {575, 17}}</string>
+						<reference key="NSSuperview" ref="962978272"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="602926229">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">138674176</int>
+							<string key="NSContents">Please select the client SSL certificate file to use when establishing a secure connection.</string>
+							<reference key="NSSupport" ref="718282869"/>
+							<reference key="NSControlView" ref="624133663"/>
+							<reference key="NSBackgroundColor" ref="700609571"/>
+							<reference key="NSTextColor" ref="1035618107"/>
+						</object>
 					</object>
 				</object>
+				<string key="NSFrameSize">{579, 34}</string>
+				<string key="NSClassName">NSView</string>
+			</object>
+			<object class="NSCustomView" id="453507512">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSTextField" id="534911197">
+						<reference key="NSNextResponder" ref="453507512"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{2, 10}, {575, 34}}</string>
+						<reference key="NSSuperview" ref="453507512"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="921051913">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">138674176</int>
+							<string key="NSContents">Please select the client SSL Certificate Authority certificate to use when establishing a secure connection.  This must be the same as the server CA certificate.</string>
+							<reference key="NSSupport" ref="718282869"/>
+							<reference key="NSControlView" ref="534911197"/>
+							<reference key="NSBackgroundColor" ref="700609571"/>
+							<reference key="NSTextColor" ref="1035618107"/>
+						</object>
+					</object>
+				</object>
+				<string key="NSFrameSize">{579, 51}</string>
+				<string key="NSClassName">NSView</string>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -4572,14 +4638,6 @@ AQAAAAA</bytes>
 					</object>
 					<int key="connectionID">1545</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="982657201"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">1555</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: values.SUSendProfileInfo</string>
@@ -5882,10 +5940,10 @@ AQAAAAA</bytes>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="746894224"/>
-							<reference ref="64545568"/>
-							<reference ref="591009529"/>
-							<reference ref="794722267"/>
 							<reference ref="688014148"/>
+							<reference ref="794722267"/>
+							<reference ref="591009529"/>
+							<reference ref="64545568"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Network</string>
@@ -6778,34 +6836,6 @@ AQAAAAA</bytes>
 						<reference key="object" ref="628895309"/>
 						<reference key="parent" ref="1007936999"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1547</int>
-						<reference key="object" ref="982657201"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="30395779"/>
-							<reference ref="580038192"/>
-							<reference ref="102426580"/>
-							<reference ref="512106570"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Context Menu</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1548</int>
-						<reference key="object" ref="30395779"/>
-						<reference key="parent" ref="982657201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1549</int>
-						<reference key="object" ref="580038192"/>
-						<reference key="parent" ref="982657201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1551</int>
-						<reference key="object" ref="102426580"/>
-						<reference key="parent" ref="982657201"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1615</int>
 						<reference key="object" ref="467474047"/>
@@ -6830,11 +6860,6 @@ AQAAAAA</bytes>
 						<reference key="object" ref="185366293"/>
 						<reference key="parent" ref="369742224"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1640</int>
-						<reference key="object" ref="512106570"/>
-						<reference key="parent" ref="982657201"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1669</int>
 						<reference key="object" ref="748242000"/>
@@ -7213,6 +7238,102 @@ AQAAAAA</bytes>
 						<reference key="object" ref="803513953"/>
 						<reference key="parent" ref="202566886"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1873</int>
+						<reference key="object" ref="301032184"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="200831972"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">SSH Key Selection Help</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1874</int>
+						<reference key="object" ref="200831972"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="219723569"/>
+						</object>
+						<reference key="parent" ref="301032184"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1875</int>
+						<reference key="object" ref="219723569"/>
+						<reference key="parent" ref="200831972"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2040</int>
+						<reference key="object" ref="453507512"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="534911197"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">SSL CA Cert File Selection Help</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2041</int>
+						<reference key="object" ref="46104894"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="532539071"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">SSL Key File Selection Help</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2042</int>
+						<reference key="object" ref="962978272"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="624133663"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">SSL Certificate File Selection Help</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2043</int>
+						<reference key="object" ref="624133663"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="602926229"/>
+						</object>
+						<reference key="parent" ref="962978272"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2044</int>
+						<reference key="object" ref="602926229"/>
+						<reference key="parent" ref="624133663"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2045</int>
+						<reference key="object" ref="532539071"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="925838195"/>
+						</object>
+						<reference key="parent" ref="46104894"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2046</int>
+						<reference key="object" ref="925838195"/>
+						<reference key="parent" ref="532539071"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2047</int>
+						<reference key="object" ref="534911197"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="921051913"/>
+						</object>
+						<reference key="parent" ref="453507512"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2048</int>
+						<reference key="object" ref="921051913"/>
+						<reference key="parent" ref="534911197"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2074</int>
 						<reference key="object" ref="343720994"/>
@@ -7443,17 +7564,11 @@ AQAAAAA</bytes>
 					<string>1542.IBPluginDependency</string>
 					<string>1543.IBPluginDependency</string>
 					<string>1546.IBPluginDependency</string>
-					<string>1547.IBEditorWindowLastContentRect</string>
-					<string>1547.IBPluginDependency</string>
-					<string>1548.IBPluginDependency</string>
-					<string>1549.IBPluginDependency</string>
-					<string>1551.IBPluginDependency</string>
 					<string>1615.IBPluginDependency</string>
 					<string>1615.ImportedFromIB2</string>
 					<string>1616.IBPluginDependency</string>
 					<string>1618.IBPluginDependency</string>
 					<string>1620.IBPluginDependency</string>
-					<string>1640.IBPluginDependency</string>
 					<string>1669.IBAttributePlaceholdersKey</string>
 					<string>1669.IBPluginDependency</string>
 					<string>1670.IBPluginDependency</string>
@@ -7537,7 +7652,23 @@ AQAAAAA</bytes>
 					<string>1824.IBPluginDependency</string>
 					<string>1824.ImportedFromIB2</string>
 					<string>1825.IBPluginDependency</string>
+					<string>1873.IBEditorWindowLastContentRect</string>
+					<string>1873.IBPluginDependency</string>
+					<string>1874.IBPluginDependency</string>
+					<string>1875.IBPluginDependency</string>
 					<string>2.IBPluginDependency</string>
+					<string>2040.IBEditorWindowLastContentRect</string>
+					<string>2040.IBPluginDependency</string>
+					<string>2041.IBEditorWindowLastContentRect</string>
+					<string>2041.IBPluginDependency</string>
+					<string>2042.IBEditorWindowLastContentRect</string>
+					<string>2042.IBPluginDependency</string>
+					<string>2043.IBPluginDependency</string>
+					<string>2044.IBPluginDependency</string>
+					<string>2045.IBPluginDependency</string>
+					<string>2046.IBPluginDependency</string>
+					<string>2047.IBPluginDependency</string>
+					<string>2048.IBPluginDependency</string>
 					<string>2074.IBPluginDependency</string>
 					<string>2080.IBPluginDependency</string>
 					<string>2143.IBPluginDependency</string>
@@ -7672,14 +7803,18 @@ AQAAAAA</bytes>
 					<string>642.IBPluginDependency</string>
 					<string>652.IBAttributePlaceholdersKey</string>
 					<string>652.IBPluginDependency</string>
+					<string>652.IBViewBoundsToFrameTransform</string>
 					<string>661.IBPluginDependency</string>
 					<string>669.IBPluginDependency</string>
 					<string>674.IBAttributePlaceholdersKey</string>
 					<string>674.IBPluginDependency</string>
+					<string>674.IBViewBoundsToFrameTransform</string>
 					<string>675.IBPluginDependency</string>
 					<string>676.IBPluginDependency</string>
+					<string>676.IBViewBoundsToFrameTransform</string>
 					<string>677.IBPluginDependency</string>
 					<string>681.IBPluginDependency</string>
+					<string>681.IBViewBoundsToFrameTransform</string>
 					<string>784.IBPluginDependency</string>
 					<string>785.IBPluginDependency</string>
 					<string>786.IBPluginDependency</string>
@@ -7845,17 +7980,11 @@ AQAAAAA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{508, 537}, {142, 73}}</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>
 					<integer value="1"/>
 					<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 class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
@@ -7866,7 +7995,7 @@ AQAAAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{128, 250}, {222, 125}}</string>
+					<string>{{493, 438}, {222, 125}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
@@ -7983,6 +8112,22 @@ AQAAAAA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{249, 289}, {579, 51}}</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>{{245, 466}, {579, 51}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{245, 483}, {579, 34}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{245, 483}, {579, 34}}</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>
@@ -8139,15 +8284,10 @@ AQAAAAA</bytes>
 							<int key="affinity">0</int>
 						</object>
 					</object>
-					<string>{{117, 527}, {580, 93}}</string>
+					<string>{{314, 726}, {580, 93}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableArray">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="IBUserGuide">
-							<reference key="view" ref="769132533"/>
-							<double key="location">195</double>
-							<int key="affinity">0</int>
-						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
@@ -8159,6 +8299,9 @@ AQAAAAA</bytes>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDSgAAwggAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
@@ -8170,10 +8313,19 @@ AQAAAAA</bytes>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDTAAAwpIAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDgYAAwo4AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AUNMAABCKAAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -8200,7 +8352,7 @@ AQAAAAA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{119, 335}, {580, 360}}</string>
+					<string>{{314, 523}, {580, 360}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableArray">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8293,6 +8445,13 @@ AQAAAAA</bytes>
 						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarControl.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -8385,7 +8544,6 @@ AQAAAAA</bytes>
 							<string>saveAsColorScheme:</string>
 							<string>setDefaultColors:</string>
 							<string>showCustomQueryFontPanel:</string>
-							<string>showGlobalResultTableFontPanel:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8399,7 +8557,6 @@ AQAAAAA</bytes>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -8416,7 +8573,6 @@ AQAAAAA</bytes>
 							<string>saveAsColorScheme:</string>
 							<string>setDefaultColors:</string>
 							<string>showCustomQueryFontPanel:</string>
-							<string>showGlobalResultTableFontPanel:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8460,10 +8616,6 @@ AQAAAAA</bytes>
 								<string key="name">showCustomQueryFontPanel:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">showGlobalResultTableFontPanel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
diff --git a/Interfaces/English.lproj/UserManagerView.xib b/Interfaces/English.lproj/UserManagerView.xib
index fbde0774..ea51d763 100644
--- a/Interfaces/English.lproj/UserManagerView.xib
+++ b/Interfaces/English.lproj/UserManagerView.xib
@@ -3,7 +3,7 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
 		<string key="IBDocument.SystemVersion">10J567</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.InterfaceBuilderVersion">804</string>
 		<string key="IBDocument.AppKitVersion">1038.35</string>
 		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
@@ -15,13 +15,13 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>788</string>
-				<string>1.2.5</string>
+				<string>804</string>
+				<string>1.2.2</string>
 			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="43"/>
+			<integer value="25"/>
 			<integer value="984"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -573,7 +573,7 @@
 												<object class="NSTabViewItem" id="1024639412">
 													<string key="NSIdentifier">Global Privileges</string>
 													<object class="NSView" key="NSView" id="202198269">
-														<nil key="NSNextResponder"/>
+														<reference key="NSNextResponder" ref="716372522"/>
 														<int key="NSvFlags">288</int>
 														<object class="NSMutableArray" key="NSSubviews">
 															<bool key="EncodedWithXMLCoder">YES</bool>
@@ -595,7 +595,7 @@
 																					<object class="NSButton" id="639415915">
 																						<reference key="NSNextResponder" ref="507349185"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 32}, {179, 18}}</string>
+																						<string key="NSFrame">{{16, 32}, {221, 18}}</string>
 																						<reference key="NSSuperview" ref="507349185"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="919244938">
@@ -646,7 +646,7 @@
 																				<reference key="NSSuperview" ref="223367051"/>
 																			</object>
 																		</object>
-																		<string key="NSFrame">{{293, 175}, {255, 74}}</string>
+																		<string key="NSFrame">{{17, 75}, {255, 74}}</string>
 																		<reference key="NSSuperview" ref="386290455"/>
 																		<string key="NSOffsets">{0, 0}</string>
 																		<object class="NSTextFieldCell" key="NSTitleCell">
@@ -679,7 +679,7 @@
 																					<object class="NSButton" id="165190944">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 190}, {124, 18}}</string>
+																						<string key="NSFrame">{{16, 192}, {124, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="68967500">
@@ -701,7 +701,7 @@
 																					<object class="NSButton" id="948609625">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 170}, {234, 18}}</string>
+																						<string key="NSFrame">{{16, 172}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="410960559">
@@ -723,7 +723,7 @@
 																					<object class="NSButton" id="514468506">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 150}, {234, 18}}</string>
+																						<string key="NSFrame">{{16, 152}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="231869678">
@@ -745,7 +745,7 @@
 																					<object class="NSButton" id="654009227">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 130}, {234, 18}}</string>
+																						<string key="NSFrame">{{16, 132}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="144741035">
@@ -767,7 +767,7 @@
 																					<object class="NSButton" id="341346472">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 110}, {234, 18}}</string>
+																						<string key="NSFrame">{{16, 112}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="967891320">
@@ -789,7 +789,7 @@
 																					<object class="NSButton" id="460063174">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 90}, {234, 18}}</string>
+																						<string key="NSFrame">{{16, 92}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="315454579">
@@ -811,7 +811,7 @@
 																					<object class="NSButton" id="712816655">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 70}, {234, 18}}</string>
+																						<string key="NSFrame">{{16, 72}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="40570585">
@@ -833,7 +833,7 @@
 																					<object class="NSButton" id="1026585310">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 50}, {234, 18}}</string>
+																						<string key="NSFrame">{{16, 52}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="799488283">
@@ -855,7 +855,7 @@
 																					<object class="NSButton" id="373270478">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 30}, {234, 18}}</string>
+																						<string key="NSFrame">{{16, 32}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="1072458811">
@@ -877,7 +877,7 @@
 																					<object class="NSButton" id="285378693">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 10}, {234, 18}}</string>
+																						<string key="NSFrame">{{16, 12}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="205758531">
@@ -899,7 +899,7 @@
 																					<object class="NSButton" id="1012114470">
 																						<reference key="NSNextResponder" ref="1066741257"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{144, 190}, {106, 18}}</string>
+																						<string key="NSFrame">{{144, 192}, {131, 18}}</string>
 																						<reference key="NSSuperview" ref="1066741257"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="213779970">
@@ -919,11 +919,11 @@
 																						</object>
 																					</object>
 																				</object>
-																				<string key="NSFrame">{{1, 1}, {266, 216}}</string>
+																				<string key="NSFrame">{{1, 1}, {291, 218}}</string>
 																				<reference key="NSSuperview" ref="517432726"/>
 																			</object>
 																		</object>
-																		<string key="NSFrame">{{17, 17}, {268, 232}}</string>
+																		<string key="NSFrame">{{273, 15}, {293, 234}}</string>
 																		<reference key="NSSuperview" ref="386290455"/>
 																		<string key="NSOffsets">{0, 0}</string>
 																		<object class="NSTextFieldCell" key="NSTitleCell">
@@ -946,7 +946,7 @@
 																	<object class="NSButton" id="610554589">
 																		<reference key="NSNextResponder" ref="386290455"/>
 																		<int key="NSvFlags">289</int>
-																		<string key="NSFrame">{{352, 131}, {157, 32}}</string>
+																		<string key="NSFrame">{{65, 44}, {157, 32}}</string>
 																		<reference key="NSSuperview" ref="386290455"/>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSButtonCell" key="NSCell" id="674356083">
@@ -976,7 +976,7 @@
 																					<object class="NSButton" id="354897609">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 92}, {118, 18}}</string>
+																						<string key="NSFrame">{{16, 192}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="856008013">
@@ -998,7 +998,7 @@
 																					<object class="NSButton" id="279892883">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 72}, {124, 18}}</string>
+																						<string key="NSFrame">{{16, 172}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="754659519">
@@ -1020,7 +1020,7 @@
 																					<object class="NSButton" id="44622938">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 52}, {124, 18}}</string>
+																						<string key="NSFrame">{{16, 152}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="1032540047">
@@ -1042,7 +1042,7 @@
 																					<object class="NSButton" id="221237545">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 32}, {124, 18}}</string>
+																						<string key="NSFrame">{{16, 132}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="127371548">
@@ -1064,7 +1064,7 @@
 																					<object class="NSButton" id="173464062">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 12}, {124, 18}}</string>
+																						<string key="NSFrame">{{16, 112}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="460476562">
@@ -1086,7 +1086,7 @@
 																					<object class="NSButton" id="905629414">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{144, 92}, {106, 18}}</string>
+																						<string key="NSFrame">{{16, 92}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="143275795">
@@ -1108,7 +1108,7 @@
 																					<object class="NSButton" id="384517358">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{144, 72}, {106, 18}}</string>
+																						<string key="NSFrame">{{16, 72}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="1016258703">
@@ -1130,7 +1130,7 @@
 																					<object class="NSButton" id="577327681">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{144, 52}, {106, 18}}</string>
+																						<string key="NSFrame">{{16, 52}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="921961521">
@@ -1152,7 +1152,7 @@
 																					<object class="NSButton" id="658073531">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{144, 32}, {106, 18}}</string>
+																						<string key="NSFrame">{{16, 32}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="489524765">
@@ -1174,7 +1174,7 @@
 																					<object class="NSButton" id="458971250">
 																						<reference key="NSNextResponder" ref="424144569"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{144, 12}, {106, 18}}</string>
+																						<string key="NSFrame">{{16, 12}, {220, 18}}</string>
 																						<reference key="NSSuperview" ref="424144569"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="282706704">
@@ -1194,11 +1194,11 @@
 																						</object>
 																					</object>
 																				</object>
-																				<string key="NSFrame">{{1, 1}, {266, 118}}</string>
+																				<string key="NSFrame">{{1, 1}, {252, 218}}</string>
 																				<reference key="NSSuperview" ref="1050276179"/>
 																			</object>
 																		</object>
-																		<string key="NSFrame">{{17, 253}, {268, 134}}</string>
+																		<string key="NSFrame">{{17, 153}, {254, 234}}</string>
 																		<reference key="NSSuperview" ref="386290455"/>
 																		<string key="NSOffsets">{0, 0}</string>
 																		<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1221,7 +1221,7 @@
 																	<object class="NSButton" id="191574098">
 																		<reference key="NSNextResponder" ref="386290455"/>
 																		<int key="NSvFlags">289</int>
-																		<string key="NSFrame">{{352, 99}, {157, 32}}</string>
+																		<string key="NSFrame">{{66, 12}, {157, 32}}</string>
 																		<reference key="NSSuperview" ref="386290455"/>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSButtonCell" key="NSCell" id="513183495">
@@ -1251,7 +1251,7 @@
 																					<object class="NSButton" id="556933759">
 																						<reference key="NSNextResponder" ref="851437767"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 92}, {179, 18}}</string>
+																						<string key="NSFrame">{{16, 92}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="851437767"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="189629129">
@@ -1273,7 +1273,7 @@
 																					<object class="NSButton" id="83587898">
 																						<reference key="NSNextResponder" ref="851437767"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 72}, {179, 18}}</string>
+																						<string key="NSFrame">{{16, 72}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="851437767"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="649732615">
@@ -1295,7 +1295,7 @@
 																					<object class="NSButton" id="969573372">
 																						<reference key="NSNextResponder" ref="851437767"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 52}, {179, 18}}</string>
+																						<string key="NSFrame">{{16, 52}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="851437767"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="637072733">
@@ -1317,7 +1317,7 @@
 																					<object class="NSButton" id="905340786">
 																						<reference key="NSNextResponder" ref="851437767"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 32}, {179, 18}}</string>
+																						<string key="NSFrame">{{16, 32}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="851437767"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="1073285410">
@@ -1339,7 +1339,7 @@
 																					<object class="NSButton" id="757005232">
 																						<reference key="NSNextResponder" ref="851437767"/>
 																						<int key="NSvFlags">268</int>
-																						<string key="NSFrame">{{16, 12}, {179, 18}}</string>
+																						<string key="NSFrame">{{16, 12}, {259, 18}}</string>
 																						<reference key="NSSuperview" ref="851437767"/>
 																						<bool key="NSEnabled">YES</bool>
 																						<object class="NSButtonCell" key="NSCell" id="578316308">
@@ -1359,11 +1359,11 @@
 																						</object>
 																					</object>
 																				</object>
-																				<string key="NSFrame">{{1, 1}, {253, 118}}</string>
+																				<string key="NSFrame">{{1, 1}, {291, 118}}</string>
 																				<reference key="NSSuperview" ref="871205380"/>
 																			</object>
 																		</object>
-																		<string key="NSFrame">{{293, 253}, {255, 134}}</string>
+																		<string key="NSFrame">{{273, 253}, {293, 134}}</string>
 																		<reference key="NSSuperview" ref="386290455"/>
 																		<string key="NSOffsets">{0, 0}</string>
 																		<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1384,12 +1384,13 @@
 																		<bool key="NSTransparent">NO</bool>
 																	</object>
 																</object>
-																<string key="NSFrame">{{17, 11}, {557, 400}}</string>
+																<string key="NSFrame">{{8, 12}, {574, 399}}</string>
 																<reference key="NSSuperview" ref="202198269"/>
 																<string key="NSClassName">NSView</string>
 															</object>
 														</object>
 														<string key="NSFrame">{{10, 33}, {591, 414}}</string>
+														<reference key="NSSuperview" ref="716372522"/>
 													</object>
 													<string key="NSLabel">Global Privileges</string>
 													<reference key="NSColor" ref="409859189"/>
@@ -1850,7 +1851,7 @@
 												<object class="NSTabViewItem" id="285628164">
 													<string key="NSIdentifier">Resources</string>
 													<object class="NSView" key="NSView" id="169019919">
-														<reference key="NSNextResponder" ref="716372522"/>
+														<nil key="NSNextResponder"/>
 														<int key="NSvFlags">256</int>
 														<object class="NSMutableArray" key="NSSubviews">
 															<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1979,8 +1980,8 @@
 																							<bool key="NS.raise.underflow">YES</bool>
 																							<bool key="NS.raise.dividebyzero">YES</bool>
 																						</object>
-																						<string key="NS.decimal">.</string>
-																						<string key="NS.thousand">,</string>
+																						<string key="NS.decimal">,</string>
+																						<string key="NS.thousand">.</string>
 																						<bool key="NS.hasthousands">NO</bool>
 																						<bool key="NS.localized">YES</bool>
 																						<bool key="NS.allowsfloats">NO</bool>
@@ -2045,8 +2046,8 @@
 																							<bool key="NS.raise.underflow">YES</bool>
 																							<bool key="NS.raise.dividebyzero">YES</bool>
 																						</object>
-																						<string key="NS.decimal">.</string>
-																						<string key="NS.thousand">,</string>
+																						<string key="NS.decimal">,</string>
+																						<string key="NS.thousand">.</string>
 																						<bool key="NS.hasthousands">NO</bool>
 																						<bool key="NS.localized">YES</bool>
 																						<bool key="NS.allowsfloats">NO</bool>
@@ -2111,8 +2112,8 @@
 																							<bool key="NS.raise.underflow">YES</bool>
 																							<bool key="NS.raise.dividebyzero">YES</bool>
 																						</object>
-																						<string key="NS.decimal">.</string>
-																						<string key="NS.thousand">,</string>
+																						<string key="NS.decimal">,</string>
+																						<string key="NS.thousand">.</string>
 																						<bool key="NS.hasthousands">NO</bool>
 																						<bool key="NS.localized">YES</bool>
 																						<bool key="NS.allowsfloats">NO</bool>
@@ -2150,20 +2151,19 @@
 															</object>
 														</object>
 														<string key="NSFrame">{{10, 33}, {591, 414}}</string>
-														<reference key="NSSuperview" ref="716372522"/>
 													</object>
 													<string key="NSLabel">Resources</string>
 													<reference key="NSColor" ref="409859189"/>
 													<reference key="NSTabView" ref="716372522"/>
 												</object>
 											</object>
-											<reference key="NSSelectedTabViewItem" ref="285628164"/>
+											<reference key="NSSelectedTabViewItem" ref="1024639412"/>
 											<reference key="NSFont" ref="746597359"/>
 											<int key="NSTvFlags">0</int>
 											<bool key="NSDrawsBackground">YES</bool>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<reference ref="169019919"/>
+												<reference ref="202198269"/>
 											</object>
 										</object>
 										<object class="NSButton" id="445730006">
@@ -2439,6 +2439,7 @@
 				<string key="NSWindowTitle">Errors Sheet</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="340939829">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -4737,29 +4738,15 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 						<reference key="object" ref="386290455"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="191574098"/>
-							<reference ref="610554589"/>
 							<reference ref="1050276179"/>
-							<reference ref="517432726"/>
 							<reference ref="871205380"/>
+							<reference ref="517432726"/>
 							<reference ref="223367051"/>
+							<reference ref="610554589"/>
+							<reference ref="191574098"/>
 						</object>
 						<reference key="parent" ref="202198269"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">511</int>
-						<reference key="object" ref="191574098"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="513183495"/>
-						</object>
-						<reference key="parent" ref="386290455"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">512</int>
-						<reference key="object" ref="513183495"/>
-						<reference key="parent" ref="191574098"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">509</int>
 						<reference key="object" ref="610554589"/>
@@ -4867,11 +4854,11 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 							<reference ref="44622938"/>
 							<reference ref="221237545"/>
 							<reference ref="173464062"/>
-							<reference ref="905629414"/>
 							<reference ref="384517358"/>
 							<reference ref="577327681"/>
 							<reference ref="658073531"/>
 							<reference ref="458971250"/>
+							<reference ref="905629414"/>
 						</object>
 						<reference key="parent" ref="386290455"/>
 					</object>
@@ -5705,6 +5692,20 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 						<reference key="object" ref="521888647"/>
 						<reference key="parent" ref="942389557"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">511</int>
+						<reference key="object" ref="191574098"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="513183495"/>
+						</object>
+						<reference key="parent" ref="386290455"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">512</int>
+						<reference key="object" ref="513183495"/>
+						<reference key="parent" ref="191574098"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -5751,9 +5752,13 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					<string>43.IBPluginDependency</string>
 					<string>44.IBPluginDependency</string>
 					<string>451.IBPluginDependency</string>
+					<string>451.IBViewBoundsToFrameTransform</string>
 					<string>452.IBPluginDependency</string>
+					<string>452.IBViewBoundsToFrameTransform</string>
 					<string>453.IBPluginDependency</string>
+					<string>453.IBViewBoundsToFrameTransform</string>
 					<string>454.IBPluginDependency</string>
+					<string>454.IBViewBoundsToFrameTransform</string>
 					<string>455.IBPluginDependency</string>
 					<string>456.IBPluginDependency</string>
 					<string>457.IBPluginDependency</string>
@@ -5765,12 +5770,16 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					<string>463.IBPluginDependency</string>
 					<string>464.IBPluginDependency</string>
 					<string>465.IBPluginDependency</string>
+					<string>465.IBViewBoundsToFrameTransform</string>
 					<string>466.IBPluginDependency</string>
 					<string>467.IBPluginDependency</string>
+					<string>467.IBViewBoundsToFrameTransform</string>
 					<string>468.IBPluginDependency</string>
 					<string>469.IBPluginDependency</string>
+					<string>469.IBViewBoundsToFrameTransform</string>
 					<string>470.IBPluginDependency</string>
 					<string>471.IBPluginDependency</string>
+					<string>471.IBViewBoundsToFrameTransform</string>
 					<string>472.IBPluginDependency</string>
 					<string>473.IBPluginDependency</string>
 					<string>474.IBPluginDependency</string>
@@ -5808,8 +5817,10 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					<string>505.IBPluginDependency</string>
 					<string>506.IBPluginDependency</string>
 					<string>509.IBPluginDependency</string>
+					<string>509.IBViewBoundsToFrameTransform</string>
 					<string>510.IBPluginDependency</string>
 					<string>511.IBPluginDependency</string>
+					<string>511.IBViewBoundsToFrameTransform</string>
 					<string>512.IBPluginDependency</string>
 					<string>579.IBPluginDependency</string>
 					<string>580.IBAttributePlaceholdersKey</string>
@@ -5829,6 +5840,7 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					<string>593.IBPluginDependency</string>
 					<string>648.IBPluginDependency</string>
 					<string>719.IBPluginDependency</string>
+					<string>719.IBViewBoundsToFrameTransform</string>
 					<string>720.IBPluginDependency</string>
 					<string>725.IBPluginDependency</string>
 					<string>726.IBPluginDependency</string>
@@ -5924,9 +5936,9 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{187, 326}, {815, 506}}</string>
+					<string>{{504, 410}, {815, 506}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{187, 326}, {815, 506}}</string>
+					<string>{{504, 410}, {815, 506}}</string>
 					<boolean value="NO"/>
 					<boolean value="YES"/>
 					<string>{752, 506}</string>
@@ -5951,9 +5963,21 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AUGIAABDEQAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AUOIgABDdQAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AUOIgABBEAAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AUGIAABChgAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5965,12 +5989,24 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBgAAAwtgAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDFQAAw28AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDFQAAw1sAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDFQAAw0cAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6008,8 +6044,14 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwlQAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCpAAAwigAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<object class="NSMutableDictionary">
@@ -6043,6 +6085,9 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDFQAAwzMAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6180,6 +6225,13 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarControl.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-- 
cgit v1.2.3