diff --git a/MasterPassword/ObjC/Mac/MPMacAppDelegate.h b/MasterPassword/ObjC/Mac/MPMacAppDelegate.h
index 3425b997..204bd53f 100644
--- a/MasterPassword/ObjC/Mac/MPMacAppDelegate.h
+++ b/MasterPassword/ObjC/Mac/MPMacAppDelegate.h
@@ -22,6 +22,7 @@
 @property(nonatomic, weak) IBOutlet NSMenuItem *hidePasswordsItem;
 @property(nonatomic, weak) IBOutlet NSMenuItem *rememberPasswordItem;
 @property(nonatomic, weak) IBOutlet NSMenuItem *openAtLoginItem;
+@property(nonatomic, weak) IBOutlet NSMenuItem *showFullScreenItem;
 @property(nonatomic, weak) IBOutlet NSMenuItem *savePasswordItem;
 @property(nonatomic, weak) IBOutlet NSMenuItem *createUserItem;
 @property(nonatomic, weak) IBOutlet NSMenuItem *deleteUserItem;
diff --git a/MasterPassword/ObjC/Mac/MPMacAppDelegate.m b/MasterPassword/ObjC/Mac/MPMacAppDelegate.m
index 1d507aeb..9271c0af 100644
--- a/MasterPassword/ObjC/Mac/MPMacAppDelegate.m
+++ b/MasterPassword/ObjC/Mac/MPMacAppDelegate.m
@@ -335,11 +335,15 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 - (IBAction)togglePreference:(id)sender {
 
     if (sender == self.hidePasswordsItem)
-        [MPConfig get].hidePasswords = @(![[MPConfig get].hidePasswords boolValue]);
+        [MPConfig get].hidePasswords = @(self.hidePasswordsItem.state != NSOnState);
     if (sender == self.rememberPasswordItem)
-        [MPConfig get].rememberLogin = @(![[MPConfig get].rememberLogin boolValue]);
+        [MPConfig get].rememberLogin = @(self.rememberPasswordItem.state != NSOnState);
     if (sender == self.openAtLoginItem)
         [self setLoginItemEnabled:self.openAtLoginItem.state != NSOnState];
+    if (sender == self.showFullScreenItem) {
+        [MPMacConfig get].fullScreen = @(self.showFullScreenItem.state != NSOnState);
+        [NSApp updateWindows];
+    }
     if (sender == self.savePasswordItem) {
         [MPMacAppDelegate managedObjectContextPerformBlockAndWait:^(NSManagedObjectContext *context) {
             MPUserEntity *activeUser = [[MPMacAppDelegate get] activeUserInContext:context];
@@ -610,6 +614,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
     BOOL loginItemEnabled = [self loginItemEnabled];
     self.openAtLoginItem.state = loginItemEnabled? NSOnState: NSOffState;
+    self.showFullScreenItem.state = [[MPMacConfig get].fullScreen boolValue]? NSOnState: NSOffState;
     self.initialWindowController.openAtLoginButton.state = loginItemEnabled? NSOnState: NSOffState;
     self.rememberPasswordItem.state = [[MPConfig get].rememberLogin boolValue]? NSOnState: NSOffState;
 
diff --git a/MasterPassword/ObjC/Mac/MPMacConfig.h b/MasterPassword/ObjC/Mac/MPMacConfig.h
index c3a208fa..3caf3db3 100644
--- a/MasterPassword/ObjC/Mac/MPMacConfig.h
+++ b/MasterPassword/ObjC/Mac/MPMacConfig.h
@@ -11,5 +11,6 @@
 @interface MPMacConfig : MPConfig
 
 @property(nonatomic, retain) NSString *usedUserName;
+@property(nonatomic, retain) NSNumber *fullScreen;
 
 @end
diff --git a/MasterPassword/ObjC/Mac/MPMacConfig.m b/MasterPassword/ObjC/Mac/MPMacConfig.m
index 7cac08be..0f494bc9 100644
--- a/MasterPassword/ObjC/Mac/MPMacConfig.m
+++ b/MasterPassword/ObjC/Mac/MPMacConfig.m
@@ -9,6 +9,7 @@
 @implementation MPMacConfig
 
 @dynamic usedUserName;
+@dynamic fullScreen;
 
 - (id)init {
 
@@ -16,7 +17,8 @@
         return self;
 
     [self.defaults registerDefaults:@{
-            NSStringFromSelector( @selector(appleID) )       : @"510296984",
+            NSStringFromSelector( @selector( appleID ) )    : @"510296984",
+            NSStringFromSelector( @selector( fullScreen ) ) : @YES,
     }];
 
     return self;
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindow.h b/MasterPassword/ObjC/Mac/MPPasswordWindow.h
index b3beab8c..9d5dc1d7 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindow.h
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindow.h
@@ -20,4 +20,5 @@
 
 
 @interface MPPasswordWindow : NSWindow
+
 @end
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindow.m b/MasterPassword/ObjC/Mac/MPPasswordWindow.m
index 89217459..9130baf9 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindow.m
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindow.m
@@ -18,21 +18,10 @@
 
 #import "MPPasswordWindow.h"
 
-
 @implementation MPPasswordWindow
 
 #pragma mark - Life
 
-- (void)awakeFromNib {
-
-    [super awakeFromNib];
-
-    self.opaque = NO;
-    self.backgroundColor = [NSColor clearColor];
-    self.level = NSScreenSaverWindowLevel;
-    self.alphaValue = 0;
-}
-
 - (BOOL)canBecomeKeyWindow {
 
     return YES;
@@ -40,6 +29,21 @@
 
 #pragma mark - State
 
+- (void)update {
+
+    if ([[MPMacConfig get].fullScreen boolValue]) {
+        [self setLevel:NSScreenSaverWindowLevel];
+        [self setFrame:self.screen.frame display:YES];
+    }
+    else {
+        [self setLevel:NSNormalWindowLevel];
+        [self setFrame:NSMakeRect( 0, 0, 640, 600) display:NO];
+        [self center];
+    }
+
+    [super update];
+}
+
 #pragma mark - Private
 
 @end
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.h b/MasterPassword/ObjC/Mac/MPPasswordWindowController.h
index 29613088..7bee11e6 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.h
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.h
@@ -19,6 +19,7 @@
 #import <Cocoa/Cocoa.h>
 #import "MPSiteModel.h"
 #import "MPSitesTableView.h"
+#import "MPPasswordWindow.h"
 
 @class MPMacAppDelegate;
 
@@ -33,7 +34,6 @@
 @property(nonatomic) BOOL newUser;
 
 @property(nonatomic, weak) IBOutlet NSArrayController *sitesController;
-@property(nonatomic, weak) IBOutlet NSImageView *blurView;
 @property(nonatomic, weak) IBOutlet NSTextField *inputLabel;
 @property(nonatomic, weak) IBOutlet NSTextField *securePasswordField;
 @property(nonatomic, weak) IBOutlet NSTextField *revealPasswordField;
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
index e6d9410d..4d0f8551 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
@@ -61,7 +61,7 @@
     [[NSNotificationCenter defaultCenter] addObserverForName:NSWindowDidBecomeKeyNotification object:self.window
                                                        queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
                 prof_new( @"didBecomeKey" );
-                [self fadeIn];
+                [self.window makeKeyAndOrderFront:nil];
                 prof_rewind( @"fadeIn" );
                 [self updateUser];
                 prof_finish( @"updateUser" );
@@ -75,7 +75,7 @@
     [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationWillResignActiveNotification object:nil
                                                        queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
 #ifndef DEBUG
-                [self fadeOut];
+                [self.window fadeOut];
 #endif
             }];
     [[NSNotificationCenter defaultCenter] addObserverForName:MPSignedInNotification object:nil
@@ -362,7 +362,7 @@
 
 - (IBAction)settings:(id)sender {
 
-    [self fadeOut:NO];
+    [self.window close];
     [[MPMacAppDelegate get] showPopup:sender];
 }
 
@@ -471,7 +471,7 @@
         return YES;
     }
     if (commandSelector == @selector( cancel: ) || commandSelector == @selector( cancelOperation: )) {
-        [self fadeOut];
+        [self.window close];
         return YES;
     }
 
@@ -492,7 +492,7 @@
     // Performing action while content is available.  Copy it.
     [self copyContent:self.shiftPressed? selectedSite.answer: selectedSite.content];
 
-    [self fadeOut];
+    [self.window close];
 
     NSUserNotification *notification = [NSUserNotification new];
     notification.title = @"Password Copied";
@@ -602,6 +602,7 @@
     CGFloat gradientOpacity = selectedOffset / siteScrollView.bounds.size.height;
     self.siteGradient.colors = @[
             (__bridge id)[NSColor whiteColor].CGColor,
+            (__bridge id)[NSColor colorWithDeviceWhite:1 alpha:1 - (1 - gradientOpacity) * 4 / 5].CGColor,
             (__bridge id)[NSColor colorWithDeviceWhite:1 alpha:gradientOpacity].CGColor
     ];
 
@@ -636,70 +637,4 @@
     }];
 }
 
-- (void)fadeIn {
-
-    prof_new( @"fadeIn" );
-    if ([self.window isOnActiveSpace] && self.window.alphaValue > FLT_EPSILON) {
-        prof_finish( @"showing" );
-        return;
-    }
-
-    CGDirectDisplayID displayID = [self.window.screen.deviceDescription[@"NSScreenNumber"] unsignedIntValue];
-    CGImageRef capturedImage = CGDisplayCreateImage( displayID );
-    if (!capturedImage || CGImageGetWidth( capturedImage ) <= 1) {
-        if (capturedImage)
-            CFRelease( capturedImage );
-        wrn( @"Failed to capture screen image for display: %d", displayID );
-        prof_finish( @"capture failed" );
-        return;
-    }
-    prof_rewind( @"capture" );
-
-    NSImage *screenImage = [[NSImage alloc] initWithCGImage:capturedImage size:NSMakeSize(
-            CGImageGetWidth( capturedImage ) / self.window.backingScaleFactor,
-            CGImageGetHeight( capturedImage ) / self.window.backingScaleFactor )];
-    prof_rewind( @"screenImage" );
-
-    NSImage *smallImage = [[NSImage alloc] initWithSize:NSMakeSize(
-            CGImageGetWidth( capturedImage ) / 20,
-            CGImageGetHeight( capturedImage ) / 20 )];
-    prof_rewind( @"smallImage" );
-    CFRelease( capturedImage );
-    [smallImage lockFocus];
-    [screenImage drawInRect:(NSRect){ .origin = CGPointZero, .size = smallImage.size, }
-                   fromRect:NSZeroRect
-                  operation:NSCompositeSourceOver
-                   fraction:1.0];
-    [smallImage unlockFocus];
-    prof_rewind( @"scale" );
-
-    self.blurView.image = smallImage;
-    prof_rewind( @"blurView" );
-
-    [self.window setFrame:self.window.screen.frame display:YES];
-    [NSAnimationContext currentContext].timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
-    self.window.animator.alphaValue = 1.0;
-    prof_finish( @"window setup" );
-}
-
-- (void)fadeOut {
-
-    [self fadeOut:YES];
-}
-
-- (void)fadeOut:(BOOL)hide {
-
-    if (![NSApp isActive] && self.window.alphaValue <= FLT_EPSILON)
-        return;
-
-    [[NSAnimationContext currentContext] setCompletionHandler:^{
-        [self close];
-
-        if (hide)
-            [NSApp hide:self];
-    }];
-    [NSAnimationContext currentContext].timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
-    [self.window animator].alphaValue = 0.0;
-}
-
 @end
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
index 03fadc62..1d88311c 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
@@ -9,7 +9,6 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPPasswordWindowController">
             <connections>
-                <outlet property="blurView" destination="Bwc-sd-6gm" id="wNV-0x-LJn"/>
                 <outlet property="inputLabel" destination="OnR-s6-d4P" id="p6G-Ut-cdu"/>
                 <outlet property="passwordTypesBox" destination="bZe-7q-i6q" id="Ai3-pt-i6K"/>
                 <outlet property="passwordTypesMatrix" destination="3fr-Fd-pxx" id="T8g-mS-lxP"/>
@@ -25,192 +24,33 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Master Password" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hasShadow="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MPPasswordWindow">
+        <window title="Master Password" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MPPasswordWindow">
+            <windowStyleMask key="styleMask" texturedBackground="YES" unifiedTitleAndToolbar="YES" fullSizeContentView="YES"/>
             <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" transient="YES" ignoresCycle="YES" fullScreenAuxiliary="YES"/>
-            <rect key="contentRect" x="0.0" y="0.0" width="640" height="560"/>
+            <rect key="contentRect" x="0.0" y="0.0" width="640" height="600"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ" userLabel="Root">
-                <rect key="frame" x="0.0" y="0.0" width="640" height="560"/>
+                <rect key="frame" x="0.0" y="0.0" width="640" height="600"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Bwc-sd-6gm" userLabel="Screen Capture">
-                        <rect key="frame" x="-80" y="-80" width="800" height="720"/>
-                        <contentFilters>
-                            <ciFilter name="CIGaussianBlur">
-                                <configuration>
-                                    <null key="inputImage"/>
-                                    <real key="inputRadius" value="30"/>
-                                </configuration>
-                            </ciFilter>
-                            <ciFilter name="CISepiaTone">
-                                <configuration>
-                                    <null key="inputImage"/>
-                                    <real key="inputIntensity" value="0.20000000000000001"/>
-                                </configuration>
-                            </ciFilter>
-                            <ciFilter name="CIExposureAdjust">
-                                <configuration>
-                                    <real key="inputEV" value="-1"/>
-                                    <null key="inputImage"/>
-                                </configuration>
-                            </ciFilter>
-                        </contentFilters>
-                        <imageCell key="cell" enabled="NO" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="small-screen" id="ArA-2w-I56"/>
-                    </imageView>
-                    <progressIndicator hidden="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="oSh-Ec-8Nf" userLabel="Progress Spinner">
-                        <rect key="frame" x="312" y="524" width="16" height="16"/>
+                    <visualEffectView blendingMode="behindWindow" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="eRe-Ef-AZx">
+                        <rect key="frame" x="0.0" y="0.0" width="640" height="600"/>
+                    </visualEffectView>
+                    <progressIndicator hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="oSh-Ec-8Nf" userLabel="Progress Spinner">
+                        <rect key="frame" x="312" y="564" width="16" height="16"/>
                     </progressIndicator>
-                    <button translatesAutoresizingMaskIntoConstraints="NO" id="Aue-Zx-6Mf" userLabel="Settings Gear">
-                        <rect key="frame" x="585" y="496" width="35" height="44"/>
-                        <buttonCell key="cell" type="square" title="⚙" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="i8r-9N-vcQ">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="48" name="AppleSymbols"/>
-                            <string key="keyEquivalent">,</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="settings:" target="-2" id="k7d-xi-2gs"/>
-                        </connections>
-                    </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gAU-xs-aae">
-                        <rect key="frame" x="593" y="478" width="19" height="14"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                        </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘," id="Xm1-qb-6EP">
-                            <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="5bz-xq-35V">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </textField>
-                    <secureTextField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iGR-wo-ual" userLabel="Secure Master Password">
-                        <rect key="frame" x="18" y="258" width="604" height="44"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                        </shadow>
-                        <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" focusRingType="none" alignment="center" usesSingleLineMode="YES" id="NcX-1Z-2OC">
-                            <font key="font" metaFont="system" size="36"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                            <allowedInputSourceLocales>
-                                <string>NSAllRomanInputSourcesLocaleIdentifier</string>
-                            </allowedInputSourceLocales>
-                        </secureTextFieldCell>
-                        <connections>
-                            <action selector="doUnlockUser:" target="-2" id="uLy-ug-wfr"/>
-                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="lNd-Rl-r2P"/>
-                            <binding destination="-2" name="hidden2" keyPath="locked" previousBinding="lNd-Rl-r2P" id="X7v-Rm-f7l">
-                                <dictionary key="options">
-                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                    <integer key="NSNullPlaceholder" value="-1"/>
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="-2" name="value" keyPath="masterPassword" id="5CH-Bd-Z1e">
-                                <dictionary key="options">
-                                    <bool key="NSConditionallySetsEditable" value="NO"/>
-                                    <bool key="NSContinuouslyUpdatesValue" value="YES"/>
-                                </dictionary>
-                            </binding>
-                            <outlet property="delegate" destination="-2" id="3es-rz-2Mx"/>
-                        </connections>
-                    </secureTextField>
-                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="v80-wd-hUR" userLabel="Reveal Master Password">
-                        <rect key="frame" x="18" y="258" width="604" height="44"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                        </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" state="on" focusRingType="none" alignment="center" placeholderString="" usesSingleLineMode="YES" id="gRw-5C-YUN">
-                            <font key="font" metaFont="system" size="36"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                            <allowedInputSourceLocales>
-                                <string>NSAllRomanInputSourcesLocaleIdentifier</string>
-                            </allowedInputSourceLocales>
-                        </textFieldCell>
-                        <connections>
-                            <action selector="doUnlockUser:" target="-2" id="fMq-6m-sTD"/>
-                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="NQY-cm-9h9">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="-2" name="hidden2" keyPath="locked" previousBinding="NQY-cm-9h9" id="Dg8-Gx-Mgx">
-                                <dictionary key="options">
-                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                    <integer key="NSNullPlaceholder" value="-1"/>
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="-2" name="value" keyPath="masterPassword" id="ug7-gM-pBW">
-                                <dictionary key="options">
-                                    <bool key="NSConditionallySetsEditable" value="NO"/>
-                                    <bool key="NSContinuouslyUpdatesValue" value="YES"/>
-                                </dictionary>
-                            </binding>
-                            <outlet property="delegate" destination="-2" id="2nK-Rc-uyR"/>
-                        </connections>
-                    </textField>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="R46-fx-n14">
-                        <rect key="frame" x="232" y="19" width="177" height="19"/>
-                        <buttonCell key="cell" type="recessed" title="Reset My Master Password" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="B7Z-72-fVP" customClass="MPNoStateButtonCell">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
-                            <font key="font" metaFont="systemBold" size="12"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="resetMasterPassword:" target="-2" id="kCy-X0-teH"/>
-                            <binding destination="-2" name="hidden" keyPath="locked" id="LFo-aw-CMB">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </button>
-                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lW3-2z-cEa" userLabel="Master Password Tip">
-                        <rect key="frame" x="190" y="235" width="260" height="15"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="0.70000000000000007" colorSpace="calibratedWhite"/>
-                        </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to temporarily reveal what you've typed." id="4Ep-xX-Ky8">
-                            <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="-2" name="hidden" keyPath="locked" id="sdC-5X-XtI">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </textField>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="NGk-Io-Buc" userLabel="Top Box">
-                        <rect key="frame" x="20" y="338" width="600" height="178"/>
+                        <rect key="frame" x="20" y="390" width="600" height="206"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ond-dT-x5d" userLabel="Site Password Tip">
-                                <rect key="frame" x="220" y="130" width="160" height="14"/>
+                                <rect key="frame" x="220" y="144" width="160" height="14"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
-                                    <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Your password for apple.com:" id="CgJ-XZ-6Hy">
                                     <font key="font" metaFont="smallSystem"/>
-                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
@@ -231,14 +71,14 @@
                                 </connections>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ia6-7b-dFr">
-                                <rect key="frame" x="115" y="82" width="370" height="14"/>
+                                <rect key="frame" x="115" y="96" width="370" height="14"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
-                                    <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="No password set.  Click &quot;Change Password&quot; on the bottom to set one." id="eDQ-iz-97a">
                                     <font key="font" metaFont="smallSystem"/>
-                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
@@ -267,14 +107,14 @@
                                 </connections>
                             </textField>
                             <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OaQ-of-zmb" userLabel="Initial Help">
-                                <rect key="frame" x="39" y="142" width="522" height="23"/>
+                                <rect key="frame" x="39" y="156" width="522" height="23"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
-                                    <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Master Password generates passwords for your sites (and other things)." id="YyD-hd-wi3">
                                     <font key="font" size="16" name="HelveticaNeue"/>
-                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
@@ -295,10 +135,10 @@
                                 </connections>
                             </textField>
                             <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sYt-eL-uwt" userLabel="Initial Tip">
-                                <rect key="frame" x="46" y="44" width="508" height="90"/>
+                                <rect key="frame" x="46" y="58" width="508" height="90"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
-                                    <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" id="9c4-NI-NM0">
                                     <font key="font" size="12" name="HelveticaNeue"/>
@@ -307,7 +147,7 @@
 — Your "site name" can be any name; we recommend the bare domain name (eg. apple.com).
 — Make your new master password strong (eg. a short sentence) and tell *nobody*.
 — Share your site's password instead.  You can change it if necessary.</string>
-                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
@@ -328,7 +168,7 @@
                                 </connections>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XUV-zU-Y9c" userLabel="Site Password">
-                                <rect key="frame" x="-2" y="41" width="604" height="97"/>
+                                <rect key="frame" x="-2" y="55" width="604" height="97"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -357,7 +197,7 @@
                                 </connections>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cp4-2G-8aG" userLabel="Site Answer">
-                                <rect key="frame" x="189" y="6" width="221" height="29"/>
+                                <rect key="frame" x="189" y="20" width="221" height="29"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -386,14 +226,14 @@
                                 </connections>
                             </textField>
                             <searchField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eBx-2g-chS" userLabel="Site Question">
-                                <rect key="frame" x="-2" y="27" width="604" height="14"/>
+                                <rect key="frame" x="-2" y="41" width="604" height="14"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
-                                    <color key="color" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
-                                <searchFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" focusRingType="none" alignment="center" placeholderString="Question Keyword" sendsSearchStringImmediately="YES" id="sZN-Vi-v8k">
+                                <searchFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" focusRingType="none" alignment="center" placeholderString="Security answer for this site (click to enter a question keyword):" sendsSearchStringImmediately="YES" id="sZN-Vi-v8k">
                                     <font key="font" metaFont="smallSystem"/>
-                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </searchFieldCell>
                                 <connections>
@@ -413,7 +253,9 @@
                             <constraint firstAttribute="centerY" secondItem="XUV-zU-Y9c" secondAttribute="centerY" id="6Qf-5O-Cvk"/>
                             <constraint firstAttribute="centerX" secondItem="XUV-zU-Y9c" secondAttribute="centerX" id="7sl-qi-HY9"/>
                             <constraint firstItem="cp4-2G-8aG" firstAttribute="centerX" secondItem="XUV-zU-Y9c" secondAttribute="centerX" id="Dx0-IB-hUM"/>
+                            <constraint firstItem="Ond-dT-x5d" firstAttribute="top" relation="greaterThanOrEqual" secondItem="NGk-Io-Buc" secondAttribute="top" constant="20" symbolic="YES" id="IX4-cd-VkJ"/>
                             <constraint firstItem="Ia6-7b-dFr" firstAttribute="centerY" secondItem="XUV-zU-Y9c" secondAttribute="centerY" id="KqM-uR-Obm"/>
+                            <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="cp4-2G-8aG" secondAttribute="bottom" constant="20" symbolic="YES" id="MT9-zC-VM4"/>
                             <constraint firstItem="Ia6-7b-dFr" firstAttribute="centerX" secondItem="XUV-zU-Y9c" secondAttribute="centerX" id="NFQ-aw-8tm"/>
                             <constraint firstAttribute="centerX" secondItem="sYt-eL-uwt" secondAttribute="centerX" id="OFw-vb-I71"/>
                             <constraint firstAttribute="trailing" secondItem="XUV-zU-Y9c" secondAttribute="trailing" id="TdB-QV-9JK"/>
@@ -429,95 +271,14 @@
                             <constraint firstAttribute="centerY" secondItem="sYt-eL-uwt" secondAttribute="centerY" id="zLS-QG-MKS"/>
                         </constraints>
                     </customView>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OnR-s6-d4P" userLabel="Site Name Label">
-                        <rect key="frame" x="209" y="310" width="223" height="20"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
-                        </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Maarten Billemont's password for:" id="1Lb-d0-fQD">
-                            <font key="font" size="14" name="HelveticaNeue"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <searchField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CnS-iI-dhr" userLabel="Site Name">
-                        <rect key="frame" x="62" y="258" width="516" height="44"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="512" id="rW7-Vq-4Xy"/>
-                        </constraints>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
-                        </shadow>
-                        <searchFieldCell key="cell" selectable="YES" editable="YES" focusRingType="none" alignment="center" placeholderString="Site Name" sendsSearchStringImmediately="YES" id="ppl-2c-1E9">
-                            <font key="font" size="36" name="HelveticaNeue-Thin"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </searchFieldCell>
-                        <connections>
-                            <action selector="doSearchSites:" target="-2" id="NJO-iR-OXt"/>
-                            <binding destination="-2" name="hidden" keyPath="locked" id="fAX-uK-cgn"/>
-                            <outlet property="delegate" destination="-2" id="2WA-uI-asx"/>
-                        </connections>
-                    </searchField>
-                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="npC-Kk-gUM" userLabel="Site Name Tip">
-                        <rect key="frame" x="101" y="235" width="438" height="15"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="0.69999999999999996" colorSpace="calibratedWhite"/>
-                        </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Type the name of your site (eg. apple.com), then hit enter ⏎ to create a password for it." id="QTI-cz-Onx">
-                            <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="rpi-M2-6ad" id="vW0-PV-bYs">
-                                <dictionary key="options">
-                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                    <integer key="NSNullPlaceholder" value="-1"/>
-                                </dictionary>
-                            </binding>
-                            <binding destination="-2" name="hidden" keyPath="locked" id="rpi-M2-6ad"/>
-                        </connections>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rhm-sC-xFS" userLabel="Site Name Tip">
-                        <rect key="frame" x="150" y="220" width="340" height="30"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="0.80000000000000004" colorSpace="calibratedWhite"/>
-                        </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="n3W-XU-dya">
-                            <font key="font" size="11" name="HelveticaNeue"/>
-                            <string key="title">Hit enter ⏎ to copy the password, hold shift ⇧ to copy the answer.
-Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="bcg-eq-V5Z" id="F9K-Cg-G6h">
-                                <dictionary key="options">
-                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                    <integer key="NSNullPlaceholder" value="-1"/>
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="-2" name="hidden" keyPath="locked" id="bcg-eq-V5Z"/>
-                        </connections>
-                    </textField>
                     <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="35" horizontalPageScroll="10" verticalLineScroll="35" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="Bme-XK-MMc" userLabel="Sites Table">
-                        <rect key="frame" x="64" y="80" width="512" height="132"/>
+                        <rect key="frame" x="64" y="0.0" width="512" height="232"/>
                         <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="e11-59-xSS">
-                            <rect key="frame" x="0.0" y="0.0" width="512" height="132"/>
+                            <rect key="frame" x="0.0" y="0.0" width="512" height="232"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="33" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="xvJ-5c-vDp" customClass="MPSitesTableView">
-                                    <rect key="frame" x="0.0" y="0.0" width="515" height="0.0"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="515" height="232"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
@@ -544,11 +305,11 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                                             <rect key="frame" x="-2" y="2" width="516" height="29"/>
                                                             <shadow key="shadow" blurRadius="0.5">
                                                                 <size key="offset" width="0.0" height="1"/>
-                                                                <color key="color" white="0.0" alpha="0.80000000000000004" colorSpace="calibratedWhite"/>
+                                                                <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                                             </shadow>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" alignment="center" title="apple.com" id="o0g-Zv-pH4">
                                                                 <font key="font" size="24" name="HelveticaNeue-Thin"/>
-                                                                <color key="textColor" name="alternateSelectedControlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                             <connections>
@@ -592,7 +353,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
                         </clipView>
                         <constraints>
-                            <constraint firstAttribute="width" constant="512" id="qfu-pO-SvM"/>
+                            <constraint firstAttribute="width" constant="512" id="Qjz-Uf-2j8"/>
                         </constraints>
                         <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="8wr-pu-1lc">
                             <rect key="frame" x="-100" y="-100" width="512" height="15"/>
@@ -605,8 +366,237 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             <binding destination="-2" name="hidden" keyPath="locked" id="FF1-c9-zmm"/>
                         </connections>
                     </scrollView>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="Aue-Zx-6Mf" userLabel="Settings Gear">
+                        <rect key="frame" x="585" y="536" width="35" height="44"/>
+                        <shadow key="shadow">
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <buttonCell key="cell" type="square" title="⚙" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="i8r-9N-vcQ">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" size="48" name="AppleSymbols"/>
+                            <string key="keyEquivalent">,</string>
+                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="settings:" target="-2" id="k7d-xi-2gs"/>
+                        </connections>
+                    </button>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gAU-xs-aae">
+                        <rect key="frame" x="593" y="518" width="19" height="14"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘," id="Xm1-qb-6EP">
+                            <font key="font" metaFont="smallSystem"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="5bz-xq-35V">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </textField>
+                    <secureTextField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iGR-wo-ual" userLabel="Secure Master Password">
+                        <rect key="frame" x="18" y="278" width="604" height="44"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" focusRingType="none" alignment="center" usesSingleLineMode="YES" id="NcX-1Z-2OC">
+                            <font key="font" metaFont="system" size="36"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <allowedInputSourceLocales>
+                                <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+                            </allowedInputSourceLocales>
+                        </secureTextFieldCell>
+                        <connections>
+                            <action selector="doUnlockUser:" target="-2" id="uLy-ug-wfr"/>
+                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="lNd-Rl-r2P"/>
+                            <binding destination="-2" name="hidden2" keyPath="locked" previousBinding="lNd-Rl-r2P" id="X7v-Rm-f7l">
+                                <dictionary key="options">
+                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                            <binding destination="-2" name="value" keyPath="masterPassword" id="5CH-Bd-Z1e">
+                                <dictionary key="options">
+                                    <bool key="NSConditionallySetsEditable" value="NO"/>
+                                    <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+                                </dictionary>
+                            </binding>
+                            <outlet property="delegate" destination="-2" id="3es-rz-2Mx"/>
+                        </connections>
+                    </secureTextField>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="v80-wd-hUR" userLabel="Reveal Master Password">
+                        <rect key="frame" x="18" y="278" width="604" height="44"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" state="on" focusRingType="none" alignment="center" placeholderString="" usesSingleLineMode="YES" id="gRw-5C-YUN">
+                            <font key="font" metaFont="system" size="36"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <allowedInputSourceLocales>
+                                <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+                            </allowedInputSourceLocales>
+                        </textFieldCell>
+                        <connections>
+                            <action selector="doUnlockUser:" target="-2" id="fMq-6m-sTD"/>
+                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="NQY-cm-9h9">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                            <binding destination="-2" name="hidden2" keyPath="locked" previousBinding="NQY-cm-9h9" id="Dg8-Gx-Mgx">
+                                <dictionary key="options">
+                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                            <binding destination="-2" name="value" keyPath="masterPassword" id="ug7-gM-pBW">
+                                <dictionary key="options">
+                                    <bool key="NSConditionallySetsEditable" value="NO"/>
+                                    <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+                                </dictionary>
+                            </binding>
+                            <outlet property="delegate" destination="-2" id="2nK-Rc-uyR"/>
+                        </connections>
+                    </textField>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="R46-fx-n14">
+                        <rect key="frame" x="232" y="19" width="177" height="19"/>
+                        <shadow key="shadow">
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <buttonCell key="cell" type="recessed" title="Reset My Master Password" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="B7Z-72-fVP" customClass="MPNoStateButtonCell">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                            <font key="font" metaFont="systemBold" size="12"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="resetMasterPassword:" target="-2" id="kCy-X0-teH"/>
+                            <binding destination="-2" name="hidden" keyPath="locked" id="LFo-aw-CMB">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </button>
+                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lW3-2z-cEa" userLabel="Master Password Tip">
+                        <rect key="frame" x="190" y="255" width="260" height="15"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to temporarily reveal what you've typed." id="4Ep-xX-Ky8">
+                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="-2" name="hidden" keyPath="locked" id="sdC-5X-XtI">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OnR-s6-d4P" userLabel="Site Name Label">
+                        <rect key="frame" x="209" y="330" width="223" height="20"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Maarten Billemont's password for:" id="1Lb-d0-fQD">
+                            <font key="font" size="14" name="HelveticaNeue"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <searchField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CnS-iI-dhr" userLabel="Site Name">
+                        <rect key="frame" x="62" y="278" width="516" height="44"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="512" id="rW7-Vq-4Xy"/>
+                        </constraints>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <searchFieldCell key="cell" selectable="YES" editable="YES" focusRingType="none" alignment="center" placeholderString="Site Name" sendsSearchStringImmediately="YES" id="ppl-2c-1E9">
+                            <font key="font" size="36" name="HelveticaNeue-Thin"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </searchFieldCell>
+                        <connections>
+                            <action selector="doSearchSites:" target="-2" id="NJO-iR-OXt"/>
+                            <binding destination="-2" name="hidden" keyPath="locked" id="fAX-uK-cgn"/>
+                            <outlet property="delegate" destination="-2" id="2WA-uI-asx"/>
+                        </connections>
+                    </searchField>
+                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="npC-Kk-gUM" userLabel="Site Name Tip">
+                        <rect key="frame" x="101" y="255" width="438" height="15"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Type the name of your site (eg. apple.com), then hit enter ⏎ to create a password for it." id="QTI-cz-Onx">
+                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="rpi-M2-6ad" id="vW0-PV-bYs">
+                                <dictionary key="options">
+                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                </dictionary>
+                            </binding>
+                            <binding destination="-2" name="hidden" keyPath="locked" id="rpi-M2-6ad"/>
+                        </connections>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rhm-sC-xFS" userLabel="Site Name Tip">
+                        <rect key="frame" x="150" y="240" width="340" height="30"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="n3W-XU-dya">
+                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <string key="title">Hit enter ⏎ to copy the password, hold shift ⇧ to copy the answer.
+Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="bcg-eq-V5Z" id="F9K-Cg-G6h">
+                                <dictionary key="options">
+                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                            <binding destination="-2" name="hidden" keyPath="locked" id="bcg-eq-V5Z"/>
+                        </connections>
+                    </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="brI-fg-Kav">
                         <rect key="frame" x="260" y="45" width="122" height="19"/>
+                        <shadow key="shadow">
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
                         <buttonCell key="cell" type="recessed" title="Change Password" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="FQu-fM-NWY" customClass="MPNoStateButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                             <font key="font" metaFont="systemBold" size="12"/>
@@ -635,11 +625,11 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         <rect key="frame" x="388" y="48" width="23" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘P" id="MyN-x6-dMk">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -672,11 +662,11 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         <rect key="frame" x="256" y="68" width="129" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Click to set a password:" id="gjc-Fw-xa1">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -711,6 +701,9 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vES-W5-m4x">
                         <rect key="frame" x="243" y="19" width="155" height="19"/>
+                        <shadow key="shadow">
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
                         <buttonCell key="cell" type="recessed" title="Change Password Type" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Fom-sN-EtZ" customClass="MPNoStateButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                             <font key="font" metaFont="systemBold" size="12"/>
@@ -730,11 +723,11 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         <rect key="frame" x="309" y="2" width="23" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘T" id="HFM-Bk-akx">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -756,6 +749,9 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XuF-Sp-6JD">
                         <rect key="frame" x="406" y="19" width="80" height="19"/>
+                        <shadow key="shadow">
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
                         <buttonCell key="cell" type="recessed" title="Delete Site" bezelStyle="recessed" alignment="center" refusesFirstResponder="YES" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="26m-of-YMQ" customClass="MPNoStateButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                             <font key="font" metaFont="systemBold" size="12"/>
@@ -775,11 +771,11 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         <rect key="frame" x="435" y="1" width="23" height="15"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘D" id="PPC-be-w4E">
                             <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -801,6 +797,9 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Qo-iG-CQt">
                         <rect key="frame" x="126" y="19" width="109" height="19"/>
+                        <shadow key="shadow">
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
                         <buttonCell key="cell" type="recessed" title="Set Login Name" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QFo-9y-aVe" customClass="MPNoStateButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                             <font key="font" metaFont="systemBold" size="12"/>
@@ -825,11 +824,11 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         <rect key="frame" x="169" y="1" width="22" height="15"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘L" id="fUB-rF-7x8">
                             <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -853,11 +852,11 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         <rect key="frame" x="155" y="106" width="332" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
-                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Upgrade your site's algorithm version for maximum protection:" id="3ds-qG-YNd">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -882,6 +881,9 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         <subviews>
                             <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mcq-qD-yte">
                                 <rect key="frame" x="-3" y="-3" width="19" height="27"/>
+                                <shadow key="shadow">
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                </shadow>
                                 <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="73y-03-zHt"/>
                                 <connections>
                                     <binding destination="mcS-ik-b0n" name="value" keyPath="selection.algorithmVersion" id="GyA-hK-6cD"/>
@@ -891,11 +893,11 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                 <rect key="frame" x="19" y="3" width="19" height="19"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
-                                    <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="V1" id="Pjy-Fm-zwB">
                                     <font key="font" size="12" name="HelveticaNeue-Medium"/>
-                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
                                 </textFieldCell>
                                 <connections>
@@ -924,6 +926,9 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         <subviews>
                             <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XgA-Vl-CKh" userLabel="Counter Stepper">
                                 <rect key="frame" x="-3" y="-3" width="19" height="27"/>
+                                <shadow key="shadow">
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                </shadow>
                                 <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="ikF-n4-xiI"/>
                                 <connections>
                                     <binding destination="mcS-ik-b0n" name="value" keyPath="selection.counter" id="qmm-6z-boy"/>
@@ -933,11 +938,11 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                 <rect key="frame" x="19" y="3" width="11" height="19"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
-                                    <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1" id="dhQ-bJ-rn3">
                                     <font key="font" size="12" name="HelveticaNeue-Medium"/>
-                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
                                 </textFieldCell>
                                 <connections>
@@ -972,12 +977,12 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                     </stackView>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="eRe-Ef-AZx" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="1Ar-vS-kS1"/>
                     <constraint firstItem="v80-wd-hUR" firstAttribute="top" secondItem="iGR-wo-ual" secondAttribute="top" id="1iV-OU-5Ay"/>
                     <constraint firstItem="brI-fg-Kav" firstAttribute="centerX" secondItem="vES-W5-m4x" secondAttribute="centerX" id="1tN-p4-2m4"/>
                     <constraint firstItem="Ido-NQ-3MY" firstAttribute="top" secondItem="1Qo-iG-CQt" secondAttribute="bottom" constant="4" id="3MM-M7-OKF"/>
-                    <constraint firstAttribute="bottom" secondItem="Bwc-sd-6gm" secondAttribute="bottom" constant="-80" id="3fF-7g-c6C"/>
                     <constraint firstItem="XuF-Sp-6JD" firstAttribute="centerX" secondItem="qal-PP-YtO" secondAttribute="centerX" id="7mj-3B-j0X"/>
-                    <constraint firstItem="NGk-Io-Buc" firstAttribute="top" secondItem="oSh-Ec-8Nf" secondAttribute="bottom" constant="8" symbolic="YES" id="8AC-MT-cz4"/>
+                    <constraint firstItem="NGk-Io-Buc" firstAttribute="top" secondItem="oSh-Ec-8Nf" secondAttribute="bottom" priority="250" constant="8" symbolic="YES" id="8AC-MT-cz4"/>
                     <constraint firstItem="vES-W5-m4x" firstAttribute="centerX" secondItem="CnS-iI-dhr" secondAttribute="centerX" id="92S-HP-Vk7"/>
                     <constraint firstItem="Ido-NQ-3MY" firstAttribute="centerX" secondItem="1Qo-iG-CQt" secondAttribute="centerX" id="99M-8j-9Dt"/>
                     <constraint firstAttribute="trailing" secondItem="Aue-Zx-6Mf" secondAttribute="trailing" constant="20" symbolic="YES" id="9Pu-34-g2q"/>
@@ -990,10 +995,10 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                     <constraint firstItem="Bgn-Ne-fQ7" firstAttribute="centerX" secondItem="dbM-ja-dKO" secondAttribute="centerX" id="HZ3-9P-tHh"/>
                     <constraint firstAttribute="centerY" secondItem="CnS-iI-dhr" secondAttribute="centerY" id="HjG-vb-3Qg"/>
                     <constraint firstItem="iGR-wo-ual" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="KNz-B2-qfi"/>
-                    <constraint firstItem="Bwc-sd-6gm" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="-80" id="Kqb-ig-5cP"/>
+                    <constraint firstAttribute="trailing" secondItem="eRe-Ef-AZx" secondAttribute="trailing" id="KXq-D3-FUM"/>
                     <constraint firstAttribute="trailing" secondItem="iGR-wo-ual" secondAttribute="trailing" constant="20" symbolic="YES" id="LW8-vu-scs"/>
                     <constraint firstItem="Aue-Zx-6Mf" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="Lts-go-pIX"/>
-                    <constraint firstAttribute="bottom" secondItem="Bme-XK-MMc" secondAttribute="bottom" constant="80" id="MbE-Oa-J9k"/>
+                    <constraint firstAttribute="bottom" secondItem="Bme-XK-MMc" secondAttribute="bottom" id="MbE-Oa-J9k"/>
                     <constraint firstItem="CnS-iI-dhr" firstAttribute="centerX" secondItem="npC-Kk-gUM" secondAttribute="centerX" id="O7q-Xc-mx3"/>
                     <constraint firstAttribute="centerX" secondItem="OnR-s6-d4P" secondAttribute="centerX" id="Pun-kD-jgl"/>
                     <constraint firstItem="gAU-xs-aae" firstAttribute="top" secondItem="Aue-Zx-6Mf" secondAttribute="bottom" constant="4" id="QkM-BN-dOT"/>
@@ -1003,16 +1008,16 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                     <constraint firstItem="qal-PP-YtO" firstAttribute="top" secondItem="XuF-Sp-6JD" secondAttribute="bottom" constant="4" id="YuB-MK-njZ"/>
                     <constraint firstItem="NGk-Io-Buc" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="ZVb-SX-b24"/>
                     <constraint firstItem="1Qo-iG-CQt" firstAttribute="centerY" secondItem="vES-W5-m4x" secondAttribute="centerY" id="ZeK-3S-ZWW"/>
+                    <constraint firstAttribute="bottom" secondItem="eRe-Ef-AZx" secondAttribute="bottom" id="a09-Gf-lZe"/>
                     <constraint firstItem="brI-fg-Kav" firstAttribute="centerX" secondItem="UpZ-rb-NXd" secondAttribute="centerX" id="b9H-8D-b8a"/>
                     <constraint firstItem="vES-W5-m4x" firstAttribute="top" secondItem="6II-KA-cNi" secondAttribute="bottom" constant="8" symbolic="YES" id="bUR-ak-bXL"/>
                     <constraint firstAttribute="centerX" secondItem="oSh-Ec-8Nf" secondAttribute="centerX" id="c28-5a-C45"/>
                     <constraint firstItem="oSh-Ec-8Nf" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="cUB-xF-1Wr"/>
                     <constraint firstItem="XuF-Sp-6JD" firstAttribute="leading" secondItem="vES-W5-m4x" secondAttribute="trailing" constant="8" symbolic="YES" id="d43-2g-dap"/>
                     <constraint firstAttribute="bottom" secondItem="R46-fx-n14" secondAttribute="bottom" constant="20" symbolic="YES" id="djJ-T6-7Rr"/>
-                    <constraint firstItem="OnR-s6-d4P" firstAttribute="top" secondItem="NGk-Io-Buc" secondAttribute="bottom" constant="8" symbolic="YES" id="dr2-eR-Yup"/>
+                    <constraint firstItem="OnR-s6-d4P" firstAttribute="top" relation="greaterThanOrEqual" secondItem="NGk-Io-Buc" secondAttribute="bottom" constant="40" id="dr2-eR-Yup"/>
                     <constraint firstAttribute="bottom" secondItem="vES-W5-m4x" secondAttribute="bottom" constant="20" symbolic="YES" id="eHI-Tn-bYD"/>
                     <constraint firstItem="rhm-sC-xFS" firstAttribute="top" secondItem="CnS-iI-dhr" secondAttribute="bottom" constant="8" symbolic="YES" id="f1g-ug-BVL"/>
-                    <constraint firstAttribute="trailing" secondItem="Bwc-sd-6gm" secondAttribute="trailing" constant="-80" id="gKu-JH-NDR"/>
                     <constraint firstItem="CnS-iI-dhr" firstAttribute="centerX" secondItem="rhm-sC-xFS" secondAttribute="centerX" id="gmg-aZ-1Si"/>
                     <constraint firstItem="Bme-XK-MMc" firstAttribute="top" secondItem="rhm-sC-xFS" secondAttribute="bottom" constant="8" symbolic="YES" id="gsL-Ww-yLa"/>
                     <constraint firstItem="9b3-wy-KBb" firstAttribute="top" secondItem="vES-W5-m4x" secondAttribute="bottom" constant="4" id="hKa-2u-uL3"/>
@@ -1022,9 +1027,9 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                     <constraint firstItem="vES-W5-m4x" firstAttribute="leading" secondItem="1Qo-iG-CQt" secondAttribute="trailing" constant="8" symbolic="YES" id="kTZ-lP-vnR"/>
                     <constraint firstAttribute="centerX" secondItem="iGR-wo-ual" secondAttribute="centerX" id="kXB-yZ-sur"/>
                     <constraint firstItem="9b3-wy-KBb" firstAttribute="centerX" secondItem="vES-W5-m4x" secondAttribute="centerX" id="leH-oh-7OJ"/>
+                    <constraint firstItem="eRe-Ef-AZx" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="pxS-U4-7ak"/>
                     <constraint firstItem="vES-W5-m4x" firstAttribute="top" secondItem="brI-fg-Kav" secondAttribute="bottom" constant="8" symbolic="YES" id="rCP-oh-rWr"/>
                     <constraint firstItem="v80-wd-hUR" firstAttribute="trailing" secondItem="iGR-wo-ual" secondAttribute="trailing" id="rIx-cQ-PNt"/>
-                    <constraint firstItem="Bwc-sd-6gm" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="-80" id="tea-fv-b1S"/>
                     <constraint firstItem="uol-dE-I8H" firstAttribute="centerY" secondItem="brI-fg-Kav" secondAttribute="centerY" id="u7f-S8-wNq"/>
                     <constraint firstItem="lW3-2z-cEa" firstAttribute="centerX" secondItem="iGR-wo-ual" secondAttribute="centerX" id="vML-2u-shw"/>
                     <constraint firstItem="Bgn-Ne-fQ7" firstAttribute="top" secondItem="dbM-ja-dKO" secondAttribute="bottom" constant="8" symbolic="YES" id="wb6-bk-HwO"/>
@@ -1120,7 +1125,4 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
             <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
         </box>
     </objects>
-    <resources>
-        <image name="small-screen" width="25" height="15.5"/>
-    </resources>
 </document>
diff --git a/MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib b/MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib
index a12b820c..01a02727 100644
--- a/MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib
+++ b/MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib
@@ -22,6 +22,7 @@
                 <outlet property="openAtLoginItem" destination="785" id="788"/>
                 <outlet property="rememberPasswordItem" destination="744" id="750"/>
                 <outlet property="savePasswordItem" destination="747" id="751"/>
+                <outlet property="showFullScreenItem" destination="Rvo-MK-GgF" id="NYi-85-Yuc"/>
                 <outlet property="showItem" destination="719" id="783"/>
                 <outlet property="statusMenu" destination="716" id="731"/>
                 <outlet property="usersItem" destination="755" id="762"/>
@@ -71,6 +72,23 @@
                                 </attributedString>
                                 <modifierMask key="keyEquivalentModifierMask"/>
                             </menuItem>
+                            <menuItem title="Show Full Screen" id="Rvo-MK-GgF">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="togglePreference:" target="494" id="wfI-yQ-Kla"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Claim the entire screen while looking up passwords." enabled="NO" id="3k1-4V-IZ7">
+                                <attributedString key="attributedTitle">
+                                    <fragment content="Always open Master Password at start-up.">
+                                        <attributes>
+                                            <font key="NSFont" size="12" name="Helvetica"/>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
+                                        </attributes>
+                                    </fragment>
+                                </attributedString>
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
                             <menuItem title="Hide Passwords" id="9G7-17-PzY">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>