diff --git a/External/Pearl b/External/Pearl
index bbb92ad1..08540e39 160000
--- a/External/Pearl
+++ b/External/Pearl
@@ -1 +1 @@
-Subproject commit bbb92ad1957b17d50aaa44e124fb5bacef05da10
+Subproject commit 08540e3945ff52d6cdc6f1cb3aca06d195df90fa
diff --git a/MasterPassword-Mac.xcodeproj/project.pbxproj b/MasterPassword-Mac.xcodeproj/project.pbxproj
index e6606be5..2b2b83ad 100644
--- a/MasterPassword-Mac.xcodeproj/project.pbxproj
+++ b/MasterPassword-Mac.xcodeproj/project.pbxproj
@@ -6206,6 +6206,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MasterPassword/Mac/MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword/Mac/MasterPassword-Info.plist";
+				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = NO;
 			};
 			name = Debug;
@@ -6214,7 +6215,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = MasterPassword/MasterPassword.entitlements;
-				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MasterPassword/Mac/MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword/Mac/MasterPassword-Info.plist";
diff --git a/MasterPassword/MPAppDelegate_Shared.h b/MasterPassword/MPAppDelegate_Shared.h
index f898a080..c23ecc4f 100644
--- a/MasterPassword/MPAppDelegate_Shared.h
+++ b/MasterPassword/MPAppDelegate_Shared.h
@@ -6,7 +6,11 @@
 //  Copyright (c) 2011 Lyndir. All rights reserved.
 //
 
+#if TARGET_OS_IPHONE
 @interface MPAppDelegate_Shared : PearlAppDelegate
+#else
+@interface MPAppDelegate_Shared : NSObject <PearlConfigDelegate>
+#endif
 
 @property (strong, nonatomic) NSData                *key;
 @property (strong, nonatomic) NSData                *keyID;
diff --git a/MasterPassword/MPAppDelegate_Store.m b/MasterPassword/MPAppDelegate_Store.m
index 65e136d7..c0fd7dd1 100644
--- a/MasterPassword/MPAppDelegate_Store.m
+++ b/MasterPassword/MPAppDelegate_Store.m
@@ -8,6 +8,7 @@
 
 #import "MPAppDelegate_Store.h"
 #import "MPElementEntity.h"
+#import "MPConfig.h"
 
 @implementation MPAppDelegate_Shared (Store)
 
diff --git a/MasterPassword/MPTypes.m b/MasterPassword/MPTypes.m
index 87c4f619..ef7585bf 100644
--- a/MasterPassword/MPTypes.m
+++ b/MasterPassword/MPTypes.m
@@ -9,7 +9,6 @@
 #import "MPTypes.h"
 #import "MPElementGeneratedEntity.h"
 #import "MPElementStoredEntity.h"
-#include <endian.h>
 
 
 #define MP_salt     nil
diff --git a/MasterPassword/Mac/MPAppDelegate.h b/MasterPassword/Mac/MPAppDelegate.h
index d13afce6..593c09c6 100644
--- a/MasterPassword/Mac/MPAppDelegate.h
+++ b/MasterPassword/Mac/MPAppDelegate.h
@@ -7,17 +7,21 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "MPAppDelegate_Shared.h"
 #import "MPPasswordWindowController.h"
 
-@interface MPAppDelegate : NSObject <NSApplicationDelegate, PearlConfigDelegate>
+@interface MPAppDelegate : MPAppDelegate_Shared <NSApplicationDelegate>
 
 @property (strong) NSStatusItem                                         *statusItem;
-@property (weak) IBOutlet NSMenuItem *lockItem;
-@property (weak) IBOutlet NSMenuItem *showItem;
-@property (strong) IBOutlet NSMenu *statusMenu;
-@property (weak) IBOutlet NSMenuItem *useICloudItem;
-@property (weak) IBOutlet NSMenuItem *rememberPasswordItem;
-@property (weak) IBOutlet NSMenuItem *savePasswordItem;
+@property (strong) MPPasswordWindowController                           *passwordWindow;
+@property (weak) IBOutlet NSMenuItem                                    *lockItem;
+@property (weak) IBOutlet NSMenuItem                                    *showItem;
+@property (strong) IBOutlet NSMenu                                      *statusMenu;
+@property (weak) IBOutlet NSMenuItem                                    *useICloudItem;
+@property (weak) IBOutlet NSMenuItem                                    *rememberPasswordItem;
+@property (weak) IBOutlet NSMenuItem                                    *savePasswordItem;
+
++ (MPAppDelegate *)get;
 
 - (IBAction)activate:(id)sender;
 - (IBAction)togglePreference:(NSMenuItem *)sender;
diff --git a/MasterPassword/Mac/MPAppDelegate.m b/MasterPassword/Mac/MPAppDelegate.m
index 9407a200..6f85c215 100644
--- a/MasterPassword/Mac/MPAppDelegate.m
+++ b/MasterPassword/Mac/MPAppDelegate.m
@@ -6,18 +6,14 @@
 //  Copyright (c) 2012 Lyndir. All rights reserved.
 //
 
-#import "MPAppDelegate_Shared.h"
+#import "MPAppDelegate.h"
+#import "MPAppDelegate_Key.h"
+#import "MPAppDelegate_Store.h"
 #import "MPConfig.h"
 #import "MPElementEntity.h"
 #import <Carbon/Carbon.h>
 
 
-@interface MPAppDelegate ()
-
-@property (readwrite, strong, nonatomic) MPPasswordWindowController     *passwordWindow;
-
-@end
-
 @implementation MPAppDelegate
 @synthesize statusItem;
 @synthesize lockItem;
@@ -43,6 +39,11 @@ static EventHotKeyID MPShowHotKey = { .signature = 'show', .id = 1 };
 #endif
 }
 
++ (MPAppDelegate *)get {
+    
+    return (MPAppDelegate *)[super get];
+}
+
 static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEvent, void *userData){
     
     // Extract the hotkey ID.
diff --git a/MasterPassword/Mac/MPPasswordWindowController.m b/MasterPassword/Mac/MPPasswordWindowController.m
index a9c244d7..63c719b2 100644
--- a/MasterPassword/Mac/MPPasswordWindowController.m
+++ b/MasterPassword/Mac/MPPasswordWindowController.m
@@ -7,7 +7,9 @@
 //
 
 #import "MPPasswordWindowController.h"
-#import "MPAppDelegate_Shared.h"
+#import "MPAppDelegate.h"
+#import "MPAppDelegate_Key.h"
+#import "MPAppDelegate_Store.h"
 #import "MPElementEntity.h"
 #import "MPElementGeneratedEntity.h"
 
diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m
index 184c842f..604ea362 100644
--- a/MasterPassword/iOS/MPMainViewController.m
+++ b/MasterPassword/iOS/MPMainViewController.m
@@ -436,7 +436,6 @@
                  } cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil
                        otherTitles:
      [self isHelpVisible]? @"Hide Help": @"Show Help", @"FAQ", @"Tutorial", @"Settings", @"Export",
-
 #ifdef ADHOC
      @"Feedback",
 #endif