diff --git a/Classes/Dialogs/ServerDialog.h b/Classes/Dialogs/ServerDialog.h
index c97af28a..38abe708 100644
--- a/Classes/Dialogs/ServerDialog.h
+++ b/Classes/Dialogs/ServerDialog.h
@@ -31,6 +31,7 @@
 @property (nonatomic) IBOutlet NSTextField* nickPasswordText;
 @property (nonatomic) IBOutlet NSButton* saslCheck;
 @property (nonatomic) IBOutlet NSTextField* altNicksText;
+@property (nonatomic) IBOutlet NSTextField* timeoutText;
 
 @property (nonatomic) IBOutlet NSTextField* leavingCommentText;
 @property (nonatomic) IBOutlet NSTextField* userInfoText;
diff --git a/Classes/Dialogs/ServerDialog.m b/Classes/Dialogs/ServerDialog.m
index 13e30568..558497c8 100644
--- a/Classes/Dialogs/ServerDialog.m
+++ b/Classes/Dialogs/ServerDialog.m
@@ -92,7 +92,9 @@ - (void)load
     _usernameText.stringValue = _config.username;
     _realNameText.stringValue = _config.realName;
     _nickPasswordText.stringValue = _config.nickPassword;
+    _timeoutText.intValue = _config.timeout;
     _saslCheck.state = _config.useSASL;
+
     if (_config.altNicks.count) {
         _altNicksText.stringValue = [_config.altNicks componentsJoinedByString:@" "];
     }
@@ -130,6 +132,7 @@ - (void)save
     _config.username = _usernameText.stringValue;
     _config.realName = _realNameText.stringValue;
     _config.nickPassword = _nickPasswordText.stringValue;
+    _config.timeout = _timeoutText.intValue;
     _config.useSASL = _saslCheck.state;
 
     NSArray* nicks = [_altNicksText.stringValue componentsSeparatedByString:@" "];
@@ -170,6 +173,7 @@ - (void)updateConnectionPage
     int port = [_portText intValue];
     NSString* nick = [_nickText stringValue];
     NSString* nickPassword = [_nickPasswordText stringValue];
+    int timeout = [_timeoutText intValue];
 
     BOOL enabled = name.length && host.length && ![host isEqualToString:@"-"] && port > 0 && nick.length;
     [_okButton setEnabled:enabled];
diff --git a/Classes/IRC/IRCClient.m b/Classes/IRC/IRCClient.m
index 92d7aedc..364e7d33 100644
--- a/Classes/IRC/IRCClient.m
+++ b/Classes/IRC/IRCClient.m
@@ -22,7 +22,6 @@
 #define QUIT_INTERVAL       5
 #define RECONNECT_INTERVAL  20
 #define RETRY_INTERVAL      240
-#define NICKSERV_INTERVAL   5
 
 #define CTCP_MIN_INTERVAL   5
 
@@ -428,7 +427,7 @@ - (void)onRetryTimer:(id)sender
 - (void)startAutoJoinTimer
 {
     [_autoJoinTimer stop];
-    [_autoJoinTimer start:NICKSERV_INTERVAL];
+    [_autoJoinTimer start:_config.timeout];
 }
 
 - (void)stopAutoJoinTimer
diff --git a/Classes/IRC/IRCClientConfig.h b/Classes/IRC/IRCClientConfig.h
index 90197e17..1ac50aa1 100644
--- a/Classes/IRC/IRCClientConfig.h
+++ b/Classes/IRC/IRCClientConfig.h
@@ -25,6 +25,7 @@ typedef enum {
 @property (nonatomic) NSString* username;
 @property (nonatomic) NSString* realName;
 @property (nonatomic) NSString* nickPassword;
+@property (nonatomic) int timeout;
 @property (nonatomic) BOOL useSASL;
 @property (nonatomic, readonly) NSMutableArray* altNicks;
 
diff --git a/Classes/IRC/IRCClientConfig.m b/Classes/IRC/IRCClientConfig.m
index b4cbec0a..8cea3765 100644
--- a/Classes/IRC/IRCClientConfig.m
+++ b/Classes/IRC/IRCClientConfig.m
@@ -35,6 +35,7 @@ - (id)init
         _username = @"";
         _realName = @"";
         _nickPassword = @"";
+        _timeout = 15;
 
         _proxyHost = @"";
         _proxyPort = 1080;
@@ -70,6 +71,7 @@ - (id)initWithDictionary:(NSDictionary*)dic
         _username = [dic stringForKey:@"username"] ?: @"";
         _realName = [dic stringForKey:@"realname"] ?: @"";
         _nickPassword = [dic stringForKey:@"nickPassword"] ?: [Keychain genericPasswordWithAccountName:[self nickPassword] serviceName:[self keychainServiceName]] ?: @"";
+        _timeout = [dic intForKey:@"timeout"] ?: 15;
         _useSASL = [dic boolForKey:@"useSASL"];
         [_altNicks addObjectsFromArray:[dic arrayForKey:@"alt_nicks"]];
 
@@ -132,6 +134,7 @@ - (NSMutableDictionary*)dictionaryValue
     } else if (_nickPassword) {
         [dic setObject:_nickPassword forKey:@"nickPassword"];
     }
+    [dic setInt:_timeout forKey:@"timeout"];
     [dic setBool:_useSASL forKey:@"useSASL"];
     if (_altNicks) [dic setObject:_altNicks forKey:@"alt_nicks"];
 
diff --git a/English.lproj/ServerDialog.xib b/English.lproj/ServerDialog.xib
index 25b791f1..209ab556 100644
--- a/English.lproj/ServerDialog.xib
+++ b/English.lproj/ServerDialog.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1070" defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="ServerDialog">
@@ -38,6 +38,7 @@
                 <outlet property="saslCheck" destination="1063" id="1068"/>
                 <outlet property="sslCheck" destination="689" id="691"/>
                 <outlet property="tab" destination="7" id="1058"/>
+                <outlet property="timeoutText" destination="uxp-sq-E3C" id="Yx5-1T-97A"/>
                 <outlet property="userInfoText" destination="49" id="1005"/>
                 <outlet property="usernameText" destination="34" id="86"/>
                 <outlet property="window" destination="5" id="59"/>
@@ -45,28 +46,28 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application"/>
-        <window title="Server Properties" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window" customClass="DialogWindow">
+        <window title="Server Properties" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window" customClass="DialogWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="625" y="619" width="409" height="512"/>
+            <rect key="contentRect" x="625" y="619" width="409" height="538"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <value key="minSize" type="size" width="213" height="107"/>
             <view key="contentView" id="6">
-                <rect key="frame" x="0.0" y="0.0" width="409" height="512"/>
+                <rect key="frame" x="0.0" y="0.0" width="409" height="538"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <tabView id="7">
-                        <rect key="frame" x="-8" y="44" width="425" height="462"/>
+                        <rect key="frame" x="-8" y="47" width="425" height="485"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="General" identifier="1" id="8">
                                 <view key="view" id="9">
-                                    <rect key="frame" x="10" y="33" width="405" height="416"/>
+                                    <rect key="frame" x="10" y="33" width="405" height="439"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField verticalHuggingPriority="750" id="20">
-                                            <rect key="frame" x="35" y="377" width="104" height="17"/>
+                                            <rect key="frame" x="35" y="400" width="104" height="17"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Network name:" id="917">
                                                 <font key="font" metaFont="system"/>
@@ -75,7 +76,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="21">
-                                            <rect key="frame" x="144" y="374" width="244" height="22"/>
+                                            <rect key="frame" x="144" y="397" width="244" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="918">
                                                 <font key="font" metaFont="system"/>
@@ -83,8 +84,23 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
+                                        <button id="40">
+                                            <rect key="frame" x="142" y="367" width="148" height="18"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <buttonCell key="cell" type="check" title="Connect on start up" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="931">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                        </button>
+                                        <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="190">
+                                            <rect key="frame" x="17" y="348" width="371" height="5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+                                            <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                            <font key="titleFont" metaFont="system"/>
+                                        </box>
                                         <textField verticalHuggingPriority="750" id="22">
-                                            <rect key="frame" x="81" y="286" width="58" height="17"/>
+                                            <rect key="frame" x="81" y="309" width="58" height="17"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Server:" id="919">
                                                 <font key="font" metaFont="system"/>
@@ -93,7 +109,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <comboBox verticalHuggingPriority="750" id="24">
-                                            <rect key="frame" x="144" y="281" width="247" height="26"/>
+                                            <rect key="frame" x="144" y="304" width="247" height="26"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="100" id="920">
                                                 <font key="font" metaFont="system"/>
@@ -105,8 +121,17 @@
                                                 <outlet property="delegate" destination="-2" id="479"/>
                                             </connections>
                                         </comboBox>
+                                        <textField verticalHuggingPriority="750" id="29">
+                                            <rect key="frame" x="87" y="279" width="52" height="17"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Port:" id="922">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
                                         <textField verticalHuggingPriority="750" id="27" customClass="NumericTextField">
-                                            <rect key="frame" x="144" y="253" width="62" height="22"/>
+                                            <rect key="frame" x="144" y="276" width="62" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" drawsBackground="YES" id="921">
                                                 <font key="font" metaFont="system"/>
@@ -120,17 +145,25 @@
                                                 <outlet property="delegate" destination="-2" id="107"/>
                                             </connections>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" id="29">
-                                            <rect key="frame" x="87" y="256" width="52" height="17"/>
+                                        <button id="689">
+                                            <rect key="frame" x="217" y="278" width="173" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="SSL connection" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="935">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                        </button>
+                                        <textField verticalHuggingPriority="750" id="31">
+                                            <rect key="frame" x="14" y="249" width="125" height="17"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Port:" id="922">
+                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Server Password:" id="924">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="30" customClass="NSSecureTextField">
-                                            <rect key="frame" x="144" y="223" width="119" height="22"/>
+                                            <rect key="frame" x="144" y="246" width="119" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="923">
                                                 <font key="font" metaFont="system"/>
@@ -138,17 +171,24 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" id="31">
-                                            <rect key="frame" x="14" y="226" width="125" height="17"/>
+                                        <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="192">
+                                            <rect key="frame" x="17" y="224" width="371" height="5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Server Password:" id="924">
+                                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+                                            <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                            <font key="titleFont" metaFont="system"/>
+                                        </box>
+                                        <textField verticalHuggingPriority="750" id="33">
+                                            <rect key="frame" x="47" y="183" width="92" height="17"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Nickname:" id="926">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="32">
-                                            <rect key="frame" x="144" y="157" width="119" height="22"/>
+                                            <rect key="frame" x="144" y="180" width="119" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="925">
                                                 <font key="font" metaFont="system"/>
@@ -159,17 +199,17 @@
                                                 <outlet property="delegate" destination="-2" id="104"/>
                                             </connections>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" id="33">
-                                            <rect key="frame" x="47" y="160" width="92" height="17"/>
+                                        <textField verticalHuggingPriority="750" id="35">
+                                            <rect key="frame" x="47" y="153" width="92" height="17"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Nickname:" id="926">
+                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Login name:" id="928">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="34">
-                                            <rect key="frame" x="144" y="127" width="119" height="22"/>
+                                            <rect key="frame" x="144" y="150" width="119" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="927">
                                                 <font key="font" metaFont="system"/>
@@ -177,17 +217,17 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" id="35">
-                                            <rect key="frame" x="47" y="130" width="92" height="17"/>
+                                        <textField verticalHuggingPriority="750" id="37">
+                                            <rect key="frame" x="59" y="123" width="80" height="17"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Login name:" id="928">
+                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Real name:" id="930">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="36">
-                                            <rect key="frame" x="144" y="97" width="244" height="22"/>
+                                            <rect key="frame" x="144" y="120" width="244" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="929">
                                                 <font key="font" metaFont="system"/>
@@ -195,17 +235,17 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" id="37">
-                                            <rect key="frame" x="59" y="100" width="80" height="17"/>
+                                        <textField verticalHuggingPriority="750" id="808">
+                                            <rect key="frame" x="7" y="91" width="132" height="19"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Real name:" id="930">
+                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Nickserv Password:" id="937">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="807" customClass="NSSecureTextField">
-                                            <rect key="frame" x="144" y="67" width="119" height="22"/>
+                                            <rect key="frame" x="144" y="90" width="119" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="936">
                                                 <font key="font" metaFont="system"/>
@@ -216,39 +256,40 @@
                                                 <outlet property="delegate" destination="-2" id="1067"/>
                                             </connections>
                                         </textField>
-                                        <button id="40">
-                                            <rect key="frame" x="142" y="344" width="148" height="18"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <buttonCell key="cell" type="check" title="Connect on start up" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="931">
+                                        <button id="1063">
+                                            <rect key="frame" x="274" y="92" width="116" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Use SASL" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="1064">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
-                                        <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="190">
-                                            <rect key="frame" x="17" y="325" width="371" height="5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                                            <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                            <font key="titleFont" metaFont="system"/>
-                                        </box>
-                                        <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="192">
-                                            <rect key="frame" x="17" y="201" width="371" height="5"/>
+                                        <textField verticalHuggingPriority="750" id="LsH-a9-Zyz">
+                                            <rect key="frame" x="7" y="63" width="132" height="19"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                                            <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                            <font key="titleFont" metaFont="system"/>
-                                        </box>
-                                        <textField verticalHuggingPriority="750" id="560">
-                                            <rect key="frame" x="144" y="37" width="244" height="22"/>
+                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Auto-join Timeout:" id="bBi-Dd-cJn">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <textField verticalHuggingPriority="750" id="uxp-sq-E3C" customClass="NumericTextField">
+                                            <rect key="frame" x="144" y="61" width="32" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="932">
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" drawsBackground="YES" id="v3l-gh-GlQ">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                <allowedInputSourceLocales>
+                                                    <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+                                                </allowedInputSourceLocales>
                                             </textFieldCell>
+                                            <connections>
+                                                <outlet property="delegate" destination="-2" id="2vQ-ge-HKr"/>
+                                            </connections>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="561">
-                                            <rect key="frame" x="32" y="38" width="107" height="20"/>
+                                            <rect key="frame" x="32" y="34" width="107" height="20"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title=" Alt. Nicknames:" id="933">
                                                 <font key="font" metaFont="system"/>
@@ -256,50 +297,34 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" id="646">
-                                            <rect key="frame" x="141" y="12" width="182" height="17"/>
+                                        <textField verticalHuggingPriority="750" id="560">
+                                            <rect key="frame" x="144" y="33" width="244" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="This field is space separated." id="934">
-                                                <font key="font" metaFont="smallSystem"/>
-                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="932">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button id="689">
-                                            <rect key="frame" x="217" y="255" width="173" height="18"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <buttonCell key="cell" type="check" title="SSL connection" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="935">
-                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                        </button>
-                                        <textField verticalHuggingPriority="750" id="808">
-                                            <rect key="frame" x="7" y="68" width="132" height="19"/>
+                                        <textField verticalHuggingPriority="750" id="646">
+                                            <rect key="frame" x="141" y="8" width="182" height="17"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Nickserv Password:" id="937">
-                                                <font key="font" metaFont="system"/>
+                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="This field is space separated." id="934">
+                                                <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <button id="1063">
-                                            <rect key="frame" x="274" y="69" width="116" height="18"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <buttonCell key="cell" type="check" title="Use SASL" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="1064">
-                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                        </button>
                                     </subviews>
                                 </view>
                             </tabViewItem>
                             <tabViewItem label="Details" identifier="2" id="10">
                                 <view key="view" id="11">
-                                    <rect key="frame" x="10" y="33" width="405" height="416"/>
+                                    <rect key="frame" x="10" y="33" width="405" height="439"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField verticalHuggingPriority="750" id="42">
-                                            <rect key="frame" x="17" y="377" width="123" height="17"/>
+                                            <rect key="frame" x="17" y="400" width="123" height="17"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Leaving comment:" id="939">
                                                 <font key="font" metaFont="system"/>
@@ -308,7 +333,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="47">
-                                            <rect key="frame" x="17" y="347" width="123" height="17"/>
+                                            <rect key="frame" x="17" y="370" width="123" height="17"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="CTCP UserInfo:" id="940">
                                                 <font key="font" metaFont="system"/>
@@ -317,7 +342,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="49">
-                                            <rect key="frame" x="145" y="344" width="237" height="22"/>
+                                            <rect key="frame" x="145" y="367" width="237" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="941">
                                                 <font key="font" metaFont="system"/>
@@ -326,7 +351,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" id="170">
-                                            <rect key="frame" x="142" y="282" width="196" height="26"/>
+                                            <rect key="frame" x="142" y="305" width="196" height="26"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="UTF-8" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="4" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="174" id="943">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -401,7 +426,7 @@
                                             </connections>
                                         </popUpButton>
                                         <textField verticalHuggingPriority="750" id="41">
-                                            <rect key="frame" x="145" y="374" width="237" height="22"/>
+                                            <rect key="frame" x="145" y="397" width="237" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="938">
                                                 <font key="font" metaFont="system"/>
@@ -410,7 +435,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" id="736">
-                                            <rect key="frame" x="142" y="210" width="196" height="26"/>
+                                            <rect key="frame" x="142" y="233" width="196" height="26"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <popUpButtonCell key="cell" type="push" title="Don't Fallback" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="4" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="762" id="946">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -479,14 +504,14 @@
                                             </popUpButtonCell>
                                         </popUpButton>
                                         <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="758">
-                                            <rect key="frame" x="20" y="322" width="362" height="5"/>
+                                            <rect key="frame" x="20" y="345" width="362" height="5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                                             <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <font key="titleFont" metaFont="system"/>
                                         </box>
                                         <textField verticalHuggingPriority="750" id="520">
-                                            <rect key="frame" x="145" y="248" width="240" height="30"/>
+                                            <rect key="frame" x="145" y="271" width="240" height="30"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="This option will be in effect after reconnecting." id="944">
                                                 <font key="font" metaFont="smallSystem"/>
@@ -495,14 +520,14 @@
                                             </textFieldCell>
                                         </textField>
                                         <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="963">
-                                            <rect key="frame" x="20" y="187" width="362" height="5"/>
+                                            <rect key="frame" x="20" y="210" width="362" height="5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                                             <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <font key="titleFont" metaFont="system"/>
                                         </box>
                                         <textField verticalHuggingPriority="750" id="964">
-                                            <rect key="frame" x="18" y="216" width="122" height="17"/>
+                                            <rect key="frame" x="18" y="239" width="122" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Fallback encoding:" id="965">
                                                 <font key="font" metaFont="system"/>
@@ -511,7 +536,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="966">
-                                            <rect key="frame" x="74" y="288" width="66" height="17"/>
+                                            <rect key="frame" x="74" y="311" width="66" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Encoding:" id="967">
                                                 <font key="font" metaFont="system"/>
@@ -520,7 +545,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="968">
-                                            <rect key="frame" x="96" y="151" width="44" height="17"/>
+                                            <rect key="frame" x="96" y="174" width="44" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Proxy:" id="969">
                                                 <font key="font" metaFont="system"/>
@@ -529,7 +554,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="970">
-                                            <rect key="frame" x="68" y="114" width="72" height="17"/>
+                                            <rect key="frame" x="68" y="137" width="72" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Hostname:" id="971">
                                                 <font key="font" metaFont="system"/>
@@ -538,7 +563,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="974">
-                                            <rect key="frame" x="102" y="84" width="38" height="17"/>
+                                            <rect key="frame" x="102" y="107" width="38" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Port:" id="975">
                                                 <font key="font" metaFont="system"/>
@@ -547,7 +572,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="976">
-                                            <rect key="frame" x="72" y="20" width="68" height="17"/>
+                                            <rect key="frame" x="72" y="43" width="68" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Password:" id="977">
                                                 <font key="font" metaFont="system"/>
@@ -556,7 +581,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="978">
-                                            <rect key="frame" x="69" y="48" width="71" height="17"/>
+                                            <rect key="frame" x="69" y="71" width="71" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Username:" id="979">
                                                 <font key="font" metaFont="system"/>
@@ -565,7 +590,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="980">
-                                            <rect key="frame" x="145" y="111" width="190" height="22"/>
+                                            <rect key="frame" x="145" y="134" width="190" height="22"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="981">
                                                 <font key="font" metaFont="system"/>
@@ -574,7 +599,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <secureTextField verticalHuggingPriority="750" id="982">
-                                            <rect key="frame" x="145" y="17" width="190" height="22"/>
+                                            <rect key="frame" x="145" y="40" width="190" height="22"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="983">
                                                 <font key="font" metaFont="system"/>
@@ -586,7 +611,7 @@
                                             </secureTextFieldCell>
                                         </secureTextField>
                                         <textField verticalHuggingPriority="750" id="984" customClass="NumericTextField">
-                                            <rect key="frame" x="145" y="81" width="96" height="22"/>
+                                            <rect key="frame" x="145" y="104" width="96" height="22"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="985">
                                                 <font key="font" metaFont="system"/>
@@ -595,7 +620,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" id="986">
-                                            <rect key="frame" x="145" y="45" width="190" height="22"/>
+                                            <rect key="frame" x="145" y="68" width="190" height="22"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="987">
                                                 <font key="font" metaFont="system"/>
@@ -604,7 +629,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" id="988">
-                                            <rect key="frame" x="142" y="145" width="196" height="26"/>
+                                            <rect key="frame" x="142" y="168" width="196" height="26"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="991" id="989">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -630,11 +655,11 @@
                             </tabViewItem>
                             <tabViewItem label="On Login" identifier="3" id="110">
                                 <view key="view" id="111">
-                                    <rect key="frame" x="10" y="33" width="405" height="416"/>
+                                    <rect key="frame" x="10" y="33" width="405" height="439"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="112">
-                                            <rect key="frame" x="17" y="200" width="371" height="206"/>
+                                            <rect key="frame" x="17" y="223" width="371" height="206"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <clipView key="contentView" id="3eL-uI-2jU">
                                                 <rect key="frame" x="1" y="17" width="369" height="188"/>
@@ -708,7 +733,7 @@
                                             </tableHeaderView>
                                         </scrollView>
                                         <button id="202">
-                                            <rect key="frame" x="15" y="15" width="220" height="18"/>
+                                            <rect key="frame" x="15" y="38" width="220" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <buttonCell key="cell" type="check" title="Set invisible (+i) mode on login" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="947">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -716,7 +741,7 @@
                                             </buttonCell>
                                         </button>
                                         <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="203">
-                                            <rect key="frame" x="17" y="39" width="371" height="94"/>
+                                            <rect key="frame" x="17" y="62" width="371" height="94"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <clipView key="contentView" id="gFV-kd-8Wa">
                                                 <rect key="frame" x="1" y="1" width="369" height="92"/>
@@ -745,7 +770,7 @@
                                             </scroller>
                                         </scrollView>
                                         <textField verticalHuggingPriority="750" id="205">
-                                            <rect key="frame" x="14" y="141" width="192" height="17"/>
+                                            <rect key="frame" x="14" y="164" width="192" height="17"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Perform commands on login:" id="948">
                                                 <font key="font" metaFont="system"/>
@@ -754,7 +779,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <button verticalHuggingPriority="750" id="858">
-                                            <rect key="frame" x="17" y="170" width="23" height="23"/>
+                                            <rect key="frame" x="17" y="193" width="23" height="23"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="949">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -765,7 +790,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" id="860">
-                                            <rect key="frame" x="333" y="170" width="55" height="23"/>
+                                            <rect key="frame" x="333" y="193" width="55" height="23"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="smallSquare" title="Edit" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="950">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -776,7 +801,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" id="862">
-                                            <rect key="frame" x="39" y="170" width="23" height="23"/>
+                                            <rect key="frame" x="39" y="193" width="23" height="23"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="951">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -791,11 +816,11 @@
                             </tabViewItem>
                             <tabViewItem label="Ignores" identifier="Item 3" id="1029">
                                 <view key="view" id="1030">
-                                    <rect key="frame" x="10" y="33" width="405" height="416"/>
+                                    <rect key="frame" x="10" y="33" width="405" height="439"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="1031">
-                                            <rect key="frame" x="17" y="46" width="371" height="360"/>
+                                            <rect key="frame" x="17" y="69" width="371" height="360"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <clipView key="contentView" id="30z-dd-Zdb">
                                                 <rect key="frame" x="1" y="17" width="369" height="342"/>
@@ -857,7 +882,7 @@
                                             </tableHeaderView>
                                         </scrollView>
                                         <button verticalHuggingPriority="750" id="1040">
-                                            <rect key="frame" x="17" y="16" width="23" height="23"/>
+                                            <rect key="frame" x="17" y="39" width="23" height="23"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="1045">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -868,7 +893,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" id="1041">
-                                            <rect key="frame" x="333" y="16" width="55" height="23"/>
+                                            <rect key="frame" x="333" y="39" width="55" height="23"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="smallSquare" title="Edit" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="1044">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -879,7 +904,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" id="1042">
-                                            <rect key="frame" x="39" y="16" width="23" height="23"/>
+                                            <rect key="frame" x="39" y="39" width="23" height="23"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="1043">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -895,7 +920,7 @@
                         </tabViewItems>
                     </tabView>
                     <button verticalHuggingPriority="750" id="57">
-                        <rect key="frame" x="313" y="12" width="82" height="32"/>
+                        <rect key="frame" x="313" y="13" width="82" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="952">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -909,7 +934,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" id="58">
-                        <rect key="frame" x="231" y="12" width="82" height="32"/>
+                        <rect key="frame" x="231" y="13" width="82" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="953">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -934,4 +959,4 @@ Gw
         <image name="NSAddTemplate" width="8" height="8"/>
         <image name="NSRemoveTemplate" width="8" height="8"/>
     </resources>
-</document>
\ No newline at end of file
+</document>