Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2

a955504f · George Nachman · d7ccf777 · 7bd18b7e · a955504f · a955504f
Commit a955504f authored 11 years ago by George Nachman
--- a/CharacterRun.m
+++ b/CharacterRun.m
@@ -122,6 +122,8 @@ static const int kDefaultAdvancesCapacity = 100;
        [dict setObject:[NSNumber numberWithDouble:strokeThickness] forKey:NSStrokeWidthAttributeName];
    }
    [dict setObject:color_ forKey:NSForegroundColorAttributeName];
+    // Turn off all ligatures
+    [dict setObject:[NSNumber numberWithInt:0] forKey:NSLigatureAttributeName];
    return dict;
 }
  

--- a/English.lproj/PreferencePanel.xib
+++ b/English.lproj/PreferencePanel.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">12B19</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
-		<string key="IBDocument.AppKitVersion">1187</string>
-		<string key="IBDocument.HIToolboxVersion">624.00</string>
+		<string key="IBDocument.SystemVersion">12D78</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.37</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2549</string>
+			<string key="NS.object.0">3084</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -747,7 +747,7 @@
 					<string key="NSFrameSize">{451, 246}</string>
 					<reference key="NSNextKeyView" ref="228190838"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -836,7 +836,7 @@
 								<nil key="NSToolbarItemView"/>
 								<object class="NSCustomResource" key="NSToolbarItemImage">
 									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSUserAccounts</string>
+									<string key="NSResourceName">PrefsProfile</string>
 								</object>
 								<nil key="NSToolbarItemTarget"/>
 								<nil key="NSToolbarItemAction"/>
@@ -858,7 +858,7 @@
 								<nil key="NSToolbarItemView"/>
 								<object class="NSCustomResource" key="NSToolbarItemImage">
 									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">screen</string>
+									<string key="NSResourceName">PrefsAppearance</string>
 								</object>
 								<nil key="NSToolbarItemTarget"/>
 								<nil key="NSToolbarItemAction"/>
@@ -902,7 +902,7 @@
 								<nil key="NSToolbarItemView"/>
 								<object class="NSCustomResource" key="NSToolbarItemImage">
 									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">arrangement</string>
+									<string key="NSResourceName">PrefsArrangements</string>
 								</object>
 								<nil key="NSToolbarItemTarget"/>
 								<nil key="NSToolbarItemAction"/>
@@ -950,7 +950,7 @@
 							<string key="NSFrame">{{13, 20}, {891, 434}}</string>
 							<reference key="NSSuperview" ref="130574301"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="105539794"/>
+							<reference key="NSNextKeyView" ref="835055720"/>
 							<object class="NSMutableArray" key="NSTabViewItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSTabViewItem" id="403608584">
@@ -2797,7 +2797,7 @@
 								<object class="NSTabViewItem" id="745611275">
 									<string key="NSIdentifier">2</string>
 									<object class="NSView" key="NSView" id="105539794">
-										<reference key="NSNextResponder" ref="415305200"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<object class="NSMutableArray" key="NSSubviews">
 											<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2806,8 +2806,6 @@
 												<int key="NSvFlags">12</int>
 												<string key="NSFrame">{{320, -10}, {579, 450}}</string>
 												<reference key="NSSuperview" ref="105539794"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="424327727"/>
 												<object class="NSMutableArray" key="NSTabViewItems">
 													<bool key="EncodedWithXMLCoder">YES</bool>
 													<object class="NSTabViewItem" id="1020441673">
@@ -5156,7 +5154,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{270, 355}, {226, 18}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="203493569"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSButtonCell" key="NSCell" id="784368808">
@@ -5180,7 +5177,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{270, 335}, {226, 18}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="311242096"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSButtonCell" key="NSCell" id="476777879">
@@ -5204,7 +5200,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{270, 315}, {154, 18}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="464353276"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSButtonCell" key="NSCell" id="1063209572">
@@ -5228,7 +5223,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{270, 295}, {134, 18}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="86588638"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSButtonCell" key="NSCell" id="1062075787">
@@ -5252,7 +5246,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{67, 384}, {132, 17}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="654131039"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSTextFieldCell" key="NSCell" id="471106657">
@@ -5271,7 +5264,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{269, 384}, {132, 17}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="495223161"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSTextFieldCell" key="NSCell" id="18595218">
@@ -5290,7 +5282,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{68, 88}, {181, 17}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="866815018"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSTextFieldCell" key="NSCell" id="326977036">
@@ -5309,7 +5300,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{68, 291}, {119, 18}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="354925026"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSButtonCell" key="NSCell" id="420007581">
@@ -5333,7 +5323,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{167, 197}, {138, 32}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="652786136"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSButtonCell" key="NSCell" id="143869250">
@@ -5359,7 +5348,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">268</int>
 																	<string key="NSFrame">{{67, 233}, {478, 17}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="1019480583"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSTextFieldCell" key="NSCell" id="469285896">
@@ -5378,7 +5366,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{167, 115}, {138, 32}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="547374323"/>
 																	<int key="NSTag">1</int>
 																	<bool key="NSEnabled">YES</bool>
@@ -5405,7 +5392,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">268</int>
 																	<string key="NSFrame">{{68, 148}, {477, 17}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="793440917"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSTextFieldCell" key="NSCell" id="1007953903">
@@ -5424,7 +5410,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{67, 258}, {101, 17}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="692203630"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSTextFieldCell" key="NSCell" id="473522290">
@@ -5443,7 +5428,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{68, 206}, {106, 18}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="998901821"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSButtonCell" key="NSCell" id="571093000">
@@ -5467,7 +5451,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{69, 124}, {106, 18}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="941740657"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSButtonCell" key="NSCell" id="460410651">
@@ -5491,7 +5474,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{67, 173}, {120, 17}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="939733047"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSTextFieldCell" key="NSCell" id="1019653570">
@@ -5510,7 +5492,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">268</int>
 																	<string key="NSFrame">{{70, 315}, {98, 58}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="553839809"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -5625,8 +5606,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{69, 64}, {393, 18}}</string>
 																	<reference key="NSSuperview" ref="424327727"/>
-																	<reference key="NSWindow"/>
-																	<reference key="NSNextKeyView"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSButtonCell" key="NSCell" id="246621155">
 																		<int key="NSCellFlags">67108864</int>
@@ -5647,7 +5626,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															</object>
 															<string key="NSFrame">{{10, 33}, {559, 404}}</string>
 															<reference key="NSSuperview" ref="551361709"/>
-															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="260074654"/>
 														</object>
 														<string key="NSLabel">Text</string>
@@ -8800,7 +8778,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrameSize">{24, 24}</string>
 												<reference key="NSSuperview" ref="105539794"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="292187634"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="489394660">
@@ -8824,7 +8801,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{23, 0}, {24, 24}}</string>
 												<reference key="NSSuperview" ref="105539794"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="118227744"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="391817896">
@@ -8848,7 +8824,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{46, 0}, {157, 24}}</string>
 												<reference key="NSSuperview" ref="105539794"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="551361709"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="56310144">
@@ -8928,14 +8903,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">12</int>
 												<string key="NSFrame">{{0, 32}, {319, 392}}</string>
 												<reference key="NSSuperview" ref="105539794"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="1072403251"/>
 												<string key="NSClassName">ProfileListView</string>
 											</object>
 										</object>
 										<string key="NSFrameSize">{891, 434}</string>
-										<reference key="NSSuperview" ref="415305200"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="477047632"/>
 									</object>
 									<string key="NSLabel">Bookmarks</string>
@@ -8945,7 +8917,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<object class="NSTabViewItem" id="336880649">
 									<string key="NSIdentifier">Keys</string>
 									<object class="NSView" key="NSView" id="835055720">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="415305200"/>
 										<int key="NSvFlags">256</int>
 										<object class="NSMutableArray" key="NSSubviews">
 											<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8954,6 +8926,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{-3, 416}, {146, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="354550319"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="97167381">
@@ -8972,6 +8945,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{360, 417}, {144, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="819370754"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="24398849">
@@ -8990,6 +8964,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{17, 396}, {143, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="549297522"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="689731067">
@@ -9008,6 +8983,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{17, 371}, {143, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="1026769345"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="623929255">
@@ -9026,6 +9002,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{14, 346}, {146, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="335160809"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="617879975">
@@ -9044,6 +9021,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{7, 321}, {153, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="739441651"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="51804533">
@@ -9062,6 +9040,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{163, 390}, {157, 26}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="599544516"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="296645322">
@@ -9152,6 +9131,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{163, 365}, {157, 26}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="792723433"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="17787661">
@@ -9243,6 +9223,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{163, 340}, {157, 26}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="115376833"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="151424122">
@@ -9334,6 +9315,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{163, 315}, {157, 26}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="510383839"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="134289427">
@@ -9425,6 +9407,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{163, 289}, {157, 26}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="1009527721"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="735335036">
@@ -9516,6 +9499,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{-3, 295}, {163, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="732295526"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="756740016">
@@ -9534,6 +9518,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{163, 225}, {72, 26}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="501203952"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="719229087">
@@ -9602,6 +9587,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{163, 195}, {72, 26}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="228502185"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="736931998">
@@ -9678,26 +9664,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															<object class="NSTableView" id="405339758">
 																<reference key="NSNextResponder" ref="35583"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrameSize">{491, 361}</string>
+																<string key="NSFrameSize">{506, 361}</string>
 																<reference key="NSSuperview" ref="35583"/>
-																<reference key="NSNextKeyView" ref="1007942010"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="543569760"/>
 																<bool key="NSEnabled">YES</bool>
 																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 																<object class="NSTableHeaderView" key="NSHeaderView" id="21462293">
 																	<reference key="NSNextResponder" ref="302482683"/>
 																	<int key="NSvFlags">256</int>
-																	<string key="NSFrameSize">{491, 17}</string>
+																	<string key="NSFrameSize">{506, 17}</string>
 																	<reference key="NSSuperview" ref="302482683"/>
-																	<reference key="NSNextKeyView" ref="520715592"/>
+																	<reference key="NSWindow"/>
+																	<reference key="NSNextKeyView" ref="35583"/>
 																	<reference key="NSTableView" ref="405339758"/>
 																</object>
-																<object class="_NSCornerView" key="NSCornerView" id="520715592">
-																	<reference key="NSNextResponder" ref="659710829"/>
+																<object class="_NSCornerView" key="NSCornerView">
+																	<nil key="NSNextResponder"/>
 																	<int key="NSvFlags">256</int>
 																	<string key="NSFrame">{{492, 0}, {16, 17}}</string>
-																	<reference key="NSSuperview" ref="659710829"/>
-																	<reference key="NSNextKeyView" ref="35583"/>
 																</object>
 																<object class="NSMutableArray" key="NSTableColumns">
 																	<bool key="EncodedWithXMLCoder">YES</bool>
@@ -9732,7 +9718,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	</object>
 																	<object class="NSTableColumn" id="625093685">
 																		<string key="NSIdentifier">1</string>
-																		<double key="NSWidth">287.101</double>
+																		<double key="NSWidth">302.101</double>
 																		<double key="NSMinWidth">42.10107</double>
 																		<double key="NSMaxWidth">1000</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -9775,8 +9761,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSTableViewGroupRowStyle">1</int>
 															</object>
 														</object>
-														<string key="NSFrame">{{1, 17}, {491, 361}}</string>
+														<string key="NSFrame">{{1, 17}, {506, 361}}</string>
 														<reference key="NSSuperview" ref="659710829"/>
+														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="405339758"/>
 														<reference key="NSDocView" ref="405339758"/>
 														<reference key="NSBGColor" ref="288792532"/>
@@ -9785,8 +9772,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 													<object class="NSScroller" id="543569760">
 														<reference key="NSNextResponder" ref="659710829"/>
 														<int key="NSvFlags">256</int>
-														<string key="NSFrame">{{492, 17}, {15, 361}}</string>
+														<string key="NSFrame">{{491, 17}, {16, 361}}</string>
 														<reference key="NSSuperview" ref="659710829"/>
+														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="649642907"/>
 														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 														<reference key="NSTarget" ref="659710829"/>
@@ -9798,6 +9786,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														<int key="NSvFlags">-2147483392</int>
 														<string key="NSFrame">{{-100, -100}, {266, 15}}</string>
 														<reference key="NSSuperview" ref="659710829"/>
+														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="302482683"/>
 														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 														<int key="NSsFlags">1</int>
@@ -9812,18 +9801,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															<bool key="EncodedWithXMLCoder">YES</bool>
 															<reference ref="21462293"/>
 														</object>
-														<string key="NSFrame">{{1, 0}, {491, 17}}</string>
+														<string key="NSFrame">{{1, 0}, {506, 17}}</string>
 														<reference key="NSSuperview" ref="659710829"/>
+														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="21462293"/>
 														<reference key="NSDocView" ref="21462293"/>
 														<reference key="NSBGColor" ref="288792532"/>
 														<int key="NScvFlags">4</int>
 													</object>
-													<reference ref="520715592"/>
 												</object>
 												<string key="NSFrame">{{363, 30}, {508, 379}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
-												<reference key="NSNextKeyView" ref="35583"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="1007942010"/>
 												<int key="NSsFlags">133138</int>
 												<reference key="NSVScroller" ref="543569760"/>
 												<reference key="NSHScroller" ref="1007942010"/>
@@ -9839,6 +9829,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{363, 0}, {21, 22}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="551898434"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="585895013">
@@ -9864,6 +9855,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{383, 0}, {20, 22}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="318768398"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="985084832">
@@ -9889,6 +9881,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{402, 0}, {144, 22}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="1055936868">
 													<int key="NSCellFlags">-2076180416</int>
@@ -9947,6 +9941,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{-3, 256}, {144, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="340915240"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="510649657">
@@ -9965,6 +9960,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{237, 231}, {65, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="989965298"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="473894583">
@@ -9983,6 +9979,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{237, 201}, {65, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="917949037"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="1016365692">
@@ -10001,6 +9998,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{61, 231}, {128, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="344127859"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="98129573">
@@ -10019,6 +10017,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{32, 201}, {128, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="342585760"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="59427643">
@@ -10037,6 +10036,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">12</int>
 												<string key="NSFrame">{{336, 0}, {5, 433}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="659710829"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -10060,6 +10060,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{-3, 166}, {153, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="1055059472"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="693976532">
@@ -10078,6 +10079,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{-1, 142}, {320, 18}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="309320251"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="967738703">
@@ -10102,6 +10104,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{82, 114}, {235, 22}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="344868448"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="896498167">
@@ -10121,6 +10124,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{27, 116}, {53, 17}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="599268235"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="514146970">
@@ -10139,6 +10143,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{-1, 92}, {326, 18}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="1035959099"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="301063877">
@@ -10163,6 +10168,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{27, 62}, {293, 26}}</string>
 												<reference key="NSSuperview" ref="835055720"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="236334648"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="193955870">
@@ -10206,6 +10212,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											</object>
 										</object>
 										<string key="NSFrameSize">{891, 434}</string>
+										<reference key="NSSuperview" ref="415305200"/>
+										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="892382161"/>
 									</object>
 									<string key="NSLabel">Keys</string>
@@ -10890,14 +10898,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									<reference key="NSTabView" ref="415305200"/>
 								</object>
 							</object>
-							<reference key="NSSelectedTabViewItem" ref="745611275"/>
+							<reference key="NSSelectedTabViewItem" ref="336880649"/>
 							<reference key="NSFont" ref="966507434"/>
 							<int key="NSTvFlags">6</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<reference ref="105539794"/>
+								<reference ref="835055720"/>
 							</object>
 						</object>
 					</object>
@@ -10906,7 +10914,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="415305200"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -11769,7 +11777,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string key="NSFrameSize">{406, 157}</string>
 					<reference key="NSNextKeyView" ref="587098530"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -12244,7 +12252,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string key="NSFrameSize">{560, 400}</string>
 					<reference key="NSNextKeyView" ref="863531537"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -12570,7 +12578,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string key="NSFrameSize">{804, 356}</string>
 					<reference key="NSNextKeyView" ref="461112392"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -12958,7 +12966,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string key="NSFrameSize">{805, 358}</string>
 					<reference key="NSNextKeyView" ref="951529987"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -13779,7 +13787,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string key="NSFrameSize">{485, 421}</string>
 					<reference key="NSNextKeyView" ref="923469367"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -13862,7 +13870,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSTableView" id="32234516">
 											<reference key="NSNextResponder" ref="866030302"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{526, 114}</string>
+											<string key="NSFrameSize">{526.5, 114}</string>
 											<reference key="NSSuperview" ref="866030302"/>
 											<reference key="NSNextKeyView" ref="362211021"/>
 											<bool key="NSEnabled">YES</bool>
@@ -13871,7 +13879,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="208265054">
 												<reference key="NSNextResponder" ref="362211021"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{526, 17}</string>
+												<string key="NSFrameSize">{526.5, 17}</string>
 												<reference key="NSSuperview" ref="362211021"/>
 												<reference key="NSNextKeyView" ref="866030302"/>
 												<reference key="NSTableView" ref="32234516"/>
@@ -14180,7 +14188,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string key="NSFrameSize">{568, 250}</string>
 					<reference key="NSNextKeyView" ref="178562551"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -33149,13 +33157,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<string>NSMenuMixedState</string>
 				<string>NSRemoveTemplate</string>
 				<string>NSSwitch</string>
-				<string>NSUserAccounts</string>
+				<string>PrefsAppearance</string>
+				<string>PrefsArrangements</string>
 				<string>PrefsGeneral</string>
 				<string>PrefsKeyboard</string>
 				<string>PrefsMouse</string>
+				<string>PrefsProfile</string>
 				<string>Warning</string>
-				<string>arrangement</string>
-				<string>screen</string>
 			</object>
 			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
@@ -33169,9 +33177,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<string>{32, 32}</string>
 				<string>{32, 32}</string>
 				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
 				<string>{16, 16}</string>
-				<string>{48, 48}</string>
-				<string>{80, 80}</string>
 			</object>
 		</object>
 	</data>
--- a/FutureMethods.h
+++ b/FutureMethods.h
@@ -6,6 +6,8 @@
 //
  
 #import <Cocoa/Cocoa.h>
+// This is for the args to CGSSetWindowBackgroundBlurRadiusFunction, which is used for window-blurring using undocumented APIs.
+#import <CGSInternal.h>
  
 #ifdef BLOCKS_NOT_AVAILABLE
 // OS 10.5 Compatibility
@@ -110,3 +112,11 @@ typedef NSInteger FutureNSScrollerStyle;
 @interface NSScroller (future)
 - (void)futureSetKnobStyle:(NSInteger)newKnobStyle;
 @end
+
+typedef CGError CGSSetWindowBackgroundBlurRadiusFunction(CGSConnectionID cid, CGSWindowID wid, NSUInteger blur);
+CGSSetWindowBackgroundBlurRadiusFunction* GetCGSSetWindowBackgroundBlurRadiusFunction(void);
+
+// 10.7-only function.
+typedef void CTFontDrawGlyphsFunction(CTFontRef runFont, const CGGlyph *glyphs, NSPoint *positions, int glyphCount, CGContextRef ctx);
+CTFontDrawGlyphsFunction* GetCTFontDrawGlyphsFunction(void);
+
--- a/FutureMethods.m
+++ b/FutureMethods.m
@@ -206,3 +206,41 @@ static FutureNSScrollerStyle GetScrollerStyle(id theObj)
 }
  
 @end
+
+static void *GetFunctionByName(NSString *library, char *func) {
+    CFBundleRef bundle;
+    CFURLRef bundleURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, (CFStringRef) library, kCFURLPOSIXPathStyle, true);
+    CFStringRef functionName = CFStringCreateWithCString(kCFAllocatorDefault, func, kCFStringEncodingASCII);
+    bundle = CFBundleCreate(kCFAllocatorDefault, bundleURL);
+    void *f = NULL;
+    if (bundle) {
+        f = CFBundleGetFunctionPointerForName(bundle, functionName);
+        CFRelease(bundle);
+    }
+    CFRelease(functionName);
+    CFRelease(bundleURL);
+    return f;
+}
+
+CGSSetWindowBackgroundBlurRadiusFunction* GetCGSSetWindowBackgroundBlurRadiusFunction(void) {
+    static BOOL tried = NO;
+    static CGSSetWindowBackgroundBlurRadiusFunction *function = NULL;
+    if (!tried) {
+        function  = GetFunctionByName(@"/System/Library/Frameworks/ApplicationServices.framework",
+                                      "CGSSetWindowBackgroundBlurRadius");
+        tried = YES;
+    }
+    return function;
+}
+
+CTFontDrawGlyphsFunction* GetCTFontDrawGlyphsFunction(void) {
+    static BOOL tried = NO;
+    static CTFontDrawGlyphsFunction *function = NULL;
+    if (!tried) {
+        function  = GetFunctionByName(@"/System/Library/Frameworks/CoreText.framework",
+                                      "CTFontDrawGlyphs");
+        tried = YES;
+    }
+    return function;
+}
+
--- a/PTYSession.m
+++ b/PTYSession.m
@@ -1029,7 +1029,7 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
    [updateDisplayUntil_ release];
    updateDisplayUntil_ = [[NSDate dateWithTimeIntervalSinceNow:10] retain];
    if ([[[self tab] parentWindow] currentTab] == [self tab]) {
-        if ([data length] < 1024) {
+        if ([data length] < 256) {
            [self scheduleUpdateIn:kFastTimerIntervalSec];
        } else {
            [self scheduleUpdateIn:kSlowTimerIntervalSec];

--- a/PTYTextView.m
+++ b/PTYTextView.m
@@ -3990,6 +3990,9 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
        includeLastNewline:(BOOL)includeLastNewline
    trimTrailingWhitespace:(BOOL)trimSelectionTrailingSpaces
 {
+    DLog(@"Find selected text from %d,%d to %d,%d pad=%d, includeLastNewline=%d, trim=%d",
+         startx, starty, nonInclusiveEndx, endy, (int)pad, (int)includeLastNewline,
+         (int)trimSelectionTrailingSpaces);
    int endx = nonInclusiveEndx-1;
    int width = [dataSource width];
    const int estimatedSize = (endy - starty + 1) * (width + 1) + (endx - startx + 1);
@@ -4089,15 +4092,18 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 - (NSString *)selectedTextWithPad:(BOOL)pad
 {
    if (startX <= -1) {
+        DLog(@"startx < 0 so there is no selected text");
        return nil;
    }
    if (selectMode == SELECT_BOX) {
+        DLog(@"find selected text in box");
        return [self contentInBoxFromX:startX
                                     Y:startY
                                   ToX:endX
                                     Y:endY
                                   pad:pad];
    } else {
+        DLog(@"find selected text in normal region");
        return ([self contentFromX:startX
                                 Y:startY
                               ToX:endX
@@ -4167,8 +4173,9 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
    NSPasteboard *pboard = [NSPasteboard generalPasteboard];
    NSString *copyString;
  
+    DLog(@"-[PTYTextView copy:] called");
    copyString = [self selectedText];
-
+    DLog(@"Have selected text of length %d. startX=%d, startY=%d, endX=%d, endY=%d", (int)[copyString length], startX, startY, endX, endY);
    if (copyString) {
        [pboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:self];
        [pboard setString:copyString forType:NSStringPboardType];
@@ -6208,6 +6215,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
        }
  
        if (minimumContrast_ > 0.001 && bgColor) {
+            // TODO: Way too much time spent here. Use previous char's color if it is the same.
            thisChar.color = [self color:thisChar.color withContrastAgainst:bgColor];
        }
        BOOL drawable;
@@ -6319,9 +6327,20 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
    [thisChar release];
 }
  
+static void PTYShowGlyphsAtPositions(CTFontRef runFont, const CGGlyph *glyphs, NSPoint *positions, int glyphCount, CGContextRef ctx) {
+    CTFontDrawGlyphsFunction* function = GetCTFontDrawGlyphsFunction();
+    if (function) {
+        // function is CTFontDrawGlyphs. It can draw Emoji, but only exists on 10.7.
+        CTFontDrawGlyphs(runFont, glyphs, positions, glyphCount, ctx);
+    } else {
+        CGContextShowGlyphsAtPositions(ctx, glyphs, positions, glyphCount);
+    }
+}
+
 - (void)drawRun:(CharacterRun *)currentRun
            ctx:(CGContextRef)ctx
   initialPoint:(NSPoint)initialPoint {
+    NSGraphicsContext *graphicsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:ctx flipped:YES];
    CTLineRef line = [currentRun newLine];
    NSArray *runs = (NSArray *)CTLineGetGlyphRuns(line);
    int x = currentRun.x;
@@ -6361,7 +6380,10 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                                                          0.0, -1.0,
                                                          x,    y));
  
-        CGContextShowGlyphsAtPositions(ctx, glyphs, positions, glyphCount);
+        // Keeps emoji from being transparent.
+        [graphicsContext setCompositingOperation:NSCompositeSourceOver];
+
+        PTYShowGlyphsAtPositions(runFont, glyphs, positions, glyphCount, ctx);
  
        if (currentRun.fakeBold) {
            // If anti-aliased, drawing twice at the same position makes the strokes thicker.
@@ -6371,7 +6393,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                                                              x + (currentRun.antiAlias ? 0 : 1),
                                                              y));
  
-            CGContextShowGlyphsAtPositions(ctx, glyphs, positions, glyphCount);
+            PTYShowGlyphsAtPositions(runFont, glyphs, positions, glyphCount, ctx);
        }
        x += runWidth;
    }
@@ -8187,10 +8209,12 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 #endif
    BOOL irEnabled = [[PreferencePanel sharedInstance] instantReplay];
    long long totalScrollbackOverflow = [dataSource totalScrollbackOverflow];
+    int allDirty = [dataSource isAllDirty] ? 1 : 0;
+    [dataSource resetAllDirty];
    for (int y = lineStart; y < lineEnd; y++) {
        NSMutableData* matches = [resultMap_ objectForKey:[NSNumber numberWithLongLong:y + totalScrollbackOverflow]];
        for (int x = 0; x < WIDTH; x++) {
-            int dirtyFlags = [dataSource dirtyAtX:x Y:y-lineStart];
+            int dirtyFlags = ([dataSource dirtyAtX:x Y:y-lineStart] | allDirty);
            if (dirtyFlags) {
                if (irEnabled) {
                    if (dirtyFlags & 1) {

--- a/PTYWindow.m
+++ b/PTYWindow.m
@@ -35,8 +35,6 @@
 #import "FutureMethods.h"
 #import "iTermController.h"
 #import "iTermApplicationDelegate.h"
-// This is included because the blurring code uses undocumented APIs to do its thing.
-#import <CGSInternal.h>
  
 #define DEBUG_METHOD_ALLOC  0
 #define DEBUG_METHOD_TRACE  0
@@ -84,34 +82,6 @@
    return self;
 }
  
-typedef CGError CGSSetWindowBackgroundBlurRadiusFunction(CGSConnectionID cid, CGSWindowID wid, NSUInteger blur);
-
-static void *GetFunctionByName(NSString *library, char *func) {
-    CFBundleRef bundle;
-    CFURLRef bundleURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, (CFStringRef) library, kCFURLPOSIXPathStyle, true);
-    CFStringRef functionName = CFStringCreateWithCString(kCFAllocatorDefault, func, kCFStringEncodingASCII);    
-    bundle = CFBundleCreate(kCFAllocatorDefault, bundleURL);
-    void *f = NULL;
-    if (bundle) {
-        f = CFBundleGetFunctionPointerForName(bundle, functionName);
-        CFRelease(bundle);
-    }
-    CFRelease(functionName);
-    CFRelease(bundleURL);
-    return f;
-}
-
-static CGSSetWindowBackgroundBlurRadiusFunction* GetCGSSetWindowBackgroundBlurRadiusFunction() {
-    static BOOL tried = NO;
-    static CGSSetWindowBackgroundBlurRadiusFunction *function = NULL;
-    if (!tried) {
-        function  = GetFunctionByName(@"/System/Library/Frameworks/ApplicationServices.framework",
-                                      "CGSSetWindowBackgroundBlurRadius");
-        tried = YES;
-    }
-    return function;
-}
-
 - (void)encodeRestorableStateWithCoder:(NSCoder *)coder
 {
    // This gives a warning, but this method won't be called except in 10.7 where this

--- a/PreferencePanel.m
+++ b/PreferencePanel.m
@@ -1456,7 +1456,7 @@ static float versionNumber;
        [openArrangementAtStartup setState:NO];
    }
    [hotkey setState: defaultHotkey?NSOnState:NSOffState];
-    if (defaultHotkeyCode) {
+    if (defaultHotkeyCode || defaultHotkeyChar) {
        [hotkeyField setStringValue:[iTermKeyBindingMgr formatKeyCombination:[NSString stringWithFormat:@"0x%x-0x%x", defaultHotkeyChar, defaultHotkeyModifiers]]];
    } else {
        [hotkeyField setStringValue:@""];
@@ -2362,10 +2362,6 @@ static float versionNumber;
        for (NSString *key in localPrefs) {
            if ([self preferenceKeyIsSyncable:key] &&
                ![[remotePrefs objectForKey:key] isEqual:[localPrefs objectForKey:key]]) {
-                NSLog(@"Prefs differ for key %@. local=\"%@\", remote=\"%@\" [case 1]",
-                      key,
-                      [localPrefs objectForKey:key],
-                      [remotePrefs objectForKey:key]);
                return YES;
            }
        }
@@ -2373,10 +2369,6 @@ static float versionNumber;
        for (NSString *key in remotePrefs) {
            if ([self preferenceKeyIsSyncable:key] &&
                ![[remotePrefs objectForKey:key] isEqual:[localPrefs objectForKey:key]]) {
-                NSLog(@"Prefs differ for key %@. local=\"%@\", remote=\"%@\" [case 2]",
-                      key,
-                      [localPrefs objectForKey:key],
-                      [remotePrefs objectForKey:key]);
                return YES;
            }
        }

--- a/PseudoTerminal.m
+++ b/PseudoTerminal.m
@@ -1074,8 +1074,7 @@ NSString *sessionsKey = @"sessions";
        title = @"";
    }
  
-    NSUInteger number = [[iTermController sharedInstance] indexOfTerminal:self];
-    if ([[PreferencePanel sharedInstance] windowNumber] && number < 9) {
+    if ([[PreferencePanel sharedInstance] windowNumber]) {
        [[self window] setTitle:[NSString stringWithFormat:@"%d. %@", number_+1, title]];
    } else {
        [[self window] setTitle:title];

--- a/ToolJobs.h
+++ b/ToolJobs.h
@@ -20,6 +20,7 @@
    NSMutableArray *pids_;
    BOOL hasSelection;
    BOOL shutdown_;
+    NSTimeInterval timerInterval_;
 }
  
 @property (nonatomic, assign) BOOL hasSelection;

--- a/ToolJobs.m
+++ b/ToolJobs.m
@@ -102,15 +102,11 @@ static const CGFloat kMargin = 4;
        
        [scrollView_ setDocumentView:tableView_];
        [self addSubview:scrollView_];
-        
+
        [tableView_ sizeToFit];
        [tableView_ setColumnAutoresizingStyle:NSTableViewSequentialColumnAutoresizingStyle];
  
-        timer_ = [NSTimer scheduledTimerWithTimeInterval:1
-                                                  target:self
-                                                selector:@selector(updateTimer:)
-                                                userInfo:nil
-                                                 repeats:YES];
+        timerInterval_ = 1;
  
        [[NSNotificationCenter defaultCenter] addObserver:self
                                                 selector:@selector(setSlowTimer)
@@ -140,23 +136,15 @@ static const CGFloat kMargin = 4;
 // When not key, check much less often to avoid burning the battery.
 - (void)setSlowTimer
 {
-    [timer_ invalidate];
-    timer_ = [NSTimer scheduledTimerWithTimeInterval:10
-                                              target:self
-                                            selector:@selector(updateTimer:)
-                                            userInfo:nil
-                                             repeats:YES];
+    timerInterval_ = 10;
 }
  
 - (void)setFastTimer
 {
-    [self updateTimer:nil];
+    timerInterval_ = 1;
    [timer_ invalidate];
-    timer_ = [NSTimer scheduledTimerWithTimeInterval:1
-                                              target:self
-                                            selector:@selector(updateTimer:)
-                                            userInfo:nil
-                                             repeats:YES];
+    timer_ = nil;
+    [self updateTimer:nil];
 }
  
 - (void)dealloc
@@ -166,6 +154,7 @@ static const CGFloat kMargin = 4;
    [tableView_ release];
    [scrollView_ release];
    [timer_ invalidate];
+    timer_ = nil;
    [names_ release];
    [pids_ release];
    [super dealloc];
@@ -176,43 +165,48 @@ static const CGFloat kMargin = 4;
    [[NSNotificationCenter defaultCenter] removeObserver:self];
    shutdown_ = YES;
    [timer_ invalidate];
-    [kill_ unbind:@"enabled"];
    timer_ = nil;
+    [kill_ unbind:@"enabled"];
 }
  
 - (void)updateTimer:(id)sender
 {
+    timer_ = nil;
    if (shutdown_) {
        return;
    }
    ToolWrapper *wrapper = (ToolWrapper *)[[self superview] superview];
    pid_t rootPid = [[[wrapper.term currentSession] SHELL] pid];
    NSSet *pids = [[ProcessCache sharedInstance] childrenOfPid:rootPid levelsToSkip:0];
-    if ([pids isEqualToSet:[NSSet setWithArray:pids_]]) {
-        // Nothing to do, skip the expensive step of getting names.
-        return;
-    }
-    [pids_ release];
-    pids_ = [[[pids allObjects] sortedArrayUsingSelector:@selector(compare:)] retain];
-    [names_ removeAllObjects];
-    int i = 0;
-    for (NSNumber *pid in pids_) {
-        BOOL fg;
-        NSString *pidName;
-        pidName = [[ProcessCache sharedInstance] getNameOfPid:[pid intValue]
-                                                 isForeground:&fg];
-        if (pidName) {
-            [names_ addObject:pidName];
-            i++;
-            if (i > kMaxJobs) {
-                break;
+    if (![pids isEqualToSet:[NSSet setWithArray:pids_]]) {
+        // Something changed. Get job names, which is expensive.
+        [pids_ release];
+        pids_ = [[[pids allObjects] sortedArrayUsingSelector:@selector(compare:)] retain];
+        [names_ removeAllObjects];
+        int i = 0;
+        for (NSNumber *pid in pids_) {
+            BOOL fg;
+            NSString *pidName;
+            pidName = [[ProcessCache sharedInstance] getNameOfPid:[pid intValue]
+                                                     isForeground:&fg];
+            if (pidName) {
+                [names_ addObject:pidName];
+                i++;
+                if (i > kMaxJobs) {
+                    break;
+                }
            }
        }
-    }
-    [tableView_ reloadData];
+        [tableView_ reloadData];
  
-    // Updating the table data causes the cursor to change into an arrow!
-    [self performSelector:@selector(fixCursor) withObject:nil afterDelay:0];
+        // Updating the table data causes the cursor to change into an arrow!
+        [self performSelector:@selector(fixCursor) withObject:nil afterDelay:0];
+    }
+    timer_ = [NSTimer scheduledTimerWithTimeInterval:timerInterval_
+                                              target:self
+                                            selector:@selector(updateTimer:)
+                                            userInfo:nil
+                                             repeats:NO];
 }
  
 - (void)fixCursor

--- a/VT100Screen.h
+++ b/VT100Screen.h
@@ -154,6 +154,7 @@ void TranslateCharacterSet(screen_char_t *s, int len);
    BOOL saveToScrollbackInAlternateScreen_;
  
    BOOL allowTitleReporting_;
+	BOOL allDirty_;  // When true, all cells are dirty. Faster than a big memset.
 }
  
  
@@ -285,6 +286,8 @@ void TranslateCharacterSet(screen_char_t *s, int len);
  
 - (void)resetDirty;
 - (void)setDirty;
+- (BOOL)isAllDirty;
+- (void)resetAllDirty;
  
 // print to ansi...
 - (BOOL) printToAnsi;

--- a/VT100Screen.m
+++ b/VT100Screen.m
@@ -76,6 +76,17 @@ typedef struct {
    int savedCursorY;
 } SavedScreenInfo;
  
+typedef struct {
+    int x, y;
+} CellCoord;
+
+static CellCoord MakeCellCoord(int x, int y) {
+    CellCoord c;
+    c.x = x;
+    c.y = y;
+    return c;
+}
+
 // Wait this long between calls to NSBeep().
 static const double kInterBellQuietPeriod = 0.1;
  
@@ -773,8 +784,8 @@ static char* FormatCont(int c)
  
 // Set the color of prototypechar to all chars between startPoint and endPoint on the screen.
 - (void)highlightWithColors:(NSDictionary *)colors
-                  fromPoint:(NSPoint)startPoint
-                    toPoint:(NSPoint)endPoint
+                  fromPoint:(CellCoord)startPoint
+                    toPoint:(CellCoord)endPoint
 {
    NSColor *fgColor = [colors objectForKey:kHighlightForegroundColor];
    NSColor *bgColor = [colors objectForKey:kHighlightBackgroundColor];
@@ -890,7 +901,11 @@ static char* FormatCont(int c)
                endY = HEIGHT - 1;
                endX = WIDTH;
            }
-            [self highlightWithColors:colors fromPoint:NSMakePoint(startX, startY) toPoint:NSMakePoint(endX, endY)];
+            if (startY < HEIGHT) {
+                [self highlightWithColors:colors
+                                fromPoint:MakeCellCoord(startX, startY)
+                                  toPoint:MakeCellCoord(endX, endY)];
+            }
  
            searchRange.location = range.location + range.length;
            searchRange.length = joinedLine.length - searchRange.location;
@@ -4125,8 +4140,21 @@ void DumpBuf(screen_char_t* p, int n) {
 {
    [self resetScrollbackOverflow];
    [display deselect];
-    [display setNeedsDisplay:YES];
-    DebugLog(@"setDirty (doesn't actually set dirty)");
+    // There was a call to [display setNeedsDisplay:YES] here which was
+    // a remnant of iTerm 0.1 (see bug 1124) that was killing performance.
+    // I'm almost sure it wasn't doing any good.
+	allDirty_ = YES;
+    DebugLog(@"setDirty (screen scrolled)");
+}
+
+- (BOOL)isAllDirty
+{
+	return allDirty_;
+}
+
+- (void)resetAllDirty
+{
+	allDirty_ = NO;
 }
  
 - (void)doPrint

--- a/VT100Terminal.m
+++ b/VT100Terminal.m
@@ -366,12 +366,6 @@ static int getCSIParam(unsigned char *datap,
                param->count++;
            // reset the parameter flag
            readNumericParameter = NO;
-
-            if (param->count >= VT100CSIPARAM_MAX) {
-                // broken
-                param->cmd = 0xff;
-                unrecognized = YES;
-            }
        }
        else if (isalpha(*datap)||*datap=='@') {
            datalen--;
@@ -639,9 +633,7 @@ static int getCSIParamCanonically(unsigned char *datap,
  
            case ';':
                // If we got an implied (blank) parameter, increment the parameter count again
-                if (param->count >= VT100CSIPARAM_MAX) {
-                    unrecognized = YES;
-                } else if(readNumericParameter == NO) {
+                if (param->count < VT100CSIPARAM_MAX && readNumericParameter == NO) {
                    param->count++;
                }
                // reset the parameter flag

--- a/iTerm.xcodeproj/project.pbxproj
+++ b/iTerm.xcodeproj/project.pbxproj
@@ -257,8 +257,6 @@
 		1D7C1AD31276FD6E00461E55 /* PasteboardHistory.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1D7C1AD11276FD6E00461E55 /* PasteboardHistory.xib */; };
 		1D7C1D1212772ECC00461E55 /* NSDateFormatterExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D7C1D1012772ECC00461E55 /* NSDateFormatterExtras.h */; };
 		1D7C1D1312772ECC00461E55 /* NSDateFormatterExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D7C1D1112772ECC00461E55 /* NSDateFormatterExtras.m */; };
-		1D823C4812F92B3F0028422B /* screen.png in Resources */ = {isa = PBXBuildFile; fileRef = 1D823C4712F92B3F0028422B /* screen.png */; };
-		1D8255F714649F8E007CAE78 /* PrefsMouse.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1D8255F614649F8E007CAE78 /* PrefsMouse.tiff */; };
 		1D8255F9146869D8007CAE78 /* DefaultPointerActions.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D8255F8146869D8007CAE78 /* DefaultPointerActions.plist */; };
 		1D8255FC14687EE8007CAE78 /* PointerPrefsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D8255FA14687EE8007CAE78 /* PointerPrefsController.h */; };
 		1D8255FD14687EE8007CAE78 /* PointerPrefsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D8255FB14687EE8007CAE78 /* PointerPrefsController.m */; };
@@ -342,14 +340,11 @@
 		1DC38818148E840700B89F7C /* SolidColorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DC38816148E840600B89F7C /* SolidColorView.h */; };
 		1DC38819148E840700B89F7C /* SolidColorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DC38817148E840700B89F7C /* SolidColorView.m */; };
 		1DC742A0127C96F90069594C /* IBarCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DC7429F127C96F90069594C /* IBarCursor.png */; };
-		1DCA5ECC13EE4DA800B7725E /* arrangement.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA5ECB13EE4DA800B7725E /* arrangement.png */; };
 		1DCA5ECF13EE507800B7725E /* WindowArrangements.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DCA5ECD13EE507800B7725E /* WindowArrangements.h */; };
 		1DCA5ED013EE507800B7725E /* WindowArrangements.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DCA5ECE13EE507800B7725E /* WindowArrangements.m */; };
 		1DCA8BA9121A1B8000ABDEB5 /* PrefsAdvanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA8BA3121A1B8000ABDEB5 /* PrefsAdvanced.tiff */; };
 		1DCA8BAA121A1B8000ABDEB5 /* PrefsBookmarks.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA8BA4121A1B8000ABDEB5 /* PrefsBookmarks.tiff */; };
 		1DCA8BAB121A1B8000ABDEB5 /* PrefsDisplay.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA8BA5121A1B8000ABDEB5 /* PrefsDisplay.tiff */; };
-		1DCA8BAC121A1B8000ABDEB5 /* PrefsGeneral.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA8BA6121A1B8000ABDEB5 /* PrefsGeneral.tiff */; };
-		1DCA8BAD121A1B8000ABDEB5 /* PrefsKeyboard.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA8BA7121A1B8000ABDEB5 /* PrefsKeyboard.tiff */; };
 		1DCA8BAE121A1B8000ABDEB5 /* PrefsTerminal.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA8BA8121A1B8000ABDEB5 /* PrefsTerminal.tiff */; };
 		1DCBC811126DD98200D5B961 /* WindowControllerInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DCBC810126DD98200D5B961 /* WindowControllerInterface.h */; };
 		1DCF3CB71222FF1400AD56F1 /* PresetKeyMappings.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DCF3CB61222FF1400AD56F1 /* PresetKeyMappings.plist */; };
@@ -400,6 +395,18 @@
 		874206530564169600CFC3F1 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0464AB2F006CD2EC7F000001 /* AppKit.framework */; };
 		9325FF500FB54E00004EC67C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9325FF4E0FB54E00004EC67C /* MainMenu.xib */; };
 		93A6FEFA10685E9900A5F905 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 93A6FEF910685E9900A5F905 /* dsa_pub.pem */; };
+		9D737D5F17495B4100B3334D /* PrefsGeneral.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D737D5D17495B4100B3334D /* PrefsGeneral.png */; };
+		9D737D6017495B4100B3334D /* PrefsGeneral@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D737D5E17495B4100B3334D /* PrefsGeneral@2x.png */; };
+		9DB3D6E0176C8F0B0071CCF8 /* PrefsAppearance.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6DE176C8F0B0071CCF8 /* PrefsAppearance.png */; };
+		9DB3D6E1176C8F0B0071CCF8 /* PrefsAppearance@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6DF176C8F0B0071CCF8 /* PrefsAppearance@2x.png */; };
+		9DB3D6E4176CB4D80071CCF8 /* PrefsProfile.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6E2176CB4D80071CCF8 /* PrefsProfile.png */; };
+		9DB3D6E5176CB4D80071CCF8 /* PrefsProfile@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6E3176CB4D80071CCF8 /* PrefsProfile@2x.png */; };
+		9DB3D6E8176CBC0C0071CCF8 /* PrefsKeyboard.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6E6176CBC0C0071CCF8 /* PrefsKeyboard.png */; };
+		9DB3D6E9176CBC0C0071CCF8 /* PrefsKeyboard@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6E7176CBC0C0071CCF8 /* PrefsKeyboard@2x.png */; };
+		9DB3D6EC176CC47E0071CCF8 /* PrefsMouse.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6EA176CC47E0071CCF8 /* PrefsMouse.png */; };
+		9DB3D6ED176CC47E0071CCF8 /* PrefsMouse@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6EB176CC47E0071CCF8 /* PrefsMouse@2x.png */; };
+		9DB3D6F0176CCABE0071CCF8 /* PrefsArrangements.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6EE176CCABE0071CCF8 /* PrefsArrangements.png */; };
+		9DB3D6F1176CCABE0071CCF8 /* PrefsArrangements@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6EF176CCABE0071CCF8 /* PrefsArrangements@2x.png */; };
 		A073973E14C768E400786414 /* ColorsMenuItemView.h in Headers */ = {isa = PBXBuildFile; fileRef = A073973D14C768E400786414 /* ColorsMenuItemView.h */; };
 		A073974014C7694600786414 /* ColorsMenuItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = A073973F14C7694600786414 /* ColorsMenuItemView.m */; };
 		DDF0FD65062916F70080EF74 /* iTermApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF0FD63062916F70080EF74 /* iTermApplication.h */; };
@@ -566,8 +573,6 @@
 		1D7C1AD21276FD6E00461E55 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PasteboardHistory.xib; sourceTree = "<group>"; };
 		1D7C1D1012772ECC00461E55 /* NSDateFormatterExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDateFormatterExtras.h; sourceTree = "<group>"; };
 		1D7C1D1112772ECC00461E55 /* NSDateFormatterExtras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSDateFormatterExtras.m; sourceTree = "<group>"; };
-		1D823C4712F92B3F0028422B /* screen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = screen.png; path = images/screen.png; sourceTree = "<group>"; };
-		1D8255F614649F8E007CAE78 /* PrefsMouse.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsMouse.tiff; path = images/PrefsMouse.tiff; sourceTree = "<group>"; };
 		1D8255F8146869D8007CAE78 /* DefaultPointerActions.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = DefaultPointerActions.plist; sourceTree = "<group>"; };
 		1D8255FA14687EE8007CAE78 /* PointerPrefsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PointerPrefsController.h; sourceTree = "<group>"; };
 		1D8255FB14687EE8007CAE78 /* PointerPrefsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PointerPrefsController.m; sourceTree = "<group>"; };
@@ -652,14 +657,11 @@
 		1DC38816148E840600B89F7C /* SolidColorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SolidColorView.h; sourceTree = "<group>"; };
 		1DC38817148E840700B89F7C /* SolidColorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SolidColorView.m; sourceTree = "<group>"; };
 		1DC7429F127C96F90069594C /* IBarCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = IBarCursor.png; path = images/IBarCursor.png; sourceTree = "<group>"; };
-		1DCA5ECB13EE4DA800B7725E /* arrangement.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrangement.png; path = images/arrangement.png; sourceTree = "<group>"; };
 		1DCA5ECD13EE507800B7725E /* WindowArrangements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowArrangements.h; sourceTree = "<group>"; };
 		1DCA5ECE13EE507800B7725E /* WindowArrangements.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WindowArrangements.m; sourceTree = "<group>"; };
 		1DCA8BA3121A1B8000ABDEB5 /* PrefsAdvanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsAdvanced.tiff; path = images/PrefsAdvanced.tiff; sourceTree = "<group>"; };
 		1DCA8BA4121A1B8000ABDEB5 /* PrefsBookmarks.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsBookmarks.tiff; path = images/PrefsBookmarks.tiff; sourceTree = "<group>"; };
 		1DCA8BA5121A1B8000ABDEB5 /* PrefsDisplay.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsDisplay.tiff; path = images/PrefsDisplay.tiff; sourceTree = "<group>"; };
-		1DCA8BA6121A1B8000ABDEB5 /* PrefsGeneral.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsGeneral.tiff; path = images/PrefsGeneral.tiff; sourceTree = "<group>"; };
-		1DCA8BA7121A1B8000ABDEB5 /* PrefsKeyboard.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsKeyboard.tiff; path = images/PrefsKeyboard.tiff; sourceTree = "<group>"; };
 		1DCA8BA8121A1B8000ABDEB5 /* PrefsTerminal.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsTerminal.tiff; path = images/PrefsTerminal.tiff; sourceTree = "<group>"; };
 		1DCBC810126DD98200D5B961 /* WindowControllerInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowControllerInterface.h; sourceTree = "<group>"; };
 		1DCF3CB61222FF1400AD56F1 /* PresetKeyMappings.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = PresetKeyMappings.plist; sourceTree = "<group>"; };
@@ -736,6 +738,18 @@
 		9325FF470FB54DF1004EC67C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/BookmarksWindow.xib; sourceTree = "<group>"; };
 		9325FF4F0FB54E00004EC67C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		93A6FEF910685E9900A5F905 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
+		9D737D5D17495B4100B3334D /* PrefsGeneral.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PrefsGeneral.png; path = images/PrefsGeneral.png; sourceTree = "<group>"; };
+		9D737D5E17495B4100B3334D /* PrefsGeneral@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "PrefsGeneral@2x.png"; path = "images/PrefsGeneral@2x.png"; sourceTree = "<group>"; };
+		9DB3D6DE176C8F0B0071CCF8 /* PrefsAppearance.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PrefsAppearance.png; path = images/PrefsAppearance.png; sourceTree = "<group>"; };
+		9DB3D6DF176C8F0B0071CCF8 /* PrefsAppearance@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "PrefsAppearance@2x.png"; path = "images/PrefsAppearance@2x.png"; sourceTree = "<group>"; };
+		9DB3D6E2176CB4D80071CCF8 /* PrefsProfile.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PrefsProfile.png; path = images/PrefsProfile.png; sourceTree = "<group>"; };
+		9DB3D6E3176CB4D80071CCF8 /* PrefsProfile@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "PrefsProfile@2x.png"; path = "images/PrefsProfile@2x.png"; sourceTree = "<group>"; };
+		9DB3D6E6176CBC0C0071CCF8 /* PrefsKeyboard.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PrefsKeyboard.png; path = images/PrefsKeyboard.png; sourceTree = "<group>"; };
+		9DB3D6E7176CBC0C0071CCF8 /* PrefsKeyboard@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "PrefsKeyboard@2x.png"; path = "images/PrefsKeyboard@2x.png"; sourceTree = "<group>"; };
+		9DB3D6EA176CC47E0071CCF8 /* PrefsMouse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PrefsMouse.png; path = images/PrefsMouse.png; sourceTree = "<group>"; };
+		9DB3D6EB176CC47E0071CCF8 /* PrefsMouse@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "PrefsMouse@2x.png"; path = "images/PrefsMouse@2x.png"; sourceTree = "<group>"; };
+		9DB3D6EE176CCABE0071CCF8 /* PrefsArrangements.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PrefsArrangements.png; path = images/PrefsArrangements.png; sourceTree = "<group>"; };
+		9DB3D6EF176CCABE0071CCF8 /* PrefsArrangements@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "PrefsArrangements@2x.png"; path = "images/PrefsArrangements@2x.png"; sourceTree = "<group>"; };
 		A073973D14C768E400786414 /* ColorsMenuItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorsMenuItemView.h; sourceTree = "<group>"; };
 		A073973F14C7694600786414 /* ColorsMenuItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ColorsMenuItemView.m; sourceTree = "<group>"; };
 		DD02572409CB9398008F320C /* PSMAquaTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSMAquaTabStyle.h; sourceTree = "<group>"; };
@@ -1179,16 +1193,24 @@
 		1D093C131217412B0029F9AD /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				9DB3D6E2176CB4D80071CCF8 /* PrefsProfile.png */,
+				9DB3D6E3176CB4D80071CCF8 /* PrefsProfile@2x.png */,
+				9DB3D6DE176C8F0B0071CCF8 /* PrefsAppearance.png */,
+				9DB3D6DF176C8F0B0071CCF8 /* PrefsAppearance@2x.png */,
+				9DB3D6E6176CBC0C0071CCF8 /* PrefsKeyboard.png */,
+				9DB3D6E7176CBC0C0071CCF8 /* PrefsKeyboard@2x.png */,
+				9DB3D6EA176CC47E0071CCF8 /* PrefsMouse.png */,
+				9DB3D6EB176CC47E0071CCF8 /* PrefsMouse@2x.png */,
+				9DB3D6EE176CCABE0071CCF8 /* PrefsArrangements.png */,
+				9DB3D6EF176CCABE0071CCF8 /* PrefsArrangements@2x.png */,
 				1D48B2F8165F45BA000046EE /* star@2x.png */,
 				1D48B293165F4416000046EE /* star.png */,
 				1D48B291165F405A000046EE /* important@2x.png */,
 				FBB2EBCD040AC7C201F955DB /* important.png */,
 				1DA34E02165F268F00AA91C4 /* IBarCursor@2x.png */,
-				1D8255F614649F8E007CAE78 /* PrefsMouse.tiff */,
 				5ECE4AE914514058002A9CC2 /* Growl Registration Ticket.growlRegDict */,
 				1D9DDE9D142E855D00275650 /* Coprocess.png */,
 				1D19C3621415998E00617E08 /* closebutton.tif */,
-				1DCA5ECB13EE4DA800B7725E /* arrangement.png */,
 				1D6A5FDE140D7AA000DE19F8 /* IBarCursorXMR.png */,
 				1DA34E03165F268F00AA91C4 /* IBarCursorXMR@2x.png */,
 				1D8F396A13EB7A2C0025B80B /* BroadcastInput.png */,
@@ -1196,7 +1218,6 @@
 				1DA02CFA1327612600D7E7DB /* bell.png */,
 				1DA030F71328BD7C00D7E7DB /* wrap_to_bottom.png */,
 				1DA030F81328BD7C00D7E7DB /* wrap_to_top.png */,
-				1D823C4712F92B3F0028422B /* screen.png */,
 				1DC7429F127C96F90069594C /* IBarCursor.png */,
 				1D53A6AE1232DA3B00B7767B /* DefaultGlobalKeyMap.plist */,
 				1D8C6BF4126592DF00E2744E /* EncodingsWithLowerCase.plist */,
@@ -1205,10 +1226,10 @@
 				1DCF3EFF1224EEBD00AD56F1 /* MigrationMap.plist */,
 				1DCA8BA3121A1B8000ABDEB5 /* PrefsAdvanced.tiff */,
 				1DCA8BA4121A1B8000ABDEB5 /* PrefsBookmarks.tiff */,
+				9D737D5D17495B4100B3334D /* PrefsGeneral.png */,
+				9D737D5E17495B4100B3334D /* PrefsGeneral@2x.png */,
 				1DB72CF51396059200EB1005 /* xterm-terminfo.txt */,
 				1DCA8BA5121A1B8000ABDEB5 /* PrefsDisplay.tiff */,
-				1DCA8BA6121A1B8000ABDEB5 /* PrefsGeneral.tiff */,
-				1DCA8BA7121A1B8000ABDEB5 /* PrefsKeyboard.tiff */,
 				1DCA8BA8121A1B8000ABDEB5 /* PrefsTerminal.tiff */,
 				1DCF3CB61222FF1400AD56F1 /* PresetKeyMappings.plist */,
 				1D1158C913444D29009B366F /* iTerm2 Help */,
@@ -1747,8 +1768,6 @@
 				1DCA8BA9121A1B8000ABDEB5 /* PrefsAdvanced.tiff in Resources */,
 				1DCA8BAA121A1B8000ABDEB5 /* PrefsBookmarks.tiff in Resources */,
 				1DCA8BAB121A1B8000ABDEB5 /* PrefsDisplay.tiff in Resources */,
-				1DCA8BAC121A1B8000ABDEB5 /* PrefsGeneral.tiff in Resources */,
-				1DCA8BAD121A1B8000ABDEB5 /* PrefsKeyboard.tiff in Resources */,
 				1DCA8BAE121A1B8000ABDEB5 /* PrefsTerminal.tiff in Resources */,
 				1DCF3CB71222FF1400AD56F1 /* PresetKeyMappings.plist in Resources */,
 				1D6C4D5A122329F000E0AA3E /* ColorPresets.plist in Resources */,
@@ -1763,7 +1782,6 @@
 				1D94EAB012D64022008225A9 /* UKCrashReporter.nib in Resources */,
 				1D94EAB112D64022008225A9 /* UKCrashReporter.strings in Resources */,
 				1D99785312EEB3D600F0794D /* GlobalSearch.xib in Resources */,
-				1D823C4812F92B3F0028422B /* screen.png in Resources */,
 				1D237D90131D8BEE004DD60C /* FindView.xib in Resources */,
 				1DA02CFB1327612600D7E7DB /* bell.png in Resources */,
 				1DA030F91328BD7C00D7E7DB /* wrap_to_bottom.png in Resources */,
@@ -1772,13 +1790,11 @@
 				1D395913134E75B5005A8021 /* SmartSelectionRules.plist in Resources */,
 				1DB72CF61396059200EB1005 /* xterm-terminfo.txt in Resources */,
 				1D8F396B13EB7A2C0025B80B /* BroadcastInput.png in Resources */,
-				1DCA5ECC13EE4DA800B7725E /* arrangement.png in Resources */,
 				1D844C8D13FD8B7700CD4F85 /* SplitPanel.xib in Resources */,
 				1D6A5FDF140D7AA000DE19F8 /* IBarCursorXMR.png in Resources */,
 				1D19C3631415998E00617E08 /* closebutton.tif in Resources */,
 				1D9DDE9E142E855D00275650 /* Coprocess.png in Resources */,
 				5ECE4AEA14514058002A9CC2 /* Growl Registration Ticket.growlRegDict in Resources */,
-				1D8255F714649F8E007CAE78 /* PrefsMouse.tiff in Resources */,
 				1D8255F9146869D8007CAE78 /* DefaultPointerActions.plist in Resources */,
 				1DD4CE7D14A5163B00ED182E /* TmuxDashboard.xib in Resources */,
 				1DA34E04165F268F00AA91C4 /* IBarCursor@2x.png in Resources */,
@@ -1798,6 +1814,18 @@
 				1D48B294165F4416000046EE /* star.png in Resources */,
 				1D48B2F9165F45BA000046EE /* star@2x.png in Resources */,
 				1D085F8916F030FB00B7FCE9 /* PasteView.xib in Resources */,
+				9D737D5F17495B4100B3334D /* PrefsGeneral.png in Resources */,
+				9D737D6017495B4100B3334D /* PrefsGeneral@2x.png in Resources */,
+				9DB3D6E0176C8F0B0071CCF8 /* PrefsAppearance.png in Resources */,
+				9DB3D6E1176C8F0B0071CCF8 /* PrefsAppearance@2x.png in Resources */,
+				9DB3D6E4176CB4D80071CCF8 /* PrefsProfile.png in Resources */,
+				9DB3D6E5176CB4D80071CCF8 /* PrefsProfile@2x.png in Resources */,
+				9DB3D6E8176CBC0C0071CCF8 /* PrefsKeyboard.png in Resources */,
+				9DB3D6E9176CBC0C0071CCF8 /* PrefsKeyboard@2x.png in Resources */,
+				9DB3D6EC176CC47E0071CCF8 /* PrefsMouse.png in Resources */,
+				9DB3D6ED176CC47E0071CCF8 /* PrefsMouse@2x.png in Resources */,
+				9DB3D6F0176CCABE0071CCF8 /* PrefsArrangements.png in Resources */,
+				9DB3D6F1176CCABE0071CCF8 /* PrefsArrangements@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/iTermApplicationDelegate.m
+++ b/iTermApplicationDelegate.m
@@ -311,7 +311,8 @@ static BOOL hasBecomeActive = NO;
                             kCFPreferencesCurrentApplication);
  
    PreferencePanel* ppanel = [PreferencePanel sharedInstance];
-    if ([ppanel hotkey] && [ppanel hotkeyChar]) {
+    // Code could be 0 (e.g., A on an American keyboard) and char is also sometimes 0 (seen in bug 2501).
+    if ([ppanel hotkey] && ([ppanel hotkeyCode] || [ppanel hotkeyChar])) {
        [[iTermController sharedInstance] registerHotkey:[ppanel hotkeyCode] modifiers:[ppanel hotkeyModifiers]];
    }
    if ([ppanel isAnyModifierRemapped]) {

--- a/images/PrefsAppearance.png
+++ b/images/PrefsAppearance.png
--- a/images/PrefsAppearance@2x.png
+++ b/images/PrefsAppearance@2x.png
--- a/images/PrefsArrangements.png
+++ b/images/PrefsArrangements.png
--- a/images/PrefsArrangements@2x.png
+++ b/images/PrefsArrangements@2x.png