New shortcuts:

- Shift+Cmd+A to add the current connection to your favourites if it doesn't already exist
- Shift+Cmd+I to invoke importing
- Shift+Cmd+S to display the create table syntax panel

2 files changed, 163 insertions, 277 deletions

diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 750018c4..9b75a6fe 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -8,6 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="908"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -239,6 +240,15 @@
 									<reference key="NSOnImage" ref="625762401"/>
 									<reference key="NSMixedImage" ref="315854375"/>
 								</object>
+								<object class="NSMenuItem" id="320151386">
+									<reference key="NSMenu" ref="709725194"/>
+									<string key="NSTitle">Add To Favorites</string>
+									<string key="NSKeyEquiv">A</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="625762401"/>
+									<reference key="NSMixedImage" ref="315854375"/>
+								</object>
 								<object class="NSMenuItem" id="849728981">
 									<reference key="NSMenu" ref="709725194"/>
 									<string key="NSTitle">Open</string>
@@ -258,14 +268,6 @@
 									<reference key="NSOnImage" ref="625762401"/>
 									<reference key="NSMixedImage" ref="315854375"/>
 								</object>
-								<object class="NSMenuItem" id="320151386">
-									<reference key="NSMenu" ref="709725194"/>
-									<string key="NSTitle">Add To Favorites</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="625762401"/>
-									<reference key="NSMixedImage" ref="315854375"/>
-								</object>
 								<object class="NSMenuItem" id="3878246">
 									<reference key="NSMenu" ref="709725194"/>
 									<bool key="NSIsDisabled">YES</bool>
@@ -300,7 +302,7 @@
 								<object class="NSMenuItem" id="867960923">
 									<reference key="NSMenu" ref="709725194"/>
 									<string type="base64-UTF8" key="NSTitle">SW1wb3J04oCmA</string>
-									<string key="NSKeyEquiv"/>
+									<string key="NSKeyEquiv">I</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="625762401"/>
@@ -309,9 +311,9 @@
 								<object class="NSMenuItem" id="934534577">
 									<reference key="NSMenu" ref="709725194"/>
 									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsHidden">YES</bool>
 									<string type="base64-UTF8" key="NSTitle">RXhwb3J04oCmA</string>
-									<string key="NSKeyEquiv"/>
+									<string key="NSKeyEquiv">e</string>
+									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="625762401"/>
 									<reference key="NSMixedImage" ref="315854375"/>
@@ -1428,7 +1430,6 @@
 									<reference key="NSMenu" ref="172963563"/>
 									<string key="NSTitle">Flush Privileges</string>
 									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="625762401"/>
 									<reference key="NSMixedImage" ref="315854375"/>
@@ -1473,7 +1474,8 @@
 								<object class="NSMenuItem" id="638185532">
 									<reference key="NSMenu" ref="1056168652"/>
 									<string key="NSTitle">Show Create Table Syntax</string>
-									<string key="NSKeyEquiv"/>
+									<string key="NSKeyEquiv">S</string>
+									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="625762401"/>
 									<reference key="NSMixedImage" ref="315854375"/>
@@ -2740,9 +2742,9 @@
 							<reference ref="390057667"/>
 							<reference ref="3878246"/>
 							<reference ref="934534577"/>
-							<reference ref="320151386"/>
 							<reference ref="849728981"/>
 							<reference ref="256715652"/>
+							<reference ref="320151386"/>
 						</object>
 						<reference key="parent" ref="86447006"/>
 					</object>
@@ -4093,7 +4095,7 @@
 					<integer value="1" id="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{614, 626}, {181, 93}}</string>
+					<string>{{836, 500}, {181, 93}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{561, 605}, {181, 43}}</string>
@@ -4144,7 +4146,7 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{312, 436}, {283, 283}}</string>
+					<string>{{534, 310}, {283, 283}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{654, 613}, {157, 223}}</string>
@@ -4173,11 +4175,11 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{928, 484}, {197, 73}}</string>
+					<string>{{765, 520}, {197, 73}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{449, 1007}, {197, 53}}</string>
-					<string>{{311, 851}, {511, 20}}</string>
+					<string>{{710, 675}, {511, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{506, 836}, {511, 20}}</string>
@@ -4187,7 +4189,7 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{390, 483}, {213, 133}}</string>
+					<string>{{701, 300}, {213, 133}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{399, 465}, {213, 93}}</string>
@@ -4197,17 +4199,17 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{603, 634}, {136, 43}}</string>
+					<string>{{914, 340}, {136, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{768, 231}, {136, 43}}</string>
+					<string>{{914, 300}, {136, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{603, 574}, {136, 43}}</string>
+					<string>{{914, 280}, {136, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4230,7 +4232,7 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{267, 624}, {235, 203}}</string>
+					<string>{{578, 390}, {235, 203}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{698, 703}, {184, 133}}</string>
@@ -4248,7 +4250,7 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{176, 466}, {218, 253}}</string>
+					<string>{{398, 340}, {218, 253}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{518, 583}, {218, 253}}</string>
@@ -4256,7 +4258,7 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{406, 566}, {254, 153}}</string>
+					<string>{{628, 440}, {254, 153}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{312, 683}, {231, 153}}</string>
@@ -4325,7 +4327,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{651, 517}, {268, 213}}</string>
+					<string>{{709, 410}, {268, 183}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{829, 663}, {268, 173}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4354,7 +4356,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{417, 618}, {209, 233}}</string>
+					<string>{{816, 442}, {209, 233}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{180, 535}, {182, 253}}</string>
@@ -4362,7 +4364,7 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{768, 251}, {136, 43}}</string>
+					<string>{{914, 320}, {136, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4388,7 +4390,7 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{580, 506}, {221, 83}}</string>
+					<string>{{817, 360}, {221, 83}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
@@ -4495,7 +4497,7 @@ w6gg4oaSIGZhY2FkZV0</string>
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
 					<string key="className">CMCopyTable</string>
-					<string key="superclassName">NSTableView</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>
@@ -4600,6 +4602,7 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>donate:</string>
 							<string>openPreferences:</string>
+							<string>visitFAQWebsite:</string>
 							<string>visitHelpWebsite:</string>
 							<string>visitWebsite:</string>
 						</object>
@@ -4609,6 +4612,7 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -4636,14 +4640,39 @@ w6gg4oaSIGZhY2FkZV0</string>
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Frameworks/MCPKit/MCPFoundationKit/MCPConnection.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/MCPKit/MCPFoundationKit/MCPNull.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">Source/CMImageView.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="296977353">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Source/SPConnectionController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">toggleCollapse:</string>
+						<string key="NS.object.0">id</string>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Source/CMMCPConnection.h</string>
+						<string key="minorKey">Source/TablesList.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -4661,6 +4690,7 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<string>doSelectionTitleCase:</string>
 							<string>doSelectionUpperCase:</string>
 							<string>doTranspose:</string>
+							<string>insertNULLvalue:</string>
 							<string>selectCurrentLine:</string>
 							<string>selectCurrentWord:</string>
 							<string>selectEnclosingBrackets:</string>
@@ -4679,6 +4709,7 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -4694,6 +4725,79 @@ w6gg4oaSIGZhY2FkZV0</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">SPConnectionController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addFavorite:</string>
+							<string>editFavorites:</string>
+							<string>initiateConnection:</string>
+							<string>showHelp:</string>
+							<string>updateFavoriteSelection:</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>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addToFavoritesButton</string>
+							<string>connectButton</string>
+							<string>connectionResizeContainer</string>
+							<string>connectionSplitView</string>
+							<string>connectionSplitViewButtonBar</string>
+							<string>connectionView</string>
+							<string>errorDetailText</string>
+							<string>errorDetailWindow</string>
+							<string>favoritesTable</string>
+							<string>progressIndicator</string>
+							<string>progressIndicatorText</string>
+							<string>socketConnectionFormContainer</string>
+							<string>socketPasswordField</string>
+							<string>sshConnectionFormContainer</string>
+							<string>sshPasswordField</string>
+							<string>sshSQLHostField</string>
+							<string>sshSSHPasswordField</string>
+							<string>standardConnectionFormContainer</string>
+							<string>standardPasswordField</string>
+							<string>standardSQLHostField</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSView</string>
+							<string>NSSplitView</string>
+							<string>BWAnchoredButtonBar</string>
+							<string>NSView</string>
+							<string>NSTextView</string>
+							<string>NSWindow</string>
+							<string>NSTableView</string>
+							<string>NSProgressIndicator</string>
+							<string>NSTextField</string>
+							<string>NSView</string>
+							<string>NSSecureTextField</string>
+							<string>NSView</string>
+							<string>NSSecureTextField</string>
+							<string>NSTextField</string>
+							<string>NSSecureTextField</string>
+							<string>NSView</string>
+							<string>NSSecureTextField</string>
+							<string>NSTextField</string>
+						</object>
+					</object>
+					<reference key="sourceIdentifier" ref="296977353"/>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">SPQueryConsole</string>
 					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="actions">
@@ -4754,6 +4858,14 @@ w6gg4oaSIGZhY2FkZV0</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">SPTableView</string>
+					<string key="superclassName">NSTableView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Source/SPTableView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">TableDocument</string>
 					<string key="superclassName">NSDocument</string>
 					<object class="NSMutableDictionary" key="actions">
@@ -4763,35 +4875,30 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<string>addConnectionToFavorites:</string>
 							<string>addDatabase:</string>
 							<string>analyzeTable:</string>
-							<string>cancelConnectSheet:</string>
 							<string>checkTable:</string>
 							<string>checksumTable:</string>
 							<string>chooseDatabase:</string>
 							<string>chooseEncoding:</string>
-							<string>chooseFavorite:</string>
 							<string>closeDatabaseSheet:</string>
+							<string>closeErrorConnectionSheet:</string>
 							<string>closeSheet:</string>
-							<string>connectSheetAddToFavorites:</string>
-							<string>connectSheetShowHelp:</string>
-							<string>connectToDB:</string>
 							<string>copyCreateTableSyntax:</string>
-							<string>editFavorites:</string>
 							<string>export:</string>
 							<string>exportMultipleTables:</string>
 							<string>exportTable:</string>
 							<string>flushPrivileges:</string>
 							<string>flushTable:</string>
 							<string>import:</string>
-							<string>initiateConnection:</string>
+							<string>openConnectionSheet:</string>
 							<string>optimizeTable:</string>
 							<string>removeDatabase:</string>
 							<string>repairTable:</string>
+							<string>saveConnectionSheet:</string>
 							<string>saveServerVariables:</string>
 							<string>setDatabases:</string>
 							<string>showCreateTableSyntax:</string>
 							<string>showMySQLHelp:</string>
 							<string>showVariables:</string>
-							<string>toggleUseSSH:</string>
 							<string>viewContent:</string>
 							<string>viewQuery:</string>
 							<string>viewRelations:</string>
@@ -4832,11 +4939,6 @@ w6gg4oaSIGZhY2FkZV0</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="outlets">
@@ -4845,42 +4947,33 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addDatabaseButton</string>
 							<string>chooseDatabaseButton</string>
-							<string>connectFavoritesTableView</string>
-							<string>connectProgressBar</string>
-							<string>connectProgressStatusText</string>
-							<string>connectSheet</string>
+							<string>connectionErrorDialog</string>
 							<string>contentViewSplitter</string>
 							<string>createTableSyntaxWindow</string>
 							<string>customQueryInstance</string>
 							<string>customQueryTextView</string>
 							<string>databaseDataInstance</string>
 							<string>databaseEncodingButton</string>
-							<string>databaseField</string>
 							<string>databaseNameField</string>
 							<string>databaseSheet</string>
 							<string>dbTablesTableView</string>
+							<string>encodingAccessoryView</string>
+							<string>encodingPopUp</string>
 							<string>extendedTableInfoInstance</string>
 							<string>favoritesButton</string>
-							<string>favoritesController</string>
-							<string>hostField</string>
-							<string>keyChainInstance</string>
-							<string>nameField</string>
-							<string>passwordField</string>
-							<string>portField</string>
+							<string>historyControl</string>
+							<string>listFilterField</string>
 							<string>queryProgressBar</string>
+							<string>saveVariablesButton</string>
 							<string>sidebarGrabber</string>
-							<string>socketField</string>
 							<string>spExportControllerInstance</string>
-							<string>sshCheckbox</string>
-							<string>sshHostField</string>
-							<string>sshPasswordField</string>
-							<string>sshPortField</string>
-							<string>sshUserField</string>
+							<string>spHistoryControllerInstance</string>
 							<string>syntaxView</string>
 							<string>syntaxViewContent</string>
 							<string>tableContentInstance</string>
 							<string>tableDataInstance</string>
 							<string>tableDumpInstance</string>
+							<string>tableInfoCollapseButton</string>
 							<string>tableInfoTable</string>
 							<string>tableListSplitter</string>
 							<string>tableRelationsInstance</string>
@@ -4890,7 +4983,8 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<string>tablesListInstance</string>
 							<string>titleAccessoryView</string>
 							<string>titleImageView</string>
-							<string>userField</string>
+							<string>titleStringView</string>
+							<string>variablesSearchField</string>
 							<string>variablesSheet</string>
 							<string>variablesTableView</string>
 						</object>
@@ -4898,10 +4992,7 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
-							<string>NSTableView</string>
-							<string>NSProgressIndicator</string>
-							<string>NSTextField</string>
-							<string>id</string>
+							<string>NSWindow</string>
 							<string>NSSplitView</string>
 							<string>NSWindow</string>
 							<string>id</string>
@@ -4910,22 +5001,15 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 							<string>NSTableView</string>
 							<string>id</string>
-							<string>id</string>
-							<string>NSArrayController</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>NSSearchField</string>
 							<string>id</string>
+							<string>NSButton</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
@@ -4934,6 +5018,7 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>NSButton</string>
 							<string>NSTableView</string>
 							<string>NSSplitView</string>
 							<string>id</string>
@@ -4944,6 +5029,7 @@ w6gg4oaSIGZhY2FkZV0</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>NSSearchField</string>
 							<string>id</string>
 							<string>id</string>
 						</object>
@@ -4957,33 +5043,6 @@ w6gg4oaSIGZhY2FkZV0</string>
 			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
-					<string key="className">MainController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>donate:</string>
-							<string>openPreferences:</string>
-							<string>visitFAQWebsite:</string>
-							<string>visitHelpWebsite:</string>
-							<string>visitWebsite:</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>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBDocumentRelativeSource</string>
-						<string key="minorKey">../../Source/MainController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="939419192">
 						<string key="majorKey">IBDocumentRelativeSource</string>
@@ -5003,176 +5062,6 @@ w6gg4oaSIGZhY2FkZV0</string>
 					</object>
 					<reference key="sourceIdentifier" ref="939419192"/>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TableDocument</string>
-					<string key="superclassName">NSDocument</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addConnectionToFavorites:</string>
-							<string>addDatabase:</string>
-							<string>analyzeTable:</string>
-							<string>checkTable:</string>
-							<string>checksumTable:</string>
-							<string>chooseDatabase:</string>
-							<string>chooseEncoding:</string>
-							<string>closeDatabaseSheet:</string>
-							<string>closeErrorConnectionSheet:</string>
-							<string>closeSheet:</string>
-							<string>copyCreateTableSyntax:</string>
-							<string>export:</string>
-							<string>exportMultipleTables:</string>
-							<string>exportTable:</string>
-							<string>flushPrivileges:</string>
-							<string>flushTable:</string>
-							<string>import:</string>
-							<string>openConnectionSheet:</string>
-							<string>optimizeTable:</string>
-							<string>removeDatabase:</string>
-							<string>repairTable:</string>
-							<string>saveConnectionSheet:</string>
-							<string>saveServerVariables:</string>
-							<string>setDatabases:</string>
-							<string>showCreateTableSyntax:</string>
-							<string>showMySQLHelp:</string>
-							<string>showVariables:</string>
-							<string>viewContent:</string>
-							<string>viewQuery:</string>
-							<string>viewRelations:</string>
-							<string>viewStatus:</string>
-							<string>viewStructure:</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>
-							<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="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addDatabaseButton</string>
-							<string>chooseDatabaseButton</string>
-							<string>connectionErrorDialog</string>
-							<string>contentViewSplitter</string>
-							<string>createTableSyntaxWindow</string>
-							<string>customQueryInstance</string>
-							<string>customQueryTextView</string>
-							<string>databaseDataInstance</string>
-							<string>databaseEncodingButton</string>
-							<string>databaseNameField</string>
-							<string>databaseSheet</string>
-							<string>dbTablesTableView</string>
-							<string>extendedTableInfoInstance</string>
-							<string>favoritesButton</string>
-							<string>historyControl</string>
-							<string>listFilterField</string>
-							<string>queryProgressBar</string>
-							<string>saveVariablesButton</string>
-							<string>sidebarGrabber</string>
-							<string>spExportControllerInstance</string>
-							<string>spHistoryControllerInstance</string>
-							<string>syntaxView</string>
-							<string>syntaxViewContent</string>
-							<string>tableContentInstance</string>
-							<string>tableDataInstance</string>
-							<string>tableDumpInstance</string>
-							<string>tableInfoCollapseButton</string>
-							<string>tableInfoTable</string>
-							<string>tableListSplitter</string>
-							<string>tableRelationsInstance</string>
-							<string>tableSourceInstance</string>
-							<string>tableTabView</string>
-							<string>tableWindow</string>
-							<string>tablesListInstance</string>
-							<string>titleAccessoryView</string>
-							<string>titleImageView</string>
-							<string>titleStringView</string>
-							<string>variablesSearchField</string>
-							<string>variablesSheet</string>
-							<string>variablesTableView</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>NSWindow</string>
-							<string>NSSplitView</string>
-							<string>NSWindow</string>
-							<string>id</string>
-							<string>NSTextView</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSTableView</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSSearchField</string>
-							<string>id</string>
-							<string>NSButton</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>NSButton</string>
-							<string>NSTableView</string>
-							<string>NSSplitView</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSTabView</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSSearchField</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBDocumentRelativeSource</string>
-						<string key="minorKey">../../Source/TableDocument.h</string>
-					</object>
-				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
diff --git a/Source/SPPrintAccessory.m b/Source/SPPrintAccessory.m
index 0ec18b26..4237acbf 100644
--- a/Source/SPPrintAccessory.m
+++ b/Source/SPPrintAccessory.m
@@ -47,10 +47,7 @@
 
 - (NSSet *)keyPathsForValuesAffectingPreview
 {
-	return [NSSet setWithObjects:
-			@"defaultsController.values.PrintBackground",
-//			@"defaultsController.values.PrintGrid",
-			nil];
+	return [NSSet setWithObjects:@"defaultsController.values.PrintBackground", nil];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context