diff --git a/Classes/Controllers/GrowlController.m b/Classes/Controllers/GrowlController.m
index 96cd6d0157..d9ce99d72f 100755
--- a/Classes/Controllers/GrowlController.m
+++ b/Classes/Controllers/GrowlController.m
@@ -136,6 +136,7 @@ - (void)notify:(NotificationType)type title:(NSString *)title desc:(NSString *)d
 - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification
 {
 	[_NSUserNotificationCenter() removeDeliveredNotification:notification];
+	
 	[self growlNotificationWasClicked:[notification userInfo]];
 }
 
diff --git a/Classes/Views/Log/LogController.m b/Classes/Views/Log/LogController.m
index 9c0ceb8ae2..06cfbee93a 100755
--- a/Classes/Views/Log/LogController.m
+++ b/Classes/Views/Log/LogController.m
@@ -507,7 +507,8 @@ - (BOOL)highlightAvailable:(BOOL)previous
 	 depending on the direction being traveled. */
 }
 
-- (void)jumpToLine:(NSInteger)line {
+- (void)jumpToLine:(NSInteger)line 
+{
 	NSString *lid = [NSString stringWithFormat:@"line%i", line];
 	
 	if (loaded == NO) return;
diff --git a/English.lproj/HighlightSheet.xib b/English.lproj/HighlightSheet.xib
index 1a6aed8af4..d1353d02af 100755
--- a/English.lproj/HighlightSheet.xib
+++ b/English.lproj/HighlightSheet.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">11C35</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
-		<string key="IBDocument.AppKitVersion">1138.15</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<string key="IBDocument.SystemVersion">12A128p</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2427</string>
+		<string key="IBDocument.AppKitVersion">1157.7</string>
+		<string key="IBDocument.HIToolboxVersion">599.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1617</string>
+			<string key="NS.object.0">2427</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -16,8 +16,8 @@
 			<string>NSTableHeaderView</string>
 			<string>NSButton</string>
 			<string>NSScrollView</string>
-			<string>NSTextFieldCell</string>
 			<string>NSButtonCell</string>
+			<string>NSTextFieldCell</string>
 			<string>NSTableView</string>
 			<string>NSCustomObject</string>
 			<string>NSView</string>
@@ -30,11 +30,8 @@
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<reference key="dict.values" ref="0"/>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="285530636">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -103,7 +100,7 @@
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags">75545152</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Channel Name</string>
 														<object class="NSFont" key="NSSupport" id="26">
@@ -126,7 +123,7 @@
 														</object>
 													</object>
 													<object class="NSTextFieldCell" key="NSDataCell" id="206253680">
-														<int key="NSCellFlags">67239488</int>
+														<int key="NSCellFlags">67156544</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Text Cell</string>
 														<object class="NSFont" key="NSSupport" id="876066128">
@@ -161,7 +158,7 @@
 													<double key="NSMinWidth">10</double>
 													<double key="NSMaxWidth">3.4028234663852886e+38</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags">75545152</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Message</string>
 														<reference key="NSSupport" ref="26"/>
@@ -177,7 +174,7 @@
 														<reference key="NSTextColor" ref="718667740"/>
 													</object>
 													<object class="NSTextFieldCell" key="NSDataCell" id="433947301">
-														<int key="NSCellFlags">67239488</int>
+														<int key="NSCellFlags">67156544</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Text Cell</string>
 														<reference key="NSSupport" ref="876066128"/>
@@ -196,7 +193,7 @@
 													<double key="NSMinWidth">10</double>
 													<double key="NSMaxWidth">3.4028234663852886e+38</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags">75545152</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Time</string>
 														<reference key="NSSupport" ref="26"/>
@@ -204,7 +201,7 @@
 														<reference key="NSTextColor" ref="718667740"/>
 													</object>
 													<object class="NSTextFieldCell" key="NSDataCell" id="481132882">
-														<int key="NSCellFlags">67239488</int>
+														<int key="NSCellFlags">67156544</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Text Cell</string>
 														<reference key="NSSupport" ref="876066128"/>
@@ -311,6 +308,9 @@
 							<reference key="NSContentView" ref="86922448"/>
 							<reference key="NSHeaderClipView" ref="586223888"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+							<double key="NSMinMagnification">0.25</double>
+							<double key="NSMaxMagnification">4</double>
+							<double key="NMagnification">1</double>
 						</object>
 						<object class="NSButton" id="887075163">
 							<reference key="NSNextResponder" ref="459955935"/>
@@ -321,12 +321,12 @@
 							<reference key="NSNextKeyView" ref="918197425"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="984249461">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">134217728</int>
 								<string key="NSContents">Clear List</string>
 								<reference key="NSSupport" ref="876066128"/>
 								<reference key="NSControlView" ref="887075163"/>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">129</int>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent"/>
@@ -343,12 +343,12 @@
 							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="685205676">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">134217728</int>
 								<string key="NSContents">Close</string>
 								<reference key="NSSupport" ref="876066128"/>
 								<reference key="NSControlView" ref="918197425"/>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">129</int>
 								<string key="NSAlternateContents"/>
 								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
@@ -365,7 +365,7 @@
 							<reference key="NSNextKeyView" ref="463809352"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="360239044">
-								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags">68205120</int>
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents">Highlight List for "%@"</string>
 								<object class="NSFont" key="NSSupport">
@@ -385,7 +385,7 @@
 						</object>
 						<object class="NSTextField" id="957867410">
 							<reference key="NSNextResponder" ref="459955935"/>
-							<int key="NSvFlags">268</int>
+							<int key="NSvFlags">294</int>
 							<string key="NSFrame">{{17, 15}, {357, 17}}</string>
 							<reference key="NSSuperview" ref="459955935"/>
 							<reference key="NSWindow"/>
@@ -393,7 +393,7 @@
 							<string key="NSReuseIdentifierKey">_NS:3937</string>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="332476491">
-								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags">68205120</int>
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents">Messages starting with a bullet (•) respresent an action.</string>
 								<reference key="NSSupport" ref="876066128"/>
@@ -496,7 +496,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="285530636"/>
 						<nil key="parent"/>
 					</object>
@@ -711,7 +713,7 @@
 					<string>278.IBPluginDependency</string>
 					<string>281.IBPluginDependency</string>
 				</object>
-				<object class="NSMutableArray" key="dict.values">
+				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -770,7 +772,7 @@
 							<string>header</string>
 							<string>table</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSTextField</string>
 							<string>ListView</string>
@@ -783,7 +785,7 @@
 							<string>header</string>
 							<string>table</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
 								<string key="name">header</string>
@@ -800,14 +802,6 @@
 						<string key="minorKey">./Classes/HighlightSheet.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HighlightSheetCell</string>
-					<string key="superclassName">NSTextFieldCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HighlightSheetCell.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">ListView</string>
 					<string key="superclassName">NSTableView</string>
@@ -827,7 +821,7 @@
 							<string>okButton</string>
 							<string>sheet</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSButton</string>
 							<string>NSButton</string>
@@ -842,7 +836,7 @@
 							<string>okButton</string>
 							<string>sheet</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
 								<string key="name">cancelButton</string>
@@ -871,10 +865,6 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<integer value="1050" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1060" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
diff --git a/Resources/Miscellaneous/Info.plist b/Resources/Miscellaneous/Info.plist
index c7803c6c91..9cb9b80d8c 100755
--- a/Resources/Miscellaneous/Info.plist
+++ b/Resources/Miscellaneous/Info.plist
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>Build Number</key>
-	<string>9615</string>
+	<string>9616</string>
 	<key>Build Reference</key>
-	<string>2.1-224-g7c7c964-unstable</string>
+	<string>2.1-227-g6ee6db2-unstable</string>
 	<key>CFBundleExecutable</key>
 	<string>Textual</string>
 	<key>CFBundleIconFile</key>