Enable minor & build numbers > 9.

Update fonts to stay consistent with system UIs.
Ask for consent to sendInfo.
2020-04-18 22:13:36 -04:00 · 2020-04-18 21:50:06 -04:00 · 2020-04-18 21:48:55 -04:00 · 2020-04-16 17:46:39 -04:00 · 2020-04-16 17:13:23 -04:00 · 2020-04-16 17:13:08 -04:00
57 changed files with 809 additions and 1650 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # OS-Specific junk.
 .DS_Store
 Thumbs.db
+*~

 # IntelliJ
 .idea
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,9 @@
 [submodule "External/Pearl"]
 	path = platform-darwin/External/Pearl
 	url = git://github.com/Lyndir/Pearl.git
-[submodule "External/InAppSettingsKit"]
-	path = platform-darwin/External/InAppSettingsKit
-	url = git://github.com/lhunath/InAppSettingsKit.git
-[submodule "External/KCOrderedAccessorFix"]
-	path = platform-darwin/External/KCOrderedAccessorFix
-	url = https://github.com/lhunath/KCOrderedAccessorFix.git
 [submodule "External/AttributedMarkdown"]
 	path = platform-darwin/External/AttributedMarkdown
 	url = https://github.com/dreamwieber/AttributedMarkdown.git
-[submodule "External/uicolor-utilities"]
-	path = platform-darwin/External/uicolor-utilities
-	url = git://github.com/lhunath/uicolor-utilities.git
-[submodule "External/jrswizzle"]
-	path = platform-darwin/External/jrswizzle
-	url = git://github.com/jonmarimba/jrswizzle.git
 [submodule "MasterPassword/Web/js/mpw-js"]
 	path = platform-independent/web/js/mpw-js
 	url = https://github.com/tmthrgd/mpw-js.git
--- a/platform-darwin/External/AttributedMarkdown
+++ b/platform-darwin/External/AttributedMarkdown
--- a/platform-darwin/External/InAppSettingsKit
+++ b/platform-darwin/External/InAppSettingsKit
--- a/platform-darwin/External/KCOrderedAccessorFix
+++ b/platform-darwin/External/KCOrderedAccessorFix
--- a/platform-darwin/External/Pearl
+++ b/platform-darwin/External/Pearl
--- a/platform-darwin/External/jrswizzle
+++ b/platform-darwin/External/jrswizzle
--- a/platform-darwin/External/uicolor-utilities
+++ b/platform-darwin/External/uicolor-utilities
--- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		93D3928D629EA563F9EC4909 /* NSPersistentStore+PearlMigration.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D399C2F3D48E57C4803BDC /* NSPersistentStore+PearlMigration.m */; };
 		93D392A33CCE85431E910C7B /* NSOrderedSetOrArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39789AAF49338F8AC8B02 /* NSOrderedSetOrArray.m */; };
 		93D392A8777DC30C11361647 /* UITextView+PearlAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39AA10CD00D05937671B1 /* UITextView+PearlAttributes.h */; };
-		93D392EC39DA43C46C692C12 /* NSDictionary+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */; };
 		93D392FD5E2052F7D7DB3774 /* NSString+MPMarkDown.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39C41A27AA42D044D68AE /* NSString+MPMarkDown.m */; };
 		93D3932889B6B4206E66A6D6 /* PearlEMail.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39F7C9F47BF6387FBC5C3 /* PearlEMail.h */; };
 		93D39359B0DF9823F6C56A05 /* PearlHangDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39D8508BF868907E9732E /* PearlHangDetector.h */; };
@@ -33,7 +32,6 @@
 		93D3957237D303DE2D38C267 /* MPAvatarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39B381350802A194BF332 /* MPAvatarCell.m */; };
 		93D39577FD8BB0945DB2F0A3 /* MPAlgorithmV3.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39FD9623E8D5571C0AEB3 /* MPAlgorithmV3.m */; };
 		93D395B715D15F2B56F2A2EE /* mpw-types.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D392C5A6572DB0EB5B82C8 /* mpw-types.c */; };
-		93D395F08A087F8A24689347 /* NSArray+Indexing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */; };
 		93D39673DDC085BE72C34D7C /* MPPopdownSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39B050DD5F55E9794EFD4 /* MPPopdownSegue.m */; };
 		93D396AA30690B256F30378A /* PearlNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3956915634581E737B38C /* PearlNavigationController.m */; };
 		93D396BA1C74C4A06FD86437 /* PearlOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D3942A356B639724157982 /* PearlOverlay.h */; };
@@ -55,13 +53,10 @@
 		93D39B76DD5AB108BA8928E8 /* UIScrollView+PearlAdjustInsets.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39DE2CB351D4E3789462B /* UIScrollView+PearlAdjustInsets.h */; };
 		93D39B842AB9A5D072810D76 /* NSError+PearlFullDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */; };
 		93D39B8F90F58A5D158DDBA3 /* MPSitesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3924EE15017F8A12CB436 /* MPSitesViewController.m */; };
-		93D39BA1EA3CAAC8A220B4A6 /* MPAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */; };
 		93D39BFB5F5F9337F6565DE3 /* UIView+Visible.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39B7B765546B1F1900CB7 /* UIView+Visible.h */; };
-		93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D396D04E57792A54D437AC /* NSArray+Indexing.h */; };
 		93D39D47FC623E91FC39D20C /* UICollectionView+PearlReloadItems.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3908DF8EABBD952065DC0 /* UICollectionView+PearlReloadItems.m */; };
 		93D39D596A2E376D6F6F5DA1 /* MPCombinedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D393310223DDB35218467A /* MPCombinedViewController.m */; };
 		93D39D8F78978196D6ABDEDE /* MPNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39CC01630D0421205C4C4 /* MPNavigationController.m */; };
-		93D39E281E3658B30550CB55 /* NSDictionary+Indexing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */; };
 		93D39E34FD28D24FE3442C48 /* UITextView+PearlAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3977321EB249981821AB0 /* UITextView+PearlAttributes.m */; };
 		93D39E5F7F6D7F5C0FAD090F /* MPTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D72239990DDAC2D75B0 /* MPTypes.m */; };
 		93D39EAA4D064193074D3021 /* MPFixable.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39A813CA9D7E192261ED2 /* MPFixable.m */; };
@@ -69,22 +64,6 @@
 		DA071BF3190187FE00179766 /* empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF1190187FE00179766 /* empty@2x.png */; };
 		DA071BF4190187FE00179766 /* empty.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF2190187FE00179766 /* empty.png */; };
 		DA095E75172F4CD8001C948B /* MPLogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3979190DACEBD1F6AE9F4 /* MPLogsViewController.m */; };
-		DA0CC5291EAB99BA009A8ED9 /* IASKAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5071EAB99BA009A8ED9 /* IASKAppSettingsViewController.m */; };
-		DA0CC52A1EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5091EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m */; };
-		DA0CC52B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC50B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m */; };
-		DA0CC52C1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC50D1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m */; };
-		DA0CC52D1EAB99BA009A8ED9 /* IASKSettingsReader.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5111EAB99BA009A8ED9 /* IASKSettingsReader.m */; };
-		DA0CC52E1EAB99BA009A8ED9 /* IASKSettingsStore.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5131EAB99BA009A8ED9 /* IASKSettingsStore.m */; };
-		DA0CC52F1EAB99BA009A8ED9 /* IASKSettingsStoreFile.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5151EAB99BA009A8ED9 /* IASKSettingsStoreFile.m */; };
-		DA0CC5301EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5171EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m */; };
-		DA0CC5311EAB99BA009A8ED9 /* IASKSpecifier.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5191EAB99BA009A8ED9 /* IASKSpecifier.m */; };
-		DA0CC5321EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC51C1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m */; };
-		DA0CC5331EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC51E1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m */; };
-		DA0CC5341EAB99BA009A8ED9 /* IASKSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5201EAB99BA009A8ED9 /* IASKSlider.m */; };
-		DA0CC5351EAB99BA009A8ED9 /* IASKSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5221EAB99BA009A8ED9 /* IASKSwitch.m */; };
-		DA0CC5361EAB99BA009A8ED9 /* IASKTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5241EAB99BA009A8ED9 /* IASKTextField.m */; };
-		DA0CC5371EAB99BA009A8ED9 /* IASKTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5261EAB99BA009A8ED9 /* IASKTextView.m */; };
-		DA0CC5381EAB99BA009A8ED9 /* IASKTextViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5281EAB99BA009A8ED9 /* IASKTextViewCell.m */; };
 		DA0CC54E1EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5441EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld */; };
 		DA0CC58C1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5791EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m */; };
 		DA0CC58D1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC57B1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m */; };
@@ -137,8 +116,6 @@
 		DA32D00A19CF5C55004F3F0E /* icon_question@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37FF1711E29600CF925C /* icon_question@2x.png */; };
 		DA32D01A19D046E1004F3F0E /* PearlFixedTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */; };
 		DA32D01B19D046E1004F3F0E /* PearlFixedTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = DA32D01919D046E1004F3F0E /* PearlFixedTableView.h */; };
-		DA32D03C19D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32D03A19D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.m */; };
-		DA32D03E19D11293004F3F0E /* libKCOrderedAccessorFix.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */; };
 		DA32D04219D27093004F3F0E /* thumb_generated_answers@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D03F19D27093004F3F0E /* thumb_generated_answers@3x.png */; };
 		DA32D04319D27093004F3F0E /* thumb_generated_answers@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D04019D27093004F3F0E /* thumb_generated_answers@2x.png */; };
 		DA32D04419D27093004F3F0E /* thumb_generated_answers.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D04119D27093004F3F0E /* thumb_generated_answers.png */; };
@@ -169,8 +146,6 @@
 		DA45224B190628B2008F650A /* icon_gear.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37821711E29500CF925C /* icon_gear.png */; };
 		DA45224C190628B2008F650A /* icon_gear@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37831711E29500CF925C /* icon_gear@2x.png */; };
 		DA46021D23D5E30B00398FF4 /* MPSecrets.m in Sources */ = {isa = PBXBuildFile; fileRef = DA46021C23D5E30B00398FF4 /* MPSecrets.m */; };
-		DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; };
-		DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */; };
 		DA5A09DF171A70E4005284AB /* play.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5A09DD171A70E4005284AB /* play.png */; };
 		DA5A09E0171A70E4005284AB /* play@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5A09DE171A70E4005284AB /* play@2x.png */; };
 		DA5A09EA171BB0F7005284AB /* unlocked.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5A09E8171BB0F7005284AB /* unlocked.png */; };
@@ -356,26 +331,17 @@
 		DABD3FCB1712446200CF925C /* cloud@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD3FC91712446200CF925C /* cloud@2x.png */; };
 		DABD3FCE1714F45C00CF925C /* identity.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD3FCC1714F45B00CF925C /* identity.png */; };
 		DABD3FCF1714F45C00CF925C /* identity@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD3FCD1714F45B00CF925C /* identity@2x.png */; };
-		DAC6325E1486805C0075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
-		DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DAC632891486D9690075AEA5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC632871486D95D0075AEA5 /* Security.framework */; };
 		DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DAC8DF47192831E100BA7D71 /* icon_key.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD379A1711E29600CF925C /* icon_key.png */; };
 		DAC8DF48192831E100BA7D71 /* icon_key@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD379B1711E29600CF925C /* icon_key@2x.png */; };
 		DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */ = {isa = PBXBuildFile; fileRef = DACA29721705E1A8002C6C22 /* dictionary.lst */; };
-		DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29771705E2BD002C6C22 /* JRSwizzle.h */; };
-		DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA298C1705E2BD002C6C22 /* JRSwizzle.m */; };
-		DACA29BC1705E2DE002C6C22 /* UIColor+Expanded.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29B51705E2DE002C6C22 /* UIColor+Expanded.h */; };
-		DACA29BD1705E2DE002C6C22 /* UIColor+HSV.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29B61705E2DE002C6C22 /* UIColor+HSV.h */; };
-		DACA29BE1705E2DE002C6C22 /* UIColor+Expanded.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA29BA1705E2DE002C6C22 /* UIColor+Expanded.m */; };
-		DACA29BF1705E2DE002C6C22 /* UIColor+HSV.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA29BB1705E2DE002C6C22 /* UIColor+HSV.m */; };
 		DACE2F6519BA6A0A0010F92E /* PearlProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = DACE2F6319BA6A0A0010F92E /* PearlProfiler.m */; };
 		DACE2F6619BA6A0A0010F92E /* PearlProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = DACE2F6419BA6A0A0010F92E /* PearlProfiler.h */; };
 		DACE2F6C19BA6A2A0010F92E /* PearlMutableStaticTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DACE2F6819BA6A2A0010F92E /* PearlMutableStaticTableViewController.m */; };
 		DACE2F6D19BA6A2A0010F92E /* PearlMutableStaticTableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = DACE2F6919BA6A2A0010F92E /* PearlMutableStaticTableViewController.h */; };
 		DACE2F6E19BA6A2A0010F92E /* UIView+FontScale.h in Headers */ = {isa = PBXBuildFile; fileRef = DACE2F6A19BA6A2A0010F92E /* UIView+FontScale.h */; };
 		DAE1EF2217E942DE00BC0086 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = DAE1EF2417E942DE00BC0086 /* Localizable.strings */; };
-		DAE2725919C93B80007C5262 /* libInAppSettingsKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAFC5655172C573B00CB5CC5 /* libInAppSettingsKit.a */; };
 		DAE2725A19C93B8E007C5262 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA70EC7F1811B13C00F65DB2 /* StoreKit.framework */; };
 		DAE2726319CE9CB3007C5262 /* UITableViewCell+PearlDeque.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE2726119CE9CB3007C5262 /* UITableViewCell+PearlDeque.m */; };
 		DAE2726419CE9CB3007C5262 /* UITableViewCell+PearlDeque.h in Headers */ = {isa = PBXBuildFile; fileRef = DAE2726219CE9CB3007C5262 /* UITableViewCell+PearlDeque.h */; };
@@ -390,7 +356,6 @@
 		DAF4EF51190A81E400023C90 /* NSManagedObject+Pearl.h in Headers */ = {isa = PBXBuildFile; fileRef = DAF4EF4F190A81E400023C90 /* NSManagedObject+Pearl.h */; };
 		DAFC1F702439795100D1CD66 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAFC1F6F2439795000D1CD66 /* CoreServices.framework */; };
 		DAFC1F73243989FB00D1CD66 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DAFC1F72243989FB00D1CD66 /* Launch Screen.storyboard */; };
-		DAFC5656172C573B00CB5CC5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DAFE4A1315039824003ABA7C /* NSObject+PearlExport.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */; };
 		DAFE4A1415039824003ABA7C /* NSObject+PearlExport.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE45D915039823003ABA7C /* NSObject+PearlExport.m */; };
 		DAFE4A1515039824003ABA7C /* NSString+PearlNSArrayFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE45DA15039823003ABA7C /* NSString+PearlNSArrayFormat.h */; };
@@ -475,15 +440,6 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXCopyFilesBuildPhase section */
-		DA32D01E19D111C6004F3F0E /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "include/$(PRODUCT_NAME)";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DAA1757B19D86BE70044227B /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -498,7 +454,6 @@
 /* Begin PBXFileReference section */
 		5C616FA365D7A5C31689B2FF /* Pods-MasterPassword.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword.test.xcconfig"; path = "Target Support Files/Pods-MasterPassword/Pods-MasterPassword.test.xcconfig"; sourceTree = "<group>"; };
 		93D390519405B76CC6A57C4F /* MPCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCell.h; sourceTree = "<group>"; };
-		93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Indexing.m"; sourceTree = "<group>"; };
 		93D3908DF8EABBD952065DC0 /* UICollectionView+PearlReloadItems.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UICollectionView+PearlReloadItems.m"; sourceTree = "<group>"; };
 		93D390A3B351FEF1B9EDAB56 /* mpw-algorithm_v2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v2.c"; sourceTree = "<group>"; };
 		93D390A99850139D0FF0211E /* mpw-algorithm_v0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v0.c"; sourceTree = "<group>"; };
@@ -507,7 +462,6 @@
 		93D39149A5F1F9B174D6D061 /* MPStoreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPStoreViewController.h; sourceTree = "<group>"; };
 		93D3914D7597F9A28DB9D85E /* MPSitesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSitesViewController.h; sourceTree = "<group>"; };
 		93D39156E806BB78E04F78B9 /* PearlSizedTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlSizedTextView.m; sourceTree = "<group>"; };
-		93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAppSettingsViewController.m; sourceTree = "<group>"; };
 		93D391943675426839501BB8 /* MPLogsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLogsViewController.h; sourceTree = "<group>"; };
 		93D391AA32F24290C424438E /* NSNotificationCenter+PearlEasyCleanup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+PearlEasyCleanup.h"; sourceTree = "<group>"; };
 		93D39246FC21C6E63E35D615 /* UICollectionView+PearlReloadItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UICollectionView+PearlReloadItems.h"; sourceTree = "<group>"; };
@@ -516,7 +470,6 @@
 		93D392876BE5C011DE73B43F /* MPPopdownSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPopdownSegue.h; sourceTree = "<group>"; };
 		93D392C5A6572DB0EB5B82C8 /* mpw-types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-types.c"; sourceTree = "<group>"; };
 		93D393310223DDB35218467A /* MPCombinedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCombinedViewController.m; sourceTree = "<group>"; };
-		93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Indexing.h"; sourceTree = "<group>"; };
 		93D393BB973253D4BAAC84AA /* PearlEMail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlEMail.m; sourceTree = "<group>"; };
 		93D393CB0B1F4EC8C17CFE43 /* NSString+MPMarkDown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+MPMarkDown.h"; path = "iOS/NSString+MPMarkDown.h"; sourceTree = "<group>"; };
 		93D394077F8FAB8167647187 /* Twitter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Twitter.framework; path = System/Library/Frameworks/Twitter.framework; sourceTree = SDKROOT; };
@@ -529,7 +482,6 @@
 		93D3957D76F71A652716EECC /* MPStoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPStoreViewController.m; sourceTree = "<group>"; };
 		93D3969393A3A46BD27D7078 /* mpw-algorithm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm.c"; sourceTree = "<group>"; };
 		93D396C311C3725870343EE0 /* mpw-util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-util.c"; sourceTree = "<group>"; };
-		93D396D04E57792A54D437AC /* NSArray+Indexing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Indexing.h"; sourceTree = "<group>"; };
 		93D396F918E6470DB846C17F /* mpw-algorithm_v1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v1.c"; sourceTree = "<group>"; };
 		93D3970502644794E8A027BE /* MPNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPNavigationController.h; sourceTree = "<group>"; };
 		93D3971FE104BB4052484151 /* MPUsersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPUsersViewController.h; sourceTree = "<group>"; };
@@ -557,7 +509,6 @@
 		93D39A813CA9D7E192261ED2 /* MPFixable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPFixable.m; sourceTree = "<group>"; };
 		93D39A97A7D48CB3B784194D /* MPAlgorithmV2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAlgorithmV2.h; sourceTree = "<group>"; };
 		93D39AA10CD00D05937671B1 /* UITextView+PearlAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITextView+PearlAttributes.h"; sourceTree = "<group>"; };
-		93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Indexing.m"; sourceTree = "<group>"; };
 		93D39ACBA9F4878B6A1CC33B /* MPEmergencyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPEmergencyViewController.m; sourceTree = "<group>"; };
 		93D39AFD17CBE324D745DAB0 /* mpw-types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-types.h"; sourceTree = "<group>"; };
 		93D39B050DD5F55E9794EFD4 /* MPPopdownSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPopdownSegue.m; sourceTree = "<group>"; };
@@ -570,7 +521,6 @@
 		93D39C41A27AA42D044D68AE /* NSString+MPMarkDown.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+MPMarkDown.m"; path = "iOS/NSString+MPMarkDown.m"; sourceTree = "<group>"; };
 		93D39C426E03358384018E85 /* MPAnswersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAnswersViewController.m; sourceTree = "<group>"; };
 		93D39C44361BE57AF0B3071F /* MPSitesSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSitesSegue.h; sourceTree = "<group>"; };
-		93D39C86E984EC65DA5ACB1D /* MPAppSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAppSettingsViewController.h; sourceTree = "<group>"; };
 		93D39CB0EABD2748740992D8 /* MPMessageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMessageViewController.h; sourceTree = "<group>"; };
 		93D39CC01630D0421205C4C4 /* MPNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPNavigationController.m; sourceTree = "<group>"; };
 		93D39CDD434AFD6E1B0DA359 /* MPEmergencyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEmergencyViewController.h; sourceTree = "<group>"; };
@@ -594,41 +544,6 @@
 		DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		DA071BF1190187FE00179766 /* empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "empty@2x.png"; sourceTree = "<group>"; };
 		DA071BF2190187FE00179766 /* empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = empty.png; sourceTree = "<group>"; };
-		DA0CC4F61EAB99BA009A8ED9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/IASKLocalizable.strings; sourceTree = "<group>"; };
-		DA0CC4F91EAB99BA009A8ED9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/IASKLocalizable.strings; sourceTree = "<group>"; };
-		DA0CC5061EAB99BA009A8ED9 /* IASKAppSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKAppSettingsViewController.h; sourceTree = "<group>"; };
-		DA0CC5071EAB99BA009A8ED9 /* IASKAppSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKAppSettingsViewController.m; sourceTree = "<group>"; };
-		DA0CC5081EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKAppSettingsWebViewController.h; sourceTree = "<group>"; };
-		DA0CC5091EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKAppSettingsWebViewController.m; sourceTree = "<group>"; };
-		DA0CC50A1EAB99BA009A8ED9 /* IASKMultipleValueSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKMultipleValueSelection.h; sourceTree = "<group>"; };
-		DA0CC50B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKMultipleValueSelection.m; sourceTree = "<group>"; };
-		DA0CC50C1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSpecifierValuesViewController.h; sourceTree = "<group>"; };
-		DA0CC50D1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSpecifierValuesViewController.m; sourceTree = "<group>"; };
-		DA0CC50E1EAB99BA009A8ED9 /* IASKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKViewController.h; sourceTree = "<group>"; };
-		DA0CC5101EAB99BA009A8ED9 /* IASKSettingsReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSettingsReader.h; sourceTree = "<group>"; };
-		DA0CC5111EAB99BA009A8ED9 /* IASKSettingsReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSettingsReader.m; sourceTree = "<group>"; };
-		DA0CC5121EAB99BA009A8ED9 /* IASKSettingsStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSettingsStore.h; sourceTree = "<group>"; };
-		DA0CC5131EAB99BA009A8ED9 /* IASKSettingsStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSettingsStore.m; sourceTree = "<group>"; };
-		DA0CC5141EAB99BA009A8ED9 /* IASKSettingsStoreFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSettingsStoreFile.h; sourceTree = "<group>"; };
-		DA0CC5151EAB99BA009A8ED9 /* IASKSettingsStoreFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSettingsStoreFile.m; sourceTree = "<group>"; };
-		DA0CC5161EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSettingsStoreUserDefaults.h; sourceTree = "<group>"; };
-		DA0CC5171EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSettingsStoreUserDefaults.m; sourceTree = "<group>"; };
-		DA0CC5181EAB99BA009A8ED9 /* IASKSpecifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSpecifier.h; sourceTree = "<group>"; };
-		DA0CC5191EAB99BA009A8ED9 /* IASKSpecifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSpecifier.m; sourceTree = "<group>"; };
-		DA0CC51B1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKPSSliderSpecifierViewCell.h; sourceTree = "<group>"; };
-		DA0CC51C1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKPSSliderSpecifierViewCell.m; sourceTree = "<group>"; };
-		DA0CC51D1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKPSTextFieldSpecifierViewCell.h; sourceTree = "<group>"; };
-		DA0CC51E1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKPSTextFieldSpecifierViewCell.m; sourceTree = "<group>"; };
-		DA0CC51F1EAB99BA009A8ED9 /* IASKSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSlider.h; sourceTree = "<group>"; };
-		DA0CC5201EAB99BA009A8ED9 /* IASKSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSlider.m; sourceTree = "<group>"; };
-		DA0CC5211EAB99BA009A8ED9 /* IASKSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSwitch.h; sourceTree = "<group>"; };
-		DA0CC5221EAB99BA009A8ED9 /* IASKSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSwitch.m; sourceTree = "<group>"; };
-		DA0CC5231EAB99BA009A8ED9 /* IASKTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKTextField.h; sourceTree = "<group>"; };
-		DA0CC5241EAB99BA009A8ED9 /* IASKTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextField.m; sourceTree = "<group>"; };
-		DA0CC5251EAB99BA009A8ED9 /* IASKTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKTextView.h; sourceTree = "<group>"; };
-		DA0CC5261EAB99BA009A8ED9 /* IASKTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextView.m; sourceTree = "<group>"; };
-		DA0CC5271EAB99BA009A8ED9 /* IASKTextViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKTextViewCell.h; sourceTree = "<group>"; };
-		DA0CC5281EAB99BA009A8ED9 /* IASKTextViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextViewCell.m; sourceTree = "<group>"; };
 		DA0CC5451EB6AD0E009A8ED9 /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
 		DA0CC5461EB6AD0E009A8ED9 /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
 		DA0CC5471EB6AD0E009A8ED9 /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = "<group>"; };
@@ -704,9 +619,6 @@
 		DA30E9D615723E6900A68B4C /* PearlLazy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlLazy.m; sourceTree = "<group>"; };
 		DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlFixedTableView.m; sourceTree = "<group>"; };
 		DA32D01919D046E1004F3F0E /* PearlFixedTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlFixedTableView.h; sourceTree = "<group>"; };
-		DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKCOrderedAccessorFix.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		DA32D03919D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObjectModel+KCOrderedAccessorFix.h"; sourceTree = "<group>"; };
-		DA32D03A19D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObjectModel+KCOrderedAccessorFix.m"; sourceTree = "<group>"; };
 		DA32D03F19D27093004F3F0E /* thumb_generated_answers@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumb_generated_answers@3x.png"; sourceTree = "<group>"; };
 		DA32D04019D27093004F3F0E /* thumb_generated_answers@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumb_generated_answers@2x.png"; sourceTree = "<group>"; };
 		DA32D04119D27093004F3F0E /* thumb_generated_answers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumb_generated_answers.png; sourceTree = "<group>"; };
@@ -1573,17 +1485,9 @@
 		DABD3FC91712446200CF925C /* cloud@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cloud@2x.png"; sourceTree = "<group>"; };
 		DABD3FCC1714F45B00CF925C /* identity.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = identity.png; sourceTree = "<group>"; };
 		DABD3FCD1714F45B00CF925C /* identity@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "identity@2x.png"; sourceTree = "<group>"; };
-		DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libuicolor-utilities.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		DAC6326C148680650075AEA5 /* libjrswizzle.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjrswizzle.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DAC632871486D95D0075AEA5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		DAC77CAD148291A600BCF976 /* libPearl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPearl.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DACA29721705E1A8002C6C22 /* dictionary.lst */ = {isa = PBXFileReference; fileEncoding = 1; lastKnownFileType = text; path = dictionary.lst; sourceTree = "<group>"; };
-		DACA29771705E2BD002C6C22 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JRSwizzle.h; sourceTree = "<group>"; };
-		DACA298C1705E2BD002C6C22 /* JRSwizzle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JRSwizzle.m; sourceTree = "<group>"; };
-		DACA29B51705E2DE002C6C22 /* UIColor+Expanded.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+Expanded.h"; sourceTree = "<group>"; };
-		DACA29B61705E2DE002C6C22 /* UIColor+HSV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+HSV.h"; sourceTree = "<group>"; };
-		DACA29BA1705E2DE002C6C22 /* UIColor+Expanded.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+Expanded.m"; sourceTree = "<group>"; };
-		DACA29BB1705E2DE002C6C22 /* UIColor+HSV.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+HSV.m"; sourceTree = "<group>"; };
 		DACE2F6319BA6A0A0010F92E /* PearlProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlProfiler.m; sourceTree = "<group>"; };
 		DACE2F6419BA6A0A0010F92E /* PearlProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlProfiler.h; sourceTree = "<group>"; };
 		DACE2F6719BA6A2A0010F92E /* UIView+FontScale.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+FontScale.m"; sourceTree = "<group>"; };
@@ -1605,7 +1509,6 @@
 		DAF4EF4F190A81E400023C90 /* NSManagedObject+Pearl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObject+Pearl.h"; sourceTree = "<group>"; };
 		DAFC1F6F2439795000D1CD66 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
 		DAFC1F72243989FB00D1CD66 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
-		DAFC5655172C573B00CB5CC5 /* libInAppSettingsKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libInAppSettingsKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+PearlExport.h"; sourceTree = "<group>"; };
 		DAFE45D915039823003ABA7C /* NSObject+PearlExport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+PearlExport.m"; sourceTree = "<group>"; };
 		DAFE45DA15039823003ABA7C /* NSString+PearlNSArrayFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+PearlNSArrayFormat.h"; sourceTree = "<group>"; };
@@ -1680,13 +1583,6 @@
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
-		DA32D01D19D111C6004F3F0E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DA5BFA41147E415C00F98B1E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -1697,10 +1593,8 @@
 				DA2C3D651BD9612F001137B3 /* libz.tbd in Frameworks */,
 				DA2C3D631BD96126001137B3 /* libc++.tbd in Frameworks */,
 				DAA1761B19D86D0D0044227B /* libAttributedMarkdown.a in Frameworks */,
-				DA32D03E19D11293004F3F0E /* libKCOrderedAccessorFix.a in Frameworks */,
 				DAFC1F702439795100D1CD66 /* CoreServices.framework in Frameworks */,
 				DAE2725A19C93B8E007C5262 /* StoreKit.framework in Frameworks */,
-				DAE2725919C93B80007C5262 /* libInAppSettingsKit.a in Frameworks */,
 				DA6701E016406BB400B61001 /* AdSupport.framework in Frameworks */,
 				DA6701DE16406B7300B61001 /* Social.framework in Frameworks */,
 				DA6701B816406A4100B61001 /* Accounts.framework in Frameworks */,
@@ -1724,40 +1618,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DAC6325A1486805C0075AEA5 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DAC6325E1486805C0075AEA5 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DAC63269148680650075AEA5 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DAC77CAA148291A600BCF976 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */,
-				DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */,
 				DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DAFC5652172C573B00CB5CC5 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DAFC5656172C573B00CB5CC5 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
@@ -1803,68 +1671,6 @@
 			path = "../platform-independent/c/core/src";
 			sourceTree = "<group>";
 		};
-		DA0CC4F41EAB99BA009A8ED9 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				DA0CC4F51EAB99BA009A8ED9 /* IASKLocalizable.strings */,
-			);
-			path = Resources;
-			sourceTree = "<group>";
-		};
-		DA0CC5051EAB99BA009A8ED9 /* Controllers */ = {
-			isa = PBXGroup;
-			children = (
-				DA0CC5061EAB99BA009A8ED9 /* IASKAppSettingsViewController.h */,
-				DA0CC5071EAB99BA009A8ED9 /* IASKAppSettingsViewController.m */,
-				DA0CC5081EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.h */,
-				DA0CC5091EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m */,
-				DA0CC50A1EAB99BA009A8ED9 /* IASKMultipleValueSelection.h */,
-				DA0CC50B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m */,
-				DA0CC50C1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.h */,
-				DA0CC50D1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m */,
-				DA0CC50E1EAB99BA009A8ED9 /* IASKViewController.h */,
-			);
-			path = Controllers;
-			sourceTree = "<group>";
-		};
-		DA0CC50F1EAB99BA009A8ED9 /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				DA0CC5101EAB99BA009A8ED9 /* IASKSettingsReader.h */,
-				DA0CC5111EAB99BA009A8ED9 /* IASKSettingsReader.m */,
-				DA0CC5121EAB99BA009A8ED9 /* IASKSettingsStore.h */,
-				DA0CC5131EAB99BA009A8ED9 /* IASKSettingsStore.m */,
-				DA0CC5141EAB99BA009A8ED9 /* IASKSettingsStoreFile.h */,
-				DA0CC5151EAB99BA009A8ED9 /* IASKSettingsStoreFile.m */,
-				DA0CC5161EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.h */,
-				DA0CC5171EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m */,
-				DA0CC5181EAB99BA009A8ED9 /* IASKSpecifier.h */,
-				DA0CC5191EAB99BA009A8ED9 /* IASKSpecifier.m */,
-			);
-			path = Models;
-			sourceTree = "<group>";
-		};
-		DA0CC51A1EAB99BA009A8ED9 /* Views */ = {
-			isa = PBXGroup;
-			children = (
-				DA0CC51B1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.h */,
-				DA0CC51C1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m */,
-				DA0CC51D1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.h */,
-				DA0CC51E1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m */,
-				DA0CC51F1EAB99BA009A8ED9 /* IASKSlider.h */,
-				DA0CC5201EAB99BA009A8ED9 /* IASKSlider.m */,
-				DA0CC5211EAB99BA009A8ED9 /* IASKSwitch.h */,
-				DA0CC5221EAB99BA009A8ED9 /* IASKSwitch.m */,
-				DA0CC5231EAB99BA009A8ED9 /* IASKTextField.h */,
-				DA0CC5241EAB99BA009A8ED9 /* IASKTextField.m */,
-				DA0CC5251EAB99BA009A8ED9 /* IASKTextView.h */,
-				DA0CC5261EAB99BA009A8ED9 /* IASKTextView.m */,
-				DA0CC5271EAB99BA009A8ED9 /* IASKTextViewCell.h */,
-				DA0CC5281EAB99BA009A8ED9 /* IASKTextViewCell.m */,
-			);
-			path = Views;
-			sourceTree = "<group>";
-		};
 		DA24EBB019DAD4D000FF010B /* ios */ = {
 			isa = PBXGroup;
 			children = (
@@ -1943,15 +1749,6 @@
 			path = Guide;
 			sourceTree = "<group>";
 		};
-		DA32D03719D111EB004F3F0E /* KCOrderedAccessorFix */ = {
-			isa = PBXGroup;
-			children = (
-				DA32D03919D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.h */,
-				DA32D03A19D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.m */,
-			);
-			path = KCOrderedAccessorFix;
-			sourceTree = "<group>";
-		};
 		DA5BFA39147E415C00F98B1E = {
 			isa = PBXGroup;
 			children = (
@@ -1970,10 +1767,6 @@
 			children = (
 				DA5BFA44147E415C00F98B1E /* MasterPassword.app */,
 				DAC77CAD148291A600BCF976 /* libPearl.a */,
-				DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */,
-				DAC6326C148680650075AEA5 /* libjrswizzle.a */,
-				DAFC5655172C573B00CB5CC5 /* libInAppSettingsKit.a */,
-				DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */,
 				DAA1757D19D86BE70044227B /* libAttributedMarkdown.a */,
 			);
 			name = Products;
@@ -2007,13 +1800,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		DAA141181922FED80032B392 /* iOS */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = iOS;
-			sourceTree = "<group>";
-		};
 		DAA1411E1922FF020032B392 /* include */ = {
 			isa = PBXGroup;
 			children = (
@@ -2956,8 +2742,6 @@
 				DABD3BF81711E2DC00CF925C /* MasterPassword.entitlements */,
 				93D39D6604447D7708039155 /* MPAnswersViewController.h */,
 				93D39C426E03358384018E85 /* MPAnswersViewController.m */,
-				93D39C86E984EC65DA5ACB1D /* MPAppSettingsViewController.h */,
-				93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */,
 				93D39DA27D768B53C8B1330C /* MPAvatarCell.h */,
 				93D39B381350802A194BF332 /* MPAvatarCell.m */,
 				93D390519405B76CC6A57C4F /* MPCell.h */,
@@ -3028,12 +2812,7 @@
 				DAA7BB6D20C4C0C400101DC7 /* libjson-c-ios */,
 				DAA7BB8720C4C10F00101DC7 /* libsodium-ios */,
 				DAA1759319D86C610044227B /* AttributedMarkdown */,
-				DAFC5662172C57EC00CB5CC5 /* InAppSettingsKit */,
-				DAA141181922FED80032B392 /* iOS */,
-				DACA29751705E2BD002C6C22 /* jrswizzle */,
-				DA32D03719D111EB004F3F0E /* KCOrderedAccessorFix */,
 				DAC77CAF148291A600BCF976 /* Pearl */,
-				DACA29B41705E2DE002C6C22 /* uicolor-utilities */,
 			);
 			path = External;
 			sourceTree = "<group>";
@@ -3056,50 +2835,14 @@
 			path = Data;
 			sourceTree = "<group>";
 		};
-		DACA29751705E2BD002C6C22 /* jrswizzle */ = {
-			isa = PBXGroup;
-			children = (
-				DACA29771705E2BD002C6C22 /* JRSwizzle.h */,
-				DACA298C1705E2BD002C6C22 /* JRSwizzle.m */,
-			);
-			path = jrswizzle;
-			sourceTree = "<group>";
-		};
-		DACA29B41705E2DE002C6C22 /* uicolor-utilities */ = {
-			isa = PBXGroup;
-			children = (
-				DACA29B51705E2DE002C6C22 /* UIColor+Expanded.h */,
-				DACA29BA1705E2DE002C6C22 /* UIColor+Expanded.m */,
-				DACA29B61705E2DE002C6C22 /* UIColor+HSV.h */,
-				DACA29BB1705E2DE002C6C22 /* UIColor+HSV.m */,
-			);
-			path = "uicolor-utilities";
-			sourceTree = "<group>";
-		};
-		DAFC5662172C57EC00CB5CC5 /* InAppSettingsKit */ = {
-			isa = PBXGroup;
-			children = (
-				DA0CC4F41EAB99BA009A8ED9 /* Resources */,
-				DA0CC5051EAB99BA009A8ED9 /* Controllers */,
-				DA0CC50F1EAB99BA009A8ED9 /* Models */,
-				DA0CC51A1EAB99BA009A8ED9 /* Views */,
-			);
-			name = InAppSettingsKit;
-			path = InAppSettingsKit/InAppSettingsKit;
-			sourceTree = "<group>";
-		};
 		DAFE45D715039823003ABA7C /* Pearl */ = {
 			isa = PBXGroup;
 			children = (
 				DAA1411E1922FF020032B392 /* include */,
-				93D396D04E57792A54D437AC /* NSArray+Indexing.h */,
-				93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */,
 				DA2CA4DA18D28859007798F8 /* NSArray+Pearl.h */,
 				DA2CA4D918D28859007798F8 /* NSArray+Pearl.m */,
 				DAFE4A63150399FF003ABA93 /* NSDateFormatter+RFC3339.h */,
 				DAFE4A63150399FF003ABA91 /* NSDateFormatter+RFC3339.m */,
-				93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */,
-				93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */,
 				93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */,
 				93D39F9106F2CCFB94283188 /* NSError+PearlFullDescription.m */,
 				DAB4FBC2202FDDDC002768FB /* NSInvocation+Pearl.h */,
@@ -3282,23 +3025,6 @@
 /* End PBXGroup section */

 /* Begin PBXHeadersBuildPhase section */
-		DAC6325B1486805C0075AEA5 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DACA29BC1705E2DE002C6C22 /* UIColor+Expanded.h in Headers */,
-				DACA29BD1705E2DE002C6C22 /* UIColor+HSV.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DAC6326A148680650075AEA5 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DAC77CAB148291A600BCF976 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -3355,9 +3081,7 @@
 				DAFE4A63150399FF003ABA8C /* UIControl+PearlSelect.h in Headers */,
 				DAFE4A63150399FF003ABA90 /* UIScrollView+PearlFlashingIndicators.h in Headers */,
 				DAFE4A63150399FF003ABA94 /* NSDateFormatter+RFC3339.h in Headers */,
-				93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */,
 				DA2CA4DE18D28859007798F8 /* NSArray+Pearl.h in Headers */,
-				93D392EC39DA43C46C692C12 /* NSDictionary+Indexing.h in Headers */,
 				93D3932889B6B4206E66A6D6 /* PearlEMail.h in Headers */,
 				DAB4FBC8202FDDF3002768FB /* NSNotificationCenter+PearlEasyCleanup.h in Headers */,
 				DA3509FE15F101A500C14A8E /* PearlQueue.h in Headers */,
@@ -3417,23 +3141,6 @@
 /* End PBXLegacyTarget section */

 /* Begin PBXNativeTarget section */
-		DA32D01F19D111C6004F3F0E /* KCOrderedAccessorFix */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DA32D03419D111C7004F3F0E /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */;
-			buildPhases = (
-				DA32D01C19D111C6004F3F0E /* Sources */,
-				DA32D01D19D111C6004F3F0E /* Frameworks */,
-				DA32D01E19D111C6004F3F0E /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = KCOrderedAccessorFix;
-			productName = KCOrderedAccessorFix;
-			productReference = DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */;
-			productType = "com.apple.product-type.library.static";
-		};
 		DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-iOS" */;
@@ -3475,40 +3182,6 @@
 			productReference = DAA1757D19D86BE70044227B /* libAttributedMarkdown.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		DAC6325C1486805C0075AEA5 /* uicolor-utilities */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DAC632651486805C0075AEA5 /* Build configuration list for PBXNativeTarget "uicolor-utilities" */;
-			buildPhases = (
-				DAC632591486805C0075AEA5 /* Sources */,
-				DAC6325A1486805C0075AEA5 /* Frameworks */,
-				DAC6325B1486805C0075AEA5 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "uicolor-utilities";
-			productName = "uicolor-utilities";
-			productReference = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		DAC6326B148680650075AEA5 /* jrswizzle */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */;
-			buildPhases = (
-				DAC63268148680650075AEA5 /* Sources */,
-				DAC63269148680650075AEA5 /* Frameworks */,
-				DAC6326A148680650075AEA5 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = jrswizzle;
-			productName = jrswizzle;
-			productReference = DAC6326C148680650075AEA5 /* libjrswizzle.a */;
-			productType = "com.apple.product-type.library.static";
-		};
 		DAC77CAC148291A600BCF976 /* Pearl */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = DAC77CB7148291A600BCF976 /* Build configuration list for PBXNativeTarget "Pearl" */;
@@ -3527,22 +3200,6 @@
 			productReference = DAC77CAD148291A600BCF976 /* libPearl.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		DAFC5654172C573B00CB5CC5 /* InAppSettingsKit */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DAFC565E172C573B00CB5CC5 /* Build configuration list for PBXNativeTarget "InAppSettingsKit" */;
-			buildPhases = (
-				DAFC5651172C573B00CB5CC5 /* Sources */,
-				DAFC5652172C573B00CB5CC5 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = InAppSettingsKit;
-			productName = InAppSettingsKit;
-			productReference = DAFC5655172C573B00CB5CC5 /* libInAppSettingsKit.a */;
-			productType = "com.apple.product-type.library.static";
-		};
 /* End PBXNativeTarget section */

 /* Begin PBXProject section */
@@ -3554,9 +3211,6 @@
 				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = Lyndir;
 				TargetAttributes = {
-					DA32D01F19D111C6004F3F0E = {
-						DevelopmentTeam = HL3Q45LX9N;
-					};
 					DA5BFA43147E415C00F98B1E = {
 						DevelopmentTeam = HL3Q45LX9N;
 						LastSwiftMigration = 0920;
@@ -3589,18 +3243,9 @@
 						DevelopmentTeam = HL3Q45LX9N;
 						ProvisioningStyle = Automatic;
 					};
-					DAC6325C1486805C0075AEA5 = {
-						DevelopmentTeam = HL3Q45LX9N;
-					};
-					DAC6326B148680650075AEA5 = {
-						DevelopmentTeam = HL3Q45LX9N;
-					};
 					DAC77CAC148291A600BCF976 = {
 						DevelopmentTeam = HL3Q45LX9N;
 					};
-					DAFC5654172C573B00CB5CC5 = {
-						DevelopmentTeam = HL3Q45LX9N;
-					};
 				};
 			};
 			buildConfigurationList = DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-iOS" */;
@@ -3618,10 +3263,6 @@
 			targets = (
 				DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */,
 				DAC77CAC148291A600BCF976 /* Pearl */,
-				DAC6325C1486805C0075AEA5 /* uicolor-utilities */,
-				DAC6326B148680650075AEA5 /* jrswizzle */,
-				DAFC5654172C573B00CB5CC5 /* InAppSettingsKit */,
-				DA32D01F19D111C6004F3F0E /* KCOrderedAccessorFix */,
 				DAA1757C19D86BE70044227B /* AttributedMarkdown */,
 				DAB7AE471F3D468300C856B1 /* libsodium-ios */,
 				DAB7AE3D1F3D464A00C856B1 /* libjson-c-ios */,
@@ -3824,15 +3465,12 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/Countly-iOS/Countly.framework",
-				"${BUILT_PRODUCTS_DIR}/Sentry-iOS/Sentry.framework",
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Countly.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -3926,14 +3564,6 @@
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
-		DA32D01C19D111C6004F3F0E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DA32D03C19D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DA5BFA40147E415C00F98B1E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -3974,7 +3604,6 @@
 				93D394B5036C882B33C71872 /* MPSitesSegue.m in Sources */,
 				DA0CC5911EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataProperties.m in Sources */,
 				93D39673DDC085BE72C34D7C /* MPPopdownSegue.m in Sources */,
-				93D39BA1EA3CAAC8A220B4A6 /* MPAppSettingsViewController.m in Sources */,
 				DA0CC58F1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.m in Sources */,
 				93D396D8B67DA6522CDBA142 /* MPCoachmarkViewController.m in Sources */,
 				DAADBFE01A68763B00F7A756 /* mpw-algorithm.c in Sources */,
@@ -4015,23 +3644,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DAC632591486805C0075AEA5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DACA29BE1705E2DE002C6C22 /* UIColor+Expanded.m in Sources */,
-				DACA29BF1705E2DE002C6C22 /* UIColor+HSV.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DAC63268148680650075AEA5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DAC77CA9148291A600BCF976 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -4081,8 +3693,6 @@
 				DAFE4A63150399FF003ABA8E /* UIScrollView+PearlFlashingIndicators.m in Sources */,
 				DAFE4A63150399FF003ABA92 /* NSDateFormatter+RFC3339.m in Sources */,
 				DA2CA4E618D2AC10007798F8 /* NSLayoutConstraint+PearlUIKit.m in Sources */,
-				93D395F08A087F8A24689347 /* NSArray+Indexing.m in Sources */,
-				93D39E281E3658B30550CB55 /* NSDictionary+Indexing.m in Sources */,
 				DAF4EF50190A81E400023C90 /* NSManagedObject+Pearl.m in Sources */,
 				93D39262A8A97DB748213309 /* PearlEMail.m in Sources */,
 				DAB4FBD9202FDE48002768FB /* UIView+PearlSize.m in Sources */,
@@ -4112,29 +3722,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DAFC5651172C573B00CB5CC5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DA0CC52B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m in Sources */,
-				DA0CC5321EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m in Sources */,
-				DA0CC52D1EAB99BA009A8ED9 /* IASKSettingsReader.m in Sources */,
-				DA0CC52A1EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m in Sources */,
-				DA0CC5291EAB99BA009A8ED9 /* IASKAppSettingsViewController.m in Sources */,
-				DA0CC5381EAB99BA009A8ED9 /* IASKTextViewCell.m in Sources */,
-				DA0CC5311EAB99BA009A8ED9 /* IASKSpecifier.m in Sources */,
-				DA0CC5341EAB99BA009A8ED9 /* IASKSlider.m in Sources */,
-				DA0CC5351EAB99BA009A8ED9 /* IASKSwitch.m in Sources */,
-				DA0CC5331EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m in Sources */,
-				DA0CC52E1EAB99BA009A8ED9 /* IASKSettingsStore.m in Sources */,
-				DA0CC52C1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m in Sources */,
-				DA0CC5361EAB99BA009A8ED9 /* IASKTextField.m in Sources */,
-				DA0CC5371EAB99BA009A8ED9 /* IASKTextView.m in Sources */,
-				DA0CC52F1EAB99BA009A8ED9 /* IASKSettingsStoreFile.m in Sources */,
-				DA0CC5301EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */

 /* Begin PBXTargetDependency section */
@@ -4151,15 +3738,6 @@
 /* End PBXTargetDependency section */

 /* Begin PBXVariantGroup section */
-		DA0CC4F51EAB99BA009A8ED9 /* IASKLocalizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				DA0CC4F61EAB99BA009A8ED9 /* Base */,
-				DA0CC4F91EAB99BA009A8ED9 /* en */,
-			);
-			name = IASKLocalizable.strings;
-			sourceTree = "<group>";
-		};
 		DABD3BFA1711E2DC00CF925C /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -4187,18 +3765,6 @@
 /* End PBXVariantGroup section */

 /* Begin XCBuildConfiguration section */
-		DA32D02E19D111C7004F3F0E /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Debug;
-		};
-		DA32D02F19D111C7004F3F0E /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Release;
-		};
 		DA5BFA6B147E415C00F98B1E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -4600,38 +4166,6 @@
 			};
 			name = Release;
 		};
-		DAC632661486805C0075AEA5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = NO;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
-			};
-			name = Debug;
-		};
-		DAC632671486805C0075AEA5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = NO;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
-			};
-			name = Release;
-		};
-		DAC63275148680650075AEA5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = NO;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
-			};
-			name = Debug;
-		};
-		DAC63276148680650075AEA5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = NO;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
-			};
-			name = Release;
-		};
 		DAC77CB5148291A600BCF976 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -4658,34 +4192,9 @@
 			};
 			name = Release;
 		};
-		DAFC565F172C573B00CB5CC5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
-			};
-			name = Debug;
-		};
-		DAFC5660172C573B00CB5CC5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
-			};
-			name = Release;
-		};
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
-		DA32D03419D111C7004F3F0E /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DA32D02E19D111C7004F3F0E /* Debug */,
-				DA32D02F19D111C7004F3F0E /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
 		DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -4731,24 +4240,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		DAC632651486805C0075AEA5 /* Build configuration list for PBXNativeTarget "uicolor-utilities" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DAC632661486805C0075AEA5 /* Debug */,
-				DAC632671486805C0075AEA5 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
-		DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DAC63275148680650075AEA5 /* Debug */,
-				DAC63276148680650075AEA5 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
 		DAC77CB7148291A600BCF976 /* Build configuration list for PBXNativeTarget "Pearl" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -4758,15 +4249,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		DAFC565E172C573B00CB5CC5 /* Build configuration list for PBXNativeTarget "InAppSettingsKit" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DAFC565F172C573B00CB5CC5 /* Debug */,
-				DAFC5660172C573B00CB5CC5 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
 /* End XCConfigurationList section */

 /* Begin XCVersionGroup section */
--- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
+++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
@@ -10,17 +10,13 @@
 		7352E972184B980C428B66A2 /* Pods_MasterPassword_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E9477508F419F29008C7553 /* Pods_MasterPassword_macOS.framework */; };
 		93D390C676DF52DA7E459F19 /* MPSitesWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D9D0061FF1159998F06 /* MPSitesWindow.m */; };
 		93D391E61DC23E128DA4446C /* NSView+Traversing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D393EE88DE554BCCBC1C2D /* NSView+Traversing.h */; };
-		93D392EC39DA43C46C692C12 /* NSDictionary+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */; };
 		93D393A1646430FAAC73E7FE /* MPMacApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39F83DD151985F2C7345A /* MPMacApplication.m */; };
 		93D394C4254EEB45FB335AFB /* MPSitesTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39423D7BF4FD31FE6D27C /* MPSitesTableView.m */; };
 		93D395E4830290EBB6E71F34 /* MPNoStateButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39538C4CEFF46DF379254 /* MPNoStateButton.m */; };
-		93D395F08A087F8A24689347 /* NSArray+Indexing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */; };
 		93D39784E725A34D1EE3FB3B /* MPInitialWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D3CB30874147D9A9E1B /* MPInitialWindowController.m */; };
 		93D3987F6D9046DBEE4D8364 /* NSView+Traversing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D392870DF659AFC1870521 /* NSView+Traversing.m */; };
 		93D398D1F5D8CD5A22AF6929 /* MPGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39934FD8D5BFABA46F41C /* MPGradientView.m */; };
-		93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D396D04E57792A54D437AC /* NSArray+Indexing.h */; };
 		93D39C5789EFA607CF788082 /* MPSiteModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39E73BF5CBF8E5B005CD3 /* MPSiteModel.m */; };
-		93D39E281E3658B30550CB55 /* NSDictionary+Indexing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */; };
 		93D39F833DEC1C89B2F795AC /* MPSitesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39A57A7823DE98A0FF83C /* MPSitesWindowController.m */; };
 		DA0933CC1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0933CB1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png */; };
 		DA0933D01747B91B00DE1CEF /* appstore.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0933CF1747B91B00DE1CEF /* appstore.png */; };
@@ -87,7 +83,6 @@
 		DA3B8453190FC86F00246EEA /* NSManagedObject+Pearl.h in Headers */ = {isa = PBXBuildFile; fileRef = DA3B8451190FC86F00246EEA /* NSManagedObject+Pearl.h */; };
 		DA3B8456190FC89700246EEA /* MPFixable.m in Sources */ = {isa = PBXBuildFile; fileRef = DA3B8454190FC89700246EEA /* MPFixable.m */; };
 		DA3BCFCD19BD09E0006B2681 /* SourceCodePro-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = DA3BCFCC19BD09E0006B2681 /* SourceCodePro-Regular.otf */; };
-		DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; };
 		DA4DAE941A7D8117003E5423 /* MPAlgorithmV3.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4DAE921A7D8117003E5423 /* MPAlgorithmV3.m */; };
 		DA4DAE951A7D8117003E5423 /* MPTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4DAE931A7D8117003E5423 /* MPTypes.m */; };
 		DA5180CA19FF2F9200A587E9 /* MPAlgorithmV2.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5180C719FF2F9200A587E9 /* MPAlgorithmV2.m */; };
@@ -119,6 +114,7 @@
 		DA6774431A474A3B004F356A /* mpw-algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773BB1A4746AF004F356A /* mpw-algorithm.c */; };
 		DA6774451A474A3B004F356A /* mpw-types.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C21A4746AF004F356A /* mpw-types.c */; };
 		DA6774461A474A3B004F356A /* mpw-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C51A4746AF004F356A /* mpw-util.c */; };
+		DA72E2272444081200676D4F /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DABB981515100B4000B05417 /* SystemConfiguration.framework */; };
 		DA7471A31F2B71AE005F3468 /* mpw-marshal-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DA7471A01F2B71A9005F3468 /* mpw-marshal-util.c */; };
 		DA7471A61F2B71B9005F3468 /* mpw-marshal-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DA7471A01F2B71A9005F3468 /* mpw-marshal-util.c */; };
 		DA89D4EC1A51EABD00AC64D7 /* Pearl-Cocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = DA89D4EA1A51EABD00AC64D7 /* Pearl-Cocoa.h */; };
@@ -126,7 +122,6 @@
 		DA8ED895192906920099B726 /* PearlTween.m in Sources */ = {isa = PBXBuildFile; fileRef = DA8ED891192906920099B726 /* PearlTween.m */; };
 		DA8ED896192906920099B726 /* PearlTween.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8ED892192906920099B726 /* PearlTween.h */; };
 		DA8ED897192906920099B726 /* map-macro.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8ED894192906920099B726 /* map-macro.h */; };
-		DA9261511BE1A86700369DE5 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA92614F1BE1A86700369DE5 /* SystemConfiguration.framework */; };
 		DA9261541BE1A88900369DE5 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261531BE1A88900369DE5 /* libc++.tbd */; };
 		DA9261561BE1A89600369DE5 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261551BE1A89600369DE5 /* libz.tbd */; };
 		DAA449D51EEC4B6B00E7BDD5 /* mpw-marshal.c in Sources */ = {isa = PBXBuildFile; fileRef = DAA449D31EEC4B6B00E7BDD5 /* mpw-marshal.c */; };
@@ -136,8 +131,6 @@
 		DAADCC4819FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */; };
 		DAADCC4919FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m in Sources */ = {isa = PBXBuildFile; fileRef = DAADCC4019FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m */; };
 		DAADCC4B19FB000C00987B1D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAEBC45214F6364500987BF6 /* QuartzCore.framework */; };
-		DAADCC6919FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m in Sources */ = {isa = PBXBuildFile; fileRef = DAADCC6719FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m */; };
-		DAADCC6A19FB00B500987B1D /* libKCOrderedAccessorFix.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */; };
 		DAAF16661F5CA3240013B8AE /* mpw-cli-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DAAF16631F5897EA0013B8AE /* mpw-cli-util.c */; };
 		DAB07CA01F7725D400CC6D43 /* aes.c in Sources */ = {isa = PBXBuildFile; fileRef = DAB07C9E1F7725D400CC6D43 /* aes.c */; };
 		DAB07CA31F77261400CC6D43 /* aes.c in Sources */ = {isa = PBXBuildFile; fileRef = DAB07C9E1F7725D400CC6D43 /* aes.c */; };
@@ -166,7 +159,6 @@
 		DABD5EF9242BBCE200200755 /* icon_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = DAD0C5FE19FD6034009CB08D /* icon_512x512.png */; };
 		DABD5EFA242BBCE200200755 /* icon_512x512@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAD0C5FF19FD6034009CB08D /* icon_512x512@2x.png */; };
 		DABD5F00242BC32D00200755 /* MPSecrets.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD5EFE242BC32D00200755 /* MPSecrets.m */; };
-		DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DACA26FE1705DF81002C6C22 /* logo-bare.png in Resources */ = {isa = PBXBuildFile; fileRef = DACA241C1705DF7D002C6C22 /* logo-bare.png */; };
 		DACA27121705DF81002C6C22 /* avatar-13@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DACA24321705DF7D002C6C22 /* avatar-13@2x.png */; };
@@ -211,8 +203,6 @@
 		DACA29671705DF81002C6C22 /* SourceCodePro-ExtraLight.otf in Resources */ = {isa = PBXBuildFile; fileRef = DACA268E1705DF81002C6C22 /* SourceCodePro-ExtraLight.otf */; };
 		DACA29681705DF81002C6C22 /* SourceCodePro-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = DACA268F1705DF81002C6C22 /* SourceCodePro-Black.otf */; };
 		DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */ = {isa = PBXBuildFile; fileRef = DACA29721705E1A8002C6C22 /* dictionary.lst */; };
-		DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29771705E2BD002C6C22 /* JRSwizzle.h */; };
-		DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA298C1705E2BD002C6C22 /* JRSwizzle.m */; };
 		DAD9B5F01762CAA4001835F9 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAD9B5EF1762CAA4001835F9 /* ServiceManagement.framework */; };
 		DAD9B5F11762CAB9001835F9 /* MasterPassword-Mac-LoginHelper.app in Copy LoginHelper */ = {isa = PBXBuildFile; fileRef = DAD9B5E6176299BA001835F9 /* MasterPassword-Mac-LoginHelper.app */; };
 		DAEB942E18B47FB3000490CC /* MPInitialWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA0933C91747A56A00DE1CEF /* MPInitialWindow.xib */; };
@@ -308,13 +298,6 @@
 			remoteGlobalIDString = DAD9B5C0176299B9001835F9;
 			remoteInfo = "MasterPassword-Mac-LoginHelper";
 		};
-		DAC63285148681200075AEA5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = DA5BFA3B147E415C00F98B1E /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = DAC6326B148680650075AEA5;
-			remoteInfo = jrswizzle;
-		};
 		DAD9B5E5176299BA001835F9 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = DAD9B5E1176299B9001835F9 /* MasterPassword-Mac-LoginHelper.xcodeproj */;
@@ -352,15 +335,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
-		DAADCC4E19FB006500987B1D /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "include/$(PRODUCT_NAME)";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DAD9B5EE1762CA3A001835F9 /* Copy LoginHelper */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -380,23 +354,19 @@
 		1E9ED9547411486CE0898611 /* Pods-MasterPassword-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-macOS.debug.xcconfig"; path = "Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS.debug.xcconfig"; sourceTree = "<group>"; };
 		28DD0F6129ECC496C8DFE6F8 /* Pods-MasterPassword-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-macOS.release.xcconfig"; path = "Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS.release.xcconfig"; sourceTree = "<group>"; };
 		7791961245EBC3023523FDCD /* Pods-MasterPassword.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword.release.xcconfig"; path = "Target Support Files/Pods-MasterPassword/Pods-MasterPassword.release.xcconfig"; sourceTree = "<group>"; };
-		93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Indexing.m"; sourceTree = "<group>"; };
 		93D39240B5143E01F0B75E96 /* MPSiteModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSiteModel.h; sourceTree = "<group>"; };
 		93D392870DF659AFC1870521 /* NSView+Traversing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSView+Traversing.m"; sourceTree = "<group>"; };
 		93D392A4F3DE0BD758B9B056 /* MPNoStateButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPNoStateButton.h; sourceTree = "<group>"; };
 		93D392C3918763B3B72CF366 /* MPSitesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSitesWindowController.h; sourceTree = "<group>"; };
 		93D392FD65A1DF0E8B2A45C6 /* MPGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPGradientView.h; sourceTree = "<group>"; };
 		93D39368EF3CBFEF2AFCA15A /* MPInitialWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPInitialWindowController.h; sourceTree = "<group>"; };
-		93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Indexing.h"; sourceTree = "<group>"; };
 		93D393EE88DE554BCCBC1C2D /* NSView+Traversing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSView+Traversing.h"; sourceTree = "<group>"; };
 		93D3942099C9AD0374B5777D /* MPMacApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMacApplication.h; sourceTree = "<group>"; };
 		93D39423D7BF4FD31FE6D27C /* MPSitesTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSitesTableView.m; sourceTree = "<group>"; };
 		93D39538C4CEFF46DF379254 /* MPNoStateButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPNoStateButton.m; sourceTree = "<group>"; };
-		93D396D04E57792A54D437AC /* NSArray+Indexing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Indexing.h"; sourceTree = "<group>"; };
 		93D3977484534E99F9BA579D /* MPSitesWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSitesWindow.h; sourceTree = "<group>"; };
 		93D39934FD8D5BFABA46F41C /* MPGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPGradientView.m; sourceTree = "<group>"; };
 		93D39A57A7823DE98A0FF83C /* MPSitesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSitesWindowController.m; sourceTree = "<group>"; };
-		93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Indexing.m"; sourceTree = "<group>"; };
 		93D39AC6360DDC16AEAA4119 /* MPSitesTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSitesTableView.h; sourceTree = "<group>"; };
 		93D39D3CB30874147D9A9E1B /* MPInitialWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPInitialWindowController.m; sourceTree = "<group>"; };
 		93D39D9D0061FF1159998F06 /* MPSitesWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSitesWindow.m; sourceTree = "<group>"; };
@@ -937,7 +907,6 @@
 		DA8ED891192906920099B726 /* PearlTween.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlTween.m; sourceTree = "<group>"; };
 		DA8ED892192906920099B726 /* PearlTween.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlTween.h; sourceTree = "<group>"; };
 		DA8ED894192906920099B726 /* map-macro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "map-macro.h"; sourceTree = "<group>"; };
-		DA92614F1BE1A86700369DE5 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		DA9261531BE1A88900369DE5 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		DA9261551BE1A89600369DE5 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		DAA449D31EEC4B6B00E7BDD5 /* mpw-marshal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshal.c"; sourceTree = "<group>"; };
@@ -1032,9 +1001,6 @@
 		DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+PearlEasyCleanup.h"; sourceTree = "<group>"; };
 		DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPersistentStore+PearlMigration.h"; sourceTree = "<group>"; };
 		DAADCC4019FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSPersistentStore+PearlMigration.m"; sourceTree = "<group>"; };
-		DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKCOrderedAccessorFix.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		DAADCC6619FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObjectModel+KCOrderedAccessorFix.h"; sourceTree = "<group>"; };
-		DAADCC6719FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObjectModel+KCOrderedAccessorFix.m"; sourceTree = "<group>"; };
 		DAAF16631F5897EA0013B8AE /* mpw-cli-util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-cli-util.c"; sourceTree = "<group>"; };
 		DAAF16641F5897EA0013B8AE /* mpw-cli-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-cli-util.h"; sourceTree = "<group>"; };
 		DAB07C9E1F7725D400CC6D43 /* aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aes.c; sourceTree = "<group>"; };
@@ -1050,7 +1016,6 @@
 		DABB981515100B4000B05417 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		DABD5EFE242BC32D00200755 /* MPSecrets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSecrets.m; sourceTree = "<group>"; };
 		DABD5EFF242BC32D00200755 /* MPSecrets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSecrets.h; sourceTree = "<group>"; };
-		DAC6326C148680650075AEA5 /* libjrswizzle.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjrswizzle.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DAC632871486D95D0075AEA5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		DAC77CAD148291A600BCF976 /* libPearl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPearl.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DACA241C1705DF7D002C6C22 /* logo-bare.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-bare.png"; sourceTree = "<group>"; };
@@ -1096,8 +1061,6 @@
 		DACA268E1705DF81002C6C22 /* SourceCodePro-ExtraLight.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-ExtraLight.otf"; sourceTree = "<group>"; };
 		DACA268F1705DF81002C6C22 /* SourceCodePro-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-Black.otf"; sourceTree = "<group>"; };
 		DACA29721705E1A8002C6C22 /* dictionary.lst */ = {isa = PBXFileReference; fileEncoding = 1; lastKnownFileType = text; path = dictionary.lst; sourceTree = "<group>"; };
-		DACA29771705E2BD002C6C22 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JRSwizzle.h; sourceTree = "<group>"; };
-		DACA298C1705E2BD002C6C22 /* JRSwizzle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JRSwizzle.m; sourceTree = "<group>"; };
 		DACBFCDB1C59B22E007EF90F /* NSMutableSet+Pearl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableSet+Pearl.h"; sourceTree = "<group>"; };
 		DACBFCDC1C59B22E007EF90F /* NSMutableSet+Pearl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableSet+Pearl.m"; sourceTree = "<group>"; };
 		DAD0C5F619FD6034009CB08D /* icon_128x128.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_128x128.png; sourceTree = "<group>"; };
@@ -1185,14 +1148,13 @@
 				DAB7AE5B1F3D750B00C856B1 /* libjson-c.a in Frameworks */,
 				DA9261561BE1A89600369DE5 /* libz.tbd in Frameworks */,
 				DA9261541BE1A88900369DE5 /* libc++.tbd in Frameworks */,
-				DAADCC6A19FB00B500987B1D /* libKCOrderedAccessorFix.a in Frameworks */,
-				DA9261511BE1A86700369DE5 /* SystemConfiguration.framework in Frameworks */,
 				DA250925195148E200AC23F1 /* QuartzCore.framework in Frameworks */,
 				DAD9B5F01762CAA4001835F9 /* ServiceManagement.framework in Frameworks */,
 				DA16B341170661DB000A0EAB /* Carbon.framework in Frameworks */,
 				DA16B342170661E0000A0EAB /* Security.framework in Frameworks */,
 				DA16B345170661F2000A0EAB /* libPearl.a in Frameworks */,
 				DA16B344170661EE000A0EAB /* Cocoa.framework in Frameworks */,
+				DA72E2272444081200676D4F /* SystemConfiguration.framework in Frameworks */,
 				7352E972184B980C428B66A2 /* Pods_MasterPassword_macOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1205,27 +1167,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DAADCC4D19FB006500987B1D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DAC63269148680650075AEA5 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DAC77CAA148291A600BCF976 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				DAADCC4B19FB000C00987B1D /* QuartzCore.framework in Frameworks */,
-				DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */,
 				DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1272,14 +1218,6 @@
 			name = "Other Frameworks";
 			sourceTree = "<group>";
 		};
-		DA3B8449190FC5A900246EEA /* Mac */ = {
-			isa = PBXGroup;
-			children = (
-				DA92614F1BE1A86700369DE5 /* SystemConfiguration.framework */,
-			);
-			path = Mac;
-			sourceTree = "<group>";
-		};
 		DA5BFA39147E415C00F98B1E = {
 			isa = PBXGroup;
 			children = (
@@ -1298,8 +1236,6 @@
 			children = (
 				DA5BFA44147E415C00F98B1E /* Master Password.app */,
 				DAC77CAD148291A600BCF976 /* libPearl.a */,
-				DAC6326C148680650075AEA5 /* libjrswizzle.a */,
-				DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */,
 				DA67743B1A474A03004F356A /* mpw-test */,
 				DA1C7AB61F1A8F24009A3551 /* mpw-cli */,
 				DA1C7AD61F1A8FD8009A3551 /* mpw-bench */,
@@ -2025,15 +1961,6 @@
 			path = lib;
 			sourceTree = "<group>";
 		};
-		DAADCC6819FB007F00987B1D /* KCOrderedAccessorFix */ = {
-			isa = PBXGroup;
-			children = (
-				DAADCC6619FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.h */,
-				DAADCC6719FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m */,
-			);
-			path = KCOrderedAccessorFix;
-			sourceTree = "<group>";
-		};
 		DAC77CAF148291A600BCF976 /* Pearl */ = {
 			isa = PBXGroup;
 			children = (
@@ -2050,9 +1977,6 @@
 			children = (
 				DAA7BC0D20C4C1B500101DC7 /* libjson-c-macos */,
 				DAA7BBC920C4C17300101DC7 /* libsodium-macos */,
-				DACA29751705E2BD002C6C22 /* jrswizzle */,
-				DAADCC6819FB007F00987B1D /* KCOrderedAccessorFix */,
-				DA3B8449190FC5A900246EEA /* Mac */,
 				DAC77CAF148291A600BCF976 /* Pearl */,
 			);
 			path = External;
@@ -2152,15 +2076,6 @@
 			path = Data;
 			sourceTree = "<group>";
 		};
-		DACA29751705E2BD002C6C22 /* jrswizzle */ = {
-			isa = PBXGroup;
-			children = (
-				DACA29771705E2BD002C6C22 /* JRSwizzle.h */,
-				DACA298C1705E2BD002C6C22 /* JRSwizzle.m */,
-			);
-			path = jrswizzle;
-			sourceTree = "<group>";
-		};
 		DAD0C5F419FD6034009CB08D /* mac */ = {
 			isa = PBXGroup;
 			children = (
@@ -2205,14 +2120,10 @@
 				DAB4FBDD202FF93D002768FB /* PearlHangDetector.h */,
 				DAB4FBDE202FF93D002768FB /* PearlHangDetector.m */,
 				DA8ED893192906920099B726 /* include */,
-				93D396D04E57792A54D437AC /* NSArray+Indexing.h */,
-				93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */,
 				DA2CA4EA18D323D3007798F8 /* NSArray+Pearl.h */,
 				DA2CA4E918D323D3007798F8 /* NSArray+Pearl.m */,
 				DAFE4A63150399FF003ABA93 /* NSDateFormatter+RFC3339.h */,
 				DAFE4A63150399FF003ABA91 /* NSDateFormatter+RFC3339.m */,
-				93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */,
-				93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */,
 				DA2CA4E818D323D3007798F8 /* NSError+PearlFullDescription.h */,
 				DA2CA4E718D323D3007798F8 /* NSError+PearlFullDescription.m */,
 				DA3B8451190FC86F00246EEA /* NSManagedObject+Pearl.h */,
@@ -2292,14 +2203,6 @@
 /* End PBXGroup section */

 /* Begin PBXHeadersBuildPhase section */
-		DAC6326A148680650075AEA5 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DAC77CAB148291A600BCF976 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -2335,8 +2238,6 @@
 				DAADCC4719FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h in Headers */,
 				DAFE4A63150399FF003ABA88 /* NSObject+PearlKVO.h in Headers */,
 				DAFE4A63150399FF003ABA94 /* NSDateFormatter+RFC3339.h in Headers */,
-				93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */,
-				93D392EC39DA43C46C692C12 /* NSDictionary+Indexing.h in Headers */,
 				DA3509FE15F101A500C14A8E /* PearlQueue.h in Headers */,
 				DA2C3D681BD9665B001137B3 /* PearlProfiler.h in Headers */,
 				DA2CA4EE18D323D3007798F8 /* NSError+PearlFullDescription.h in Headers */,
@@ -2460,40 +2361,6 @@
 			productReference = DA67743B1A474A03004F356A /* mpw-test */;
 			productType = "com.apple.product-type.tool";
 		};
-		DAADCC4F19FB006500987B1D /* KCOrderedAccessorFix */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DAADCC5E19FB006500987B1D /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */;
-			buildPhases = (
-				DAADCC4C19FB006500987B1D /* Sources */,
-				DAADCC4D19FB006500987B1D /* Frameworks */,
-				DAADCC4E19FB006500987B1D /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = KCOrderedAccessorFix;
-			productName = KCOrderedAccessorFix;
-			productReference = DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		DAC6326B148680650075AEA5 /* jrswizzle */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */;
-			buildPhases = (
-				DAC63268148680650075AEA5 /* Sources */,
-				DAC63269148680650075AEA5 /* Frameworks */,
-				DAC6326A148680650075AEA5 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = jrswizzle;
-			productName = jrswizzle;
-			productReference = DAC6326C148680650075AEA5 /* libjrswizzle.a */;
-			productType = "com.apple.product-type.library.static";
-		};
 		DAC77CAC148291A600BCF976 /* Pearl */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = DAC77CB7148291A600BCF976 /* Build configuration list for PBXNativeTarget "Pearl" */;
@@ -2505,7 +2372,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				DAC63286148681200075AEA5 /* PBXTargetDependency */,
 			);
 			name = Pearl;
 			productName = Pearl;
@@ -2549,18 +2415,11 @@
 						CreatedOnToolsVersion = 6.1.1;
 						DevelopmentTeam = HL3Q45LX9N;
 					};
-					DAADCC4F19FB006500987B1D = {
-						CreatedOnToolsVersion = 6.0.1;
-						DevelopmentTeam = HL3Q45LX9N;
-					};
 					DAB7AE421F3D466D00C856B1 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = HL3Q45LX9N;
 						ProvisioningStyle = Automatic;
 					};
-					DAC6326B148680650075AEA5 = {
-						DevelopmentTeam = HL3Q45LX9N;
-					};
 					DAC77CAC148291A600BCF976 = {
 						DevelopmentTeam = HL3Q45LX9N;
 					};
@@ -2587,8 +2446,6 @@
 			targets = (
 				DA5BFA43147E415C00F98B1E /* MasterPassword-macOS */,
 				DAC77CAC148291A600BCF976 /* Pearl */,
-				DAC6326B148680650075AEA5 /* jrswizzle */,
-				DAADCC4F19FB006500987B1D /* KCOrderedAccessorFix */,
 				DA67743A1A474A03004F356A /* mpw-test */,
 				DA1C7AC61F1A8FD8009A3551 /* mpw-bench */,
 				DA1C7AA61F1A8F24009A3551 /* mpw-cli */,
@@ -2716,15 +2573,12 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/Countly-macOS/Countly.framework",
-				"${BUILT_PRODUCTS_DIR}/Sentry-macOS/Sentry.framework",
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Countly.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -2891,22 +2745,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DAADCC4C19FB006500987B1D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DAADCC6919FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DAC63268148680650075AEA5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DAC77CA9148291A600BCF976 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2942,8 +2780,6 @@
 				DAB4FBEA202FF951002768FB /* NSMutableSet+Pearl.m in Sources */,
 				DAFE4A63150399FF003ABA86 /* NSObject+PearlKVO.m in Sources */,
 				DAFE4A63150399FF003ABA92 /* NSDateFormatter+RFC3339.m in Sources */,
-				93D395F08A087F8A24689347 /* NSArray+Indexing.m in Sources */,
-				93D39E281E3658B30550CB55 /* NSDictionary+Indexing.m in Sources */,
 				DA3509FF15F101A500C14A8E /* PearlQueue.m in Sources */,
 				93D3987F6D9046DBEE4D8364 /* NSView+Traversing.m in Sources */,
 			);
@@ -2987,11 +2823,6 @@
 			name = "MasterPassword-Mac-LoginHelper";
 			targetProxy = DABFA071176E3FDF00E83589 /* PBXContainerItemProxy */;
 		};
-		DAC63286148681200075AEA5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = DAC6326B148680650075AEA5 /* jrswizzle */;
-			targetProxy = DAC63285148681200075AEA5 /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */

 /* Begin PBXVariantGroup section */
@@ -3389,6 +3220,7 @@
 					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
 					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
 					"-DMPW_JSON=1",
@@ -3427,6 +3259,7 @@
 					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
 					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
 					"-DMPW_JSON=1",
@@ -3486,22 +3319,6 @@
 			};
 			name = Release;
 		};
-		DAADCC5F19FB006500987B1D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-			};
-			name = Debug;
-		};
-		DAADCC6019FB006500987B1D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-			};
-			name = Release;
-		};
 		DAB7AE441F3D466D00C856B1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -3543,34 +3360,6 @@
 			};
 			name = Release;
 		};
-		DAC63275148680650075AEA5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = NO;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				DSTROOT = /tmp/jrswizzle.dst;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-			};
-			name = Debug;
-		};
-		DAC63276148680650075AEA5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = NO;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				DSTROOT = /tmp/jrswizzle.dst;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-			};
-			name = Release;
-		};
 		DAC77CB5148291A600BCF976 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -3654,15 +3443,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		DAADCC5E19FB006500987B1D /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DAADCC5F19FB006500987B1D /* Debug */,
-				DAADCC6019FB006500987B1D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
 		DAB7AE431F3D466D00C856B1 /* Build configuration list for PBXLegacyTarget "libjson-c-macos" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -3672,15 +3452,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DAC63275148680650075AEA5 /* Debug */,
-				DAC63276148680650075AEA5 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
 		DAC77CB7148291A600BCF976 /* Build configuration list for PBXNativeTarget "Pearl" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
--- a/platform-darwin/Podfile
+++ b/platform-darwin/Podfile
@@ -11,6 +11,9 @@ target 'MasterPassword-iOS' do

  pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git'
  pod 'Countly'
+  pod 'UIColor-Utilities'
+  pod 'KCOrderedAccessorFix'
+  pod 'JRSwizzle'
 end

 target 'MasterPassword-macOS' do
@@ -22,4 +25,6 @@ target 'MasterPassword-macOS' do

  pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git'
  pod 'Countly'
+  pod 'KCOrderedAccessorFix'
+  pod 'JRSwizzle'
 end
--- a/platform-darwin/Scripts/updatePlist
+++ b/platform-darwin/Scripts/updatePlist
@@ -46,9 +46,10 @@ esac
 description=$(git describe --always --dirty --long --match "*-$platform*")
 version=${description%-g*} build=${version##*-} version=${version%-$build}
 version=${version//-$platform/} version=${version//-/.} commit=${description##*-g}
+IFS=. read major minor build <<< "$version"

 addPlistWithKey GITDescription string "$description"
-setPlistWithKey CFBundleVersion "$(hr "${version%%.*}" 14).${version#*.}"
+setPlistWithKey CFBundleVersion "$(hr "$major" 14)$(printf '%02d' "$minor")$(printf '%02d' "$build")"
 setPlistWithKey CFBundleShortVersionString "$version"

 setSettingWithTitle "Build" "$commit"
--- a/platform-darwin/Source/MPAlgorithmV0.m
+++ b/platform-darwin/Source/MPAlgorithmV0.m
@@ -81,8 +81,7 @@ static NSOperationQueue *_mpwQueue = nil;
    }

    NSOperation *operation = [NSBlockOperation blockOperationWithBlock:operationBlock];
-    if ([operation respondsToSelector:@selector( qualityOfService )])
-        operation.qualityOfService = NSQualityOfServiceUserInitiated;
+    operation.qualityOfService = NSQualityOfServiceUserInitiated;
    [_mpwQueue addOperations:@[ operation ] waitUntilFinished:YES];
 }

--- a/platform-darwin/Source/MPAppDelegate_InApp.m
+++ b/platform-darwin/Source/MPAppDelegate_InApp.m
@@ -172,21 +172,13 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
 #endif
 }

- (void)requestDidFinish:(SKRequest *)request {
-
-    dbg( @"StoreKit request (%@) finished.", request );
-}
-
 #pragma mark - SKPaymentTransactionObserver

 - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions {

    for (SKPaymentTransaction *transaction in transactions) {
-        dbg( @"transaction updated: %@ -> %d", transaction.payment.productIdentifier, (int)(transaction.transactionState) );
-
        switch (transaction.transactionState) {
            case SKPaymentTransactionStatePurchased: {
-                inf( @"Purchased: %@", transaction.payment.productIdentifier );
                NSMutableDictionary *attributes = [NSMutableDictionary new];

                if ([transaction.payment.productIdentifier isEqualToString:MPProductFuel]) {
@@ -220,7 +212,6 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
                break;
            }
            case SKPaymentTransactionStateRestored: {
-                inf( @"Restored: %@", transaction.payment.productIdentifier );
                [[NSUserDefaults standardUserDefaults] setObject:transaction.transactionIdentifier
                                                          forKey:transaction.payment.productIdentifier];
                [queue finishTransaction:transaction];
--- a/platform-darwin/Source/MPAppDelegate_Shared.m
+++ b/platform-darwin/Source/MPAppDelegate_Shared.m
@@ -32,7 +32,7 @@
@end

 MPLogSink mpw_log_sink_pearl;
-void mpw_log_sink_pearl(const MPLogEvent *record) {
+bool mpw_log_sink_pearl(const MPLogEvent *record) {

    PearlLogLevel level = PearlLogLevelInfo;
    switch (record->level) {
@@ -58,6 +58,7 @@ void mpw_log_sink_pearl(const MPLogEvent *record) {

    [[PearlLogger get] inFile:[@(record->file) lastPathComponent] atLine:record->line fromFunction:@(record->function)
                    withLevel:level text:@(record->message)];
+    return YES;
 }

@implementation MPAppDelegate_Shared
@@ -112,7 +113,7 @@ static MPAppDelegate_Shared *instance;
 - (void)setActiveUser:(MPUserEntity *)activeUser {

    NSManagedObjectID *activeUserOID = activeUser.permanentObjectID;
-    if ([self.activeUserOID isEqual:activeUserOID])
+    if (self.activeUserOID == activeUserOID || [self.activeUserOID isEqual:activeUserOID])
        return;

    if (self.key)
@@ -121,9 +122,9 @@ static MPAppDelegate_Shared *instance;
    if ([[MPConfig get].sendInfo boolValue])
        [Countly.sharedInstance userLoggedOut];

-    [[NSNotificationCenter defaultCenter] postNotificationName:MPSignedOutNotification object:self];
-
    self.activeUserOID = activeUserOID;
+
+    [[NSNotificationCenter defaultCenter] postNotificationName:MPSignedOutNotification object:self];
 }

 - (void)handleCoordinatorError:(NSError *)error {
--- a/platform-darwin/Source/MPAppDelegate_Store.m
+++ b/platform-darwin/Source/MPAppDelegate_Store.m
@@ -643,7 +643,6 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
        user.avatar = importUser->avatar;
        user.defaultType = importUser->defaultType;
        user.lastUsed = [NSDate dateWithTimeIntervalSince1970:MAX( user.lastUsed.timeIntervalSince1970, importUser->lastUsed )];
-        dbg( @"Importing user: %@", [user debugDescription] );

        // Update or create sites.
        for (size_t s = 0; s < importUser->sites_count; ++s) {
@@ -657,10 +656,8 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                return MPError( error, @"Lookup of existing sites failed for site: %@, user: %@", @(importSite->siteName), user.userID );
            if ([existingSites count])
                // Update existing site.
-                for (MPSiteEntity *site in existingSites) {
+                for (MPSiteEntity *site in existingSites)
                    [self importSite:importSite protectedByKey:importKey intoSite:site usingKey:userKey];
-                    dbg( @"Updated site: %@", [site debugDescription] );
-                }
            else {
                // Create new site.
                id<MPAlgorithm> algorithm = MPAlgorithmForVersion( importSite->algorithm );
@@ -673,7 +670,6 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                site.user = user;

                [self importSite:importSite protectedByKey:importKey intoSite:site usingKey:userKey];
-                dbg( @"Created site: %@", [site debugDescription] );
            }
        }

--- a/platform-darwin/Source/MPConfig.h
+++ b/platform-darwin/Source/MPConfig.h
@@ -21,6 +21,7 @@
@interface MPConfig : PearlConfig

@property(nonatomic, retain) NSNumber *sendInfo;
+@property(nonatomic, retain) NSNumber *sendInfoDecided;
@property(nonatomic, retain) NSNumber *rememberLogin;
@property(nonatomic, retain) NSNumber *hidePasswords;

--- a/platform-darwin/Source/MPConfig.m
+++ b/platform-darwin/Source/MPConfig.m
@@ -29,13 +29,15 @@
        return nil;

    [self.defaults registerDefaults:@{
-            NSStringFromSelector( @selector( askForReviews ) )     : @YES,
-
            NSStringFromSelector( @selector( sendInfo ) )          : @YES,
+            NSStringFromSelector( @selector( sendInfoDecided ) )   : @NO,
+
            NSStringFromSelector( @selector( rememberLogin ) )     : @NO,
            NSStringFromSelector( @selector( hidePasswords ) )     : @NO,
-            NSStringFromSelector( @selector( checkInconsistency ) ): @NO,
            NSStringFromSelector( @selector( siteAttacker ) )      : @(MPAttacker1),
+
+            NSStringFromSelector( @selector( checkInconsistency ) ): @NO,
+            NSStringFromSelector( @selector( askForReviews ) )     : @YES,
    }];

    self.delegate = [MPAppDelegate_Shared get];
--- a/platform-darwin/Source/Mac/Base.lproj/MainMenu.xib
+++ b/platform-darwin/Source/Mac/Base.lproj/MainMenu.xib
@@ -66,7 +66,7 @@
                                                <action selector="exportSitesSecure:" target="494" id="LVH-es-imA"/>
                                            </connections>
                                        </menuItem>
-                                        <menuItem title="Your passwords are hidden." enabled="NO" id="ybY-P3-eao">
+                                        <menuItem title="Your passwords are not visible." enabled="NO" id="ybY-P3-eao">
                                            <attributedString key="attributedTitle">
                                                <fragment content="Your passwords are not visible.">
                                                    <attributes>
@@ -83,7 +83,7 @@
                                                <action selector="exportSitesReveal:" target="494" id="1IW-VT-Oeu"/>
                                            </connections>
                                        </menuItem>
-                                        <menuItem title="Handy for backups - keep it in a safe location!" enabled="NO" id="cQu-oR-SUa">
+                                        <menuItem title="Keep this file secure or delete it when you're done with it!" enabled="NO" id="cQu-oR-SUa">
                                            <attributedString key="attributedTitle">
                                                <fragment content="Keep this file secure or delete it when you're done with it!">
                                                    <attributes>
@@ -210,7 +210,7 @@
                            </menuItem>
                            <menuItem title="Crash and usage information is anonymized and sent to development." enabled="NO" id="WfD-lX-C93">
                                <attributedString key="attributedTitle">
-                                    <fragment content="Save the password in your keychain so you don't need to enter it again.">
+                                    <fragment content="Crash and usage information is anonymized and sent to development.">
                                        <attributes>
                                            <font key="NSFont" size="11" name="Helvetica"/>
                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" firstLineHeadIndent="8"/>
--- a/platform-darwin/Source/Mac/MPMacAppDelegate.m
+++ b/platform-darwin/Source/Mac/MPMacAppDelegate.m
@@ -70,22 +70,23 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
    @try {
        // Sentry
        [SentrySDK initWithOptions:@{
-                @"dsn"        : decrypt( sentryDSN ),
+                @"dsn"                      : NilToNSNull( decrypt( sentryDSN ) ),
 #ifdef DEBUG
-                @"debug"      : @(YES),
-                @"environment": @"Development",
+                @"debug"                    : @(YES),
+                @"environment"              : @"Development",
 #elif PUBLIC
-                @"debug"      : @(NO),
-                @"environment": @"Public",
+                @"debug"                    : @(NO),
+                @"environment"              : @"Public",
 #else
-                @"debug"      : @(NO),
-                @"environment": @"Private",
+                @"debug"                    : @(NO),
+                @"environment"              : @"Private",
 #endif
-                @"enabled"    : [MPMacConfig get].sendInfo,
+                @"enabled"                  : [MPMacConfig get].sendInfo,
+                @"enableAutoSessionTracking": @(YES),
        }];
        [[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) {
            PearlLogLevel level = PearlLogLevelWarn;
-            if ([[MPConfig get].sendInfo boolValue])
+            if ([[MPMacConfig get].sendInfo boolValue])
                level = PearlLogLevelDebug;

            if (message.level >= level) {
@@ -131,11 +132,11 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
        countlyConfig.deviceID = [PearlKeyChain deviceIdentifier];
        countlyConfig.secretSalt = decrypt( countlySalt );
 #if DEBUG
-        countlyConfig.pushTestMode = CLYPushTestModeDevelopment;
        countlyConfig.enableDebug = YES;
+        countlyConfig.pushTestMode = CLYPushTestModeDevelopment;
 #elif ! PUBLIC
-        countlyConfig.pushTestMode = CLYPushTestModeTestFlightOrAdHoc;
        countlyConfig.enableDebug = NO;
+        countlyConfig.pushTestMode = CLYPushTestModeTestFlightOrAdHoc;
 #endif
        [Countly.sharedInstance startWithConfig:countlyConfig];
    }
@@ -144,7 +145,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
    }

    // Setup delegates and listeners.
-    [MPConfig get].delegate = self;
+    [MPMacConfig get].delegate = self;
    __weak id weakSelf = self;
    [self addObserverBlock:^(NSString *keyPath, id object, NSDictionary *change, void *context) {
        dispatch_async( dispatch_get_main_queue(), ^{
@@ -203,11 +204,13 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
                .window makeKeyAndOrderFront:self];
        [NSApp activateIgnoringOtherApps:YES];
    }
+
+    [self enableNotifications];
 }

 - (void)applicationWillResignActive:(NSNotification *)notification {

-    if (![[MPConfig get].rememberLogin boolValue])
+    if (![[MPMacConfig get].rememberLogin boolValue])
        [self lock:nil];
 }

@@ -228,6 +231,41 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
    return NSTerminateNow;
 }

+- (void)enableNotifications {
+
+    [Countly.sharedInstance giveConsentForFeature:CLYConsentPushNotifications];
+    if (@available( macOS 10.14, * )) {
+        [Countly.sharedInstance askForNotificationPermissionWithOptions:UNAuthorizationOptionProvisional | UNAuthorizationOptionAlert
+                                                      completionHandler:^(BOOL granted, NSError *error) {
+                                                          if (!granted)
+                                                              err( @"No provisional notification permission: %@", error );
+
+                                                          [self askNotifications];
+                                                      }];
+    }
+    else {
+        [self askNotifications];
+    }
+}
+
+- (void)askNotifications {
+
+    PearlMainQueue( ^{
+        if (![[NSUserDefaults standardUserDefaults] boolForKey:@"notificationsDecided"]) {
+            if (@available( macOS 10.14, * )) {
+                [Countly.sharedInstance askForNotificationPermissionWithOptions:UNAuthorizationOptionAlert completionHandler:
+                        ^(BOOL granted, NSError *error) {
+                            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"notificationsDecided"];
+                        }];
+            }
+            else {
+                [Countly.sharedInstance askForNotificationPermission];
+                [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"notificationsDecided"];
+            }
+        }
+    } );
+}
+
 #pragma mark - State

 - (void)setActiveUser:(MPUserEntity *)activeUser {
@@ -370,12 +408,18 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven

 - (IBAction)togglePreference:(id)sender {

-    if (sender == self.diagnosticsItem)
-        [MPConfig get].sendInfo = @(self.diagnosticsItem.state != NSOnState);
+    if (sender == self.diagnosticsItem) {
+        BOOL sendInfo = self.diagnosticsItem.state != NSOnState;
+        [[Countly sharedInstance] recordEvent:@"sendInfoDecided" segmentation:@{
+                @"from": @"preferences",
+                @"sendInfo": [@(sendInfo) description],
+            }];
+        [MPMacConfig get].sendInfo = @(sendInfo);
+    }
    if (sender == self.hidePasswordsItem)
-        [MPConfig get].hidePasswords = @(self.hidePasswordsItem.state != NSOnState);
+        [MPMacConfig get].hidePasswords = @(self.hidePasswordsItem.state != NSOnState);
    if (sender == self.rememberPasswordItem)
-        [MPConfig get].rememberLogin = @(self.rememberPasswordItem.state != NSOnState);
+        [MPMacConfig get].rememberLogin = @(self.rememberPasswordItem.state != NSOnState);
    if (sender == self.openAtLoginItem)
        [self setLoginItemEnabled:self.openAtLoginItem.state != NSOnState];
    if (sender == self.showFullScreenItem) {
@@ -685,10 +729,13 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
    }

    BOOL loginItemEnabled = [self loginItemEnabled];
+    self.initialWindowController.openAtLoginButton.state = loginItemEnabled? NSOnState: NSOffState;
    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;
+    self.rememberPasswordItem.state = [[MPMacConfig get].rememberLogin boolValue]? NSOnState: NSOffState;
+    self.diagnosticsItem.state = [[MPMacConfig get].sendInfo boolValue]? NSOnState: NSOffState;
+    self.hidePasswordsItem.state = [[MPMacConfig get].hidePasswords boolValue]? NSOnState: NSOffState;
+    self.rememberPasswordItem.state = [[MPMacConfig get].rememberLogin boolValue]? NSOnState: NSOffState;

    self.savePasswordItem.state = activeUser.saveKey? NSOnState: NSOffState;
    if (!activeUser) {
@@ -719,47 +766,40 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven

    PearlMainQueue( ^{
        if (!key || [key isEqualToString:NSStringFromSelector( @selector( sendInfo ) )])
-            self.diagnosticsItem.state = [[MPConfig get].sendInfo boolValue]? NSOnState: NSOffState;
+            self.diagnosticsItem.state = [[MPMacConfig get].sendInfo boolValue]? NSOnState: NSOffState;
        if (!key || [key isEqualToString:NSStringFromSelector( @selector( hidePasswords ) )])
-            self.hidePasswordsItem.state = [[MPConfig get].hidePasswords boolValue]? NSOnState: NSOffState;
+            self.hidePasswordsItem.state = [[MPMacConfig get].hidePasswords boolValue]? NSOnState: NSOffState;
        if (!key || [key isEqualToString:NSStringFromSelector( @selector( rememberLogin ) )])
-            self.rememberPasswordItem.state = [[MPConfig get].rememberLogin boolValue]? NSOnState: NSOffState;
+            self.rememberPasswordItem.state = [[MPMacConfig get].rememberLogin boolValue]? NSOnState: NSOffState;
    } );

    // Send info
-    if ([[MPConfig get].sendInfo boolValue]) {
-        PearlMainQueue( ^{
-            [Countly.sharedInstance giveConsentForAllFeatures];
-            [Countly.sharedInstance askForNotificationPermission];
-        });
-
+    NSArray *countlyFeatures = @[
+            CLYConsentSessions, CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating
+    ];
+    if ([[MPMacConfig get].sendInfo boolValue]) {
+        [Countly.sharedInstance giveConsentForFeatures:countlyFeatures];
        if ([PearlLogger get].printLevel > PearlLogLevelInfo)
            [PearlLogger get].printLevel = PearlLogLevelInfo;

-        NSMutableDictionary *prefs = [NSMutableDictionary new];
-        prefs[@"rememberLogin"] = [MPConfig get].rememberLogin;
-        prefs[@"sendInfo"] = [MPConfig get].sendInfo;
-        prefs[@"fullScreen"] = [MPMacConfig get].fullScreen;
-        prefs[@"firstRun"] = [PearlConfig get].firstRun;
-        prefs[@"launchCount"] = [PearlConfig get].launchCount;
-        prefs[@"askForReviews"] = [PearlConfig get].askForReviews;
-        prefs[@"reviewAfterLaunches"] = [PearlConfig get].reviewAfterLaunches;
-        prefs[@"reviewedVersion"] = [PearlConfig get].reviewedVersion;
-        prefs[@"simulator"] = @([PearlDeviceUtils isSimulator]);
-        prefs[@"encrypted"] = @([PearlDeviceUtils isAppEncrypted]);
-        prefs[@"platform"] = [PearlDeviceUtils platform];
-
        [SentrySDK.currentHub getClient].options.enabled = @YES;
        [SentrySDK configureScope:^(SentryScope *scope) {
-            for (NSString *pref in prefs.allKeys)
-                [scope setExtraValue:prefs[pref] forKey:pref];
+            [scope setExtraValue:[MPMacConfig get].rememberLogin forKey:@"rememberLogin"];
+            [scope setExtraValue:[MPMacConfig get].sendInfo forKey:@"sendInfo"];
+            [scope setExtraValue:[MPMacConfig get].fullScreen forKey:@"fullScreen"];
+            [scope setExtraValue:[PearlConfig get].firstRun forKey:@"firstRun"];
+            [scope setExtraValue:[PearlConfig get].launchCount forKey:@"launchCount"];
+            [scope setExtraValue:[PearlConfig get].askForReviews forKey:@"askForReviews"];
+            [scope setExtraValue:[PearlConfig get].reviewAfterLaunches forKey:@"reviewAfterLaunches"];
+            [scope setExtraValue:[PearlConfig get].reviewedVersion forKey:@"reviewedVersion"];
+            [scope setExtraValue:@([PearlDeviceUtils isSimulator]) forKey:@"simulator"];
+            [scope setExtraValue:@([PearlDeviceUtils isAppEncrypted]) forKey:@"encrypted"];
+            [scope setExtraValue:[PearlDeviceUtils platform] forKey:@"platform"];
        }];
    }
    else {
        [SentrySDK.currentHub getClient].options.enabled = @NO;
-        PearlMainQueue( ^{
-            [Countly.sharedInstance cancelConsentForAllFeatures];
-        });
+        [Countly.sharedInstance cancelConsentForFeatures:countlyFeatures];
    }
 }

--- a/platform-darwin/Source/Mac/MPSitesWindowController.m
+++ b/platform-darwin/Source/Mac/MPSitesWindowController.m
@@ -17,6 +17,7 @@
 //==============================================================================

 #import <QuartzCore/QuartzCore.h>
+#import <Countly/Countly.h>
 #import "MPSitesWindowController.h"
 #import "MPMacAppDelegate.h"
 #import "MPAppDelegate_Store.h"
@@ -42,13 +43,35 @@
    prof_rewind( @"replaceFonts" );

    PearlAddNotificationObserver( NSWindowDidBecomeKeyNotification, self.window, [NSOperationQueue mainQueue],
-            ^(id host, NSNotification *note) {
+            (^(id host, NSNotification *note) {
                prof_new( @"didBecomeKey" );
                [self.window makeKeyAndOrderFront:nil];
                prof_rewind( @"fadeIn" );
                [self updateUser];
-                prof_finish( @"updateUser" );
-            } );
+                prof_rewind( @"updateUser" );
+
+                if (![[MPMacConfig get].sendInfoDecided boolValue]) {
+                    NSAlert *alert = [NSAlert new];
+                    alert.messageText = @"Welcome to Master Password!";
+                    alert.informativeText = @"We want you to have a top-notch experience.\n"
+                                            @"Using diagnostics, we ensure the application keeps working as designed for you.\n"
+                                            @"\n"
+                                            @"We look out for application bugs, runtime issues, sudden crashes & usage counters.\n"
+                                            @"Needless to say, diagnostics are always scrubbed and personal details will never leave your device.";
+                    [alert addButtonWithTitle:@"Thanks!"];
+                    [alert addButtonWithTitle:@"Disable"];
+                    [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
+                        BOOL sendInfo = returnCode != NSAlertSecondButtonReturn;
+                        [[Countly sharedInstance] recordEvent:@"sendInfoDecided" segmentation:@{
+                                @"from": @"initial",
+                                @"sendInfo": [@(sendInfo) description],
+                        }];
+                        [MPMacConfig get].sendInfo = @(sendInfo);
+                        [MPMacConfig get].sendInfoDecided = @(YES);
+                    }];
+                }
+                prof_finish( @"sendInfoDecided" );
+            }) );
    PearlAddNotificationObserver( NSWindowWillCloseNotification, self.window, [NSOperationQueue mainQueue],
            ^(id host, NSNotification *note) {
                NSWindow *sheet = [self.window attachedSheet];
--- a/platform-darwin/Source/Mac/MPSitesWindowController.xib
+++ b/platform-darwin/Source/Mac/MPSitesWindowController.xib
@@ -31,20 +31,20 @@
            <rect key="contentRect" x="0.0" y="0.0" width="640" height="577"/>
            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ" userLabel="Root">
-                <rect key="frame" x="0.0" y="0.0" width="640" height="557"/>
+                <rect key="frame" x="0.0" y="0.0" width="738" height="553"/>
                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                <subviews>
                    <visualEffectView blendingMode="behindWindow" material="popover" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="eRe-Ef-AZx">
-                        <rect key="frame" x="0.0" y="0.0" width="640" height="557"/>
+                        <rect key="frame" x="0.0" y="0.0" width="738" height="553"/>
                    </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="521" width="16" height="16"/>
+                        <rect key="frame" x="361" y="517" width="16" height="16"/>
                    </progressIndicator>
                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="NGk-Io-Buc" userLabel="Top Box">
-                        <rect key="frame" x="20" y="381" width="600" height="132"/>
+                        <rect key="frame" x="20" y="377" width="698" height="132"/>
                        <subviews>
                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ond-dT-x5d" userLabel="Site Password Label">
-                                <rect key="frame" x="157" y="98" width="287" height="14"/>
+                                <rect key="frame" x="206" y="98" width="287" 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"/>
@@ -72,7 +72,7 @@
                                </connections>
                            </textField>
                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ia6-7b-dFr">
-                                <rect key="frame" x="127" y="59" width="347" height="14"/>
+                                <rect key="frame" x="176" y="59" width="347" 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"/>
@@ -108,13 +108,13 @@
                                </connections>
                            </textField>
                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OaQ-of-zmb" userLabel="Initial Help">
-                                <rect key="frame" x="39" y="109" width="522" height="18"/>
+                                <rect key="frame" x="113" y="109" width="473" height="17"/>
                                <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="Master Password generates passwords for your sites (and other things)." id="YyD-hd-wi3">
-                                    <font key="font" size="16" name="HelveticaNeue"/>
+                                    <font key="font" metaFont="system" size="14"/>
                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                </textFieldCell>
@@ -136,18 +136,18 @@
                                </connections>
                            </textField>
                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sYt-eL-uwt" userLabel="Initial Tip">
-                                <rect key="frame" x="-26" y="31" width="652" height="70"/>
+                                <rect key="frame" x="-2" y="31" width="702" height="70"/>
                                <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="left" id="9c4-NI-NM0">
-                                    <font key="font" size="12" name="HelveticaNeue"/>
-                                    <string key="title">– When you create an account with a site, use Master Password to create a password for it.
-– For accounts you already have, change the password to that created by Master Password for it.
-– To get a password, enter the site's bare domain name in the "site name" field (eg. apple.com).
-– For your master password, think of a strong password (eg. a short sentence). Tell *nobody*.
-– It's OK to share your site passwords.  They can be changed if necessary.</string>
+                                    <font key="font" metaFont="message" size="11"/>
+                                    <mutableString key="title">⑴ When you create an account on a site, open Master Password to create your account password.
+⑵ Consider changing all your existing account passwords to the password Master Password creates for those sites.
+⑶ To get the password for a site, just enter its domain name in the "site name" field (eg. "apple.com").
+⑷ When chosing a master password, make it easy but long (eg. a short sentence).
+⑸ Tell *nobody* your master password. It's OK to share your site passwords with people you trust: they can be changed if necessary.</mutableString>
                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                </textFieldCell>
@@ -169,7 +169,7 @@
                                </connections>
                            </textField>
                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XUV-zU-Y9c" userLabel="Site Password">
-                                <rect key="frame" x="-2" y="26" width="604" height="80"/>
+                                <rect key="frame" x="-2" y="26" width="702" height="80"/>
                                <shadow key="shadow" blurRadius="0.5">
                                    <size key="offset" width="0.0" height="1"/>
                                    <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -202,6 +202,7 @@
                            <constraint firstItem="XUV-zU-Y9c" firstAttribute="leading" secondItem="NGk-Io-Buc" secondAttribute="leading" id="6Kl-7u-r90"/>
                            <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="sYt-eL-uwt" firstAttribute="width" secondItem="NGk-Io-Buc" secondAttribute="width" id="Beb-mW-KDP"/>
                            <constraint firstItem="Ond-dT-x5d" firstAttribute="top" 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 firstItem="Ia6-7b-dFr" firstAttribute="centerX" secondItem="XUV-zU-Y9c" secondAttribute="centerX" id="NFQ-aw-8tm"/>
@@ -209,14 +210,13 @@
                            <constraint firstAttribute="trailing" secondItem="XUV-zU-Y9c" secondAttribute="trailing" id="TdB-QV-9JK"/>
                            <constraint firstItem="Ond-dT-x5d" firstAttribute="bottom" secondItem="XUV-zU-Y9c" secondAttribute="top" constant="8" symbolic="YES" id="UgV-J6-B5T"/>
                            <constraint firstItem="Ond-dT-x5d" firstAttribute="centerX" secondItem="XUV-zU-Y9c" secondAttribute="centerX" id="UhT-LQ-aZ8"/>
-                            <constraint firstItem="sYt-eL-uwt" firstAttribute="leading" secondItem="NGk-Io-Buc" secondAttribute="leading" constant="-24" id="eaC-ow-ren"/>
                            <constraint firstItem="sYt-eL-uwt" firstAttribute="top" secondItem="OaQ-of-zmb" secondAttribute="bottom" constant="8" symbolic="YES" id="hjJ-f1-mFv"/>
                            <constraint firstItem="sYt-eL-uwt" firstAttribute="centerX" secondItem="OaQ-of-zmb" secondAttribute="centerX" id="mu2-se-Mtn"/>
                            <constraint firstAttribute="centerY" secondItem="sYt-eL-uwt" secondAttribute="centerY" id="zLS-QG-MKS"/>
                        </constraints>
                    </customView>
                    <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="34" horizontalPageScroll="10" verticalLineScroll="34" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="Bme-XK-MMc" userLabel="Sites Table">
-                        <rect key="frame" x="64" y="40" width="512" height="177"/>
+                        <rect key="frame" x="113" y="40" width="512" height="177"/>
                        <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="e11-59-xSS">
                            <rect key="frame" x="0.0" y="0.0" width="512" height="177"/>
                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -251,7 +251,7 @@
                                                                <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"/>
+                                                                <font key="font" metaFont="systemUltraLight" size="24"/>
                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                            </textFieldCell>
@@ -310,7 +310,7 @@
                        </connections>
                    </scrollView>
                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="nM8-O3-spM" customClass="MPGradientView">
-                        <rect key="frame" x="0.0" y="0.0" width="640" height="212"/>
+                        <rect key="frame" x="0.0" y="0.0" width="738" height="212"/>
                        <userDefinedRuntimeAttributes>
                            <userDefinedRuntimeAttribute type="color" keyPath="startingColor">
                                <color key="value" red="0.11764705882352941" green="0.11764705882352941" blue="0.11764705882352941" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -324,7 +324,7 @@
                        </userDefinedRuntimeAttributes>
                    </customView>
                    <button translatesAutoresizingMaskIntoConstraints="NO" id="Aue-Zx-6Mf" userLabel="Settings Gear">
-                        <rect key="frame" x="585" y="493" width="35" height="44"/>
+                        <rect key="frame" x="683" y="489" width="35" height="44"/>
                        <shadow key="shadow">
                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                        </shadow>
@@ -339,7 +339,7 @@
                        </connections>
                    </button>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gAU-xs-aae">
-                        <rect key="frame" x="594" y="479" width="18" height="14"/>
+                        <rect key="frame" x="692" y="475" width="18" 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"/>
@@ -358,7 +358,7 @@
                        </connections>
                    </textField>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OnR-s6-d4P" userLabel="Site Name Label">
-                        <rect key="frame" x="209" y="308" width="223" height="16"/>
+                        <rect key="frame" x="258" y="306" width="223" height="16"/>
                        <shadow key="shadow" blurRadius="0.5">
                            <size key="offset" width="0.0" height="1"/>
                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -370,7 +370,7 @@
                        </textFieldCell>
                    </textField>
                    <secureTextField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iGR-wo-ual" userLabel="Secure Master Password">
-                        <rect key="frame" x="18" y="257" width="604" height="43"/>
+                        <rect key="frame" x="18" y="255" width="702" height="43"/>
                        <shadow key="shadow" blurRadius="0.5">
                            <size key="offset" width="0.0" height="1"/>
                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -405,7 +405,7 @@
                        </connections>
                    </secureTextField>
                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="v80-wd-hUR" userLabel="Revealed Master Password">
-                        <rect key="frame" x="18" y="257" width="604" height="43"/>
+                        <rect key="frame" x="18" y="255" width="702" height="43"/>
                        <shadow key="shadow" blurRadius="0.5">
                            <size key="offset" width="0.0" height="1"/>
                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -444,13 +444,13 @@
                        </connections>
                    </textField>
                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lW3-2z-cEa" userLabel="Master Password Tip">
-                        <rect key="frame" x="195" y="237" width="251" height="12"/>
+                        <rect key="frame" x="248" y="236" width="243" height="11"/>
                        <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 reveal tips and unmask ●●●●●●●●." id="4Ep-xX-Ky8">
-                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <font key="font" metaFont="miniSystem"/>
                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                        </textFieldCell>
@@ -471,13 +471,13 @@
                        </connections>
                    </textField>
                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Oy5-B7-hdN" userLabel="Revealed Master Password Tip">
-                        <rect key="frame" x="195" y="237" width="250" height="12"/>
+                        <rect key="frame" x="258" y="236" width="222" height="11"/>
                        <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 reveal tips and unmask passwords." id="bQ4-AN-S1A">
-                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <font key="font" metaFont="miniSystem"/>
                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                        </textFieldCell>
@@ -499,7 +499,7 @@
                        </connections>
                    </textField>
                    <searchField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CnS-iI-dhr" userLabel="Site Name">
-                        <rect key="frame" x="62" y="257" width="516" height="43"/>
+                        <rect key="frame" x="111" y="255" width="516" height="43"/>
                        <constraints>
                            <constraint firstAttribute="width" constant="512" id="rW7-Vq-4Xy"/>
                        </constraints>
@@ -508,7 +508,7 @@
                            <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"/>
+                            <font key="font" metaFont="system" size="36"/>
                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                        </searchFieldCell>
@@ -519,13 +519,13 @@
                        </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="237" width="438" height="12"/>
+                        <rect key="frame" x="172" y="236" width="395" height="11"/>
                        <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"/>
+                            <font key="font" metaFont="miniSystem"/>
                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                        </textFieldCell>
@@ -542,13 +542,13 @@
                        </connections>
                    </textField>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rhm-sC-xFS" userLabel="Site Name Tip">
-                        <rect key="frame" x="138" y="225" width="365" height="24"/>
+                        <rect key="frame" x="206" y="225" width="326" height="22"/>
                        <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"/>
+                            <font key="font" metaFont="miniSystem"/>
                            <string key="title">Hit enter ⏎ to copy the site's password, hold shift ⇧ for the login name.
 Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -568,7 +568,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                        </connections>
                    </textField>
                    <stackView distribution="fill" orientation="horizontal" alignment="bottom" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pHt-gg-ZNX">
-                        <rect key="frame" x="73" y="20" width="495" height="152"/>
+                        <rect key="frame" x="122" y="20" width="495" height="152"/>
                        <subviews>
                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Qo-iG-CQt">
                                <rect key="frame" x="0.0" y="-1" width="85" height="19"/>
@@ -686,7 +686,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                        </connections>
                                    </button>
                                    <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bgn-Ne-fQ7" userLabel="Version Container">
-                                        <rect key="frame" x="70" y="56" width="36" height="22"/>
+                                        <rect key="frame" x="71" y="56" width="34" height="22"/>
                                        <subviews>
                                            <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mcq-qD-yte">
                                                <rect key="frame" x="-3" y="-3" width="19" height="28"/>
@@ -699,13 +699,13 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                                </connections>
                                            </stepper>
                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gyg-Fh-yn7">
-                                                <rect key="frame" x="19" y="7" width="19" height="15"/>
+                                                <rect key="frame" x="19" y="8" width="17" 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="V1" id="Pjy-Fm-zwB">
-                                                    <font key="font" size="12" name="HelveticaNeue-Medium"/>
+                                                    <font key="font" metaFont="message" size="11"/>
                                                    <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>
@@ -740,7 +740,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                        </connections>
                                    </stackView>
                                    <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6II-KA-cNi" userLabel="Counter Container">
-                                        <rect key="frame" x="74" y="26" width="28" height="22"/>
+                                        <rect key="frame" x="75" y="26" width="27" height="22"/>
                                        <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="28"/>
@@ -753,13 +753,13 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                                </connections>
                                            </stepper>
                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NvO-kt-eZ2" userLabel="Counter Field">
-                                                <rect key="frame" x="19" y="4" width="11" height="15"/>
+                                                <rect key="frame" x="19" y="4" width="10" 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="1" id="dhQ-bJ-rn3">
-                                                    <font key="font" size="12" name="HelveticaNeue-Medium"/>
+                                                    <font key="font" metaFont="message" size="11"/>
                                                    <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>
@@ -886,7 +886,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                        </customSpacing>
                    </stackView>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="luC-0j-BeV">
-                        <rect key="frame" x="135" y="50" width="103" height="14"/>
+                        <rect key="frame" x="185" y="50" width="103" 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"/>
@@ -923,7 +923,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                        </connections>
                    </textField>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gjx-bt-fKM">
-                        <rect key="frame" x="134" y="80" width="100" height="14"/>
+                        <rect key="frame" x="184" y="80" width="100" 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"/>
@@ -960,7 +960,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                        </connections>
                    </textField>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dbM-ja-dKO" userLabel="Version Tip">
-                        <rect key="frame" x="88" y="106" width="332" height="14"/>
+                        <rect key="frame" x="137" y="106" width="332" 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"/>
@@ -988,13 +988,13 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                        </connections>
                    </textField>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ido-NQ-3MY">
-                        <rect key="frame" x="104" y="4" width="22" height="12"/>
+                        <rect key="frame" x="154" y="2" width="21" 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="⌘L" id="fUB-rF-7x8">
-                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <font key="font" metaFont="message" size="11"/>
                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                        </textFieldCell>
@@ -1016,7 +1016,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                        </connections>
                    </textField>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9b3-wy-KBb">
-                        <rect key="frame" x="243" y="2" width="22" height="14"/>
+                        <rect key="frame" x="292" y="2" width="22" 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"/>
@@ -1044,13 +1044,13 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                        </connections>
                    </textField>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qal-PP-YtO">
-                        <rect key="frame" x="516" y="4" width="23" height="12"/>
+                        <rect key="frame" x="565" y="2" width="23" 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="⌘D" id="PPC-be-w4E">
-                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <font key="font" metaFont="message" size="11"/>
                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                        </textFieldCell>
@@ -1072,13 +1072,13 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                        </connections>
                    </textField>
                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qLF-A6-ThX">
-                        <rect key="frame" x="404" y="4" width="23" height="12"/>
+                        <rect key="frame" x="453" y="2" width="22" 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="⌘S" id="qh6-k2-MUr">
-                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <font key="font" metaFont="message" size="11"/>
                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                        </textFieldCell>
--- a/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper-Info.plist
+++ b/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper-Info.plist
@@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-    <dict>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>en</string>
-        <key>CFBundleExecutable</key>
-        <string>${EXECUTABLE_NAME}</string>
-        <key>CFBundleIconFile</key>
-        <string></string>
-        <key>CFBundleIdentifier</key>
-        <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-        <key>CFBundleName</key>
-        <string>${PRODUCT_NAME}</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.0</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-        <string>1</string>
-        <key>LSBackgroundOnly</key>
-        <true/>
-        <key>LSMinimumSystemVersion</key>
-        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
-        <key>NSHumanReadableCopyright</key>
-        <string>Copyright © 2013 Maarten Billemont. All rights reserved.</string>
-        <key>NSPrincipalClass</key>
-        <string>NSApplication</string>
-    </dict>
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.productivity</string>
+	<key>LSBackgroundOnly</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2013 Maarten Billemont. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
 </plist>
--- a/platform-darwin/Source/iOS/MPAppSettingsViewController.h
+++ b/platform-darwin/Source/iOS/MPAppSettingsViewController.h
@@ -1,23 +0,0 @@
-//==============================================================================
-// This file is part of Master Password.
-// Copyright (c) 2011-2017, Maarten Billemont.
-//
-// Master Password is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Master Password is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You can find a copy of the GNU General Public License in the
-// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
-//==============================================================================
-
-#import <Foundation/Foundation.h>
-#import "IASKAppSettingsViewController.h"
-
-@interface MPAppSettingsViewController : IASKAppSettingsViewController
-@end
--- a/platform-darwin/Source/iOS/MPAppSettingsViewController.m
+++ b/platform-darwin/Source/iOS/MPAppSettingsViewController.m
@@ -1,45 +0,0 @@
-//==============================================================================
-// This file is part of Master Password.
-// Copyright (c) 2011-2017, Maarten Billemont.
-//
-// Master Password is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Master Password is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You can find a copy of the GNU General Public License in the
-// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
-//==============================================================================
-
-#import "MPAppSettingsViewController.h"
-#import "UIColor+Expanded.h"
-
-@implementation MPAppSettingsViewController
-
- (void)viewWillAppear:(BOOL)animated {
-
-    [super viewWillAppear:animated];
-
-    self.tableView.contentInset = UIEdgeInsetsMake( 64, 0, 49, 0 );
-}
-
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-
-    UITableViewCell *cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
-    cell.backgroundColor = [UIColor clearColor];
-    cell.textLabel.textColor = [UIColor whiteColor];
-
-    if (cell.selectionStyle != UITableViewCellSelectionStyleNone) {
-        cell.selectedBackgroundView = [[UIView alloc] initWithFrame:cell.bounds];
-        cell.selectedBackgroundView.backgroundColor = [UIColor colorWithRGBAHex:0x78DDFB33];
-    }
-
-    return cell;
-}
-
-@end
--- a/platform-darwin/Source/iOS/MPCombinedViewController.m
+++ b/platform-darwin/Source/iOS/MPCombinedViewController.m
@@ -102,8 +102,6 @@
 #pragma mark - Actions

 - (IBAction)unwindToCombined:(UIStoryboardSegue *)sender {
-
-    dbg( @"unwindToCombined:%@", sender );
 }

 #pragma mark - State
--- a/platform-darwin/Source/iOS/MPLogsViewController.m
+++ b/platform-darwin/Source/iOS/MPLogsViewController.m
@@ -18,7 +18,6 @@

 #import "MPLogsViewController.h"
 #import "MPiOSAppDelegate.h"
-#import "MPAppDelegate_Store.h"

@implementation MPLogsViewController

@@ -52,6 +51,17 @@
    PearlRemoveNotificationObservers();
 }

+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "UnavailableInDeploymentTarget"
+- (void)viewSafeAreaInsetsDidChange {
+
+    [super viewSafeAreaInsetsDidChange];
+
+    self.logView.contentInset = UIEdgeInsetsMake( 44, 0, 0, 0 );
+    self.logView.scrollIndicatorInsets = UIEdgeInsetsMake( 44, 0, 0, 0 );
+}
+#pragma clang diagnostic pop
+
 - (IBAction)toggleLevelControl:(UISegmentedControl *)sender {

    BOOL traceEnabled = (BOOL)self.levelControl.selectedSegmentIndex;
--- a/platform-darwin/Source/iOS/MPPreferencesViewController.m
+++ b/platform-darwin/Source/iOS/MPPreferencesViewController.m
@@ -52,6 +52,17 @@
    [self reload];
 }

+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "UnavailableInDeploymentTarget"
+- (void)viewSafeAreaInsetsDidChange {
+
+    [super viewSafeAreaInsetsDidChange];
+
+    self.tableView.contentInset = UIEdgeInsetsMake( 44, 0, 0, 0 );
+    self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake( 44, 0, 0, 0 );
+}
+#pragma clang diagnostic pop
+
 - (void)reload {

    MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserForMainThread];
--- a/platform-darwin/Source/iOS/MPSiteCell.m
+++ b/platform-darwin/Source/iOS/MPSiteCell.m
@@ -512,132 +512,140 @@

 - (void)updateAnimated:(BOOL)animated {

-    Weakify( self );
    if (![NSThread isMainThread]) {
        PearlMainQueueOperation( ^{
-            Strongify( self );
            [self updateAnimated:animated];
        } );
        return;
    }

-    [UIView animateWithDuration:animated? .3f: 0 animations:^{
-        MPSiteEntity *mainSite = [self siteInContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]];
+    if (animated)
+        [UIView animateWithDuration:.3f animations:^{
+            [self updateWasAnimated:animated];
+        }];
+    else
+        [self updateWasAnimated:animated];
+}

-        // UI
-        //self.backgroundColor = mainSite.url? [UIColor greenColor]: [UIColor redColor];
-        self.upgradeButton.gone = !mainSite.requiresExplicitMigration && ![[MPiOSConfig get].allowDowngrade boolValue];
-        self.answersButton.gone = ![[MPiOSAppDelegate get] isFeatureUnlocked:MPProductGenerateAnswers];
-        BOOL settingsMode = self.mode == MPPasswordCellModeSettings;
-        self.loginNameContainer.visible = settingsMode || mainSite.loginGenerated || [mainSite.loginName length];
-        self.modeButton.visible = !self.transientSite;
-        self.modeButton.alpha = settingsMode? 0.5f: 0.1f;
-        self.counterLabel.visible = self.counterButton.visible = mainSite.type & MPResultTypeClassTemplate;
-        self.modeButton.selected = settingsMode;
-        self.strengthLabel.gone = !settingsMode;
-        self.modeScrollView.scrollEnabled = !self.transientSite;
-        [self.modeScrollView setContentOffset:CGPointMake( self.mode * self.modeScrollView.frame.size.width, 0 ) animated:animated];
-        if (!settingsMode) {
-            [self.loginNameField resignFirstResponder];
-            [self.passwordField resignFirstResponder];
-        }
-        if ([[MPiOSAppDelegate get] isFeatureUnlocked:MPProductGenerateLogins])
-            self.loginNameHint.text = @"Tap here to ⚙ generate username or the pencil to type one";
-        else
-            self.loginNameHint.text = @"Tap the pencil to type a username";
+- (void)updateWasAnimated:(BOOL)animated {

-        // Site Name
-        [self updateSiteName:mainSite];
+    Weakify( self );
+    MPSiteEntity *mainSite = [self siteInContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]];

-        // Site Counter
-        if ([mainSite isKindOfClass:[MPGeneratedSiteEntity class]])
-            self.counterLabel.text = strf( @"%lu", (unsigned long)((MPGeneratedSiteEntity *)mainSite).counter );
+    // UI
+    //self.backgroundColor = mainSite.url? [UIColor greenColor]: [UIColor redColor];
+    self.upgradeButton.gone = !mainSite.requiresExplicitMigration && ![[MPiOSConfig get].allowDowngrade boolValue];
+    self.answersButton.gone = ![[MPiOSAppDelegate get] isFeatureUnlocked:MPProductGenerateAnswers];
+    BOOL settingsMode = self.mode == MPPasswordCellModeSettings;
+    self.loginNameContainer.visible = settingsMode || mainSite.loginGenerated || [mainSite.loginName length];
+    self.modeButton.visible = !self.transientSite;
+    self.modeButton.alpha = settingsMode? 0.5f: 0.1f;
+    self.counterLabel.visible = self.counterButton.visible = mainSite.type & MPResultTypeClassTemplate;
+    self.modeButton.selected = settingsMode;
+    self.strengthLabel.gone = !settingsMode;
+    self.modeScrollView.scrollEnabled = !self.transientSite;
+    [self.modeScrollView setContentOffset:CGPointMake( self.mode * self.modeScrollView.frame.size.width, 0 ) animated:animated];
+    if (!settingsMode) {
+        [self.loginNameField resignFirstResponder];
+        [self.passwordField resignFirstResponder];
+    }
+    if ([[MPiOSAppDelegate get] isFeatureUnlocked:MPProductGenerateLogins])
+        self.loginNameHint.text = @"Tap here to ⚙ generate username or the pencil to type one";
+    else
+        self.loginNameHint.text = @"Tap the pencil to type a username";

-        // Site Login Name
-        self.loginNameField.enabled = self.passwordField.enabled = //
-                [self.loginNameField isFirstResponder] || [self.passwordField isFirstResponder];
+    // Site Name
+    [self updateSiteName:mainSite];

-        // Site Password
-        self.passwordField.secureTextEntry = [[MPiOSConfig get].hidePasswords boolValue];
-        self.passwordField.attributedPlaceholder = stra(
-                mainSite.type & MPResultTypeClassStateful? strl( @"No password" ):
-                mainSite.type & MPResultTypeClassTemplate? strl( @"..." ): @"", @{
-                        NSForegroundColorAttributeName: [UIColor whiteColor]
-                } );
+    // Site Counter
+    if ([mainSite isKindOfClass:[MPGeneratedSiteEntity class]])
+        self.counterLabel.text = strf( @"%lu", (unsigned long)((MPGeneratedSiteEntity *)mainSite).counter );

-        // Calculate Fields
-        if (![MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-            MPKey *key = [MPiOSAppDelegate get].key;
-            if (!key) {
-                wrn( @"Could not load cell content: key unavailable." );
-                PearlMainQueueOperation( ^{
-                    Strongify( self );
-                    [self updateAnimated:YES];
-                } );
-                return;
-            }
+    // Site Login Name
+    self.loginNameField.enabled = self.passwordField.enabled = //
+            [self.loginNameField isFirstResponder] || [self.passwordField isFirstResponder];

-            MPSiteEntity *site = [self siteInContext:context];
-            BOOL loginGenerated = site.loginGenerated;
-            NSString *password = nil, *loginName = [site resolveLoginUsingKey:key];
-            MPResultType transientType = [[MPiOSAppDelegate get] activeUserInContext:context].defaultType?: MPAlgorithmDefault.defaultType;
-            if (self.transientSite && transientType & MPResultTypeClassTemplate)
-                password = [MPAlgorithmDefault mpwTemplateForSiteNamed:self.transientSite ofType:transientType
-                                                           withCounter:1 usingKey:key];
-            else if (site)
-                password = [site resolvePasswordUsingKey:key];
-
-            TimeToCrack timeToCrack;
-            NSString *timeToCrackString = nil;
-            id<MPAlgorithm> algorithm = site.algorithm?: MPAlgorithmDefault;
-            MPAttacker attackHardware = [[MPConfig get].siteAttacker integerValue];
-            if ([algorithm timeToCrack:&timeToCrack passwordOfType:site.type byAttacker:attackHardware] ||
-                [algorithm timeToCrack:&timeToCrack passwordString:password byAttacker:attackHardware])
-                timeToCrackString = NSStringFromTimeToCrack( timeToCrack );
-
-            BOOL requiresExplicitMigration = site.requiresExplicitMigration;
-
-            PearlMainQueue( ^{
-                self.passwordField.text = password;
-                self.strengthLabel.text = timeToCrackString;
-                self.loginNameGenerated.hidden = !loginGenerated;
-                self.loginNameField.attributedText =
-                        strarm( stra( loginName?: @"", self.siteNameLabel.textAttributes ), NSParagraphStyleAttributeName, nil );
-                self.loginNameHint.hidden = [loginName length] || self.loginNameField.enabled;
-
-                if (![password length]) {
-                    self.indicatorView.hidden = NO;
-                    [self.indicatorView removeFromSuperview];
-                    [self.modeScrollView addSubview:self.indicatorView];
-                    [self.contentView addConstraintsWithVisualFormat:@"V:[indicator][target]" options:NSLayoutFormatAlignAllCenterX
-                                                             metrics:nil views:@{
-                                    @"indicator": self.indicatorView,
-                                    @"target"   : settingsMode? self.editButton: self.modeButton
-                            }];
-                }
-                else if (requiresExplicitMigration) {
-                    self.indicatorView.hidden = NO;
-                    [self.indicatorView removeFromSuperview];
-                    [self.modeScrollView addSubview:self.indicatorView];
-                    [self.contentView addConstraintsWithVisualFormat:@"V:[indicator][target]" options:NSLayoutFormatAlignAllCenterX
-                                                             metrics:nil views:@{
-                                    @"indicator": self.indicatorView,
-                                    @"target"   : settingsMode? self.upgradeButton: self.modeButton
-                            }];
-                }
-                else
-                    self.indicatorView.hidden = YES;
+    // Site Password
+    self.passwordField.secureTextEntry = [[MPiOSConfig get].hidePasswords boolValue];
+    self.passwordField.attributedPlaceholder = stra(
+            mainSite.type & MPResultTypeClassStateful? strl( @"No password" ):
+            mainSite.type & MPResultTypeClassTemplate? strl( @"..." ): @"", @{
+                    NSForegroundColorAttributeName: [UIColor whiteColor]
            } );
-        }]) {
-            wrn( @"Could not load cell content: store unavailable." );
+
+    // Calculate Fields
+    if (![MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+        MPKey *key = [MPiOSAppDelegate get].key;
+        if (!key) {
+            wrn( @"Could not load cell content: key unavailable." );
            PearlMainQueueOperation( ^{
                Strongify( self );
-                [self updateAnimated:YES];
+                [self updateAnimated:animated];
            } );
+            return;
        }

+        MPSiteEntity *site = [self siteInContext:context];
+        BOOL loginGenerated = site.loginGenerated;
+        NSString *password = nil, *loginName = [site resolveLoginUsingKey:key];
+        MPResultType transientType = [[MPiOSAppDelegate get] activeUserInContext:context].defaultType?: MPAlgorithmDefault.defaultType;
+        if (self.transientSite && transientType & MPResultTypeClassTemplate)
+            password = [MPAlgorithmDefault mpwTemplateForSiteNamed:self.transientSite ofType:transientType
+                                                       withCounter:1 usingKey:key];
+        else if (site)
+            password = [site resolvePasswordUsingKey:key];
+
+        TimeToCrack timeToCrack;
+        NSString *timeToCrackString = nil;
+        id<MPAlgorithm> algorithm = site.algorithm?: MPAlgorithmDefault;
+        MPAttacker attackHardware = [[MPConfig get].siteAttacker integerValue];
+        if ([algorithm timeToCrack:&timeToCrack passwordOfType:site.type byAttacker:attackHardware] ||
+            [algorithm timeToCrack:&timeToCrack passwordString:password byAttacker:attackHardware])
+            timeToCrackString = NSStringFromTimeToCrack( timeToCrack );
+
+        BOOL requiresExplicitMigration = site.requiresExplicitMigration;
+
+        PearlMainQueue( ^{
+            self.passwordField.text = password;
+            self.strengthLabel.text = timeToCrackString;
+            self.loginNameGenerated.hidden = !loginGenerated;
+            self.loginNameField.attributedText =
+                    strarm( stra( loginName?: @"", self.siteNameLabel.textAttributes ), NSParagraphStyleAttributeName, nil );
+            self.loginNameHint.hidden = [loginName length] || self.loginNameField.enabled;
+
+            if (![password length]) {
+                self.indicatorView.hidden = NO;
+                [self.indicatorView removeFromSuperview];
+                [self.modeScrollView addSubview:self.indicatorView];
+                [self.contentView addConstraintsWithVisualFormat:@"V:[indicator][target]" options:NSLayoutFormatAlignAllCenterX
+                                                         metrics:nil views:@{
+                                @"indicator": self.indicatorView,
+                                @"target"   : settingsMode? self.editButton: self.modeButton
+                        }];
+            }
+            else if (requiresExplicitMigration) {
+                self.indicatorView.hidden = NO;
+                [self.indicatorView removeFromSuperview];
+                [self.modeScrollView addSubview:self.indicatorView];
+                [self.contentView addConstraintsWithVisualFormat:@"V:[indicator][target]" options:NSLayoutFormatAlignAllCenterX
+                                                         metrics:nil views:@{
+                                @"indicator": self.indicatorView,
+                                @"target"   : settingsMode? self.upgradeButton: self.modeButton
+                        }];
+            }
+            else
+                self.indicatorView.hidden = YES;
+        } );
+    }]) {
+        wrn( @"Could not load cell content: store unavailable." );
+        PearlMainQueueOperation( ^{
+            Strongify( self );
+            [self updateAnimated:animated];
+        } );
+    }
+
+    if (animated)
        [self.contentView layoutIfNeeded];
-    }];
 }

 - (void)updateSiteName:(MPSiteEntity *)site {
--- a/platform-darwin/Source/iOS/MPSitesViewController.m
+++ b/platform-darwin/Source/iOS/MPSitesViewController.m
@@ -64,13 +64,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
        self.collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
    [self.collectionView automaticallyAdjustInsetsForKeyboard];
    self.searchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    if ([self.searchBar respondsToSelector:@selector( keyboardAppearance )])
-        self.searchBar.keyboardAppearance = UIKeyboardAppearanceDark;
-    else
-        [self.searchBar enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
-            if ([subview isKindOfClass:[UITextField class]])
-                ((UITextField *)subview).keyboardAppearance = UIKeyboardAppearanceDark;
-        }                      recurse:YES];
+    self.searchBar.keyboardAppearance = UIKeyboardAppearanceDark;
 }

 - (void)viewWillAppear:(BOOL)animated {
@@ -127,6 +121,14 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
    PearlRemoveNotificationObservers();
 }

+- (void)viewWillLayoutSubviews {
+
+    self.collectionView.contentInset = [self.collectionView occludedInsets];
+    self.collectionView.scrollIndicatorInsets = self.collectionView.contentInset;
+
+    [super viewWillLayoutSubviews];
+}
+
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {

    if ([segue.identifier isEqualToString:@"popdown"])
@@ -144,33 +146,6 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
 }

-#pragma mark - UICollectionViewDelegateFlowLayout
-
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout
-  sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-
-    UICollectionViewFlowLayout *layout = (UICollectionViewFlowLayout *)collectionViewLayout;
-    CGFloat itemWidth = UIEdgeInsetsInsetRect( collectionView.bounds, layout.sectionInset ).size.width;
-    return CGSizeMake( itemWidth, 100 );
-}
-
- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout
-        insetForSectionAtIndex:(NSInteger)section {
-
-    UICollectionViewFlowLayout *layout = (UICollectionViewFlowLayout *)collectionViewLayout;
-    UIEdgeInsets occludedInsets = [self.collectionView occludedInsets];
-    UIEdgeInsets insets = layout.sectionInset;
-    insets.top = insets.bottom; // Undo storyboard hack for manual top-occluded insets.
-
-    if (section == 0)
-        insets.top += occludedInsets.top;
-
-    if (section == collectionView.numberOfSections - 1)
-        insets.bottom += occludedInsets.bottom;
-
-    return insets;
-}
-
 #pragma mark - UICollectionViewDataSource

 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
--- a/platform-darwin/Source/iOS/MPStoreViewController.m
+++ b/platform-darwin/Source/iOS/MPStoreViewController.m
@@ -64,6 +64,17 @@ PearlEnum( MPDevelopmentFuelConsumption,
    [[MPiOSAppDelegate get] removeProductsObserver:self];
 }

+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "UnavailableInDeploymentTarget"
+- (void)viewSafeAreaInsetsDidChange {
+
+    [super viewSafeAreaInsetsDidChange];
+
+    self.tableView.contentInset = UIEdgeInsetsMake( 44, 0, 0, 0 );
+    self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake( 44, 0, 0, 0 );
+}
+#pragma clang diagnostic pop
+
 #pragma mark - UITableViewDataSource

 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
--- a/platform-darwin/Source/iOS/MPiOSAppDelegate.m
+++ b/platform-darwin/Source/iOS/MPiOSAppDelegate.m
@@ -30,7 +30,6 @@

@property(nonatomic, strong) UIDocumentInteractionController *interactionController;
@property(nonatomic, strong) PearlHangDetector *hangDetector;
-
@end

@implementation MPiOSAppDelegate
@@ -45,18 +44,19 @@
    @try {
        // Sentry
        [SentrySDK initWithOptions:@{
-                @"dsn"        : decrypt( sentryDSN ),
+                @"dsn"                      : NilToNSNull( decrypt( sentryDSN ) ),
 #ifdef DEBUG
-                @"debug"      : @(YES),
-                @"environment": @"Development",
+                @"debug"                    : @(YES),
+                @"environment"              : @"Development",
 #elif PUBLIC
-                @"debug"      : @(NO),
-                @"environment": @"Public",
+                @"debug"                    : @(NO),
+                @"environment"              : @"Public",
 #else
-                @"debug"      : @(NO),
-                @"environment": @"Private",
+                @"debug"                    : @(NO),
+                @"environment"              : @"Private",
 #endif
-                @"enabled"    : [MPiOSConfig get].sendInfo,
+                @"enabled"                  : [MPiOSConfig get].sendInfo,
+                @"enableAutoSessionTracking": @(YES),
        }];
        [[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) {
            PearlLogLevel level = PearlLogLevelWarn;
@@ -102,15 +102,16 @@
        countlyConfig.appKey = decrypt( countlyKey );
        countlyConfig.features = @[ CLYPushNotifications, CLYAutoViewTracking ];
        countlyConfig.requiresConsent = YES;
-#if DEBUG
-        countlyConfig.pushTestMode = CLYPushTestModeDevelopment;
-#elif ! PUBLIC
-        countlyConfig.pushTestMode = CLYPushTestModeTestFlightOrAdHoc;
-#endif
        countlyConfig.alwaysUsePOST = YES;
        countlyConfig.deviceID = [PearlKeyChain deviceIdentifier];
        countlyConfig.secretSalt = decrypt( countlySalt );
+#if DEBUG
        countlyConfig.enableDebug = YES;
+        countlyConfig.pushTestMode = CLYPushTestModeDevelopment;
+#elif ! PUBLIC
+        countlyConfig.enableDebug = NO;
+        countlyConfig.pushTestMode = CLYPushTestModeTestFlightOrAdHoc;
+#endif
        [Countly.sharedInstance startWithConfig:countlyConfig];

 #if ! DEBUG
@@ -171,30 +172,11 @@
            }
        } );

-        if (@available( iOS 12, * )) {
-            [Countly.sharedInstance askForNotificationPermissionWithOptions:UNAuthorizationOptionProvisional completionHandler:
-                    ^(BOOL granted, NSError *error) {
-                        inf( @"provisional: %d: %@", granted, error );
-            }];
-        }
-
-
        PearlMainQueueOperation( ^{
            if ([[MPiOSConfig get].showSetup boolValue])
                [self.navigationController performSegueWithIdentifier:@"setup" sender:self];

-            if (![[NSUserDefaults standardUserDefaults] boolForKey:@"notificationsDecided"]) {
-                UIAlertController *alert =  [UIAlertController alertControllerWithTitle:@"Coming Soon" message:
-                                @"Master Password is rolling out a new modern personal security platform and we're excited to bring you along.\n\n"
-                                @"When it's time, we'll send you a notification to help you make an effortless transition."
-                                                                        preferredStyle:UIAlertControllerStyleAlert];
-                [alert addAction:[UIAlertAction actionWithTitle:@"Thanks" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-                    [Countly.sharedInstance askForNotificationPermission];
-                    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"notificationsDecided"];
-                }]];
-                [(self.navigationController.presentedViewController?: (UIViewController *)self.navigationController)
-                        presentViewController:alert animated:YES completion:nil];
-            }
+            [self enableNotifications];
        } );
    }
    @catch (id exception) {
@@ -247,6 +229,49 @@
    return YES;
 }

+- (void)enableNotifications {
+
+    [Countly.sharedInstance giveConsentForFeature:CLYConsentPushNotifications];
+    if (@available( iOS 12, * )) {
+        [Countly.sharedInstance askForNotificationPermissionWithOptions:UNAuthorizationOptionProvisional | UNAuthorizationOptionAlert
+                                                      completionHandler:^(BOOL granted, NSError *error) {
+                                                          if (!granted)
+                                                              err( @"No provisional notification permission: %@", error );
+
+                                                          [self askNotifications];
+                                                      }];
+    }
+    else {
+        [self askNotifications];
+    }
+}
+
+- (void)askNotifications {
+
+    PearlMainQueue( ^{
+        if (![[NSUserDefaults standardUserDefaults] boolForKey:@"notificationsDecided"]) {
+            UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Coming Soon" message:
+                            @"Master Password is rolling out a new modern personal security platform and we're excited to bring you along.\n\n"
+                            @"When it's time, we'll send you a notification to help you make an effortless transition."
+                                                                    preferredStyle:UIAlertControllerStyleAlert];
+            [alert addAction:[UIAlertAction actionWithTitle:@"Thanks" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+                if (@available( iOS 12, * )) {
+                    [Countly.sharedInstance askForNotificationPermissionWithOptions:UNAuthorizationOptionAlert completionHandler:
+                            ^(BOOL granted, NSError *error) {
+                                [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"notificationsDecided"];
+                            }];
+                }
+                else {
+                    [Countly.sharedInstance askForNotificationPermission];
+                    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"notificationsDecided"];
+                }
+            }]];
+            [(self.navigationController.presentedViewController?: (UIViewController *)self.navigationController)
+                    presentViewController:alert animated:YES completion:nil];
+        }
+    } );
+}
+
 - (void)importSites:(NSString *)importData {

    if ([NSThread isMainThread]) {
@@ -362,44 +387,6 @@

    [self.hangDetector stop];

-//    self.task = [application beginBackgroundTaskWithExpirationHandler:^{
-//        [application endBackgroundTask:self.task];
-//        dbg( @"background expiring" );
-//    }];
-//    PearlNotMainQueueOperation( ^{
-//        NSString *pbstring = [UIPasteboard generalPasteboard].string;
-//        while (YES) {
-//            NSString *newString = [UIPasteboard generalPasteboard].string;
-//            if (![newString isEqualToString:pbstring]) {
-//                dbg( @"pasteboard changed to: %@", newString );
-//                pbstring = newString;
-//                NSURL *url = [NSURL URLWithString:pbstring];
-//                if (url) {
-//                    NSString *siteName = [url host];
-//                }
-//                MPKey *key = [MPiOSAppDelegate get].key;
-//                if (key)
-//                    [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-//                        NSFetchRequest<MPSiteEntity *>
-//                                *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPSiteEntity class] )];
-//                        fetchRequest.sortDescriptors = @[
-//                                [[NSSortDescriptor alloc] initWithKey:NSStringFromSelector( @selector( lastUsed ) ) ascending:NO]
-//                        ];
-//                        fetchRequest.fetchBatchSize = 2;
-//                        fetchRequest.predicate = [NSPredicate predicateWithFormat:@"(name LIKE[cd] %@) AND user == %@", siteName,
-//                                                                                  [[MPiOSAppDelegate get] activeUserOID]];
-//                        NSError *error = nil;
-//                        NSArray<MPSiteEntity *> *results = [fetchRequest execute:&error];
-//                        dbg( @"site search, error: %@, results:\n%@", error, results );
-//                        if ([results count]) {
-//                            [UIPasteboard generalPasteboard].string = [[results firstObject] resolvePasswordUsingKey:key];
-//                        }
-//                    }];
-//            }
-//            [NSThread sleepForTimeInterval:5];
-//        }
-//    } );
-
    [super applicationDidEnterBackground:application];
 }

@@ -655,41 +642,39 @@
    [PearlLogger get].historyLevel = [[MPiOSConfig get].traceMode boolValue]? PearlLogLevelTrace: PearlLogLevelInfo;

    // Send info
+    NSArray *countlyFeatures = @[
+            CLYConsentSessions, CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating
+    ];
    if ([[MPConfig get].sendInfo boolValue]) {
-        [Countly.sharedInstance giveConsentForAllFeatures];
-
+        [Countly.sharedInstance giveConsentForFeatures:countlyFeatures];
        if ([PearlLogger get].printLevel > PearlLogLevelInfo)
            [PearlLogger get].printLevel = PearlLogLevelInfo;

-        NSMutableDictionary *prefs = [NSMutableDictionary new];
-        prefs[@"rememberLogin"] = [MPConfig get].rememberLogin;
-        prefs[@"sendInfo"] = [MPConfig get].sendInfo;
-        prefs[@"helpHidden"] = [MPiOSConfig get].helpHidden;
-        prefs[@"showQuickStart"] = [MPiOSConfig get].showSetup;
-        prefs[@"firstRun"] = [PearlConfig get].firstRun;
-        prefs[@"launchCount"] = [PearlConfig get].launchCount;
-        prefs[@"askForReviews"] = [PearlConfig get].askForReviews;
-        prefs[@"reviewAfterLaunches"] = [PearlConfig get].reviewAfterLaunches;
-        prefs[@"reviewedVersion"] = [PearlConfig get].reviewedVersion;
-        prefs[@"simulator"] = @([PearlDeviceUtils isSimulator]);
-        prefs[@"encrypted"] = @([PearlDeviceUtils isAppEncrypted]);
-        prefs[@"jailbroken"] = @([PearlDeviceUtils isJailbroken]);
-        prefs[@"platform"] = [PearlDeviceUtils platform];
-#ifdef APPSTORE
-        prefs[@"reviewedVersion"] = @([PearlDeviceUtils isAppEncrypted]);
-#else
-        prefs[@"reviewedVersion"] = @(YES);
-#endif
-
        [SentrySDK.currentHub getClient].options.enabled = @YES;
        [SentrySDK configureScope:^(SentryScope *scope) {
-            for (NSString *pref in prefs.allKeys)
-                [scope setExtraValue:prefs[pref] forKey:pref];
+            [scope setExtraValue:[MPConfig get].rememberLogin forKey:@"rememberLogin"];
+            [scope setExtraValue:[MPConfig get].sendInfo forKey:@"sendInfo"];
+            [scope setExtraValue:[MPiOSConfig get].helpHidden forKey:@"helpHidden"];
+            [scope setExtraValue:[MPiOSConfig get].showSetup forKey:@"showQuickStart"];
+            [scope setExtraValue:[PearlConfig get].firstRun forKey:@"firstRun"];
+            [scope setExtraValue:[PearlConfig get].launchCount forKey:@"launchCount"];
+            [scope setExtraValue:[PearlConfig get].askForReviews forKey:@"askForReviews"];
+            [scope setExtraValue:[PearlConfig get].reviewAfterLaunches forKey:@"reviewAfterLaunches"];
+            [scope setExtraValue:[PearlConfig get].reviewedVersion forKey:@"reviewedVersion"];
+            [scope setExtraValue:@([PearlDeviceUtils isSimulator]) forKey:@"simulator"];
+            [scope setExtraValue:@([PearlDeviceUtils isAppEncrypted]) forKey:@"encrypted"];
+            [scope setExtraValue:@([PearlDeviceUtils isJailbroken]) forKey:@"jailbroken"];
+            [scope setExtraValue:[PearlDeviceUtils platform] forKey:@"platform"];
+#ifdef APPSTORE
+            [scope setExtraValue:@([PearlDeviceUtils isAppEncrypted]) forKey:@"reviewedVersion"];
+#else
+            [scope setExtraValue:@(NO) forKey:@"reviewedVersion"];
+#endif
        }];
    }
    else {
        [SentrySDK.currentHub getClient].options.enabled = @NO;
-        [Countly.sharedInstance cancelConsentForAllFeatures];
+        [Countly.sharedInstance cancelConsentForFeatures:countlyFeatures];
    }
 }

--- a/platform-darwin/Source/iOS/MasterPassword-Info.plist
+++ b/platform-darwin/Source/iOS/MasterPassword-Info.plist
@@ -43,6 +43,8 @@
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
 	<false/>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Biometrics are used to load your master password from the device's keychain.</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2011-2020</string>
 	<key>UIAppFonts</key>
--- a/platform-darwin/Source/iOS/Settings.bundle/Root.plist
+++ b/platform-darwin/Source/iOS/Settings.bundle/Root.plist
@@ -18,7 +18,7 @@
 			<key>Title</key>
 			<string>Version</string>
 			<key>Key</key>
-			<string>unset</string>
+			<string>version</string>
 			<key>Type</key>
 			<string>PSTitleValueSpecifier</string>
 		</dict>
@@ -28,7 +28,7 @@
 			<key>Title</key>
 			<string>Build</string>
 			<key>Key</key>
-			<string>unset</string>
+			<string>build</string>
 			<key>Type</key>
 			<string>PSTitleValueSpecifier</string>
 		</dict>
@@ -40,7 +40,7 @@
 			<key>Type</key>
 			<string>PSTitleValueSpecifier</string>
 			<key>Key</key>
-			<string>unset</string>
+			<string>copyright</string>
 		</dict>
 		<dict>
 			<key>Type</key>
--- a/platform-darwin/Source/iOS/Storyboard.storyboard
+++ b/platform-darwin/Source/iOS/Storyboard.storyboard
@@ -600,7 +600,6 @@
                    <connections>
                        <segue destination="JFc-sj-awD" kind="relationship" relationship="viewControllers" id="bwn-ao-Y5g"/>
                        <segue destination="C0Q-RC-szS" kind="relationship" relationship="viewControllers" id="wap-5K-BMD"/>
-                        <segue destination="LBn-EA-NAH" kind="relationship" relationship="viewControllers" id="sGh-gf-eKK"/>
                        <segue destination="pdl-xv-zjX" kind="relationship" relationship="viewControllers" id="QTc-cR-VHJ"/>
                    </connections>
                </tabBarController>
@@ -899,14 +898,15 @@
                                                    </connections>
                                                </switch>
                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Biometrics" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6xf-vt-aXd">
-                                                    <rect key="frame" x="20" y="20" width="374" height="21"/>
+                                                    <rect key="frame" x="20" y="20" width="374" height="20"/>
                                                    <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="URR-yZ-QuC">
-                                                    <rect key="frame" x="20" y="49" width="374" height="142"/>
-                                                    <string key="text">When enabled on a biometrics-enabled device, your fingerprint or face scan will be required to load your saved password.  Note that this feature requires that the Save Password option is enabled and Biometrics support has been purchased from the in-app store.</string>
+                                                    <rect key="frame" x="20" y="48" width="374" height="143"/>
+                                                    <string key="text">When enabled on a biometrics-enabled device, your fingerprint or face scan will be required to load your stored master password.
+Note that this feature requires you enable the Save Password option and have purchased Biometrics support from the in-app store.</string>
                                                    <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="12"/>
                                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
@@ -1143,20 +1143,20 @@
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K2e-Gh-7hH" userLabel="Passwords Container">
                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                <subviews>
-                                    <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="aXw-tn-8Sj" userLabel="Password Collection">
+                                    <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" keyboardDismissMode="interactive" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="aXw-tn-8Sj" userLabel="Password Collection">
                                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Mv1-29-TWx">
+                                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" sectionInsetReference="safeArea" id="Mv1-29-TWx">
                                            <size key="itemSize" width="355" height="100"/>
                                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
                                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                            <inset key="sectionInset" minX="10" minY="200" maxX="10" maxY="10"/>
+                                            <inset key="sectionInset" minX="10" minY="10" maxX="10" maxY="10"/>
                                        </collectionViewFlowLayout>
                                        <cells>
                                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MPSiteCell" id="W2g-yv-V3V" customClass="MPSiteCell">
-                                                <rect key="frame" x="29.5" y="200" width="355" height="100"/>
+                                                <rect key="frame" x="29.5" y="10" width="355" height="100"/>
                                                <autoresizingMask key="autoresizingMask"/>
-                                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
                                                    <rect key="frame" x="0.0" y="0.0" width="355" height="100"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                    <subviews>
@@ -1547,11 +1547,12 @@
                                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                                <gestureRecognizers/>
                                                <constraints>
-                                                    <constraint firstAttribute="trailing" secondItem="xph-TW-9QO" secondAttribute="trailing" id="Fmt-yZ-Vjo"/>
-                                                    <constraint firstItem="xph-TW-9QO" firstAttribute="leading" secondItem="W2g-yv-V3V" secondAttribute="leading" id="IsM-Br-kMe"/>
-                                                    <constraint firstItem="xph-TW-9QO" firstAttribute="top" secondItem="W2g-yv-V3V" secondAttribute="top" id="KDo-0Z-mc1"/>
-                                                    <constraint firstAttribute="bottom" secondItem="xph-TW-9QO" secondAttribute="bottom" id="W1r-47-bqe"/>
+                                                    <constraint firstAttribute="trailing" secondItem="xph-TW-9QO" secondAttribute="trailing" priority="900" id="Fmt-yZ-Vjo"/>
+                                                    <constraint firstItem="xph-TW-9QO" firstAttribute="leading" secondItem="W2g-yv-V3V" secondAttribute="leading" priority="900" id="IsM-Br-kMe"/>
+                                                    <constraint firstItem="xph-TW-9QO" firstAttribute="top" secondItem="W2g-yv-V3V" secondAttribute="top" priority="900" id="KDo-0Z-mc1"/>
+                                                    <constraint firstAttribute="bottom" secondItem="xph-TW-9QO" secondAttribute="bottom" priority="900" id="W1r-47-bqe"/>
                                                </constraints>
+                                                <size key="customSize" width="355" height="100"/>
                                                <connections>
                                                    <outlet property="answersButton" destination="vGk-t6-hZn" id="0oi-2F-M1S"/>
                                                    <outlet property="contentButton" destination="aDw-qY-VjU" id="R3R-kq-XMd"/>
@@ -2058,9 +2059,7 @@ This app is now out of maintenance.</string>
                            <constraint firstAttribute="width" secondItem="whU-l0-2bU" secondAttribute="width" id="AiQ-LE-3bh"/>
                            <constraint firstItem="IV3-lc-Fnf" firstAttribute="top" secondItem="gRG-Ys-94p" secondAttribute="bottom" id="IMb-wl-Eeb"/>
                            <constraint firstAttribute="trailing" secondItem="gRG-Ys-94p" secondAttribute="trailing" id="Pb1-eY-0FG"/>
-                            <constraint firstAttribute="trailing" secondItem="GiS-3g-cDj" secondAttribute="trailing" id="TjK-B6-KoI"/>
                            <constraint firstItem="gRG-Ys-94p" firstAttribute="top" secondItem="GiS-3g-cDj" secondAttribute="top" id="oyk-Xr-zTZ"/>
-                            <constraint firstItem="IV3-lc-Fnf" firstAttribute="top" secondItem="GiS-3g-cDj" secondAttribute="bottom" id="t22-RN-Hm0"/>
                            <constraint firstItem="gRG-Ys-94p" firstAttribute="leading" secondItem="GiS-3g-cDj" secondAttribute="leading" id="zhC-jf-5dY"/>
                        </constraints>
                        <userDefinedRuntimeAttributes>
@@ -2091,58 +2090,6 @@ This app is now out of maintenance.</string>
            </objects>
            <point key="canvasLocation" x="2038" y="-518"/>
        </scene>
-        <!--Settings-->
-        <scene sceneID="jGj-Je-kyC">
-            <objects>
-                <navigationController definesPresentationContext="YES" id="LBn-EA-NAH" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Settings" image="icon_gears.png" id="6n3-Ay-Knn"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="h6j-1o-LHf">
-                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="IJT-xV-jHt" kind="relationship" relationship="rootViewController" id="ymU-OE-v4t"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="PQz-c8-3Ww" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3803" y="919"/>
-        </scene>
-        <!--Settings-->
-        <scene sceneID="fmc-CS-nuo">
-            <objects>
-                <tableViewController automaticallyAdjustsScrollViewInsets="NO" id="IJT-xV-jHt" customClass="MPAppSettingsViewController" sceneMemberID="viewController">
-                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="jPx-Oa-WxU">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                        <inset key="scrollIndicatorInsets" minX="0.0" minY="64" maxX="0.0" maxY="49"/>
-                        <color key="separatorColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <color key="sectionIndexColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="-" id="3ZC-Sm-lB8">
-                                <rect key="frame" x="0.0" y="55.5" width="414" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3ZC-Sm-lB8" id="UzB-cq-EM3">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                </tableViewCellContentView>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="IJT-xV-jHt" id="bMa-HU-UPY"/>
-                            <outlet property="delegate" destination="IJT-xV-jHt" id="MJE-yH-6xk"/>
-                        </connections>
-                    </tableView>
-                    <tabBarItem key="tabBarItem" title="Settings" image="icon_gears.png" id="K62-lO-hO3"/>
-                    <navigationItem key="navigationItem" title="Settings" id="FPc-yy-RoS">
-                        <barButtonItem key="rightBarButtonItem" title="Logs" id="rO8-gt-aLH"/>
-                    </navigationItem>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="sDE-fE-FNc" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="4730" y="919"/>
-        </scene>
        <!--Usage-->
        <scene sceneID="9SY-7D-CE9">
            <objects>
@@ -2278,7 +2225,7 @@ CgoKCgoKCgoKCgoKCg
                        <autoresizingMask key="autoresizingMask"/>
                        <subviews>
                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZLZ-Ds-7pp">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="852"/>
                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                <inset key="scrollIndicatorInsets" minX="0.0" minY="64" maxX="0.0" maxY="93"/>
                                <string key="text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris facilisis tortor leo, iaculis mollis elit dictum et. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In congue justo porta enim imperdiet, id luctus justo fringilla. Nunc nec sem id augue bibendum hendrerit eu ut eros. Ut fermentum augue quis nunc feugiat vehicula. Quisque in ultrices magna. Praesent quis mollis lectus. Sed fringilla massa vitae eros luctus, eget convallis justo pretium. Duis non tristique ante. Sed suscipit tortor ligula, sed fermentum eros sodales ut. Maecenas sed ante et orci posuere lobortis et sodales diam. Nunc non ullamcorper orci.
@@ -2290,7 +2237,7 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien.
                                <dataDetectorType key="dataDetectorTypes" link="YES"/>
                            </textView>
                            <toolbar contentMode="scaleToFill" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="WmH-JB-jp2">
-                                <rect key="frame" x="0.0" y="798" width="414" height="49"/>
+                                <rect key="frame" x="0.0" y="764" width="414" height="49"/>
                                <items>
                                    <barButtonItem systemItem="compose" id="BSV-3i-01h">
                                        <connections>
@@ -2323,8 +2270,8 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien.
                        </subviews>
                        <color key="backgroundColor" red="0.1215686275" green="0.12941176469999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
-                            <constraint firstAttribute="bottom" secondItem="WmH-JB-jp2" secondAttribute="bottom" constant="49" id="3MJ-7p-Ko1"/>
-                            <constraint firstItem="ZLZ-Ds-7pp" firstAttribute="top" secondItem="VRk-ZF-UQ6" secondAttribute="top" id="SDj-uX-oNC"/>
+                            <constraint firstAttribute="bottomMargin" secondItem="WmH-JB-jp2" secondAttribute="bottom" id="3MJ-7p-Ko1"/>
+                            <constraint firstItem="ZLZ-Ds-7pp" firstAttribute="top" secondItem="VRk-ZF-UQ6" secondAttribute="topMargin" id="SDj-uX-oNC"/>
                            <constraint firstAttribute="bottom" secondItem="ZLZ-Ds-7pp" secondAttribute="bottom" id="bpm-15-Rgy"/>
                            <constraint firstAttribute="trailing" secondItem="WmH-JB-jp2" secondAttribute="trailing" id="f4Q-oI-Dxc"/>
                            <constraint firstAttribute="trailing" secondItem="ZLZ-Ds-7pp" secondAttribute="trailing" id="iID-PM-DSF"/>
@@ -2384,10 +2331,10 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien.
                                <rect key="frame" x="0.0" y="56" width="414" height="752"/>
                                <subviews>
                                    <imageView userInteractionEnabled="NO" contentMode="top" image="unlocked.png" translatesAutoresizingMaskIntoConstraints="NO" id="Cih-B6-Sfd">
-                                        <rect key="frame" x="20" y="20" width="374" height="79.5"/>
+                                        <rect key="frame" x="20" y="20" width="374" height="80"/>
                                    </imageView>
                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Stay Logged In?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5X1-J4-TbH">
-                                        <rect key="frame" x="20" y="107.5" width="374" height="20"/>
+                                        <rect key="frame" x="20" y="108" width="374" height="20"/>
                                        <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                        <nil key="highlightedColor"/>
@@ -2397,7 +2344,7 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien.
                                        <color key="onTintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                    </switch>
                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e80-98-V6D">
-                                        <rect key="frame" x="20" y="135.5" width="374" height="151.5"/>
+                                        <rect key="frame" x="20" y="136" width="374" height="151.5"/>
                                        <string key="text">The right balance between security and convenience is often very personal.

 To make getting to your passwords faster, you can remain logged in after you close Master Password.  This allows you to skip having to log in the next time.
--- a/platform-independent/c/core/build.gradle
+++ b/platform-independent/c/core/build.gradle
@@ -44,7 +44,6 @@ library {
        def arch = targetMachine.getArchitecture().getName().replace('-', '_')

        compile.macros.put("MPW_SODIUM", "1")
-        compile.macros.put("MPW_LOG", "mpw_log_app")

        dependencies {
            // libsodium
--- a/platform-independent/c/core/src/base64.c
+++ b/platform-independent/c/core/src/base64.c
@@ -81,7 +81,7 @@ static const uint8_t b64ToBits[256] =
 size_t mpw_base64_decode_max(const char *b64Text) {

    register const char *b64Cursor = b64Text;
-    for (; b64ToBits[*b64Cursor] <= 63; ++b64Cursor);
+    for (; b64ToBits[(uint8_t)*b64Cursor] <= 63; ++b64Cursor);
    size_t b64Size = b64Cursor - b64Text;

    // Every 4 b64 chars yield 3 plain bytes => len = 3 * ceil(b64Size / 4)
@@ -91,7 +91,7 @@ size_t mpw_base64_decode_max(const char *b64Text) {
 size_t mpw_base64_decode(uint8_t *plainBuf, const char *b64Text) {

    register const uint8_t *b64Cursor = (uint8_t *)b64Text;
-    for (; b64ToBits[*b64Cursor] <= 63; ++b64Cursor);
+    for (; b64ToBits[(uint8_t)*b64Cursor] <= 63; ++b64Cursor);
    size_t b64Remaining = b64Cursor - (uint8_t *)b64Text;

    b64Cursor = (uint8_t *)b64Text;
--- a/platform-independent/c/core/src/java/com_lyndir_masterpassword_MPAlgorithm_Version.h
+++ b/platform-independent/c/core/src/java/com_lyndir_masterpassword_MPAlgorithm_Version.h
@@ -7,8 +7,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_lyndir_masterpassword_MPAlgorithm_Version_AES_BLOCKSIZE
-#define com_lyndir_masterpassword_MPAlgorithm_Version_AES_BLOCKSIZE 128L
 /*
 * Class:     com_lyndir_masterpassword_MPAlgorithm_Version
 * Method:    _masterKey
@@ -41,6 +39,22 @@ JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Versio
 JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Version__1siteState
  (JNIEnv *, jobject, jbyteArray, jbyteArray, jstring, jlong, jint, jstring, jint, jstring, jint);

+/*
+ * Class:     com_lyndir_masterpassword_MPAlgorithm_Version
+ * Method:    _identicon
+ * Signature: (Ljava/lang/String;[B)Lcom/lyndir/masterpassword/MPIdenticon;
+ */
+JNIEXPORT jobject JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Version__1identicon
+  (JNIEnv *, jobject, jstring, jbyteArray);
+
+/*
+ * Class:     com_lyndir_masterpassword_MPAlgorithm_Version
+ * Method:    _toID
+ * Signature: ([B)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Version__1toID
+  (JNIEnv *, jobject, jbyteArray);
+
 #ifdef __cplusplus
 }
 #endif
--- a/platform-independent/c/core/src/mpw-jni.c
+++ b/platform-independent/c/core/src/mpw-jni.c
@@ -10,50 +10,46 @@
 static JavaVM* _vm;
 static jobject logger;

-void mpw_log_app(LogLevel level, const char *format, ...) {
+MPLogSink mpw_log_sink_jni;
+bool mpw_log_sink_jni(const MPLogEvent *record) {
+    bool sunk = false;
+
    JNIEnv *env;
    if ((*_vm)->GetEnv( _vm, (void **)&env, JNI_VERSION_1_6 ) != JNI_OK)
-        return;
-
-    va_list args;
-    va_start( args, format );
+        return sunk;

    if (logger && (*env)->PushLocalFrame( env, 16 ) == OK) {
        jmethodID method = NULL;
-        jclass Logger = (*env)->GetObjectClass( env, logger );
-        if (level >= LogLevelTrace)
-            method = (*env)->GetMethodID( env, Logger, "trace", "(Ljava/lang/String;)V" );
-        else if (level == LogLevelDebug)
-            method = (*env)->GetMethodID( env, Logger, "debug", "(Ljava/lang/String;)V" );
-        else if (level == LogLevelInfo)
-            method = (*env)->GetMethodID( env, Logger, "info", "(Ljava/lang/String;)V" );
-        else if (level == LogLevelWarning)
-            method = (*env)->GetMethodID( env, Logger, "warn", "(Ljava/lang/String;)V" );
-        else if (level <= LogLevelError)
-            method = (*env)->GetMethodID( env, Logger, "error", "(Ljava/lang/String;)V" );
+        jclass cLogger = (*env)->GetObjectClass( env, logger );
+        switch (record->level) {
+            case LogLevelTrace:
+                method = (*env)->GetMethodID( env, cLogger, "trace", "(Ljava/lang/String;)V" );
+                break;
+            case LogLevelDebug:
+                method = (*env)->GetMethodID( env, cLogger, "debug", "(Ljava/lang/String;)V" );
+                break;
+            case LogLevelInfo:
+                method = (*env)->GetMethodID( env, cLogger, "info", "(Ljava/lang/String;)V" );
+                break;
+            case LogLevelWarning:
+                method = (*env)->GetMethodID( env, cLogger, "warn", "(Ljava/lang/String;)V" );
+                break;
+            case LogLevelError:
+            case LogLevelFatal:
+                method = (*env)->GetMethodID( env, cLogger, "error", "(Ljava/lang/String;)V" );
+                break;
+        }

-        va_list _args;
-        va_copy( _args, args );
-        int length = vsnprintf( NULL, 0, format, _args );
-        va_end( _args );
-
-        if (length > 0) {
-            size_t size = (size_t) (length + 1);
-            char *message = malloc( size );
-            va_copy( _args, args );
-            if (message && (length = vsnprintf( message, size, format, _args )) > 0)
-                (*env)->CallVoidMethod( env, logger, method, (*env)->NewStringUTF( env, message ) );
-            va_end( _args );
-            mpw_free( &message, (size_t)max( 0, length ) );
+        if (method && record->message) {
+            // TODO: log file, line & function as markers?
+            (*env)->CallVoidMethod( env, logger, method, (*env)->NewStringUTF( env, record->message ) );
+            sunk = true;
        }

        (*env)->PopLocalFrame( env, NULL );
    }
-    else
-        // Can't log via slf4j, fall back to cli logger.
-        mpw_vlog_cli( level, format, args );

-    va_end( args );
+    return sunk;
 }

 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
@@ -61,33 +57,45 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
    if ((*vm)->GetEnv( _vm = vm, (void **)&env, JNI_VERSION_1_6 ) != JNI_OK)
        return -1;

-    jclass LoggerFactory = (*env)->FindClass( env, "org/slf4j/LoggerFactory" );
-    jmethodID method = (*env)->GetStaticMethodID( env, LoggerFactory, "getLogger", "(Ljava/lang/String;)Lorg/slf4j/Logger;" );
-    jstring name = (*env)->NewStringUTF( env, "com.lyndir.masterpassword.algorithm" );
-    if (LoggerFactory && method && name)
-        logger = (*env)->NewGlobalRef( env, (*env)->CallStaticObjectMethod( env, LoggerFactory, method, name ) );
-    else
-        wrn( "Couldn't initialize JNI logger." );
+    do {
+        jclass cLoggerFactory = (*env)->FindClass( env, "org/slf4j/LoggerFactory" );
+        if (!cLoggerFactory)
+            break;
+        jmethodID method = (*env)->GetStaticMethodID( env, cLoggerFactory, "getLogger", "(Ljava/lang/String;)Lorg/slf4j/Logger;" );
+        if (!method)
+            break;
+        jstring name = (*env)->NewStringUTF( env, "com.lyndir.masterpassword.algorithm" );
+        if (!name)
+            break;
+        logger = (*env)->NewGlobalRef( env, (*env)->CallStaticObjectMethod( env, cLoggerFactory, method, name ) );
+        if (!logger)
+            break;

-    jclass Logger = (*env)->GetObjectClass( env, logger );
-    if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isTraceEnabled", "()Z" ) ))
-        mpw_verbosity = LogLevelTrace;
-    else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isDebugEnabled", "()Z" ) ))
-        mpw_verbosity = LogLevelDebug;
-    else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isInfoEnabled", "()Z" ) ))
-        mpw_verbosity = LogLevelInfo;
-    else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isWarnEnabled", "()Z" ) ))
-        mpw_verbosity = LogLevelWarning;
-    else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isErrorEnabled", "()Z" ) ))
-        mpw_verbosity = LogLevelError;
-    else
-        mpw_verbosity = LogLevelFatal;
+        jclass cLogger = (*env)->GetObjectClass( env, logger );
+        if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, cLogger, "isTraceEnabled", "()Z" ) ))
+            mpw_verbosity = LogLevelTrace;
+        else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, cLogger, "isDebugEnabled", "()Z" ) ))
+            mpw_verbosity = LogLevelDebug;
+        else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, cLogger, "isInfoEnabled", "()Z" ) ))
+            mpw_verbosity = LogLevelInfo;
+        else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, cLogger, "isWarnEnabled", "()Z" ) ))
+            mpw_verbosity = LogLevelWarning;
+        else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, cLogger, "isErrorEnabled", "()Z" ) ))
+            mpw_verbosity = LogLevelError;
+        else
+            mpw_verbosity = LogLevelFatal;
+
+        mpw_log_sink_register( &mpw_log_sink_jni );
+    } while (false);
+
+    if (!logger)
+        wrn( "Couldn't initialize JNI logger." );

    return JNI_VERSION_1_6;
 }

-/* native int _masterKey(final String fullName, final byte[] masterPassword, final Version version) */
-JNIEXPORT jbyteArray JNICALL Java_com_lyndir_masterpassword_impl_MPAlgorithmV0__1masterKey(JNIEnv *env, jobject obj,
+/* native byte[] _masterKey(final String fullName, final byte[] masterPassword, final int algorithmVersion) */
+JNIEXPORT jbyteArray JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Version__1masterKey(JNIEnv *env, jobject obj,
        jstring fullName, jbyteArray masterPassword, jint algorithmVersion) {

    if (!fullName || !masterPassword)
@@ -110,9 +118,9 @@ JNIEXPORT jbyteArray JNICALL Java_com_lyndir_masterpassword_impl_MPAlgorithmV0__
    return masterKey;
 }

-/* native int _siteKey(final byte[] masterKey, final String siteName, final long siteCounter,
-                       final MPKeyPurpose keyPurpose, @Nullable final String keyContext,  final Version version) */
-JNIEXPORT jbyteArray JNICALL Java_com_lyndir_masterpassword_impl_MPAlgorithmV0__1siteKey(JNIEnv *env, jobject obj,
+/* native byte[] _siteKey(final byte[] masterKey, final String siteName, final long siteCounter,
+                          final int keyPurpose, @Nullable final String keyContext, final int version) */
+JNIEXPORT jbyteArray JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Version__1siteKey(JNIEnv *env, jobject obj,
        jbyteArray masterKey, jstring siteName, jlong siteCounter, jint keyPurpose, jstring keyContext, jint algorithmVersion) {

    if (!masterKey || !siteName)
@@ -140,9 +148,9 @@ JNIEXPORT jbyteArray JNICALL Java_com_lyndir_masterpassword_impl_MPAlgorithmV0__
 }

 /* native String _siteResult(final byte[] masterKey, final byte[] siteKey, final String siteName, final long siteCounter,
-                             final MPKeyPurpose keyPurpose, @Nullable final String keyContext,
-                             final MPResultType resultType, @Nullable final String resultParam, final Version version) */
-JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_impl_MPAlgorithmV0__1siteResult(JNIEnv *env, jobject obj,
+                             final int keyPurpose, @Nullable final String keyContext,
+                             final int resultType, @Nullable final String resultParam, final int algorithmVersion) */
+JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Version__1siteResult(JNIEnv *env, jobject obj,
        jbyteArray masterKey, jbyteArray siteKey, jstring siteName, jlong siteCounter, jint keyPurpose, jstring keyContext,
        jint resultType, jstring resultParam, jint algorithmVersion) {

@@ -175,9 +183,9 @@ JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_impl_MPAlgorithmV0__1si
 }

 /* native String _siteState(final byte[] masterKey, final byte[] siteKey, final String siteName, final long siteCounter,
-                            final MPKeyPurpose keyPurpose, @Nullable final String keyContext,
-                            final MPResultType resultType, final String resultParam, final Version version) */
-JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_impl_MPAlgorithmV0__1siteState(JNIEnv *env, jobject obj,
+                            final int keyPurpose, @Nullable final String keyContext,
+                            final int resultType, final String resultParam, final int algorithmVersion) */
+JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Version__1siteState(JNIEnv *env, jobject obj,
        jbyteArray masterKey, jbyteArray siteKey, jstring siteName, jlong siteCounter, jint keyPurpose, jstring keyContext,
        jint resultType, jstring resultParam, jint algorithmVersion) {

@@ -208,3 +216,51 @@ JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_impl_MPAlgorithmV0__1si

    return siteState;
 }
+
+/* native MPIdenticon _identicon(final String fullName, final byte[] masterPassword) */
+JNIEXPORT jobject JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Version__1identicon(JNIEnv *env, jobject obj,
+        jstring fullName, jbyteArray masterPassword) {
+
+    if (!fullName || !masterPassword)
+        return NULL;
+
+    const char *fullNameString = (*env)->GetStringUTFChars( env, fullName, NULL );
+    jbyte *masterPasswordString = (*env)->GetByteArrayElements( env, masterPassword, NULL );
+
+    MPIdenticon identicon = mpw_identicon( fullNameString, (char *)masterPasswordString );
+    (*env)->ReleaseStringUTFChars( env, fullName, fullNameString );
+    (*env)->ReleaseByteArrayElements( env, masterPassword, masterPasswordString, JNI_ABORT );
+    if (identicon.color == MPIdenticonColorUnset)
+        return NULL;
+
+    jclass cMPIdenticonColor = (*env)->FindClass( env, "com/lyndir/masterpassword/MPIdenticon$Color" );
+    if (!cMPIdenticonColor)
+        return NULL;
+    jmethodID method = (*env)->GetStaticMethodID( env, cMPIdenticonColor, "values", "()[Lcom/lyndir/masterpassword/MPIdenticon$Color;" );
+    if (!method)
+        return NULL;
+    jobject values = (*env)->CallStaticObjectMethod( env, cMPIdenticonColor, method );
+    if (!values)
+        return NULL;
+
+    jclass cMPIdenticon = (*env)->FindClass( env, "com/lyndir/masterpassword/MPIdenticon" );
+    if (!cMPIdenticon)
+        return NULL;
+    jmethodID init = (*env)->GetMethodID( env, cMPIdenticon, "<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lyndir/masterpassword/MPIdenticon$Color;)V" );
+    if (!init)
+        return NULL;
+
+    return (*env)->NewObject( env, cMPIdenticon, init, fullName,
+            (*env)->NewStringUTF( env, identicon.leftArm ),
+            (*env)->NewStringUTF( env, identicon.body ),
+            (*env)->NewStringUTF( env, identicon.rightArm ),
+            (*env)->NewStringUTF( env, identicon.accessory ),
+            (*env)->GetObjectArrayElement( env, values, identicon.color ) );
+}
+
+/* native String _toID(final byte[] buffer) */
+JNIEXPORT jstring JNICALL Java_com_lyndir_masterpassword_MPAlgorithm_00024Version__1toID(JNIEnv *env, jobject obj,
+        jbyteArray buffer) {
+
+    return (*env)->NewStringUTF( env, mpw_id_buf( (*env)->GetByteArrayElements( env, buffer, NULL ), (*env)->GetArrayLength( env, buffer ) ) );
+}
--- a/platform-independent/c/core/src/mpw-types.h
+++ b/platform-independent/c/core/src/mpw-types.h
@@ -120,18 +120,17 @@ typedef mpw_enum ( uint32_t, MPCounterValue ) {

 /** These colours are compatible with the original ANSI SGR. */
 typedef mpw_enum( uint8_t, MPIdenticonColor ) {
-    MPIdenticonColorBlack,
+    MPIdenticonColorUnset,
    MPIdenticonColorRed,
    MPIdenticonColorGreen,
    MPIdenticonColorYellow,
    MPIdenticonColorBlue,
    MPIdenticonColorMagenta,
    MPIdenticonColorCyan,
-    MPIdenticonColorWhite,
+    MPIdenticonColorMono,

-    MPIdenticonColorUnset = MPIdenticonColorBlack,
    MPIdenticonColorFirst = MPIdenticonColorRed,
-    MPIdenticonColorLast = MPIdenticonColorWhite,
+    MPIdenticonColorLast = MPIdenticonColorMono,
 };

 typedef struct {
--- a/platform-independent/c/core/src/mpw-util.c
+++ b/platform-independent/c/core/src/mpw-util.c
@@ -97,14 +97,15 @@ void mpw_log_ssink(LogLevel level, const char *file, int line, const char *funct
            .message = message,
    };

+    bool sunk = false;
    for (unsigned int s = 0; s < sinks_count; ++s) {
        MPLogSink *sink = sinks[s];

        if (sink)
-            sink( &record );
+            sunk |= sink( &record );
    }
-    if (!sinks_count)
-        mpw_log_sink_file( &record );
+    if (!sunk)
+        sunk = mpw_log_sink_file( &record );

    if (record.level <= LogLevelError) {
        /* error breakpoint */;
@@ -113,7 +114,7 @@ void mpw_log_ssink(LogLevel level, const char *file, int line, const char *funct
        abort();
 }

-void mpw_log_sink_file(const MPLogEvent *record) {
+bool mpw_log_sink_file(const MPLogEvent *record) {

    if (!mpw_log_sink_file_target)
        mpw_log_sink_file_target = stderr;
@@ -145,6 +146,7 @@ void mpw_log_sink_file(const MPLogEvent *record) {
    }

    fprintf( mpw_log_sink_file_target, "%s\n", record->message );
+    return true;
 }

 void mpw_uint16(const uint16_t number, uint8_t buf[2]) {
--- a/platform-independent/c/core/src/mpw-util.h
+++ b/platform-independent/c/core/src/mpw-util.h
@@ -54,7 +54,7 @@ typedef struct {
 } MPLogEvent;

 /** A log sink describes a function that can receive log events. */
-typedef void (MPLogSink)(const MPLogEvent *event);
+typedef bool (MPLogSink)(const MPLogEvent *event);

 /** To receive events, sinks need to be registered.  If no sinks are registered, log events are sent to the mpw_log_sink_file sink. */
 bool mpw_log_sink_register(MPLogSink *sink);
--- a/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java
+++ b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java
@@ -87,6 +87,29 @@ public interface MPAlgorithm {
                     MPKeyPurpose keyPurpose, @Nullable String keyContext,
                     MPResultType resultType, String resultParam);

+    /**
+     * Derive an identicon that represents the user's identity in a visually recognizable way.
+     *
+     * @param fullName       The name of the user whose identity is described by the key.
+     * @param masterPassword The user's secret that authenticates his access to the identity.
+     */
+    MPIdenticon identicon(final String fullName, final char[] masterPassword);
+
+    /**
+     * Encode a fingerprint for a message.
+     */
+    String toID(final String string);
+
+    /**
+     * Encode a fingerprint for a char buffer.
+     */
+    String toID(final char[] message);
+
+    /**
+     * Encode a fingerprint for a byte buffer.
+     */
+    String toID(final byte[] buffer);
+
    // Configuration

    /**
@@ -125,69 +148,6 @@ public interface MPAlgorithm {
    @Nonnull
    Charset mpw_charset();

-    /**
-     * mpw: Platform-agnostic byte order.
-     */
-    @Nonnull
-    ByteOrder mpw_byteOrder();
-
-    /**
-     * mpw: Key ID hash.
-     */
-    @Nonnull
-    MessageDigests mpw_hash();
-
-    /**
-     * mpw: Site digest.
-     */
-    @Nonnull
-    MessageAuthenticationDigests mpw_digest();
-
-    /**
-     * mpw: Master key size (byte).
-     */
-    int mpw_dkLen();
-
-    /**
-     * mpw: Minimum size for derived keys (bit).
-     */
-    int mpw_keySize_min();
-
-    /**
-     * mpw: Maximum size for derived keys (bit).
-     */
-    int mpw_keySize_max();
-
-    /**
-     * mpw: validity for the time-based rolling counter (s).
-     */
-    long mpw_otp_window();
-
-    /**
-     * scrypt: CPU cost parameter.
-     */
-    int scrypt_N();
-
-    /**
-     * scrypt: Memory cost parameter.
-     */
-    int scrypt_r();
-
-    /**
-     * scrypt: Parallelization parameter.
-     */
-    int scrypt_p();
-
-    // Utilities
-
-    byte[] toBytes(final int number);
-
-    byte[] toBytes(final UnsignedInteger number);
-
-    byte[] toBytes(final char[] characters);
-
-    byte[] toID(final byte[] bytes);
-
    /**
     * The algorithm iterations.
     */
@@ -222,12 +182,9 @@ public interface MPAlgorithm {

        public static final Version CURRENT = V3;

-        @SuppressWarnings("HardcodedFileSeparator")
-        private static final String AES_TRANSFORMATION = "AES/CBC/PKCS5Padding";
-        private static final int    AES_BLOCKSIZE      = 128 /* bit */;
-
        static {
-            Native.load( MPAlgorithm.class, "mpw" );
+            if (!Native.load( MPAlgorithm.class, "mpw" ))
+                Logger.get( MPAlgorithm.class ).err( "Native mpw library unavailable." );
        }

        protected final Logger logger = Logger.get( getClass() );
@@ -320,6 +277,70 @@ public interface MPAlgorithm {
                                           final int keyPurpose, @Nullable final String keyContext,
                                           final int resultType, final String resultParam, final int algorithmVersion);

+        @Nullable
+        @Override
+        public MPIdenticon identicon(final String fullName, final char[] masterPassword) {
+
+            // Create a memory-safe NUL-terminated UTF-8 C-string byte array variant of masterPassword.
+            CharsetEncoder encoder             = mpw_charset().newEncoder();
+            byte[]         masterPasswordBytes = new byte[(int) (masterPassword.length * (double) encoder.maxBytesPerChar()) + 1];
+            try {
+                Arrays.fill( masterPasswordBytes, (byte) 0 );
+                ByteBuffer masterPasswordBuffer = ByteBuffer.wrap( masterPasswordBytes );
+
+                CoderResult result = encoder.encode( CharBuffer.wrap( masterPassword ), masterPasswordBuffer, true );
+                if (result.isError())
+                    throw new IllegalStateException( result.toString() );
+                result = encoder.flush( masterPasswordBuffer );
+                if (result.isError())
+                    throw new IllegalStateException( result.toString() );
+
+                return _identicon( fullName, masterPasswordBytes );
+            }
+            finally {
+                Arrays.fill( masterPasswordBytes, (byte) 0 );
+            }
+        }
+
+        @Nullable
+        protected native MPIdenticon _identicon(final String fullName, final byte[] masterPassword);
+
+        @Override
+        public String toID(final String message) {
+            return toID( message.toCharArray() );
+        }
+
+        @Override
+        public String toID(final char[] message) {
+            // Create a memory-safe NUL-terminated UTF-8 C-string byte array variant of masterPassword.
+            CharsetEncoder encoder             = mpw_charset().newEncoder();
+            byte[]         messageBytes = new byte[(int) (message.length * (double) encoder.maxBytesPerChar()) + 1];
+            try {
+                Arrays.fill( messageBytes, (byte) 0 );
+                ByteBuffer messageBuffer = ByteBuffer.wrap( messageBytes );
+
+                CoderResult result = encoder.encode( CharBuffer.wrap( message ), messageBuffer, true );
+                if (result.isError())
+                    throw new IllegalStateException( result.toString() );
+                result = encoder.flush( messageBuffer );
+                if (result.isError())
+                    throw new IllegalStateException( result.toString() );
+
+                return toID( messageBytes );
+            }
+            finally {
+                Arrays.fill( messageBytes, (byte) 0 );
+            }
+        }
+
+        @Override
+        public String toID(final byte[] buffer) {
+            return _toID( buffer );
+        }
+
+        @Nullable
+        protected native String _toID(final byte[] buffer);
+
        // Configuration

        @Nonnull
@@ -357,93 +378,5 @@ public interface MPAlgorithm {
        public Charset mpw_charset() {
            return Charsets.UTF_8;
        }
-
-        @Nonnull
-        @Override
-        public ByteOrder mpw_byteOrder() {
-            return ByteOrder.BIG_ENDIAN;
-        }
-
-        @Nonnull
-        @Override
-        public MessageDigests mpw_hash() {
-            return MessageDigests.SHA256;
-        }
-
-        @Nonnull
-        @Override
-        public MessageAuthenticationDigests mpw_digest() {
-            return MessageAuthenticationDigests.HmacSHA256;
-        }
-
-        @Override
-        @SuppressWarnings("MagicNumber")
-        public int mpw_dkLen() {
-            return 64;
-        }
-
-        @Override
-        @SuppressWarnings("MagicNumber")
-        public int mpw_keySize_min() {
-            return 128;
-        }
-
-        @Override
-        @SuppressWarnings("MagicNumber")
-        public int mpw_keySize_max() {
-            return 512;
-        }
-
-        @Override
-        @SuppressWarnings("MagicNumber")
-        public long mpw_otp_window() {
-            return 5 * 60 /* s */;
-        }
-
-        @Override
-        @SuppressWarnings("MagicNumber")
-        public int scrypt_N() {
-            return 32768;
-        }
-
-        @Override
-        @SuppressWarnings("MagicNumber")
-        public int scrypt_r() {
-            return 8;
-        }
-
-        @Override
-        @SuppressWarnings("MagicNumber")
-        public int scrypt_p() {
-            return 2;
-        }
-
-        // Utilities
-
-        @Nonnull
-        public byte[] toBytes(final int number) {
-            return ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( mpw_byteOrder() ).putInt( number ).array();
-        }
-
-        @Nonnull
-        public byte[] toBytes(final UnsignedInteger number) {
-            return ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( mpw_byteOrder() ).putInt( number.intValue() ).array();
-        }
-
-        @Nonnull
-        public byte[] toBytes(final char[] characters) {
-            ByteBuffer byteBuffer = mpw_charset().encode( CharBuffer.wrap( characters ) );
-
-            byte[] bytes = new byte[byteBuffer.remaining()];
-            byteBuffer.get( bytes );
-
-            Arrays.fill( byteBuffer.array(), (byte) 0 );
-            return bytes;
-        }
-
-        @Nonnull
-        public byte[] toID(final byte[] bytes) {
-            return mpw_hash().of( bytes );
-        }
    }
 }
--- a/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java
+++ b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java
@@ -20,14 +20,8 @@ package com.lyndir.masterpassword;

 import static com.lyndir.lhunath.opal.system.util.StringUtils.*;

-import com.google.common.base.Charsets;
-import com.google.common.primitives.UnsignedBytes;
-import com.lyndir.lhunath.opal.system.MessageAuthenticationDigests;
 import com.lyndir.lhunath.opal.system.logging.Logger;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.nio.*;
-import java.nio.charset.Charset;
-import java.util.Arrays;
 import java.util.Locale;


@@ -39,43 +33,23 @@ public class MPIdenticon {
    @SuppressWarnings("UnusedDeclaration")
    private static final Logger logger = Logger.get( MPIdenticon.class );

-    private static final Charset charset   = Charsets.UTF_8;
-    private static final Color[] colors    = {
-            Color.RED, Color.GREEN, Color.YELLOW, Color.BLUE, Color.MAGENTA, Color.CYAN, Color.MONO };
-    private static final char[]  leftArm   = { '╔', '╚', '╰', '═' };
-    private static final char[]  rightArm  = { '╗', '╝', '╯', '═' };
-    private static final char[]  body      = { '█', '░', '▒', '▓', '☺', '☻' };
-    private static final char[]  accessory = {
-            '◈', '◎', '◐', '◑', '◒', '◓', '☀', '☁', '☂', '☃', '☄', '★', '☆', '☎', '☏', '⎈', '⌂', '☘', '☢', '☣', '☕', '⌚', '⌛', '⏰', '⚡',
-            '⛄', '⛅', '☔', '♔', '♕', '♖', '♗', '♘', '♙', '♚', '♛', '♜', '♝', '♞', '♟', '♨', '♩', '♪', '♫', '⚐', '⚑', '⚔', '⚖', '⚙', '⚠',
-            '⌘', '⏎', '✄', '✆', '✈', '✉', '✌' };
-
    private final String fullName;
+    private final String leftArm;
+    private final String body;
+    private final String rightArm;
+    private final String accessory;
    private final Color  color;
-    private final String text;
-
-    public MPIdenticon(final String fullName, final String masterPassword) {
-        this( fullName, masterPassword.toCharArray() );
-    }

    @SuppressFBWarnings("CLI_CONSTANT_LIST_INDEX")
    @SuppressWarnings("MethodCanBeVariableArityMethod")
-    public MPIdenticon(final String fullName, final char[] masterPassword) {
+    public MPIdenticon(final String fullName, final String leftArm, final String body, final String rightArm, final String accessory,
+                       final Color color) {
        this.fullName = fullName;
-
-        byte[] masterPasswordBytes = charset.encode( CharBuffer.wrap( masterPassword ) ).array();
-        ByteBuffer identiconSeedBytes = ByteBuffer.wrap(
-                MessageAuthenticationDigests.HmacSHA256.of( masterPasswordBytes, fullName.getBytes( charset ) ) );
-        Arrays.fill( masterPasswordBytes, (byte) 0 );
-
-        IntBuffer identiconSeedBuffer = IntBuffer.allocate( identiconSeedBytes.capacity() );
-        while (identiconSeedBytes.hasRemaining())
-            identiconSeedBuffer.put( UnsignedBytes.toInt( identiconSeedBytes.get() ) );
-        int[] identiconSeed = identiconSeedBuffer.array();
-
-        color = colors[identiconSeed[4] % colors.length];
-        text = strf( "%c%c%c%c", leftArm[identiconSeed[0] % leftArm.length], body[identiconSeed[1] % body.length],
-                     rightArm[identiconSeed[2] % rightArm.length], accessory[identiconSeed[3] % accessory.length] );
+        this.leftArm = leftArm;
+        this.body = body;
+        this.rightArm = rightArm;
+        this.accessory = accessory;
+        this.color = color;
    }

    public String getFullName() {
@@ -83,11 +57,11 @@ public class MPIdenticon {
    }

    public String getText() {
-        return text;
+        return strf( "%s%s%s%s", this.leftArm, this.body, this.rightArm, this.accessory );
    }

    public String getHTML() {
-        return strf( "<span style='color: %s'>%s</span>", color.getCSS(), text );
+        return strf( "<span style='color: %s'>%s</span>", color.getCSS(), getText() );
    }

    public Color getColor() {
@@ -95,6 +69,12 @@ public class MPIdenticon {
    }

    public enum Color {
+        UNSET {
+            @Override
+            public String getCSS() {
+                return "inherit";
+            }
+        },
        RED,
        GREEN,
        YELLOW,
--- a/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java
+++ b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java
@@ -55,6 +55,18 @@ public class MPMasterKey {
        Arrays.fill( masterPassword, (char) 0 );
    }

+    @Override
+    protected void finalize()
+            throws Throwable {
+
+        if (isValid()) {
+            logger.wrn( "A master key for %s was abandoned without being invalidated.", getFullName() );
+            invalidate();
+        }
+
+        super.finalize();
+    }
+
    @Nonnull
    public String getFullName() {

@@ -67,7 +79,7 @@ public class MPMasterKey {
     * @throws MPKeyUnavailableException {@link #invalidate()} has been called on this object.
     */
    @Nonnull
-    public byte[] getKeyID(final MPAlgorithm algorithm)
+    public String getKeyID(final MPAlgorithm algorithm)
            throws MPKeyUnavailableException, MPAlgorithmException {

        return algorithm.toID( masterKey( algorithm ) );
@@ -98,11 +110,6 @@ public class MPMasterKey {

        byte[] masterKey = keyByVersion.get( algorithm.version() );
        if (masterKey == null) {
-            logger.trc( "-- mpw_masterKey (algorithm: %s)", algorithm );
-            logger.trc( "fullName: %s", fullName );
-            logger.trc( "masterPassword.id: %s", CodeUtils.encodeHex(
-                    algorithm.toID( algorithm.toBytes( masterPassword ) ) ) );
-
            keyByVersion.put( algorithm.version(), masterKey = algorithm.masterKey( fullName, masterPassword ) );
        }
        if (masterKey == null)
@@ -118,13 +125,6 @@ public class MPMasterKey {
        Preconditions.checkArgument( !siteName.isEmpty() );

        byte[] masterKey = masterKey( algorithm );
-
-        logger.trc( "-- mpw_siteKey (algorithm: %s)", algorithm );
-        logger.trc( "siteName: %s", siteName );
-        logger.trc( "siteCounter: %s", siteCounter );
-        logger.trc( "keyPurpose: %d (%s)", keyPurpose.toInt(), keyPurpose.getShortName() );
-        logger.trc( "keyContext: %s", keyContext );
-
        byte[] siteKey = algorithm.siteKey( masterKey, siteName, siteCounter, keyPurpose, keyContext );
        if (siteKey == null)
            throw new MPAlgorithmException( "Could not derive site key." );
@@ -161,10 +161,6 @@ public class MPMasterKey {
        byte[] masterKey = masterKey( algorithm );
        byte[] siteKey   = siteKey( siteName, algorithm, siteCounter, keyPurpose, keyContext );

-        logger.trc( "-- mpw_siteResult (algorithm: %s)", algorithm );
-        logger.trc( "resultType: %d (%s)", resultType.getType(), resultType.getShortName() );
-        logger.trc( "resultParam: %s", resultParam );
-
        String siteResult = algorithm.siteResult(
                masterKey, siteKey, siteName, siteCounter, keyPurpose, keyContext, resultType, resultParam );
        if (siteResult == null)
@@ -199,10 +195,6 @@ public class MPMasterKey {
        byte[] masterKey = masterKey( algorithm );
        byte[] siteKey   = siteKey( siteName, algorithm, siteCounter, keyPurpose, keyContext );

-        logger.trc( "-- mpw_siteState (algorithm: %s)", algorithm );
-        logger.trc( "resultType: %d (%s)", resultType.getType(), resultType.getShortName() );
-        logger.trc( "resultParam: %d bytes = %s", resultParam.getBytes( algorithm.mpw_charset() ).length, resultParam );
-
        String siteState = algorithm.siteState(
                masterKey, siteKey, siteName, siteCounter, keyPurpose, keyContext, resultType, resultParam );
        if (siteState == null)
--- a/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java
+++ b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java
@@ -74,9 +74,9 @@ public final class Native {

                // Write the library resource to a temporary file.
                libraryFile = File.createTempFile( libraryName, libraryExtension );
+                libraryFile.deleteOnExit();
                FileOutputStream libraryFileStream = new FileOutputStream( libraryFile );
                try {
-                    libraryFile.deleteOnExit();
                    ByteStreams.copy( libraryStream, libraryFileStream );
                }
                finally {
@@ -91,9 +91,8 @@ public final class Native {
            catch (@SuppressWarnings("ErrorNotRethrown") final IOException | UnsatisfiedLinkError e) {
                logger.wrn( e, "Couldn't load library: %s", libraryResource );

-                if (libraryFile != null)
-                    if (libraryFile.exists() && !libraryFile.delete())
-                        logger.wrn( "Couldn't clean up library file: %s", libraryFile );
+                if (libraryFile != null && libraryFile.exists() && !libraryFile.delete())
+                    logger.wrn( "Couldn't clean up library file: %s", libraryFile );
                libraryFile = null;
            }
        }
--- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoUser.java
+++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoUser.java
@@ -35,7 +35,7 @@ public class MPIncognitoUser extends MPBasicUser<MPIncognitoSite> {

    @Nullable
    @Override
-    public byte[] getKeyID() {
+    public String getKeyID() {
        return null;
    }

--- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Components.java
+++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Components.java
@@ -35,6 +35,7 @@ import javax.swing.border.Border;
 import javax.swing.border.CompoundBorder;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.text.*;
+import javax.swing.undo.UndoableEdit;
 import org.jetbrains.annotations.NonNls;


@@ -207,7 +208,13 @@ public abstract class Components {
    }

    public static JPasswordField passwordField() {
-        return new JPasswordField() {
+        return new JPasswordField( new PlainDocument( new GapContent() {
+            @Override
+            public String getString(final int where, final int len)
+                    throws BadLocationException {
+                return "";
+            }
+        } ), null, 0 ) {
            {
                setBorder( BorderFactory.createCompoundBorder( BorderFactory.createLineBorder( Res.colors().controlBorder(), 1, true ),
                                                               BorderFactory.createEmptyBorder( 4, 4, 4, 4 ) ) );
--- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Res.java
+++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Res.java
@@ -182,7 +182,7 @@ public abstract class Res {

    public static final class Fonts {

-        public Font emoticonsFont(final int size) {
+        public Font identiconFont(final int size) {
            return MPFont.emoticonsRegular.get( size );
        }

--- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java
+++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java
@@ -317,7 +317,7 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L
            add( Components.strut() );

            add( identiconLabel = Components.label( SwingConstants.CENTER ) );
-            identiconLabel.setFont( Res.fonts().emoticonsFont( Components.TEXT_SIZE_CONTROL ) );
+            identiconLabel.setFont( Res.fonts().identiconFont( Components.TEXT_SIZE_CONTROL ) );
            add( Box.createGlue() );

            add( Components.label( "Master Password:" ) );
@@ -330,6 +330,15 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L
            add( Box.createGlue() );
        }

+        @Override
+        public void removeNotify() {
+            char[] password = masterPasswordField.getPassword();
+            Arrays.fill( password, (char) 0 );
+            masterPasswordField.setText( new String( password ) );
+
+            super.removeNotify();
+        }
+
        private void exportUser() {
            MPFileUser fileUser = (user instanceof MPFileUser)? (MPFileUser) user: null;
            if (fileUser == null)
@@ -449,7 +458,8 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L
        private void updateIdenticon() {
            char[] masterPassword = masterPasswordField.getPassword();
            MPIdenticon identicon = ((masterPassword != null) && (masterPassword.length > 0))?
-                    new MPIdenticon( user.getFullName(), masterPassword ): null;
+                    user.getAlgorithm().identicon( user.getFullName(), masterPassword ): null;
+            Arrays.fill( masterPassword, (char) 0 );

            Res.ui( () -> {
                if (identicon != null) {
@@ -779,7 +789,7 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L
            typeModel.selection( MPResultType.DeriveKey, t -> {
                switch (t) {
                    case DeriveKey:
-                        stateModel.setText( Integer.toString( site.getAlgorithm().mpw_keySize_min() ) );
+                        stateModel.setText( "128" );
                        break;

                    default:
--- a/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java
+++ b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java
@@ -49,10 +49,7 @@ public interface MPUser<S extends MPSite<?>> extends Comparable<MPUser<?>> {
    void setAlgorithm(MPAlgorithm algorithm);

    @Nullable
-    byte[] getKeyID();
-
-    @Nullable
-    String exportKeyID();
+    String getKeyID();

    /**
     * Performs an authentication attempt against the keyID for this user.
--- a/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java
+++ b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java
@@ -100,7 +100,7 @@ public abstract class MPBasicUser<S extends MPBasicSite<?, ?>> extends Changeabl

    @Nullable
    @Override
-    public byte[] getKeyID() {
+    public String getKeyID() {
        try {
            if (isMasterKeyAvailable())
                return getMasterKey().getKeyID( getAlgorithm() );
@@ -112,12 +112,6 @@ public abstract class MPBasicUser<S extends MPBasicSite<?, ?>> extends Changeabl
        return null;
    }

-    @Nullable
-    @Override
-    public String exportKeyID() {
-        return CodeUtils.encodeHex( getKeyID() );
-    }
-
    @Override
    public void authenticate(final char[] masterPassword)
            throws MPIncorrectMasterPasswordException, MPAlgorithmException {
@@ -136,8 +130,8 @@ public abstract class MPBasicUser<S extends MPBasicSite<?, ?>> extends Changeabl
            throw new IllegalArgumentException(
                    "Master key (for " + masterKey.getFullName() + ") is not for this user (" + getFullName() + ")." );

-        byte[] keyID = getKeyID();
-        if ((keyID != null) && !Arrays.equals( masterKey.getKeyID( getAlgorithm() ), keyID ))
+        String keyID = getKeyID();
+        if (keyID != null && !keyID.equalsIgnoreCase( masterKey.getKeyID( getAlgorithm() ) ))
            throw new MPIncorrectMasterPasswordException( this );

        this.masterKey = masterKey;
--- a/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java
+++ b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java
@@ -39,7 +39,7 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {
    private static final Logger logger = Logger.get( MPFileUser.class );

    @Nullable
-    private byte[]                   keyID;
+    private String                   keyID;
    private File                     file;
    private MPMarshalFormat          format;
    private MPMarshaller.ContentMode contentMode;
@@ -62,18 +62,18 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {
        this( fullName, null, MPAlgorithm.Version.CURRENT, location );
    }

-    public MPFileUser(final String fullName, @Nullable final byte[] keyID, final MPAlgorithm algorithm, final File location) {
+    public MPFileUser(final String fullName, @Nullable final String keyID, final MPAlgorithm algorithm, final File location) {
        this( fullName, keyID, algorithm, 0, null, new Instant(), false,
              MPMarshaller.ContentMode.PROTECTED, MPMarshalFormat.DEFAULT, location );
    }

    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
-    public MPFileUser(final String fullName, @Nullable final byte[] keyID, final MPAlgorithm algorithm, final int avatar,
+    public MPFileUser(final String fullName, @Nullable final String keyID, final MPAlgorithm algorithm, final int avatar,
                      @Nullable final MPResultType defaultType, final ReadableInstant lastUsed, final boolean hidePasswords,
                      final MPMarshaller.ContentMode contentMode, final MPMarshalFormat format, final File location) {
        super( avatar, fullName, algorithm );

-        this.keyID = (keyID != null)? keyID.clone(): null;
+        this.keyID = keyID;
        this.lastUsed = lastUsed;
        this.preferences = new MPFileUserPreferences( this, defaultType, hidePasswords );
        this.format = format;
@@ -87,8 +87,8 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {

    @Nullable
    @Override
-    public byte[] getKeyID() {
-        return (keyID == null)? null: keyID.clone();
+    public String getKeyID() {
+        return keyID;
    }

    @Nonnull
--- a/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java
+++ b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java
@@ -54,7 +54,7 @@ public class MPFlatMarshaller implements MPMarshaller {
        content.append( "# User Name: " ).append( user.getFullName() ).append( '\n' );
        content.append( "# Full Name: " ).append( user.getFullName() ).append( '\n' );
        content.append( "# Avatar: " ).append( user.getAvatar() ).append( '\n' );
-        content.append( "# Key ID: " ).append( user.exportKeyID() ).append( '\n' );
+        content.append( "# Key ID: " ).append( user.getKeyID() ).append( '\n' );
        content.append( "# Algorithm: " ).append( user.getAlgorithm().version().toInt() ).append( '\n' );
        content.append( "# Default Type: " ).append( user.getPreferences().getDefaultType().getType() ).append( '\n' );
        content.append( "# Passwords: " ).append( user.getContentMode().name() ).append( '\n' );
--- a/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java
+++ b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java
@@ -51,7 +51,7 @@ public class MPFlatUnmarshaller implements MPUnmarshaller {
    public MPFileUser readUser(@Nonnull final File file)
            throws IOException, MPMarshalException {
        try (Reader reader = new InputStreamReader( new FileInputStream( file ), Charsets.UTF_8 )) {
-            byte[]       keyID        = null;
+            String       keyID        = null;
            String       fullName     = null;
            int          mpVersion    = 0, avatar = 0;
            boolean      clearContent = false, headerStarted = false;
@@ -84,7 +84,7 @@ public class MPFlatUnmarshaller implements MPUnmarshaller {
                            if ("Full Name".equalsIgnoreCase( name ) || "User Name".equalsIgnoreCase( name ))
                                fullName = value;
                            else if ("Key ID".equalsIgnoreCase( name ))
-                                keyID = CodeUtils.decodeHex( value );
+                                keyID = value;
                            else if ("Algorithm".equalsIgnoreCase( name ))
                                mpVersion = ConversionUtils.toIntegerNN( value );
                            else if ("Avatar".equalsIgnoreCase( name ))
--- a/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java
+++ b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java
@@ -61,7 +61,7 @@ public class MPJSONFile extends MPJSONAnyObject {
        user.avatar = modelUser.getAvatar();
        user.full_name = modelUser.getFullName();
        user.last_used = MPModelConstants.dateTimeFormatter.print( modelUser.getLastUsed() );
-        user.key_id = modelUser.exportKeyID();
+        user.key_id = modelUser.getKeyID();
        user.algorithm = modelUser.getAlgorithm().version();
        user._ext_mpw = new User.Ext() {
            {
@@ -131,7 +131,7 @@ public class MPJSONFile extends MPJSONAnyObject {
        MPAlgorithm algorithm = ifNotNullElse( user.algorithm, MPAlgorithm.Version.CURRENT );

        return new MPFileUser(
-                user.full_name, CodeUtils.decodeHex( user.key_id ), algorithm, user.avatar,
+                user.full_name, user.key_id, algorithm, user.avatar,
                (user._ext_mpw != null)? user._ext_mpw.default_type: null,
                (user.last_used != null)? MPModelConstants.dateTimeFormatter.parseDateTime( user.last_used ): new Instant(),
                (user._ext_mpw != null) && user._ext_mpw.hide_passwords,
--- a/platform-independent/java/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java
+++ b/platform-independent/java/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java
@@ -53,9 +53,8 @@ public class MPMasterKeyTest {
            MPMasterKey masterKey      = new MPMasterKey( testCase.getFullName(), masterPassword );

            // Test key
-            assertEquals(
-                    CodeUtils.encodeHex( masterKey.getKeyID( testCase.getAlgorithm() ) ),
-                    testCase.getKeyID(),
+            assertTrue(
+                    testCase.getKeyID().equalsIgnoreCase( masterKey.getKeyID( testCase.getAlgorithm() ) ),
                    "[testMasterKey] keyID mismatch for test case: " + testCase );

            // Test invalidation
Author	SHA1	Message	Date
Maarten Billemont	c3568e4744	Enable minor & build numbers > 9.	2020-04-18 22:13:36 -04:00
Maarten Billemont	0c921d4318	Update fonts to stay consistent with system UIs.	2020-04-18 21:50:06 -04:00
Maarten Billemont	0178efaaf7	Ask for consent to sendInfo.	2020-04-18 21:48:55 -04:00
Maarten Billemont	14f919584b	Project update.	2020-04-16 17:46:39 -04:00
Maarten Billemont	16f6c3c593	Update preference menu item state.	2020-04-16 17:13:23 -04:00
Maarten Billemont	63ca2ae83e	Can lower deployment target to 10.10	2020-04-16 17:13:08 -04:00
Maarten Billemont	1c3ea3826f	Move identicon and toID to mpw native. Clean out all unused Java MPAlgorithm stuff. Fix master password entries stuck in memory.	2020-04-15 19:09:02 -04:00
Maarten Billemont	ff9596aef0	Update log sink API.	2020-04-15 19:08:11 -04:00
Maarten Billemont	b79ed1ca0b	Fix JNI native symbol names after refactor.	2020-04-14 20:07:21 -04:00
Maarten Billemont	9a362f13a3	Use new mpw log sink logging mechanism for JNI logging.	2020-04-14 19:13:49 -04:00
Maarten Billemont	11d6660e5a	Sinks report success now & fallback sink triggers on failure. We now trigger the fallback sink (currently, mpw_log_sink_file) if no sinks successfully handled the log message.	2020-04-14 19:12:28 -04:00
Maarten Billemont	62e1563fa6	Ensure b64Cursor chars are unsigned when used as index.	2020-04-14 19:11:08 -04:00
Maarten Billemont	9b8ff7ad0c	Kill debug code.	2020-04-13 21:33:28 -04:00
Maarten Billemont	f1fc07cf9e	FaceID privacy message.	2020-04-13 18:56:57 -04:00
Maarten Billemont	00ac788f4f	Consistent flow for enabling notifications.	2020-04-13 18:12:41 -04:00
Maarten Billemont	514c383310	Obsolete sources.	2020-04-12 22:38:40 -04:00
Maarten Billemont	9a3bcd1c6f	Fix bad override of forKeyedSubscript:	2020-04-12 21:39:13 -04:00
Maarten Billemont	d30d469663	Sites list scroll & keyboard fixes.	2020-04-12 19:16:13 -04:00
Maarten Billemont	b428ee0003	Honour animated property better. Also: don't need to force a layout if not in an animation block.	2020-04-12 19:14:25 -04:00
Maarten Billemont	f80ffd078b	Move dependencies to Podfile.	2020-04-12 19:12:45 -04:00
Maarten Billemont	7f1a28ffa7	Fixes and updates to iOS. Move dependencies into Podfile where possible. IASK doesn't wrap properly; just removed it. Fixes to safe area and content insets.	2020-04-11 12:13:48 -04:00
Maarten Billemont	8eeba2e005	Don't crash if decrypt fails.	2020-04-09 21:46:09 -04:00
Maarten Billemont	fd6cbaa9a5	Ignore backup files.	2020-04-09 21:33:05 -04:00