Merge remote-tracking branch 'remotes/michelverhagen/windows' into windows

Fixed resizing issue
Now using MasterPassword icon in "Add Remove Programs"
Increased version number to 1.4

.gitmodules

@@ -4,12 +4,9 @@
 [submodule "External/InAppSettingsKit"]
 	path = External/InAppSettingsKit
 	url = git://github.com/lhunath/InAppSettingsKit.git
-[submodule "External/RHStatusItemView"]
-	path = External/RHStatusItemView
-	url = git://github.com/lhunath/RHStatusItemView.git
 [submodule "External/KCOrderedAccessorFix"]
 	path = External/KCOrderedAccessorFix
-	url = https://github.com/CFKevinRef/KCOrderedAccessorFix.git
+	url = https://github.com/lhunath/KCOrderedAccessorFix.git
 [submodule "External/AttributedMarkdown"]
 	path = External/AttributedMarkdown
 	url = https://github.com/dreamwieber/AttributedMarkdown.git
@@ -19,3 +16,6 @@
 [submodule "External/jrswizzle"]
 	path = External/jrswizzle
 	url = git://github.com/jonmarimba/jrswizzle.git
+[submodule "Site/mpw-js/js/mpw-js"]
+	path = Site/mpw-js/js/mpw-js
+	url = https://github.com/Lyndir/mpw-js.git

.travis.yml

@@ -1,7 +1,7 @@
 language: objective-c
-xcode_workspace: MasterPassword.xcworkspace
+xcode_project: MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj
 xcode_scheme: MasterPassword iOS (Development)
 xcode_sdk: iphonesimulator
+env: TERM=dumb
 git:
-  submodules: false
-before_install: ./Scripts/updateDependencies
+  submodules: true

External/Mac/Crashlytics.framework/Modules

@@ -0,0 +1 @@
+Versions/Current/Modules

External/Mac/Crashlytics.framework/Versions/A/Headers/Crashlytics.h

@@ -38,6 +38,7 @@
  *
  **/
 OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
+OBJC_EXTERN void CLSLogv(NSString *format, va_list args) NS_FORMAT_FUNCTION(1,0);
 
 /**
  *
@@ -46,6 +47,8 @@ OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
  *
  **/
 OBJC_EXTERN void CLSNSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
+OBJC_EXTERN void CLSNSLogv(NSString *format, va_list args) NS_FORMAT_FUNCTION(1,0);
+
 
 @protocol CrashlyticsDelegate;
 

External/Mac/Crashlytics.framework/Versions/A/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module Crashlytics {
+  umbrella header "Crashlytics.h"
+
+  export *
+  module * { export * }
+}

External/Mac/Crashlytics.framework/Versions/A/Resources/Info.plist

@@ -15,13 +15,13 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.2</string>
+	<string>2.2.5</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>macosx</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>39</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>MinimumOSVersion</key>

External/iOS/Crashlytics.framework/Versions/A/Headers/Crashlytics.h

@@ -38,6 +38,7 @@
  *
  **/
 OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
+OBJC_EXTERN void CLSLogv(NSString *format, va_list args) NS_FORMAT_FUNCTION(1,0);
 
 /**
  *
@@ -46,6 +47,8 @@ OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
  *
  **/
 OBJC_EXTERN void CLSNSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
+OBJC_EXTERN void CLSNSLogv(NSString *format, va_list args) NS_FORMAT_FUNCTION(1,0);
+
 
 @protocol CrashlyticsDelegate;
 

External/iOS/Crashlytics.framework/Versions/A/Resources/Info.plist

@@ -15,13 +15,13 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.4</string>
+	<string>2.2.5</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>38</string>
+	<string>40</string>
 	<key>DTPlatformName</key>
 	<string>iphoneos</string>
 	<key>MinimumOSVersion</key>

MasterPassword/C/build

@@ -2,7 +2,13 @@
 #
 # TROUBLESHOOTING
 #   - To enable verbose algorithm/implementation debugging, use ./build -DDEBUG
-#   - If you see 'undefined reference to `clock_gettime'', try ./build -lrt instead
+#   - If you see 'undefined reference to `AES_encrypt'',
+#       make sure you have openssl installed.
+#       If libcrypto.a is in a non-standard directory, try ./build -L[your-lib-dir]
+#   - If you see 'undefined reference to `clock_gettime'',
+#       try ./build -lrt instead.
+#   - If you see 'x86.S:202: Error: junk at end of line, first unrecognized character is `,'',
+#       try commenting the line in lib/bcrypt/x86.S.
 #
 # BUGS
 #   masterpassword@lyndir.com
@@ -32,6 +38,9 @@ fi
 
 ### DEPENDENCIES
 
+digest() {
+    openssl sha -sha256 -binary < "$1" | od -t x1 -An -v | tr -d '[:space:]'
+}
 fetch() {
     if hash wget 2>/dev/null; then
         wget -O "${1##*/}" "$1"
@@ -54,7 +63,7 @@ unpack() {
     fi
 
     printf 'Verifying package: %s, against digest: %s...' "$1" "$2"
-    [[ $(openssl sha < "$1") = $2 ]] || {
+    [[ $(digest "$1") = $2 ]] || {
         printf ' mismatch!\n'
         echo 2>&1 "Downloaded package doesn't match digest."
         exit 1
@@ -75,7 +84,7 @@ fetchSource() (
         [[ -e $files ]] || {
             echo
             echo "Unpacking: ${PWD##*/}, using package..."
-            unpack "${pkg##*/}" "$pkg_sha"
+            unpack "${pkg##*/}" "$pkg_sha256"
         }
 
     elif [[ $git ]] && hash git 2>/dev/null; then
@@ -108,7 +117,7 @@ fetchSource() (
             echo
             echo "Fetching: ${PWD##*/}, using package..."
             fetch "$pkg"
-            unpack "${pkg##*/}" "$pkg_sha"
+            unpack "${pkg##*/}" "$pkg_sha256"
         }
 
     else
@@ -183,7 +192,7 @@ mpw() {
         # library paths
         -L"." -L"lib/scrypt"
         # link libraries
-        -l"crypto"
+        -l"crypto" -l"curses"
         # scrypt
         "lib/scrypt/scrypt-crypto_aesctr.o"
         "lib/scrypt/scrypt-sha256.o"
@@ -239,6 +248,9 @@ mpw-bench() {
 
 ### TARGETS
 
+haslib() {
+    ! LC_ALL=C cc -l"$1" 2>&1 | grep -q 'library not found'
+}
 cc() {
     if hash llvm-gcc 2>/dev/null; then
         llvm-gcc "$@"

MasterPassword/C/lib/bcrypt/.source

@@ -1,3 +1,3 @@
 home=http://www.openwall.com/crypt/
 pkg=http://www.openwall.com/crypt/crypt_blowfish-1.3.tar.gz
-pkg_sha=7253c86c8fe890e67ec782749f95ce3f1517b065
+pkg_sha256=83fa01fca6996fe8d882b7f8e9ba0305a5664936100b01481ea3c6a8ce8d72fd

MasterPassword/C/lib/scrypt/.source

@@ -1,4 +1,4 @@
 home=https://code.google.com/p/scrypt/
 svn=http://scrypt.googlecode.com/svn
 pkg=http://masterpasswordapp.com/libscrypt-b12b554.tar.gz
-pkg_sha=a86445c3e031392d20652f4163adfd3fb0b1994e
+pkg_sha256=c726daec68a345e420896f005394a948dc5a6924713ed94b684c856d4c247f0b

MasterPassword/C/mpw.c

@@ -95,13 +95,24 @@ char *homedir(const char *filename) {
     return homefile;
 }
 
+char *getlinep(const char *prompt) {
+    char *buf = NULL;
+    size_t bufSize = 0;
+    ssize_t lineSize;
+    fprintf(stderr, "%s", prompt);
+    fprintf(stderr, " ");
+    if ((lineSize = getline(&buf, &bufSize, stdin)) < 0) {
+        free(buf);
+        return NULL;
+    }
+    buf[lineSize - 1]=0;
+    return buf;
+}
+
 int main(int argc, char *const argv[]) {
 
-    if (argc < 2)
-        usage();
-
     // Read the environment.
-    const char *userName = getenv( MP_env_username );
+    char *userName = getenv( MP_env_username );
     const char *masterPassword = NULL;
     const char *siteName = NULL;
     MPElementType siteType = MPElementTypeGeneratedLong;
@@ -156,13 +167,17 @@ int main(int argc, char *const argv[]) {
 
     // Convert and validate input.
     if (!userName) {
-        fprintf(stderr, "Missing user name.\n");
-        return 1;
+        if (!(userName = getlinep("Your user name:"))) {
+            fprintf(stderr, "Missing user name.\n");
+            return 1;
+        }
     }
     trc("userName: %s\n", userName);
     if (!siteName) {
-        fprintf(stderr, "Missing site name.\n");
-        return 1;
+        if (!(siteName = getlinep("Site name:"))) {
+            fprintf(stderr, "Missing site name.\n");
+            return 1;
+        }
     }
     trc("siteName: %s\n", siteName);
     if (siteCounterString)
@@ -206,6 +221,9 @@ int main(int argc, char *const argv[]) {
         masterPassword = getpass( "Your master password: " );
     trc("masterPassword: %s\n", masterPassword);
 
+    // Summarize operation.
+    fprintf(stderr, "%s's password for %s:\n[ %s ]: ", userName, siteName, Identicon( userName, masterPassword ));
+
     // Calculate the master key salt.
     const char *mpKeyScope = ScopeForVariant(MPElementVariantPassword);
     trc("key scope: %s\n", mpKeyScope);

MasterPassword/C/types.c

@@ -10,9 +10,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include <alg/sha256.h>
 
+#include <curses.h>
+#include <term.h>
+
 #include "types.h"
 
 const MPElementType TypeWithName(const char *typeName) {
@@ -171,6 +175,7 @@ const char CharacterFromClass(char characterClass, uint8_t seedByte) {
 
     return classCharacters[seedByte % strlen(classCharacters)];
 }
+
 const char *IDForBuf(const void *buf, size_t length) {
     uint8_t hash[32];
     SHA256_Buf(buf, length, hash);
@@ -186,5 +191,48 @@ const char *Hex(const void *buf, size_t length) {
     char *id = (char *)calloc(length*2+1, sizeof(char));
     for (int kH = 0; kH < length; kH++)
         sprintf(&(id[kH * 2]), "%02X", ((const uint8_t*)buf)[kH]);
+
     return id;
 }
+
+int putvari;
+char *putvarc = NULL;
+static void initputvar() {
+    if (putvarc)
+        free(putvarc);
+    putvari=0;
+    putvarc=(char *)calloc(256, sizeof(char));
+}
+static int putvar(int c) {
+    putvarc[putvari++]=c;
+    return 0;
+}
+
+const char *Identicon(const char *userName, const char *masterPassword) {
+    const char *left[]      = { "╔", "╚", "╰", "═" };
+    const char *right[]     = { "╗", "╝", "╯", "═" };
+    const char *body[]      = { "█", "░", "▒", "▓", "☺", "☻" };
+    const char *accessory[] = { "◈", "◎", "◐", "◑", "◒", "◓", "☀", "☁", "☂", "☃", "☄", "★", "☆", "☎", "☏", "⎈", "⌂", "☘", "☢", "☣", "☕", "⌚", "⌛", "⏰", "⚡", "⛄", "⛅", "☔", "♔", "♕", "♖", "♗", "♘", "♙", "♚", "♛", "♜", "♝", "♞", "♟", "♨", "♩", "♪", "♫", "⚐", "⚑", "⚔", "⚖", "⚙", "⚠", "⌘", "⏎", "✄", "✆", "✈", "✉", "✌" };
+
+    uint8_t identiconSeed[32];
+    HMAC_SHA256_Buf(masterPassword, strlen(masterPassword), userName, strlen(userName), identiconSeed);
+
+    char *identicon = (char *)calloc(20, sizeof(char));
+    setupterm(NULL, 2, NULL);
+    initputvar();
+    tputs(tparm(tgetstr("AF", NULL), identiconSeed[4] % 7 + 1), 1, putvar);
+    char red[strlen(putvarc)];
+    strcpy(red, putvarc);
+    tputs(tgetstr("me", NULL), 1, putvar);
+    char reset[strlen(putvarc)];
+    strcpy(reset, putvarc);
+    sprintf(identicon, "%s%s%s%s%s%s",
+            red,
+            left[identiconSeed[0] % (sizeof(left) / sizeof(left[0]))],
+            body[identiconSeed[1] % (sizeof(body) / sizeof(body[0]))],
+            right[identiconSeed[2] % (sizeof(right) / sizeof(right[0]))],
+            accessory[identiconSeed[3] % (sizeof(accessory) / sizeof(accessory[0]))],
+            reset);
+
+    return identicon;
+}

MasterPassword/C/types.h

@@ -56,4 +56,5 @@ const char *CipherForType(MPElementType type, uint8_t seedByte);
 const char CharacterFromClass(char characterClass, uint8_t seedByte);
 const char *IDForBuf(const void *buf, size_t length);
 const char *Hex(const void *buf, size_t length);
+const char *Identicon(const char *userName, const char *masterPassword);
 

MasterPassword/CSharp/MPSetup/License agreement.rtf

@@ -0,0 +1,327 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff39\deff0\stshfdbch0\stshfloch40\stshfhich40\stshfbi40\deflang5129\deflangfe5129\themelang5129\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}
+{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f4\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Helvetica;}{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
+{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}
+{\f40\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times;}{\f41\fbidi \fmodern\fcharset0\fprq1{\*\panose 00000000000000000000}Nimbus Mono L{\*\falt MS Gothic};}
+{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f384\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\f385\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f387\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f388\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f389\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f390\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f391\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f392\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f404\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}
+{\f405\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f407\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f408\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f409\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}
+{\f410\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f411\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f412\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f424\fbidi \fswiss\fcharset238\fprq2 Helvetica CE;}
+{\f425\fbidi \fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f427\fbidi \fswiss\fcharset161\fprq2 Helvetica Greek;}{\f428\fbidi \fswiss\fcharset162\fprq2 Helvetica Tur;}{\f429\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);}
+{\f430\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f431\fbidi \fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f432\fbidi \fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\f754\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
+{\f755\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f757\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f758\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f761\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
+{\f762\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f774\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f775\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f777\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek;}
+{\f778\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}{\f779\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f780\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f781\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic;}
+{\f782\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f783\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f784\fbidi \froman\fcharset238\fprq2 Times CE;}{\f785\fbidi \froman\fcharset204\fprq2 Times Cyr;}
+{\f787\fbidi \froman\fcharset161\fprq2 Times Greek;}{\f788\fbidi \froman\fcharset162\fprq2 Times Tur;}{\f789\fbidi \froman\fcharset177\fprq2 Times (Hebrew);}{\f790\fbidi \froman\fcharset178\fprq2 Times (Arabic);}
+{\f791\fbidi \froman\fcharset186\fprq2 Times Baltic;}{\f792\fbidi \froman\fcharset163\fprq2 Times (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}
+{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}
+{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
+{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;
+\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp 
+\f40\fs24\lang9226\langfe5129\kerning3\langnp9226 }{\*\defpap \ql \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\aspnum\faroman\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{
+\ql \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs24\alang1025 \ltrch\fcs0 \f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 
+\additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\aspnum\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af40\afs24\alang1025 \ltrch\fcs0 \f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 \snext11 \ssemihidden \sunhideused 
+Normal Table;}{\s15\ql \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs24\alang1025 \ltrch\fcs0 \f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 \snext15 \spriority0 
+Standard;}{\s16\ql \li0\ri0\sb240\sa120\keepn\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs28\alang1025 \ltrch\fcs0 \f4\fs28\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 
+\sbasedon15 \snext17 \spriority0 Heading;}{\s17\ql \li0\ri0\sa120\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs24\alang1025 \ltrch\fcs0 
+\f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 \sbasedon15 \snext17 \spriority0 Text body;}{\s18\ql \li0\ri0\sa120\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs24\alang1025 
+\ltrch\fcs0 \f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 \sbasedon17 \snext18 List;}{\s19\ql \li0\ri0\sb120\sa120\nowidctlpar\noline\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 
+\ai\af39\afs24\alang1025 \ltrch\fcs0 \i\f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 \sbasedon15 \snext19 \spriority35 caption;}{\s20\ql \li0\ri0\nowidctlpar\noline\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 
+\rtlch\fcs1 \af39\afs24\alang1025 \ltrch\fcs0 \f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 \sbasedon15 \snext20 \spriority0 Index;}{\s21\ql \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 
+\rtlch\fcs1 \af41\afs20\alang1025 \ltrch\fcs0 \f41\fs20\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 \sbasedon15 \snext21 \spriority0 Preformatted Text;}{\s22\ql \li0\ri0\widctlpar
+\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af2\afs20\alang1025 \ltrch\fcs0 
+\f2\fs20\lang5129\langfe5129\cgrid\langnp5129\langfenp5129 \sbasedon0 \snext22 \slink23 \ssemihidden \sunhideused \styrsid8540216 HTML Preformatted;}{\*\cs23 \additive \rtlch\fcs1 \af2\afs20 \ltrch\fcs0 
+\f2\fs20\lang5129\langfe0\kerning0\langnp5129\langfenp0 \sbasedon10 \slink22 \slocked \ssemihidden \styrsid8540216 HTML Preformatted Char;}}{\*\listtable{\list\listtemplateid319469612\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid336134145\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid336134147\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134149\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134145
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134147\'01o;}{\levelnumbers;}
+\f2\fbias0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134149\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 
+\fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134145\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li5040\lin5040 }
+{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134147\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23
+\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134149\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\lin6480 }{\listname ;}\listid2168516}{\list\listtemplateid-2025932976
+\listhybrid{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid336134167\'02\'00);}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li720\lin720 }{\listlevel\levelnfc4
+\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134169\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2
+\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134171\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134159\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134169\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0
+\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134171\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134159\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid336134169\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360
+\levelindent0{\leveltext\leveltemplateid336134171\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li6480\lin6480 }{\listname ;}\listid1148745780}{\list\listtemplateid1718929376\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid336134159\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134169\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1
+\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid336134171\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid336134159\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360
+\levelindent0{\leveltext\leveltemplateid336134169\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid336134171\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134159\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134169\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134171\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li6480\lin6480 }{\listname ;}\listid1243491588}{\list\listtemplateid14058324\listhybrid{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid336134167\'02\'00);}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid336134169\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360
+\levelindent0{\leveltext\leveltemplateid336134171\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid336134159\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134169\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134171\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134159\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134169\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134171\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li6480\lin6480 }{\listname ;}\listid1353334123}{\list\listtemplateid-2129903306\listhybrid{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid336134167\'02\'00);}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid336134169\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360
+\levelindent0{\leveltext\leveltemplateid336134171\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid336134159\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134169\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134171\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134159\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134169\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid336134171\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fi-180\li6480\lin6480 }{\listname ;}\listid2001083591}}{\*\listoverridetable{\listoverride\listid2168516\listoverridecount0\ls1}{\listoverride\listid1243491588
+\listoverridecount0\ls2}{\listoverride\listid1353334123\listoverridecount0\ls3}{\listoverride\listid1148745780\listoverridecount0\ls4}{\listoverride\listid2001083591\listoverridecount0\ls5}}{\*\pgptbl {\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0
+\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0
+\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}
+{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp
+\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43
+\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0
+\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0
+\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp43\itap0\li0\ri0\sb0\sa0}{\pgp
+\ipgp43\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid2903393\rsid5508620\rsid8540216\rsid8942186\rsid10953693\rsid12090885\rsid13708602\rsid14233442\rsid16134980}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1
+\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Michel}{\operator Michel Verhagen}{\creatim\yr2014\mo6\dy17\hr15\min55}{\revtim\yr2014\mo6\dy17\hr16\min37}{\version6}{\edmins8}{\nofpages2}{\nofwords474}{\nofchars2706}{\*\company GuruCE}
+{\nofcharsws3174}{\vern57433}}{\*\userprops {\propname Info 1}\proptype30{\staticval }{\propname Info 2}\proptype30{\staticval }{\propname Info 3}\proptype30{\staticval }{\propname Info 4}\proptype30{\staticval }}{\*\xmlnstbl {\xmlns1 http://schemas.micro
+soft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl1134\margr1134\margt1134\margb1134\gutter0\ltrsect 
+\deftab709\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1
+\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphauto1\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1134\dgvorigin1134\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale140\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
+\asianbrkrule\rsidroot2903393\newtblstyruls\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0
+{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0{\*\ftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs24\alang1025 \ltrch\fcs0 
+\f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 {\rtlch\fcs1 \af39 \ltrch\fcs0 \cf1\insrsid5508620 \chftnsep }{\rtlch\fcs1 \af39 \ltrch\fcs0 \insrsid5508620 
+\par }}{\*\ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs24\alang1025 \ltrch\fcs0 \f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 {
+\rtlch\fcs1 \af39 \ltrch\fcs0 \insrsid5508620 \chftnsepc 
+\par }}{\*\aftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs24\alang1025 \ltrch\fcs0 \f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 {
+\rtlch\fcs1 \af39 \ltrch\fcs0 \insrsid5508620 \chftnsep 
+\par }}{\*\aftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs24\alang1025 \ltrch\fcs0 \f40\fs24\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 {
+\rtlch\fcs1 \af39 \ltrch\fcs0 \insrsid5508620 \chftnsepc 
+\par }}\ltrpar \sectd \ltrsect\linex0\endnhere\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}
+{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang 
+{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar
+\s21\qc \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af41\afs20\alang1025 \ltrch\fcs0 \f41\fs20\lang9226\langfe5129\kerning3\cgrid\langnp9226\langfenp5129 {\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 
+\b\f31506\fs34\insrsid8540216\charrsid8942186 MASTERPASSWORD FOR WINDOWS
+\par }{\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 \b\f31506\fs28\insrsid8540216\charrsid8942186 Created by Michel Verhagen
+\par Copyright (C)2014 GuruCE Limited}{\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 \b\f31506\fs34\insrsid8540216\charrsid8942186 
+\par 
+\par }{\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 Released under the}{\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 \f31506\fs28\insrsid8540216\charrsid8942186 
+\par }{\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 \b\f31506\fs24\insrsid14233442\charrsid8942186 GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007}{\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 \b\f31506\fs24\insrsid2903393\charrsid8942186 
+\par }{\rtlch\fcs1 \ab\af41\afs36 \ltrch\fcs0 \b\f31506\fs28\insrsid8942186\charrsid8942186 
+\par }{\rtlch\fcs1 \af41 \ltrch\fcs0 \f31506\fs16\insrsid2903393\charrsid8942186 
+\par }\pard \ltrpar\s21\qc \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0\pararsid8540216 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 Contains software provided by Maarten Billemont
+ and used under the GPL v3 License.
+\par 
+\par }{\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 \b\f31506\fs28\insrsid8540216\charrsid8942186 Copyright (c) 2012 Lyndir. All rights reserved.
+\par 
+\par }{\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 Contains software provided by Replicon Inc. and used under this license:}{\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 \b\f31506\fs28\insrsid8540216\charrsid8942186 
+\par 
+\par Replicon.Cryptography.SCrypt
+\par Copyright (c) 2012, Replicon Inc.
+\par All rights reserved.
+\par }\pard \ltrpar\s21\qj \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0\pararsid8540216 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 
+\par Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+\par 
+\par {\listtext\pard\plain\ltrpar \s21 \rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f3\fs22\lang9226\langfe5129\kerning3\langnp9226\insrsid8540216\charrsid8942186 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar
+\s21\qj \fi-360\li720\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\ls1\adjustright\rin0\lin720\itap0\pararsid8540216 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+\par {\listtext\pard\plain\ltrpar \s21 \rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f3\fs22\lang9226\langfe5129\kerning3\langnp9226\insrsid8540216\charrsid8942186 \loch\af3\dbch\af0\hich\f3 \'b7\tab}Redistributions in binary form must reproduce the above copyright 
+notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+\par {\listtext\pard\plain\ltrpar \s21 \rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f3\fs22\lang9226\langfe5129\kerning3\langnp9226\insrsid8540216\charrsid8942186 \loch\af3\dbch\af0\hich\f3 \'b7\tab}Neither the name of Replicon Inc. nor the names of 
+its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+\par }\pard \ltrpar\s21\qj \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0\pararsid8540216 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 
+\par THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL REPLICON INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+\par 
+\par 
+\par }\pard \ltrpar\s21\qc \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0\pararsid8942186 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 
+Contains software provided by Colin Percival and used under this license:
+\par }\pard \ltrpar\s21\qj \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0\pararsid8540216 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 
+\par }\pard \ltrpar\s21\qc \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0\pararsid8540216 {\rtlch\fcs1 \ab\af41\afs52 \ltrch\fcs0 \b\f31506\fs28\insrsid8540216\charrsid8942186 Copyright 2009 Colin Percival
+\par All rights reserved.
+\par }\pard \ltrpar\s21\qj \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0\pararsid8540216 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 
+\par Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+\par 
+\par {\listtext\pard\plain\ltrpar \s21 \rtlch\fcs1 \af0\afs28 \ltrch\fcs0 \f31506\fs22\lang9226\langfe5129\kerning3\langnp9226\insrsid8540216\charrsid8942186 \hich\af31506\dbch\af0\loch\f31506 1.\tab}}\pard \ltrpar
+\s21\qj \fi-360\li720\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\ls2\adjustright\rin0\lin720\itap0\pararsid8540216 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+\par {\listtext\pard\plain\ltrpar \s21 \rtlch\fcs1 \af0\afs28 \ltrch\fcs0 \f31506\fs22\lang9226\langfe5129\kerning3\langnp9226\insrsid8540216\charrsid8942186 \hich\af31506\dbch\af0\loch\f31506 2.\tab}Redistributi
+ons in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+\par }\pard \ltrpar\s21\qj \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0\pararsid8540216 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 
+\par THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF}{\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8942186  }{\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 SUCH DAMAGE.
+\par }\pard \ltrpar\s21\qj \li0\ri0\nowidctlpar\wrapdefault\hyphpar0\aspalpha\faroman\adjustright\rin0\lin0\itap0 {\rtlch\fcs1 \af41\afs28 \ltrch\fcs0 \f31506\fs22\insrsid8540216\charrsid8942186 
+\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
+9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
+5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
+b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
+0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
+a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
+c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
+0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
+a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
+6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
+4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
+4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100aa5225dfc60600008b1a0000160000007468656d652f7468656d652f
+7468656d65312e786d6cec595d8bdb46147d2ff43f08bd3bfe92fcb1c41b6cd9ceb6d94d42eca4e4716c8fadc98e344633de8d0981923c160aa569e943037deb
+43691b48a02fe9afd936a54d217fa17746b63c638fbb9b2585a5640d8b343af7ce997bafce1d4997afdc8fa87384134e58dc708b970aae83e3211b9178d2706f
+f7bbb99aeb7081e211a22cc60d778eb97b65f7c30f2ea31d11e2083b601ff31dd4704321a63bf93c1fc230e297d814c7706dcc920809384d26f951828ec16f44
+f3a542a1928f10895d274611b8bd311e932176fad2a5bbbb74dea1701a0b2e078634e949d7d8b050d8d1615122f89c0734718e106db830cf881df7f17de13a14
+7101171a6e41fdb9f9ddcb79b4b330a2628bad66d7557f0bbb85c1e8b0a4e64c26836c52cff3bd4a33f3af00546ce23ad54ea553c9fc29001a0e61a52917dda7
+dfaab7dafe02ab81d2438bef76b55d2e1a78cd7f798373d3973f03af40a97f6f03dfed06104503af4029dedfc07b5eb51478065e81527c65035f2d34db5ed5c0
+2b5048497cb8812ef89572b05c6d061933ba6785d77daf5b2d2d9caf50500d5975c929c62c16db6a2d42f758d2058004522448ec88f9148fd110aa3840940c12
+e2ec93490885374531e3305c2815ba8532fc973f4f1da988a01d8c346bc90b98f08d21c9c7e1c3844c45c3fd18bcba1ae4cdcb1fdfbc7cee9c3c7a71f2e89793
+c78f4f1efd9c3a32acf6503cd1ad5e7fffc5df4f3f75fe7afeddeb275fd9f15cc7fffed367bffdfaa51d082b5d85e0d5d7cffe78f1ecd5379ffff9c3130bbc99
+a0810eef930873e73a3e766eb10816a6426032c783e4ed2cfa2122ba45339e701423398bc57f478406fafa1c5164c1b5b019c13b09488c0d787576cf20dc0b93
+9920168fd7c2c8001e30465b2cb146e19a9c4b0b737f164fec9327331d770ba123dbdc018a8dfc766653d05662731984d8a07993a258a0098eb170e4357688b1
+6575770931e27a408609e36c2c9cbbc46921620d499f0c8c6a5a19ed9108f232b711847c1bb139b8e3b418b5adba8d8f4c24dc15885ac8f73135c27815cd048a
+6c2efb28a27ac0f791086d247bf364a8e33a5c40a6279832a733c29cdb6c6e24b05e2de9d7405eec693fa0f3c84426821cda7cee23c674649b1d06218aa6366c
+8fc4a18efd881f428922e7261336f80133ef10790e7940f1d674df21d848f7e96a701b9455a7b42a107965965872791533a37e7b733a4658490d08bfa1e71189
+4f15f73559f7ff5b5907217df5ed53cbaa2eaaa0371362bda3f6d6647c1b6e5dbc03968cc8c5d7ee369ac53731dc2e9b0decbd74bf976ef77f2fdddbeee7772f
+d82b8d06f9965bc574abae36eed1d67dfb9850da13738af7b9daba73e84ca32e0c4a3bf5cc8ab3e7b8690887f24e86090cdc2441cac64998f88488b017a229ec
+ef8bae7432e10bd713ee4c19876dbf1ab6fa96783a8b0ed8287d5c2d16e5a3692a1e1c89d578c1cfc6e15143a4e84a75f50896b9576c27ea51794940dabe0d09
+6d329344d942a2ba1c9441520fe610340b09b5b277c2a26e615193ee97a9da6001d4b2acc0d6c9810d57c3f53d30012378a242148f649ed2542fb3ab92f92e33
+bd2d984605c03e625901ab4cd725d7adcb93ab4b4bed0c99364868e566925091513d8c87688417d52947cf42e36d735d5fa5d4a02743a1e683d25ad1a8d6fe8d
+c579730d76ebda40635d2968ec1c37dc4ad9879219a269c31dc3633f1c4653a81d2eb7bc884ee0ddd95024e90d7f1e6599265cb4110fd3802bd149d520220227
+0e2551c395cbcfd24063a5218a5bb104827061c9d541562e1a3948ba99643c1ee3a1d0d3ae8dc848a7a7a0f0a95658af2af3f383a5259b41ba7be1e8d819d059
+720b4189f9d5a20ce0887078fb534ca33922f03a3313b255fdad35a685eceaef13550da5e3884e43b4e828ba98a77025e5191d7596c5403b5bac1902aa8564d1
+080713d960f5a01add34eb1a2987ad5df7742319394d34573dd35015d935ed2a66ccb06c036bb13c5f93d7582d430c9aa677f854bad725b7bed4bab57d42d625
+20e059fc2c5df70c0d41a3b69acca026196fcab0d4ecc5a8d93b960b3c85da599a84a6fa95a5dbb5b8653dc23a1d0c9eabf383dd7ad5c2d078b9af549156df3d
+f44f136c700fc4a30d2f81675470954af8f09020d810f5d49e24950db845ee8bc5ad0147ce2c210df741c16f7a41c90f72859adfc97965af90abf9cd72aee9fb
+e562c72f16daadd243682c228c8a7efacda50bafa2e87cf1e5458d6f7c7d89966fdb2e0d599467eaeb4a5e11575f5f8aa5ed5f5f1c02a2f3a052ead6cbf55625
+572f37bb39afddaae5ea41a5956b57826abbdb0efc5abdfbd0758e14d86b9603afd2a9e52ac520c8799582a45fabe7aa5ea9d4f4aacd5ac76b3e5c6c6360e5a9
+7c2c6201e155bc76ff010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f7468656d652f5f72656c732f
+7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c082e8761be
+9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198720e274a939cd08a54f980
+ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa4c04ca5b
+babac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c0200001300000000000000000000000000000000005b436f6e74656e
+745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000000000300100005f72656c732f
+2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000190200007468656d652f7468656d652f74
+68656d654d616e616765722e786d6c504b01022d0014000600080000002100aa5225dfc60600008b1a00001600000000000000000000000000d6020000746865
+6d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b0100002700000000000000000000000000d00900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000cb0a00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax371\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
+\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;
+\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;
+\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;
+\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;
+\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;
+\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
+\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
+\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
+\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
+\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
+\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
+\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
+\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
+\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
+\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;}}{\*\datastore 010500000200000018000000
+4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
+d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000070b6
+04e9e589cf01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000105000000000000}}

MasterPassword/CSharp/MPSetup/MPSetup.wixproj

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.8</ProductVersion>
+    <ProjectGuid>a8f9aa78-b004-40f5-af04-c9c2daef940a</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>MPSetup</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MasterPassword\MasterPassword.csproj">
+      <Name>MasterPassword</Name>
+      <Project>{0b647b7d-3e3f-497d-926d-69c05b48c000}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>

MasterPassword/CSharp/MPSetup/Product.wxs

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ MASTERPASSWORD FOR WINDOWS
+ ==========================
+ Created by Michel Verhagen
+ Copyright (C)2014 GuruCE Limited
+
+ Released under the GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+
+ Contains software provided by Maarten Billemont and used under the GPL v3 License.
+
+ Copyright (c) 2012 Lyndir. All rights reserved.
+
+ Contains software provided by Replicon Inc. and used under this license:
+
+ Replicon.Cryptography.SCrypt
+ Copyright (c) 2012, Replicon Inc.
+ All rights reserved.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Id="*" Name="$(var.MasterPassword.ProjectName)" Language="1033" Version="!(bind.FileVersion.ProjectOutput)" Manufacturer="GuruCE" UpgradeCode="40c052f9-f8e1-422c-b78c-83f980f3355b">
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" InstallPrivileges="elevated" />
+
+    <MajorUpgrade Schedule="afterInstallValidate" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
+
+    <Media Id="1" Cabinet="mpsetup.cab" EmbedCab="yes"></Media>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLLOCATION" Name="$(var.MasterPassword.ProjectName)">
+          <Component Id='Application' Guid='8E7510B9-592B-43E5-AFD2-F697A9957AFB'>
+            <File Id='ProjectOutput' Name='$(var.MasterPassword.TargetFileName)' DiskId='1' Source='$(var.MasterPassword.TargetPath)' KeyPath='yes'>
+              <Shortcut Id='startmenuAppShortcut' Directory='ProgramMenuDir' Name='$(var.MasterPassword.ProjectName)'
+                        WorkingDirectory='INSTALLDIR' Icon='masterpassword.ico' IconIndex='0' Advertise='yes' />
+            </File>
+            <File Id='Config' Name='$(var.MasterPassword.TargetFileName).config' DiskId='1' Source='$(var.MasterPassword.TargetDir)\$(var.MasterPassword.TargetFileName).config' KeyPath='no'/>
+            <File Id='Newtonsoft.Json' Name='Newtonsoft.Json.dll' DiskId='1' Source='$(var.MasterPassword.TargetDir)\Newtonsoft.Json.dll' KeyPath='no'/>
+            <File Id='Replicon.Cryptography.SCrypt' Name='Replicon.Cryptography.SCrypt.dll' DiskId='1' Source='$(var.MasterPassword.TargetDir)\Replicon.Cryptography.SCrypt.dll' KeyPath='no'/>
+          </Component>
+          <Component Id='UninstallShortcut' Guid='D6499F04-1FC0-45CA-949B-074DC1F9AEEB'>
+            <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Type='string' Value='' KeyPath='yes' />
+            <Shortcut Id='startmenuUninstallShortcut' Name='Uninstall $(var.MasterPassword.ProjectName)' Icon='masterpassword.ico' IconIndex='0'
+                      Target='[System64Folder]msiexec.exe' Arguments='/x [ProductCode]' Directory='ProgramMenuDir' Description='Uninstall $(var.MasterPassword.ProjectName)' />
+          </Component>
+          <Component Id='DesktopShortcut' Guid='87EB347B-6141-485A-9F15-4A2FFC1689B2'>
+            <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Type='string' Value='' KeyPath='yes' />
+            <Shortcut Id='desktopShortcut' Name='$(var.MasterPassword.ProjectName)' Icon='masterpassword.ico' IconIndex='0' Directory='DesktopFolder'
+                      Target='[!ProjectOutput]' WorkingDirectory='INSTALLDIR' Description='Start $(var.MasterPassword.ProjectName)' />
+          </Component>
+
+          <!-- This empty component is to work around a bug in Windows Installer that will still show 
+                 "Install to run from the network" even if AllowAdvertise is set to 'no' -->
+          <Component Id='Empty' Guid='C948CC83-B207-4E9B-B5C4-DA8D68296F1B'>
+            <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Type='string' Value='' KeyPath='yes' />
+          </Component>
+
+        </Directory>
+      </Directory>
+      <Directory Id='ProgramMenuFolder' Name='Programs'>
+        <Directory Id='ProgramMenuDir' Name='$(var.MasterPassword.ProjectName)'>
+          <Component Id='ProgramMenuDir'>
+            <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
+            <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Type='string' Value='' KeyPath='yes' />
+          </Component>
+        </Directory>
+      </Directory>
+      <Directory Id='DesktopFolder' Name='Desktop' />
+    </Directory>
+
+    <Feature Id='Complete' Title='$(var.MasterPassword.ProjectName)' Description='Installation of all components' Display='expand' ConfigurableDirectory='INSTALLLOCATION' Level='1' AllowAdvertise='no' Absent='disallow'>
+      <!-- This empty component is to work around a bug in Windows Installer that will still show 
+                 "Install to run from the network" even if AllowAdvertise is set to 'no' -->
+      <ComponentRef Id='Empty' />
+      <Feature Id='MainProgram' Title='MasterPassword' Description='The $(var.MasterPassword.ProjectName)' Level='1' AllowAdvertise='no' Absent='disallow'>
+        <ComponentRef Id='Application' />
+        <ComponentRef Id='UninstallShortcut' />
+        <ComponentRef Id='ProgramMenuDir' />
+      </Feature>
+      <Feature Id='DesktopShortcut' Title='Desktop Shortcut' Description='A shortcut to the $(var.MasterPassword.ProjectName) on the desktop' Level='1' AllowAdvertise='no'>
+        <ComponentRef Id='DesktopShortcut' />
+      </Feature>
+    </Feature>
+
+    <Property Id='WIXUI_INSTALLDIR' Value='INSTALLDIR' />
+
+    <UIRef Id='WixUI_FeatureTree' />
+    <UIRef Id='WixUI_ErrorProgressText' />
+
+    <WixVariable Id='WixUILicenseRtf' Value='License agreement.rtf' />
+    <WixVariable Id='WixUIBannerBmp' Value='SetupBanner.bmp' />
+    <WixVariable Id='WixUIDialogBmp' Value='SplashScreen.bmp' />
+
+    <Icon Id='masterpassword.ico' SourceFile='$(var.MasterPassword.ProjectDir)\masterpassword.ico' />
+    
+    <Property Id="ARPPRODUCTICON" Value="masterpassword.ico" />
+  </Product>
+</Wix>

MasterPassword/CSharp/MasterPassword.sln

@@ -0,0 +1,45 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MasterPassword", "MasterPassword\MasterPassword.csproj", "{0B647B7D-3E3F-497D-926D-69C05B48C000}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MPSetup", "MPSetup\MPSetup.wixproj", "{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0B647B7D-3E3F-497D-926D-69C05B48C000}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Debug|x86.ActiveCfg = Debug|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Debug|x86.Build.0 = Debug|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Release|Any CPU.ActiveCfg = Release|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Release|Any CPU.Build.0 = Release|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Release|Mixed Platforms.Build.0 = Release|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Release|x86.ActiveCfg = Release|x86
+		{A8F9AA78-B004-40F5-AF04-C9C2DAEF940A}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

MasterPassword/CSharp/MasterPassword/App.config

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="MasterPassword.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    </startup>
+    <userSettings>
+        <MasterPassword.Properties.Settings>
+            <setting name="c2c" serializeAs="String">
+                <value>False</value>
+            </setting>
+        </MasterPassword.Properties.Settings>
+    </userSettings>
+</configuration>

MasterPassword/CSharp/MasterPassword/MRUData.cs

@@ -0,0 +1,41 @@
+// MASTERPASSWORD FOR WINDOWS
+// --------------------------
+// Created by Michel Verhagen
+// Copyright (C)2014 GuruCE Limited
+//
+// Released under the GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+//
+// Contains software provided by Maarten Billemont and used under the GPL v3 License.
+//
+// Copyright (c) 2012 Lyndir. All rights reserved.
+//
+// Contains software provided by Replicon Inc. and used under this license:
+//
+// Replicon.Cryptography.SCrypt
+// Copyright (c) 2012, Replicon Inc.
+// All rights reserved.
+//
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace MasterPassword
+{
+    class MRUData
+    {
+        public MRUData(string userName, string siteName, int siteCounter, MasterPassword.MPType passwordType)
+        {
+            this.UserName = userName;
+            this.SiteName = siteName;
+            this.SiteCounter = siteCounter;
+            this.PasswordType = passwordType;
+        }
+        public string UserName { get; set; }
+        public string SiteName { get; set; }
+        public int SiteCounter { get; set; }
+        public MasterPassword.MPType PasswordType { get; set; }
+    }
+}

MasterPassword/CSharp/MasterPassword/MasterPassword.cs

@@ -0,0 +1,421 @@
+// MASTERPASSWORD FOR WINDOWS
+// --------------------------
+// Created by Michel Verhagen
+// Copyright (C)2014 GuruCE Limited
+//
+// Released under the GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+//
+// Contains software provided by Maarten Billemont and used under the GPL v3 License.
+//
+// Copyright (c) 2012 Lyndir. All rights reserved.
+//
+// Contains software provided by Replicon Inc. and used under this license:
+//
+// Replicon.Cryptography.SCrypt
+// Copyright (c) 2012, Replicon Inc.
+// All rights reserved.
+//
+using System;
+using System.Text;
+using System.Net;
+using System.Runtime.InteropServices;
+using Replicon.Cryptography.SCrypt;
+using System.Security.Cryptography;
+using System.Diagnostics;
+using System.IO;
+
+namespace MasterPassword
+{
+    static class MasterPassword
+    {
+        private const uint MP_N = 32768;
+        private const uint MP_r = 8;
+        private const uint MP_p = 2;
+        private const uint MP_dkLen = 64;
+
+        private enum MPElementContentType
+        {
+            MPElementContentTypePassword,
+            MPElementContentTypeNote,
+            MPElementContentTypePicture,
+        }
+
+        [Flags]
+        private enum MPElementTypeClass
+        {
+            /** Generate the password. */
+            MPElementTypeClassGenerated = 1 << 4,
+            /** Store the password. */
+            MPElementTypeClassStored = 1 << 5,
+        }
+
+        [Flags]
+        private enum MPElementFeature
+        {
+            /** Export the key-protected content data. */
+            MPElementFeatureExportContent = 1 << 10,
+            /** Never export content. */
+            MPElementFeatureDevicePrivate = 1 << 11,
+        }
+
+        [Flags]
+        private enum MPElementType
+        {
+            MPElementTypeGeneratedMaximum = 0x0 | (int)MPElementTypeClass.MPElementTypeClassGenerated | 0x0,
+            MPElementTypeGeneratedLong = 0x1 | (int)MPElementTypeClass.MPElementTypeClassGenerated | 0x0,
+            MPElementTypeGeneratedMedium = 0x2 | (int)MPElementTypeClass.MPElementTypeClassGenerated | 0x0,
+            MPElementTypeGeneratedBasic = 0x4 | (int)MPElementTypeClass.MPElementTypeClassGenerated | 0x0,
+            MPElementTypeGeneratedShort = 0x3 | (int)MPElementTypeClass.MPElementTypeClassGenerated | 0x0,
+            MPElementTypeGeneratedPIN = 0x5 | (int)MPElementTypeClass.MPElementTypeClassGenerated | 0x0,
+
+            MPElementTypeStoredPersonal = 0x0 | (int)MPElementTypeClass.MPElementTypeClassStored | (int)MPElementFeature.MPElementFeatureExportContent,
+            MPElementTypeStoredDevicePrivate = 0x1 | (int)MPElementTypeClass.MPElementTypeClassStored | (int)MPElementFeature.MPElementFeatureDevicePrivate,
+        }
+
+        public enum MPType
+        {
+            Maximum,
+            Long,
+            Medium,
+            Basic,
+            Short,
+            PIN
+        }
+
+        private static string Hex(byte[] bytes)
+        {
+            return BitConverter.ToString(bytes);
+        }
+
+        private static string IDForBuf(byte[] bytes)
+        {
+            SHA256 sha256 = SHA256.Create();
+            byte[] hash = sha256.ComputeHash(bytes);
+            return BitConverter.ToString(hash);
+        }
+
+        private static string CipherForType(MPElementType type, byte seedByte)
+        {
+            string retValue = "";
+            if (((int)type & (int)MPElementTypeClass.MPElementTypeClassGenerated) > 0)
+            {
+                switch (type)
+                {
+                    case MPElementType.MPElementTypeGeneratedMaximum:
+                        {
+                            string[] ciphers = { "anoxxxxxxxxxxxxxxxxx", "axxxxxxxxxxxxxxxxxno" };
+                            retValue = ciphers[seedByte % 2];
+                            break;
+                        }
+
+                    case MPElementType.MPElementTypeGeneratedLong:
+                        {
+                            string[] ciphers = { "CvcvnoCvcvCvcv", "CvcvCvcvnoCvcv", "CvcvCvcvCvcvno", "CvccnoCvcvCvcv", "CvccCvcvnoCvcv", "CvccCvcvCvcvno", "CvcvnoCvccCvcv", "CvcvCvccnoCvcv", "CvcvCvccCvcvno", "CvcvnoCvcvCvcc", "CvcvCvcvnoCvcc", "CvcvCvcvCvccno", "CvccnoCvccCvcv", "CvccCvccnoCvcv", "CvccCvccCvcvno", "CvcvnoCvccCvcc", "CvcvCvccnoCvcc", "CvcvCvccCvccno", "CvccnoCvcvCvcc", "CvccCvcvnoCvcc", "CvccCvcvCvccno" };
+                            retValue = ciphers[seedByte % 21];
+                            break;
+                        }
+
+                    case MPElementType.MPElementTypeGeneratedMedium:
+                        {
+                            string[] ciphers = { "CvcnoCvc", "CvcCvcno" };
+                            retValue = ciphers[seedByte % 2];
+                            break;
+                        }
+                    case MPElementType.MPElementTypeGeneratedBasic:
+                        {
+                            string[] ciphers = { "aaanaaan", "aannaaan", "aaannaaa" };
+                            retValue = ciphers[seedByte % 3];
+                            break;
+                        }
+                    case MPElementType.MPElementTypeGeneratedShort:
+                        {
+                            retValue = "Cvcn";
+                            break;
+                        }
+
+                    case MPElementType.MPElementTypeGeneratedPIN:
+                        {
+                            retValue = "nnnn";
+                            break;
+                        }
+
+                    default:
+                        {
+                            Debug.WriteLine("Unknown generated type: %d", type);
+                            break;
+                        }
+                }
+            }
+            return retValue;
+        }
+
+        private static char CharacterFromClass(char characterClass, byte seedByte)
+        {
+            char retValue = char.MinValue;
+            string classCharacters = "";
+            switch (characterClass)
+            {
+                case 'V':
+                    classCharacters = "AEIOU";
+                    break;
+                case 'C':
+                    classCharacters = "BCDFGHJKLMNPQRSTVWXYZ";
+                    break;
+                case 'v':
+                    classCharacters = "aeiou";
+                    break;
+                case 'c':
+                    classCharacters = "bcdfghjklmnpqrstvwxyz";
+                    break;
+                case 'A':
+                    classCharacters = "AEIOUBCDFGHJKLMNPQRSTVWXYZ";
+                    break;
+                case 'a':
+                    classCharacters = "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz";
+                    break;
+                case 'n':
+                    classCharacters = "0123456789";
+                    break;
+                case 'o':
+                    classCharacters = "@&%?,=[]_:-+*$#!'^~;()/.";
+                    break;
+                case 'x':
+                    classCharacters = "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz0123456789!@#$%^&*()";
+                    break;
+                default:
+                    Debug.WriteLine("Unknown character class: %c", characterClass);
+                    break;
+            }
+            if (classCharacters.Length > 0)
+                retValue = classCharacters[seedByte % classCharacters.Length];
+
+            return retValue;
+        }
+
+        static byte[] EncryptStringToBytes(string plainText, byte[] Key, byte[] IV)
+        {
+            // Check arguments. 
+            if (plainText == null || plainText.Length <= 0)
+                throw new ArgumentNullException("plainText");
+            if (Key == null || Key.Length <= 0)
+                throw new ArgumentNullException("Key");
+            if (IV == null || IV.Length <= 0)
+                throw new ArgumentNullException("Key");
+            byte[] encrypted;
+            // Create an RijndaelManaged object 
+            // with the specified key and IV. 
+            using (RijndaelManaged rijAlg = new RijndaelManaged())
+            {
+                rijAlg.Key = Key;
+                rijAlg.IV = IV;
+
+                // Create a decrytor to perform the stream transform.
+                ICryptoTransform encryptor = rijAlg.CreateEncryptor(rijAlg.Key, rijAlg.IV);
+
+                // Create the streams used for encryption. 
+                using (MemoryStream msEncrypt = new MemoryStream())
+                {
+                    using (CryptoStream csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write))
+                    {
+                        using (StreamWriter swEncrypt = new StreamWriter(csEncrypt))
+                        {   // Write all data to the stream.
+                            swEncrypt.Write(plainText);
+                        }
+                        encrypted = msEncrypt.ToArray();
+                    }
+                }
+            }
+            // Return the encrypted bytes from the memory stream. 
+            return encrypted;
+        }
+
+        static string DecryptStringFromBytes(byte[] cipherText, byte[] Key, byte[] IV)
+        {
+            // Check arguments. 
+            if (cipherText == null || cipherText.Length <= 0)
+                throw new ArgumentNullException("cipherText");
+            if (Key == null || Key.Length <= 0)
+                throw new ArgumentNullException("Key");
+            if (IV == null || IV.Length <= 0)
+                throw new ArgumentNullException("Key");
+
+            // Declare the string used to hold 
+            // the decrypted text. 
+            string plaintext = null;
+
+            // Create an RijndaelManaged object 
+            // with the specified key and IV. 
+            using (RijndaelManaged rijAlg = new RijndaelManaged())
+            {
+                rijAlg.Key = Key;
+                rijAlg.IV = IV;
+
+                // Create a decrytor to perform the stream transform.
+                ICryptoTransform decryptor = rijAlg.CreateDecryptor(rijAlg.Key, rijAlg.IV);
+
+                // Create the streams used for decryption. 
+                using (MemoryStream msDecrypt = new MemoryStream(cipherText))
+                {
+                    using (CryptoStream csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read))
+                    {
+                        using (StreamReader srDecrypt = new StreamReader(csDecrypt))
+                        {   // Read the decrypted bytes from the decrypting stream 
+                            // and place them in a string.
+                            plaintext = srDecrypt.ReadToEnd();
+                        }
+                    }
+                }
+            }
+            return plaintext;
+        }
+
+        public static byte[] Encrypt(string masterPassword, string data)
+        {
+            byte[] retValue = new byte[0];
+            if (masterPassword.Length > 0)
+            {
+                string mpNameSpace = "com.lyndir.masterpassword";
+                byte[] mpNameSpaceBytes = new UTF8Encoding().GetBytes(mpNameSpace);
+                byte[] masterPasswordBytes = new UTF8Encoding().GetBytes(masterPassword);
+                byte[] masterKey = SCrypt.DeriveKey(masterPasswordBytes, mpNameSpaceBytes, MP_N, MP_r, MP_p, 32);
+                using (RijndaelManaged rijndael = new RijndaelManaged())
+                {
+                    rijndael.Key = masterKey;
+                    rijndael.GenerateIV();
+
+                    byte[] encrypted = EncryptStringToBytes(data, rijndael.Key, rijndael.IV);
+                    retValue = new byte[rijndael.IV.Length + encrypted.Length];
+                    Array.Copy(rijndael.IV, retValue, rijndael.IV.Length);
+                    Array.Copy(encrypted, 0, retValue, rijndael.IV.Length, encrypted.Length);
+                }
+            }
+            return retValue;
+        }
+
+        public static string Decrypt(string masterPassword, byte[] data)
+        {
+            string retValue = "";
+            if (masterPassword.Length > 0)
+            {
+                string mpNameSpace = "com.lyndir.masterpassword";
+                byte[] mpNameSpaceBytes = new UTF8Encoding().GetBytes(mpNameSpace);
+                byte[] masterPasswordBytes = new UTF8Encoding().GetBytes(masterPassword);
+                byte[] masterKey = SCrypt.DeriveKey(masterPasswordBytes, mpNameSpaceBytes, MP_N, MP_r, MP_p, 32);
+
+                using (RijndaelManaged rijndael = new RijndaelManaged())
+                {
+                    rijndael.Key = masterKey;
+                    byte[] iv = new byte[rijndael.IV.Length];
+                    Array.Copy(data, iv, iv.Length);
+                    rijndael.IV = iv;
+                    byte[] encrypted = new byte[data.Length - rijndael.IV.Length];
+                    Array.Copy(data, rijndael.IV.Length, encrypted, 0, encrypted.Length);
+                    retValue = DecryptStringFromBytes(encrypted, rijndael.Key, rijndael.IV);
+                }
+            }
+            return retValue;
+        }
+
+        public static string GetMasterPasswordKeySHA(string masterPassword)
+        {
+            string retValue = "";
+            if (masterPassword.Length > 0)
+            {
+                string mpNameSpace = "com.lyndir.masterpassword";
+                byte[] mpNameSpaceBytes = new UTF8Encoding().GetBytes(mpNameSpace);
+                byte[] masterPasswordBytes = new UTF8Encoding().GetBytes(masterPassword);
+                byte[] masterKey = SCrypt.DeriveKey(masterPasswordBytes, mpNameSpaceBytes, MP_N, MP_r, MP_p, MP_dkLen);
+                retValue = IDForBuf(masterKey);
+            }
+            return retValue;
+        }
+
+        public static string Calculate(string masterPassword, string userName, string siteName, int siteCounter, MPType mpType)
+        {
+            MPElementType[] passwordTypes = {MPElementType.MPElementTypeGeneratedMaximum, 
+                                             MPElementType.MPElementTypeGeneratedLong,
+                                             MPElementType.MPElementTypeGeneratedMedium,
+                                             MPElementType.MPElementTypeGeneratedBasic,
+                                             MPElementType.MPElementTypeGeneratedShort,
+                                             MPElementType.MPElementTypeGeneratedPIN};
+
+            MPElementType type = passwordTypes[(int)mpType];
+
+            string retValue = "";
+            if ((masterPassword.Length > 0) && (userName.Length > 0) && (siteName.Length > 0))
+            {
+                string mpNameSpace = "com.lyndir.masterpassword";
+                byte[] mpNameSpaceBytes = new UTF8Encoding().GetBytes(mpNameSpace);
+                byte[] userNameBytes = new UTF8Encoding().GetBytes(userName);
+                UInt32 n_userNameLength = (UInt32)IPAddress.HostToNetworkOrder(userNameBytes.Length);
+                int masterKeySaltLength = mpNameSpaceBytes.Length + sizeof(UInt32) + userNameBytes.Length;
+                IntPtr masterKeySalt = Marshal.AllocHGlobal(masterKeySaltLength);
+                IntPtr mks = masterKeySalt;
+                Marshal.Copy(mpNameSpaceBytes, 0, mks, mpNameSpaceBytes.Length);
+                mks += mpNameSpaceBytes.Length;
+                Marshal.Copy(BitConverter.GetBytes(n_userNameLength), 0, mks, sizeof(UInt32));
+                mks += sizeof(UInt32);
+                Marshal.Copy(userNameBytes, 0, mks, userNameBytes.Length);
+                mks += userNameBytes.Length;
+                if ((mks.ToInt32() - masterKeySalt.ToInt32()) == masterKeySaltLength)
+                {
+                    byte[] masterKeySaltBytes = new byte[masterKeySaltLength];
+                    Marshal.Copy(masterKeySalt, masterKeySaltBytes, 0, masterKeySaltLength);
+                    //Debug.WriteLine("masterKeySalt ID: " + IDForBuf(masterKeySaltBytes));
+
+                    byte[] masterPasswordBytes = new UTF8Encoding().GetBytes(masterPassword);
+                    byte[] masterKey = SCrypt.DeriveKey(masterPasswordBytes, masterKeySaltBytes, MP_N, MP_r, MP_p, MP_dkLen);
+
+                    //Debug.WriteLine("masterPassword Hex: " + Hex(masterPasswordBytes));
+                    //Debug.WriteLine("masterPassword ID: " + IDForBuf(masterPasswordBytes));
+                    //Debug.WriteLine("masterKey ID: " + IDForBuf(masterKey));
+
+                    byte[] siteNameBytes = new UTF8Encoding().GetBytes(siteName);
+                    UInt32 n_siteNameLength = (UInt32)IPAddress.HostToNetworkOrder(siteNameBytes.Length);
+                    UInt32 n_siteCounter = (UInt32)IPAddress.HostToNetworkOrder(siteCounter);
+                    int sitePasswordInfoLength = mpNameSpaceBytes.Length + sizeof(UInt32) + siteNameBytes.Length + sizeof(UInt32);
+                    IntPtr sitePasswordInfo = Marshal.AllocHGlobal(sitePasswordInfoLength);
+                    IntPtr sPI = sitePasswordInfo;
+                    Marshal.Copy(mpNameSpaceBytes, 0, sPI, mpNameSpaceBytes.Length);
+                    sPI += mpNameSpaceBytes.Length;
+                    Marshal.Copy(BitConverter.GetBytes(n_siteNameLength), 0, sPI, sizeof(UInt32));
+                    sPI += sizeof(UInt32);
+                    Marshal.Copy(siteNameBytes, 0, sPI, siteNameBytes.Length);
+                    sPI += siteNameBytes.Length;
+                    Marshal.Copy(BitConverter.GetBytes(n_siteCounter), 0, sPI, sizeof(UInt32));
+                    sPI += sizeof(UInt32);
+                    if ((sPI.ToInt32() - sitePasswordInfo.ToInt32()) == sitePasswordInfoLength)
+                    {
+                        byte[] sitePasswordInfoBytes = new byte[sitePasswordInfoLength];
+                        Marshal.Copy(sitePasswordInfo, sitePasswordInfoBytes, 0, sitePasswordInfoLength);
+                        //Debug.WriteLine("seed from: hmac-sha256(masterKey, 'com.lyndir.masterpassword' | {0} | {1} | {2})", Hex(BitConverter.GetBytes(n_siteNameLength)), siteName, Hex(BitConverter.GetBytes(n_siteCounter)));
+                        //Debug.WriteLine("sitePasswordInfo ID: " + IDForBuf(sitePasswordInfoBytes));
+
+
+                        HMACSHA256 hmacsha256 = new HMACSHA256(masterKey);
+                        byte[] sitePasswordSeed = hmacsha256.ComputeHash(sitePasswordInfoBytes);
+
+                        //Debug.WriteLine("sitePasswordSeed ID: " + IDForBuf(sitePasswordSeed));
+
+                        string cipher = CipherForType(type, sitePasswordSeed[0]);
+                        //Debug.WriteLine("type: {0}, cipher: {1}", type.ToString(), cipher);
+                        char[] sitePassword = new char[cipher.Length];
+                        if (cipher.Length <= 32)
+                        {
+                            for (int c = 0; c < cipher.Length; c++)
+                            {
+                                sitePassword[c] = CharacterFromClass(cipher[c], sitePasswordSeed[c + 1]);
+                                //Debug.WriteLine("class {0}, character {1}", cipher[c], sitePassword[c]);
+                            }
+                            retValue = new string(sitePassword);
+                            //Debug.WriteLine(retValue);
+                        }
+                    }
+                    Marshal.FreeHGlobal(sitePasswordInfo);
+                }
+                Marshal.FreeHGlobal(masterKeySalt);
+            }
+            return retValue;
+        }
+    }
+}

MasterPassword/CSharp/MasterPassword/MasterPassword.csproj

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0B647B7D-3E3F-497D-926D-69C05B48C000}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MasterPassword</RootNamespace>
+    <AssemblyName>MasterPassword</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>MasterPassword.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Replicon.Cryptography.SCrypt">
+      <HintPath>Replicon.Cryptography.SCrypt\Replicon.Cryptography.SCrypt.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="frmMain.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmMain.Designer.cs">
+      <DependentUpon>frmMain.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MasterPassword.cs" />
+    <Compile Include="MRUData.cs" />
+    <Compile Include="NativeMethods.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="frmMain.resx">
+      <DependentUpon>frmMain.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="MasterPassword.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

MasterPassword/CSharp/MasterPassword/MasterPassword.csproj.user

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>

MasterPassword/CSharp/MasterPassword/NativeMethods.cs

@@ -0,0 +1,32 @@
+// MASTERPASSWORD FOR WINDOWS
+// --------------------------
+// Created by Michel Verhagen
+// Copyright (C)2014 GuruCE Limited
+//
+// Released under the GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+//
+// Contains software provided by Maarten Billemont and used under the GPL v3 License.
+//
+// Copyright (c) 2012 Lyndir. All rights reserved.
+//
+// Contains software provided by Replicon Inc. and used under this license:
+//
+// Replicon.Cryptography.SCrypt
+// Copyright (c) 2012, Replicon Inc.
+// All rights reserved.
+//
+using System;
+using System.Runtime.InteropServices;
+
+namespace MasterPassword
+{
+    internal class NativeMethods
+    {
+        public const int HWND_BROADCAST = 0xffff;
+        public static readonly int WM_SHOWME = RegisterWindowMessage("WM_SHOWME");
+        [DllImport("user32")]
+        public static extern bool PostMessage(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam);
+        [DllImport("user32")]
+        public static extern int RegisterWindowMessage(string message);
+    }
+}

MasterPassword/CSharp/MasterPassword/Program.cs

@@ -0,0 +1,48 @@
+// MASTERPASSWORD FOR WINDOWS
+// --------------------------
+// Created by Michel Verhagen
+// Copyright (C)2014 GuruCE Limited
+//
+// Released under the GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+//
+// Contains software provided by Maarten Billemont and used under the GPL v3 License.
+//
+// Copyright (c) 2012 Lyndir. All rights reserved.
+//
+// Contains software provided by Replicon Inc. and used under this license:
+//
+// Replicon.Cryptography.SCrypt
+// Copyright (c) 2012, Replicon Inc.
+// All rights reserved.
+//
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MasterPassword
+{
+    static class Program
+    {
+        static Mutex mutex = new Mutex(true, "MasterPassword");
+
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            if (mutex.WaitOne(TimeSpan.Zero, true))
+            {
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                Application.Run(new frmMain());
+                mutex.ReleaseMutex();
+            }
+            else
+                NativeMethods.PostMessage((IntPtr)NativeMethods.HWND_BROADCAST, NativeMethods.WM_SHOWME, IntPtr.Zero, IntPtr.Zero);
+        }
+    }
+}

MasterPassword/CSharp/MasterPassword/Properties/AssemblyInfo.cs

@@ -0,0 +1,53 @@
+// MASTERPASSWORD FOR WINDOWS
+// --------------------------
+// Created by Michel Verhagen
+// Copyright (C)2014 GuruCE Limited
+//
+// Released under the GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+//
+// Contains software provided by Maarten Billemont and used under the GPL v3 License.
+//
+// Copyright (c) 2012 Lyndir. All rights reserved.
+//
+// Contains software provided by Replicon Inc. and used under this license:
+//
+// Replicon.Cryptography.SCrypt
+// Copyright (c) 2012, Replicon Inc.
+// All rights reserved.
+//
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MasterPassword")]
+[assembly: AssemblyDescription("MasterPassword for Windows")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("GuruCE Limited")]
+[assembly: AssemblyProduct("MasterPassword")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a5519bdf-81ee-43f2-a46e-85198b4d5c77")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyFileVersion("1.4.0.0")]

MasterPassword/CSharp/MasterPassword/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18444
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MasterPassword.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MasterPassword.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

MasterPassword/CSharp/MasterPassword/Properties/Resources.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

MasterPassword/CSharp/MasterPassword/Properties/Settings.Designer.cs

@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.34014
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MasterPassword.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
+        public bool c2c {
+            get {
+                return ((bool)(this["c2c"]));
+            }
+            set {
+                this["c2c"] = value;
+            }
+        }
+    }
+}

MasterPassword/CSharp/MasterPassword/Properties/Settings.settings

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="MasterPassword.Properties" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="c2c" Roaming="true" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>

MasterPassword/CSharp/MasterPassword/Replicon.Cryptography.SCrypt/LICENSE

@@ -0,0 +1,53 @@
+Replicon.Cryptography.SCrypt
+Copyright (c) 2012, Replicon Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Replicon Inc. nor the names of its contributors may
+      be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL REPLICON INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Contains software provided by Colin Percival and used under this license:
+
+Copyright 2009 Colin Percival
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+

MasterPassword/CSharp/MasterPassword/Replicon.Cryptography.SCrypt/Replicon.Cryptography.SCrypt.XML

@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Replicon.Cryptography.SCrypt</name>
+    </assembly>
+    <members>
+        <member name="T:Replicon.Cryptography.SCrypt.SaltParseException">
+            <summary>
+            Exception thrown when a SCrypt salt string is unparsable.
+            </summary>
+        </member>
+        <member name="T:Replicon.Cryptography.SCrypt.IKeyDerivationFunction">
+            <summary>
+            Interface wrapping an scrypt key-derivation function implementation.
+            </summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.IKeyDerivationFunction.DeriveKey(System.Byte[],System.Byte[],System.UInt64,System.UInt32,System.UInt32,System.UInt32)">
+            <summary>Key-derivation function.</summary>
+            <param name="password">The password bytes to generate the key based upon.</param>
+            <param name="salt">Random salt bytes to make the derived key unique.</param>
+            <param name="N">CPU/memory cost parameter.  Must be a value 2^N.  2^14 (16384) causes a calculation time
+            of approximately 50-70ms on 2010 era hardware; each successive value (eg. 2^15, 2^16, ...) should
+            double the amount of CPU time and memory required.</param>
+            <param name="r">scrypt 'r' tuning parameter</param>
+            <param name="p">scrypt 'p' tuning parameter (parallelization parameter); a large value of p can increase
+            computational cost of scrypt without increasing the memory usage.</param>
+            <param name="derivedKeyLengthBytes">The number of bytes of key to derive.</param>
+        </member>
+        <member name="T:Replicon.Cryptography.SCrypt.IPasswordHash">
+            <summary>Wrapper for the scrypt key-derivation function that provides helper functions for a common use-case
+            of scrypt as a password hashing algorithm.</summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.IPasswordHash.GenerateSalt">
+            <summary>Generate a salt for use with HashPassword, selecting reasonable default values for scrypt
+            parameters that are appropriate for an interactive login verification workflow.</summary>
+            <remarks>Uses the default values in DefaultSaltLengthBytes, Default_N, Default_r, Default_r, and
+            DefaultHashLengthBytes.</remarks>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.IPasswordHash.GenerateSalt(System.UInt32,System.UInt64,System.UInt32,System.UInt32,System.UInt32)">
+            <summary>Generate a random salt for use with HashPassword.  In addition to the random salt, the salt value
+            also contains the tuning parameters to use with the scrypt algorithm, as well as the size of the password
+            hash to generate.</summary>
+            <param name="saltLengthBytes">The number of bytes of random salt to generate.  The goal for the salt is
+            to be unique.  16 bytes gives a 2^128 possible salt options, and roughly an N in 2^64 chance of a salt
+            collision for N salts, which seems reasonable.  A larger salt requires more storage space, but doesn't
+            affect the scrypt performance significantly.</param>
+            <param name="N">CPU/memory cost parameter.  Must be a value 2^N.  2^14 (16384) causes a calculation time
+            of approximately 50-70ms on 2010 era hardware; each successive value (eg. 2^15, 2^16, ...) should
+            double the amount of CPU time and memory required.</param>
+            <param name="r">scrypt 'r' tuning parameter</param>
+            <param name="p">scrypt 'p' tuning parameter (parallelization parameter); a large value of p can increase
+            computational cost of scrypt without increasing the memory usage.</param>
+            <param name="hashLengthBytes">The number of bytes to store the password hash in.</param>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.IPasswordHash.HashPassword(System.String)">
+            <summary>Generate a password hash using a newly generated salt, with default salt parameters.</summary>
+            <param name="password">A password to hash.</param>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.IPasswordHash.TryParseSalt(System.String,System.Byte[]@,System.UInt64@,System.UInt32@,System.UInt32@,System.UInt32@)">
+            <summary>Attempt to parse the salt component of a salt or password and return the tuning parameters
+            embedded in the salt.</summary>
+            <param name="salt">Salt or hashed password to parse.</param>
+            <param name="saltBytes">The randomly generated salt data.  The length will match saltLengthBytes from
+            GenerateSalt.</param>
+            <param name="N">Matching value for GenerateSalt's N parameter.</param>
+            <param name="r">Matching value for GenerateSalt's r parameter.</param>
+            <param name="p">Matching value for GenerateSalt's p parameter.</param>
+            <param name="hashLengthBytes">The number of bytes to store the password hash in.</param>
+            <returns>True if the parsing was successful, false otherwise.</returns>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.IPasswordHash.ParseSalt(System.String,System.Byte[]@,System.UInt64@,System.UInt32@,System.UInt32@,System.UInt32@)">
+            <summary>Parse the salt component of a salt or password and return the tuning parameters embedded in the
+            salt.</summary>
+            <exception cref="T:Replicon.Cryptography.SCrypt.SaltParseException">Throws SaltParseException if an error
+            occurs while parsing the salt.</exception>
+            <param name="salt">Salt or hashed password to parse.</param>
+            <param name="saltBytes">The randomly generated salt data.  The length will match saltLengthBytes from
+            GenerateSalt.</param>
+            <param name="N">Matching value for GenerateSalt's N parameter.</param>
+            <param name="r">Matching value for GenerateSalt's r parameter.</param>
+            <param name="p">Matching value for GenerateSalt's p parameter.</param>
+            <param name="hashLengthBytes">The number of bytes to store the password hash in.</param>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.IPasswordHash.HashPassword(System.String,System.String)">
+            <summary>Generate a password hash using a specific password salt.</summary>
+            <param name="password">A password to hash.</param>
+            <param name="salt">Salt to hash the password with.  This is often a password hash from a previous
+            HashPassword call, which contains the salt of the original password call; in that case, the returned
+            hash will be identical to the salt parameter if the password is the same password as the original.</param>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.IPasswordHash.Verify(System.String,System.String)">
+            <summary>Verify that a given password matches a given hash.</summary>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.IPasswordHash.DefaultSaltLengthBytes">
+            <summary>Default value for saltLengthBytes used by parameterless GenerateSalt, currently 16 bytes.</summary>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.IPasswordHash.Default_N">
+            <summary>Default value for N used by parameterless GenerateSalt, currently 2^14.</summary>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.IPasswordHash.Default_r">
+            <summary>Default value for r used by parameterless GenerateSalt, currently 8.</summary>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.IPasswordHash.Default_p">
+            <summary>Default value for p used by parameterless GenerateSalt, currently 1.</summary>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.IPasswordHash.DefaultHashLengthBytes">
+            <summary>Default value for hashLengthBytes used by parameterless GenerateSalt, currently 32 bytes.</summary>
+        </member>
+        <member name="T:Replicon.Cryptography.SCrypt.SCrypt">
+            <summary>Static wrapper for Factory.CreatePasswordHash().</summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.SCrypt.GenerateSalt">
+            <summary>Generate a salt for use with HashPassword, selecting reasonable default values for scrypt
+            parameters that are appropriate for an interactive login verification workflow.</summary>
+            <remarks>Uses the default values in DefaultSaltLengthBytes, Default_N, Default_r, Default_r, and
+            DefaultHashLengthBytes.</remarks>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.SCrypt.GenerateSalt(System.UInt32,System.UInt64,System.UInt32,System.UInt32,System.UInt32)">
+            <summary>Generate a random salt for use with HashPassword.  In addition to the random salt, the salt value
+            also contains the tuning parameters to use with the scrypt algorithm, as well as the size of the password
+            hash to generate.</summary>
+            <param name="saltLengthBytes">The number of bytes of random salt to generate.  The goal for the salt is
+            to be unique.  16 bytes gives a 2^128 possible salt options, and roughly an N in 2^64 chance of a salt
+            collision for N salts, which seems reasonable.  A larger salt requires more storage space, but doesn't
+            affect the scrypt performance significantly.</param>
+            <param name="N">CPU/memory cost parameter.  Must be a value 2^N.  2^14 (16384) causes a calculation time
+            of approximately 50-70ms on 2010 era hardware; each successive value (eg. 2^15, 2^16, ...) should
+            double the amount of CPU time and memory required.</param>
+            <param name="r">scrypt 'r' tuning parameter</param>
+            <param name="p">scrypt 'p' tuning parameter (parallelization parameter); a large value of p can increase
+            computational cost of scrypt without increasing the memory usage.</param>
+            <param name="hashLengthBytes">The number of bytes to store the password hash in.</param>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.SCrypt.HashPassword(System.String)">
+            <summary>Generate a password hash using a newly generated salt, with default salt parameters.</summary>
+            <param name="password">A password to hash.</param>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.SCrypt.TryParseSalt(System.String,System.Byte[]@,System.UInt64@,System.UInt32@,System.UInt32@,System.UInt32@)">
+            <summary>Attempt to parse the salt component of a salt or password and return the tuning parameters
+            embedded in the salt.</summary>
+            <param name="salt">Salt or hashed password to parse.</param>
+            <param name="saltBytes">The randomly generated salt data.  The length will match saltLengthBytes from
+            GenerateSalt.</param>
+            <param name="N">Matching value for GenerateSalt's N parameter.</param>
+            <param name="r">Matching value for GenerateSalt's r parameter.</param>
+            <param name="p">Matching value for GenerateSalt's p parameter.</param>
+            <param name="hashLengthBytes">The number of bytes to store the password hash in.</param>
+            <returns>True if the parsing was successful, false otherwise.</returns>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.SCrypt.ParseSalt(System.String,System.Byte[]@,System.UInt64@,System.UInt32@,System.UInt32@,System.UInt32@)">
+            <summary>Parse the salt component of a salt or password and return the tuning parameters embedded in the
+            salt.</summary>
+            <exception cref="T:Replicon.Cryptography.SCrypt.SaltParseException">Throws SaltParseException if an error
+            occurs while parsing the salt.</exception>
+            <param name="salt">Salt or hashed password to parse.</param>
+            <param name="saltBytes">The randomly generated salt data.  The length will match saltLengthBytes from
+            GenerateSalt.</param>
+            <param name="N">Matching value for GenerateSalt's N parameter.</param>
+            <param name="r">Matching value for GenerateSalt's r parameter.</param>
+            <param name="p">Matching value for GenerateSalt's p parameter.</param>
+            <param name="hashLengthBytes">The number of bytes to store the password hash in.</param>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.SCrypt.HashPassword(System.String,System.String)">
+            <summary>Generate a password hash using a specific password salt.</summary>
+            <param name="password">A password to hash.</param>
+            <param name="salt">Salt to hash the password with.  This is often a password hash from a previous
+            HashPassword call, which contains the salt of the original password call; in that case, the returned
+            hash will be identical to the salt parameter if the password is the same password as the original.</param>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.SCrypt.Verify(System.String,System.String)">
+            <summary>Verify that a given password matches a given hash.</summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.SCrypt.DeriveKey(System.Byte[],System.Byte[],System.UInt64,System.UInt32,System.UInt32,System.UInt32)">
+            <summary>The 'raw' scrypt key-derivation function.</summary>
+            <param name="password">The password bytes to generate the key based upon.</param>
+            <param name="salt">Random salt bytes to make the derived key unique.</param>
+            <param name="N">CPU/memory cost parameter.  Must be a value 2^N.  2^14 (16384) causes a calculation time
+            of approximately 50-70ms on 2010 era hardware; each successive value (eg. 2^15, 2^16, ...) should
+            double the amount of CPU time and memory required.</param>
+            <param name="r">scrypt 'r' tuning parameter</param>
+            <param name="p">scrypt 'p' tuning parameter (parallelization parameter); a large value of p can increase
+            computational cost of scrypt without increasing the memory usage.</param>
+            <param name="derivedKeyLengthBytes">The number of bytes of key to derive.</param>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.SCrypt.DefaultSaltLengthBytes">
+            <summary>Default value for saltLengthBytes used by parameterless GenerateSalt, currently 16 bytes.</summary>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.SCrypt.Default_N">
+            <summary>Default value for N used by parameterless GenerateSalt, currently 2^14.</summary>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.SCrypt.Default_r">
+            <summary>Default value for r used by parameterless GenerateSalt, currently 8.</summary>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.SCrypt.Default_p">
+            <summary>Default value for p used by parameterless GenerateSalt, currently 1.</summary>
+        </member>
+        <member name="P:Replicon.Cryptography.SCrypt.SCrypt.DefaultHashLengthBytes">
+            <summary>Default value for hashLengthBytes used by parameterless GenerateSalt, currently 32 bytes.</summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.MixedModeAssemblyKeyDerivationFunction.CopyStream(System.IO.Stream,System.IO.Stream)">
+            <summary>
+            There is a similar method in the .NET 4 base classes, but we need to implement our own to support .NET
+            3.5 still.
+            </summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.MixedModeAssemblyKeyDerivationFunction.EscapeExecutionContext``1(System.Func{``0})">
+            <summary>
+            CRT initialization when first accessing the mixed-mode assembly will attempt to initialize a CRT appdomain,
+            which attempts to copy the current thread's execution context.  However, because the new appdomain doesn't
+            have a configuration matching the current appdomain, it often can't find the assemblies required to
+            deserialize the principal, or other objects stored in the execution context.  To work around this, we
+            attempt to "escape" our execution context by spawning a new thread.  I welcome ideas for how to make this
+            more efficient.
+            </summary>
+        </member>
+        <member name="T:Replicon.Cryptography.SCrypt.Factory">
+            <summary>
+            Factory for creating pre-defined implementations of IPasswordHash and IKeyDerivationFunction.
+            </summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.Factory.CreatePasswordHash">
+            <summary>
+            Create an IPasswordHash implementation, using the best available key-derivation function implementation.
+            </summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.Factory.CreatePasswordHash(Replicon.Cryptography.SCrypt.IKeyDerivationFunction)">
+            <summary>
+            Create an IPasswordHash implementation, using the provided key-derivation function implementation.
+            </summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.Factory.CreateKeyDerivationFunction">
+            <summary>
+            Create an IKeyDerivationFunction representing the best available key-derivation function implementation.
+            </summary>
+        </member>
+        <member name="M:Replicon.Cryptography.SCrypt.Factory.CreateNativeKeyDerivationFunction">
+            <summary>
+            Create an IKeyDerivationFunction implemented by a mixed-mode assembly.  This is a high-performance
+            implementation using SSE2, but requires support for C++/CLI mixed-mode assemblies (ie. doesn't work on
+            Mono), and requires that the current environment be supported (.NET 3.5 or 4.0, x86 or x64).
+            </summary>
+            <remarks>If the mixed-mode assembly cannot be loaded, this method will... FIXME: what?</remarks>
+        </member>
+    </members>
+</doc>

MasterPassword/CSharp/MasterPassword/frmMain.Designer.cs

@@ -0,0 +1,309 @@
+// MASTERPASSWORD FOR WINDOWS
+// --------------------------
+// Created by Michel Verhagen
+// Copyright (C)2014 GuruCE Limited
+//
+// Released under the GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+//
+// Contains software provided by Maarten Billemont and used under the GPL v3 License.
+//
+// Copyright (c) 2012 Lyndir. All rights reserved.
+//
+// Contains software provided by Replicon Inc. and used under this license:
+//
+// Replicon.Cryptography.SCrypt
+// Copyright (c) 2012, Replicon Inc.
+// All rights reserved.
+//
+namespace MasterPassword
+{
+    partial class frmMain
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
+            this.label1 = new System.Windows.Forms.Label();
+            this.txtUsername = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.cmbType = new System.Windows.Forms.ComboBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.nudCounter = new System.Windows.Forms.NumericUpDown();
+            this.txtPassword = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.txtMasterPassword = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.btnGetPassword = new System.Windows.Forms.Button();
+            this.cmbSite = new System.Windows.Forms.ComboBox();
+            this.btnDelete = new System.Windows.Forms.Button();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.chkC2C = new System.Windows.Forms.CheckBox();
+            ((System.ComponentModel.ISupportInitialize)(this.nudCounter)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 73);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(55, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Full name:";
+            // 
+            // txtUsername
+            // 
+            this.txtUsername.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtUsername.Location = new System.Drawing.Point(77, 65);
+            this.txtUsername.Name = "txtUsername";
+            this.txtUsername.Size = new System.Drawing.Size(235, 20);
+            this.txtUsername.TabIndex = 3;
+            this.txtUsername.Leave += new System.EventHandler(this.txtUsername_Leave);
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 100);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(34, 13);
+            this.label2.TabIndex = 2;
+            this.label2.Text = "Type:";
+            // 
+            // cmbType
+            // 
+            this.cmbType.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
+            this.cmbType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+            this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbType.FormattingEnabled = true;
+            this.cmbType.Items.AddRange(new object[] {
+            "x - maximum (20 characters, contains symbols)",
+            "l - long (Copy-friendly, 14 characters, contains symbols)",
+            "m - medium  (Copy-friendly, 8 characters, contains symbols)",
+            "b - basic (8 characters, no symbols)",
+            "s - short (Copy-friendly, 4 characters, no symbols)",
+            "p - pin (4 numbers)"});
+            this.cmbType.Location = new System.Drawing.Point(77, 92);
+            this.cmbType.Name = "cmbType";
+            this.cmbType.Size = new System.Drawing.Size(235, 21);
+            this.cmbType.TabIndex = 4;
+            this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
+            this.cmbType.Leave += new System.EventHandler(this.cmbType_Leave);
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(12, 46);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(28, 13);
+            this.label3.TabIndex = 4;
+            this.label3.Text = "Site:";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(12, 126);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(47, 13);
+            this.label4.TabIndex = 6;
+            this.label4.Text = "Counter:";
+            // 
+            // nudCounter
+            // 
+            this.nudCounter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.nudCounter.Location = new System.Drawing.Point(77, 119);
+            this.nudCounter.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.nudCounter.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nudCounter.Name = "nudCounter";
+            this.nudCounter.Size = new System.Drawing.Size(73, 20);
+            this.nudCounter.TabIndex = 5;
+            this.nudCounter.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nudCounter.Leave += new System.EventHandler(this.nudCounter_Leave);
+            // 
+            // txtPassword
+            // 
+            this.txtPassword.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtPassword.BackColor = System.Drawing.Color.LemonChiffon;
+            this.txtPassword.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtPassword.Location = new System.Drawing.Point(77, 145);
+            this.txtPassword.Name = "txtPassword";
+            this.txtPassword.ReadOnly = true;
+            this.txtPassword.Size = new System.Drawing.Size(235, 31);
+            this.txtPassword.TabIndex = 8;
+            this.txtPassword.TabStop = false;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(12, 155);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(56, 13);
+            this.label5.TabIndex = 9;
+            this.label5.Text = "Password:";
+            // 
+            // txtMasterPassword
+            // 
+            this.txtMasterPassword.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtMasterPassword.Location = new System.Drawing.Point(77, 12);
+            this.txtMasterPassword.Name = "txtMasterPassword";
+            this.txtMasterPassword.PasswordChar = '*';
+            this.txtMasterPassword.Size = new System.Drawing.Size(235, 20);
+            this.txtMasterPassword.TabIndex = 0;
+            this.txtMasterPassword.Leave += new System.EventHandler(this.txtMasterPassword_Leave);
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(12, 20);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(65, 13);
+            this.label6.TabIndex = 10;
+            this.label6.Text = "Master pwd:";
+            // 
+            // btnGetPassword
+            // 
+            this.btnGetPassword.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnGetPassword.Enabled = false;
+            this.btnGetPassword.Location = new System.Drawing.Point(224, 119);
+            this.btnGetPassword.Name = "btnGetPassword";
+            this.btnGetPassword.Size = new System.Drawing.Size(88, 23);
+            this.btnGetPassword.TabIndex = 7;
+            this.btnGetPassword.Text = "Get &Password";
+            this.btnGetPassword.UseVisualStyleBackColor = true;
+            this.btnGetPassword.Click += new System.EventHandler(this.btnGetPassword_Click);
+            // 
+            // cmbSite
+            // 
+            this.cmbSite.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbSite.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            this.cmbSite.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+            this.cmbSite.FormattingEnabled = true;
+            this.cmbSite.Location = new System.Drawing.Point(77, 38);
+            this.cmbSite.Name = "cmbSite";
+            this.cmbSite.Size = new System.Drawing.Size(235, 21);
+            this.cmbSite.TabIndex = 2;
+            this.cmbSite.SelectedIndexChanged += new System.EventHandler(this.cmbSite_Check);
+            this.cmbSite.Enter += new System.EventHandler(this.cmbSite_Enter);
+            this.cmbSite.Leave += new System.EventHandler(this.cmbSite_Check);
+            // 
+            // btnDelete
+            // 
+            this.btnDelete.Enabled = false;
+            this.btnDelete.FlatAppearance.BorderSize = 0;
+            this.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.btnDelete.Image = ((System.Drawing.Image)(resources.GetObject("btnDelete.Image")));
+            this.btnDelete.Location = new System.Drawing.Point(51, 40);
+            this.btnDelete.Name = "btnDelete";
+            this.btnDelete.Size = new System.Drawing.Size(19, 19);
+            this.btnDelete.TabIndex = 1;
+            this.btnDelete.TabStop = false;
+            this.btnDelete.UseVisualStyleBackColor = true;
+            this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
+            // 
+            // chkC2C
+            // 
+            this.chkC2C.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkC2C.AutoSize = true;
+            this.chkC2C.Location = new System.Drawing.Point(156, 122);
+            this.chkC2C.Name = "chkC2C";
+            this.chkC2C.Size = new System.Drawing.Size(70, 17);
+            this.chkC2C.TabIndex = 6;
+            this.chkC2C.Text = "Clipboard";
+            this.chkC2C.UseVisualStyleBackColor = true;
+            // 
+            // frmMain
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(324, 182);
+            this.Controls.Add(this.btnGetPassword);
+            this.Controls.Add(this.chkC2C);
+            this.Controls.Add(this.btnDelete);
+            this.Controls.Add(this.cmbSite);
+            this.Controls.Add(this.txtMasterPassword);
+            this.Controls.Add(this.label6);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.txtPassword);
+            this.Controls.Add(this.nudCounter);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.cmbType);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.txtUsername);
+            this.Controls.Add(this.label1);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(800, 220);
+            this.MinimumSize = new System.Drawing.Size(320, 220);
+            this.Name = "frmMain";
+            this.Text = "MasterPassword";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing);
+            ((System.ComponentModel.ISupportInitialize)(this.nudCounter)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox txtUsername;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.ComboBox cmbType;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.NumericUpDown nudCounter;
+        private System.Windows.Forms.TextBox txtPassword;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox txtMasterPassword;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Button btnGetPassword;
+        private System.Windows.Forms.ComboBox cmbSite;
+        private System.Windows.Forms.Button btnDelete;
+        private System.Windows.Forms.ToolTip toolTip1;
+        private System.Windows.Forms.CheckBox chkC2C;
+    }
+}
+

MasterPassword/CSharp/MasterPassword/frmMain.cs

@@ -0,0 +1,264 @@
+// MASTERPASSWORD FOR WINDOWS
+// --------------------------
+// Created by Michel Verhagen
+// Copyright (C)2014 GuruCE Limited
+//
+// Released under the GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+//
+// Contains software provided by Maarten Billemont and used under the GPL v3 License.
+//
+// Copyright (c) 2012 Lyndir. All rights reserved.
+//
+// Contains software provided by Replicon Inc. and used under this license:
+//
+// Replicon.Cryptography.SCrypt
+// Copyright (c) 2012, Replicon Inc.
+// All rights reserved.
+//
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows.Forms;
+using Newtonsoft.Json;
+using System.Security.Cryptography;
+
+
+namespace MasterPassword
+{
+    public partial class frmMain : Form
+    {
+        private const int PASSWORD_VISIBILITY_MS = 15 * 1000;   // Show the password for 15 seconds, then remove from vision
+        private Dictionary<string, MRUData> mruData = new Dictionary<string, MRUData>();
+        private Timer timerVisibitlity = new Timer();
+        public frmMain()
+        {
+            InitializeComponent();
+
+            toolTip1.SetToolTip(btnDelete, "Delete site from list");
+
+            timerVisibitlity.Interval = PASSWORD_VISIBILITY_MS;
+            timerVisibitlity.Tick += timerVisibitlity_Tick;
+
+            chkC2C.Checked = Properties.Settings.Default.c2c;
+
+            #region Test Case
+            // Test case, should produce:
+            //  masterKeySalt ID: 8C-45-CA-48-46-73-5F-C7-29-ED-8B-52-E8-74-88-15-5E-18-56-B9-CD-CA-6D-FF-88-10-A6-E8-46-BE-ED-20
+            //  masterPassword Hex: 62-61-6E-61-6E-61-20-63-6F-6C-6F-72-65-64-20-64-75-63-6B-6C-69-6E-67
+            //  masterPassword ID: A7-20-D6-A4-20-75-33-DA-98-54-55-8B-15-3A-41-E0-55-AF-32-D9-EC-1F-2C-61-6F-90-8E-99-8E-50-37-2F
+            //  masterKey ID: AE-F3-B9-47-97-3D-21-19-4D-2D-34-28-D9-70-FE-88-5D-EB-62-B1-DA-A3-30-30-CF-AA-C4-05-6A-A6-36-33
+            //  seed from: hmac-sha256(masterKey, 'com.lyndir.masterpassword' | 00-00-00-15 | masterpasswordapp.com | 00-00-00-01)
+            //  sitePasswordInfo ID: 2A-CA-06-25-BA-02-3C-64-DB-2A-65-EF-03-C5-21-BB-E2-A2-88-EE-82-A1-9C-40-2E-C0-AF-AA-0F-85-EF-11
+            //  sitePasswordSeed ID: 60-71-19-F6-5D-F8-43-1A-5E-00-D8-61-39-A0-33-18-4D-21-56-C9-24-B3-BA-73-31-59-A0-BA-45-4C-E1-E6
+            //  type: MPElementTypeGeneratedLong, cipher: CvcvnoCvcvCvcc
+            //  class C, character D
+            //  class v, character o
+            //  class c, character r
+            //  class v, character a
+            //  class n, character 6
+            //  class o, character .
+            //  class C, character N
+            //  class v, character u
+            //  class c, character d
+            //  class v, character i
+            //  class C, character D
+            //  class v, character u
+            //  class c, character h
+            //  class c, character j
+            //  Dora6.NudiDuhj
+            //MasterPassword.Calculate("banana colored duckling", "Robert Lee Mitchel", "masterpasswordapp.com", 1, MasterPassword.MPType.Long);
+            #endregion Test Case
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == NativeMethods.WM_SHOWME)
+                ShowMe();
+            base.WndProc(ref m);
+        }
+
+        private void ShowMe()
+        {
+            if (WindowState == FormWindowState.Minimized)
+                WindowState = FormWindowState.Normal;
+            // Bring window on top of everything else
+            TopMost = true;
+            // And set it back to normal
+            TopMost = false;
+        }
+
+        void timerVisibitlity_Tick(object sender, EventArgs e)
+        {
+            timerVisibitlity.Stop();
+            txtPassword.Text = "";
+        }
+
+        private bool LoadMRU(string fileName)
+        {
+            bool retValue = false;
+            string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Application.ProductName, fileName);
+            if (File.Exists(appDataPath))
+            {
+                mruData.Clear();
+                string json = "";
+                using (BinaryReader br = new BinaryReader(File.Open(appDataPath, FileMode.Open)))
+                {
+                    byte[] encrypted = br.ReadBytes((int)new FileInfo(appDataPath).Length);
+                    br.Close();
+                    json = MasterPassword.Decrypt(txtMasterPassword.Text, encrypted);
+                }
+                if (json.Length > 0)
+                {
+                    mruData = JsonConvert.DeserializeObject<Dictionary<string, MRUData>>(json);
+                    // Populate siteNames combo
+                    List<string> siteNames = new List<string>(mruData.Keys);
+                    cmbSite.Items.Clear();
+                    cmbSite.Items.AddRange(siteNames.ToArray());
+                    retValue = true;
+                }
+            }
+            return retValue;
+        }
+
+        private void SaveMRU(string fileName)
+        {
+            string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Application.ProductName, fileName);
+            string json = JsonConvert.SerializeObject(mruData);
+            byte[] encrypted = MasterPassword.Encrypt(txtMasterPassword.Text, json);
+            Directory.CreateDirectory(Path.GetDirectoryName(appDataPath));
+            using (BinaryWriter bw = new BinaryWriter(File.Create(appDataPath)))
+            {
+                bw.Write(encrypted);
+                bw.Close();
+            }
+        }
+
+        private void btnGetPassword_Click(object sender, EventArgs e)
+        {
+            if (txtUsername.Text.Length == 0)
+                return;
+            if (cmbSite.Text.Length == 0)
+                return;
+            if (cmbType.SelectedIndex == -1)
+                cmbType.SelectedIndex = 0;
+            txtPassword.Text = MasterPassword.Calculate(txtMasterPassword.Text, txtUsername.Text, cmbSite.Text, (int)nudCounter.Value, (MasterPassword.MPType)cmbType.SelectedIndex);
+            if (chkC2C.Checked)
+                Clipboard.SetText(txtPassword.Text);
+            timerVisibitlity.Stop();
+            timerVisibitlity.Start();
+            if (mruData.ContainsKey(cmbSite.Text))
+            {   // Update mruData
+                mruData[cmbSite.Text].PasswordType = (MasterPassword.MPType)cmbType.SelectedIndex;
+                mruData[cmbSite.Text].SiteCounter = (int)nudCounter.Value;
+                mruData[cmbSite.Text].UserName = txtUsername.Text;
+            }
+            else 
+            {   // Add mruData
+                mruData.Add(cmbSite.Text, new MRUData(txtUsername.Text, cmbSite.Text, (int)nudCounter.Value, (MasterPassword.MPType)cmbType.SelectedIndex));
+                // And add to list
+                cmbSite.Items.Add(cmbSite.Text);
+            }
+            UpdateButtonStates();
+        }
+
+        private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            string fileTitle = MasterPassword.GetMasterPasswordKeySHA(txtMasterPassword.Text);
+            if (fileTitle.Length > 0)
+            {
+                fileTitle = fileTitle.Replace("-", string.Empty);
+                SaveMRU(fileTitle + ".dat");
+            }
+            Properties.Settings.Default.c2c = chkC2C.Checked;
+            Properties.Settings.Default.Save();
+        }
+
+        private void cmbSite_Check(object sender, EventArgs e)
+        {
+            if (mruData.ContainsKey(cmbSite.Text))
+            {   // Update other fields to last used
+                cmbType.SelectedIndex = (int)mruData[cmbSite.Text].PasswordType;
+                nudCounter.Value = mruData[cmbSite.Text].SiteCounter;
+                txtUsername.Text = mruData[cmbSite.Text].UserName;
+            }
+            UpdateButtonStates();
+        }
+
+        private void UpdateButtonStates()
+        {
+            if ((txtMasterPassword.Text.Length > 0) && (txtUsername.Text.Length > 0) && (cmbSite.Text.Length > 0) && (cmbType.SelectedIndex != -1))
+                btnGetPassword.Enabled = true;
+            else
+                btnGetPassword.Enabled = false;
+            btnDelete.Enabled = mruData.ContainsKey(cmbSite.Text);
+        }
+
+        private void txtMasterPassword_Leave(object sender, EventArgs e)
+        {
+            string fileTitle = MasterPassword.GetMasterPasswordKeySHA(txtMasterPassword.Text);
+            if (fileTitle.Length > 0)
+            {
+                fileTitle = fileTitle.Replace("-", string.Empty);
+                if (LoadMRU(fileTitle + ".dat"))
+                    cmbSite.Focus();
+                else
+                {
+                    txtUsername.Text = "";
+                    txtPassword.Text = "";
+                    cmbSite.Text = "";
+                    cmbType.SelectedIndex = -1;
+                    cmbSite.Items.Clear();
+                    mruData.Clear();
+                    nudCounter.Value = 1;
+                }
+            }
+        }
+
+        private void btnDelete_Click(object sender, EventArgs e)
+        {
+            if (mruData.ContainsKey(cmbSite.Text))
+            {
+                mruData.Remove(cmbSite.Text);
+                int index = cmbSite.FindStringExact(cmbSite.Text);
+                if (index != -1)
+                    cmbSite.Items.RemoveAt(index);
+                cmbSite.Text = "";
+                txtUsername.Text = "";
+                txtPassword.Text = "";
+                nudCounter.Value = 1;
+                cmbType.SelectedIndex = -1;
+                cmbSite.Focus();
+                UpdateButtonStates();
+            }
+        }
+
+        private void txtUsername_Leave(object sender, EventArgs e)
+        {
+            UpdateButtonStates();
+        }
+
+        private void cmbType_Leave(object sender, EventArgs e)
+        {
+            UpdateButtonStates();
+        }
+
+        private void nudCounter_Leave(object sender, EventArgs e)
+        {
+            UpdateButtonStates();
+        }
+
+        private void cmbSite_Enter(object sender, EventArgs e)
+        {
+            txtUsername.Text = "";
+            cmbType.SelectedIndex = -1;
+            nudCounter.Value = 1;
+            txtPassword.Text = "";
+            UpdateButtonStates();
+        }
+
+        private void cmbType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            UpdateButtonStates();
+        }
+    }
+}

MasterPassword/CSharp/MasterPassword/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
+</packages>

MasterPassword/ObjC/MPAppDelegate_InApp.m

@@ -169,6 +169,8 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
         for (id<MPInAppDelegate> productObserver in self.productObservers)
             [productObserver updateWithTransaction:transaction];
     }
+    if (![[NSUserDefaults standardUserDefaults] synchronize])
+        wrn( @"Couldn't synchronize after transaction updates." );
 }
 
 - (void)paymentQueue:(SKPaymentQueue *)queue restoreCompletedTransactionsFailedWithError:(NSError *)error {

MasterPassword/ObjC/MPAppDelegate_Key.m

@@ -122,10 +122,8 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
 
     // No more methods left, fail if key still not known.
     if (!tryKey) {
-        if (password) {
+        if (password)
             inf( @"Login failed for: %@", user.userID );
-            MPCheckpoint( MPCheckpointSignInFailed, nil );
-        }
 
         return NO;
     }
@@ -159,7 +157,6 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
         }];
 
     [[NSNotificationCenter defaultCenter] postNotificationName:MPSignedInNotification object:self];
-    MPCheckpoint( MPCheckpointSignedIn, nil );
 
     return YES;
 }

MasterPassword/ObjC/MPAppDelegate_Shared.h

@@ -16,6 +16,7 @@
 
 @property(strong, nonatomic, readonly) MPKey *key;
 @property(strong, nonatomic, readonly) NSManagedObjectID *activeUserOID;
+@property(strong, nonatomic, readonly) NSPersistentStoreCoordinator *storeCoordinator;
 
 + (instancetype)get;
 

MasterPassword/ObjC/MPAppDelegate_Shared.m

@@ -6,15 +6,16 @@
 //  Copyright (c) 2011 Lyndir. All rights reserved.
 //
 
-#import <StoreKit/StoreKit.h>
 #import "MPAppDelegate_Shared.h"
 #import "MPAppDelegate_Store.h"
 #import "MPAppDelegate_Key.h"
+#import "NSManagedObjectModel+KCOrderedAccessorFix.h"
 
 @interface MPAppDelegate_Shared ()
 
 @property(strong, nonatomic) MPKey *key;
 @property(strong, nonatomic) NSManagedObjectID *activeUserOID;
+@property(strong, nonatomic) NSPersistentStoreCoordinator *storeCoordinator;
 
 @end
 
@@ -31,6 +32,18 @@
 #endif
 }
 
+- (instancetype)init {
+
+    if (!(self = [super init]))
+        return nil;
+
+    NSManagedObjectModel *model = [NSManagedObjectModel mergedModelFromBundles:nil];
+    [model kc_generateOrderedSetAccessors];
+    self.storeCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
+
+    return self;
+}
+
 - (MPUserEntity *)activeUserForMainThread {
 
     return [self activeUserInContext:[MPAppDelegate_Shared managedObjectContextForMainThreadIfReady]];

MasterPassword/ObjC/MPAppDelegate_Store.m

@@ -7,8 +7,6 @@
 //
 
 #import "MPAppDelegate_Store.h"
-#import "MPGeneratedSiteEntity.h"
-#import "NSManagedObjectModel+KCOrderedAccessorFix.h"
 
 #if TARGET_OS_IPHONE
 #define STORE_OPTIONS NSPersistentStoreFileProtectionKey : NSFileProtectionComplete,
@@ -16,7 +14,7 @@
 #define STORE_OPTIONS
 #endif
 
-#define MPStoreMigrationLevelKey @"MPMigrationLevelLocalStoreKey"
+#define MPMigrationLevelLocalStoreKey @"MPMigrationLevelLocalStoreKey"
 
 typedef NS_ENUM( NSInteger, MPStoreMigrationLevel ) {
     MPStoreMigrationLevelV1,
@@ -27,9 +25,7 @@ typedef NS_ENUM( NSInteger, MPStoreMigrationLevel ) {
 
 @implementation MPAppDelegate_Shared(Store)
 
-PearlAssociatedObjectProperty( id, SaveObserver, saveObserver );
-
-PearlAssociatedObjectProperty( NSPersistentStoreCoordinator*, PersistentStoreCoordinator, persistentStoreCoordinator );
+PearlAssociatedObjectProperty( NSOperationQueue *, StoreQueue, storeQueue );
 
 PearlAssociatedObjectProperty( NSManagedObjectContext*, PrivateManagedObjectContext, privateManagedObjectContext );
 
@@ -56,7 +52,12 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         return NO;
 
     [mainManagedObjectContext performBlock:^{
-        mocBlock( mainManagedObjectContext );
+        @try {
+            mocBlock( mainManagedObjectContext );
+        }
+        @catch (NSException *exception) {
+            err( @"While performing managed block:\n%@", [exception fullDescription] );
+        }
     }];
 
     return YES;
@@ -69,7 +70,12 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         return NO;
 
     [mainManagedObjectContext performBlockAndWait:^{
-        mocBlock( mainManagedObjectContext );
+        @try {
+            mocBlock( mainManagedObjectContext );
+        }
+        @catch (NSException *exception) {
+            err( @"While performing managed block:\n%@", [exception fullDescription] );
+        }
     }];
 
     return YES;
@@ -84,7 +90,12 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
     NSManagedObjectContext *moc = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
     moc.parentContext = privateManagedObjectContextIfReady;
     [moc performBlock:^{
-        mocBlock( moc );
+        @try {
+            mocBlock( moc );
+        }
+        @catch (NSException *exception) {
+            err( @"While performing managed block:\n%@", [exception fullDescription] );
+        }
     }];
 
     return YES;
@@ -99,7 +110,12 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
     NSManagedObjectContext *moc = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
     moc.parentContext = privateManagedObjectContextIfReady;
     [moc performBlockAndWait:^{
-        mocBlock( moc );
+        @try {
+            mocBlock( moc );
+        }
+        @catch (NSException *exception) {
+            err( @"While performing managed block:\n%@", [exception fullDescription] );
+        }
     }];
 
     return YES;
@@ -123,20 +139,28 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                                                                            inDomains:NSUserDomainMask] lastObject];
     return [[[applicationSupportURL
             URLByAppendingPathComponent:[NSBundle mainBundle].bundleIdentifier isDirectory:YES]
-            URLByAppendingPathComponent:@"UbiquityStore" isDirectory:NO]
+            URLByAppendingPathComponent:@"MasterPassword" isDirectory:NO]
             URLByAppendingPathExtension:@"sqlite"];
 }
 
 - (void)loadStore {
 
-    @synchronized (self) {
+    static dispatch_once_t once = 0;
+    dispatch_once( &once, ^{
+        (self.storeQueue = [NSOperationQueue new]).maxConcurrentOperationCount = 1;
+    } );
+
+    // Do nothing if already fully set up, otherwise (re-)load the store.
+    if (self.storeCoordinator && self.mainManagedObjectContext && self.privateManagedObjectContext)
+        return;
+
+    [self.storeQueue addOperationWithBlock:^{
         // Do nothing if already fully set up, otherwise (re-)load the store.
-        if (self.persistentStoreCoordinator && self.saveObserver && self.mainManagedObjectContext && self.privateManagedObjectContext)
+        if (self.storeCoordinator && self.mainManagedObjectContext && self.privateManagedObjectContext)
             return;
 
         // Unregister any existing observers and contexts.
-        if (self.saveObserver)
-            [[NSNotificationCenter defaultCenter] removeObserver:self.saveObserver];
+        PearlRemoveNotificationObserversFrom( self.mainManagedObjectContext );
         [self.mainManagedObjectContext performBlockAndWait:^{
             [self.mainManagedObjectContext reset];
             self.mainManagedObjectContext = nil;
@@ -153,13 +177,31 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         // Check if migration is necessary.
         [self migrateStore];
 
-        // Create a new store coordinator.
-        if (!self.persistentStoreCoordinator) {
-            NSManagedObjectModel *model = [NSManagedObjectModel mergedModelFromBundles:nil];
-            [model kc_generateOrderedSetAccessors];
-            self.persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
-        }
+        // Install managed object contexts and observers.
+        self.privateManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+        [self.privateManagedObjectContext performBlockAndWait:^{
+            self.privateManagedObjectContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy;
+            self.privateManagedObjectContext.persistentStoreCoordinator = self.storeCoordinator;
+        }];
 
+        self.mainManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
+        self.mainManagedObjectContext.parentContext = self.privateManagedObjectContext;
+
+        // When privateManagedObjectContext is saved, import the changes into mainManagedObjectContext.
+        PearlAddNotificationObserverTo( self.mainManagedObjectContext, NSManagedObjectContextDidSaveNotification,
+                self.privateManagedObjectContext, nil, ^(NSManagedObjectContext *mainManagedObjectContext, NSNotification *note) {
+                [mainManagedObjectContext performBlock:^{
+                    @try {
+                        [mainManagedObjectContext mergeChangesFromContextDidSaveNotification:note];
+                    }
+                    @catch (NSException *exception) {
+                        err( @"While merging changes:\n%@",[exception fullDescription] );
+                    }
+                }];
+        } );
+
+
+        // Create a new store coordinator.
         NSError *error = nil;
         NSURL *localStoreURL = [self localStoreURL];
         if (![[NSFileManager defaultManager] createDirectoryAtURL:[localStoreURL URLByDeletingLastPathComponent]
@@ -167,12 +209,12 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
             err( @"Couldn't create our application support directory: %@", [error fullDescription] );
             return;
         }
-        if (![self.persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:[self localStoreURL]
-                                                                 options:@{
-                                                                         NSMigratePersistentStoresAutomaticallyOption : @YES,
-                                                                         NSInferMappingModelAutomaticallyOption       : @YES,
-                                                                         STORE_OPTIONS
-                                                                 } error:&error]) {
+        if (![self.storeCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:[self localStoreURL]
+                                                       options:@{
+                                                               NSMigratePersistentStoresAutomaticallyOption : @YES,
+                                                               NSInferMappingModelAutomaticallyOption       : @YES,
+                                                               STORE_OPTIONS
+                                                       } error:&error]) {
             err( @"Failed to open store: %@", [error fullDescription] );
             self.storeCorrupted = @YES;
             [self handleCoordinatorError:error];
@@ -180,25 +222,6 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         }
         self.storeCorrupted = @NO;
 
-        // Create our contexts and observer.
-        self.privateManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
-        [self.privateManagedObjectContext performBlockAndWait:^{
-            self.privateManagedObjectContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy;
-            self.privateManagedObjectContext.persistentStoreCoordinator = self.persistentStoreCoordinator;
-        }];
-
-        self.mainManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
-        self.mainManagedObjectContext.parentContext = self.privateManagedObjectContext;
-
-        self.saveObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSManagedObjectContextDidSaveNotification
-                                                                              object:self.privateManagedObjectContext queue:nil usingBlock:
-                        ^(NSNotification *note) {
-                            // When privateManagedObjectContext is saved, import the changes into mainManagedObjectContext.
-                            [self.mainManagedObjectContext performBlock:^{
-                                [self.mainManagedObjectContext mergeChangesFromContextDidSaveNotification:note];
-                            }];
-                        }];
-
 #if TARGET_OS_IPHONE
         PearlAddNotificationObserver( UIApplicationWillTerminateNotification, UIApp, [NSOperationQueue mainQueue],
                 ^(MPAppDelegate_Shared *self, NSNotification *note) {
@@ -220,15 +243,14 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
             [MPAppDelegate_Shared managedObjectContextPerformBlockAndWait:^(NSManagedObjectContext *context) {
                 [self findAndFixInconsistenciesSaveInContext:context];
             }];
-    }
+    }];
 }
 
 - (void)deleteAndResetStore {
 
     @synchronized (self) {
         // Unregister any existing observers and contexts.
-        if (self.saveObserver)
-            [[NSNotificationCenter defaultCenter] removeObserver:self.saveObserver];
+        PearlRemoveNotificationObserversFrom( self.mainManagedObjectContext );
         [self.mainManagedObjectContext performBlockAndWait:^{
             [self.mainManagedObjectContext reset];
             self.mainManagedObjectContext = nil;
@@ -238,11 +260,10 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
             self.privateManagedObjectContext = nil;
         }];
         NSError *error = nil;
-        for (NSPersistentStore *store in self.persistentStoreCoordinator.persistentStores) {
-            if (![self.persistentStoreCoordinator removePersistentStore:store error:&error])
+        for (NSPersistentStore *store in self.storeCoordinator.persistentStores) {
+            if (![self.storeCoordinator removePersistentStore:store error:&error])
                 err( @"Couldn't remove persistence store from coordinator: %@", [error fullDescription] );
         }
-        self.persistentStoreCoordinator = nil;
         if (![[NSFileManager defaultManager] removeItemAtURL:self.localStoreURL error:&error])
             err( @"Couldn't remove persistence store at URL %@: %@", self.localStoreURL, [error fullDescription] );
 
@@ -287,23 +308,25 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
 
 - (void)migrateStore {
 
-    MPStoreMigrationLevel migrationLevel = (signed)[[NSUserDefaults standardUserDefaults] integerForKey:MPStoreMigrationLevelKey];
+    MPStoreMigrationLevel migrationLevel = (signed)[[NSUserDefaults standardUserDefaults] integerForKey:MPMigrationLevelLocalStoreKey];
     if (migrationLevel >= MPStoreMigrationLevelCurrent)
         // Local store up-to-date.
         return;
 
     inf( @"Local store migration level: %d (current %d)", (signed)migrationLevel, (signed)MPStoreMigrationLevelCurrent );
-    if (migrationLevel == MPStoreMigrationLevelV1 && ![self migrateV1LocalStore]) {
+    if (migrationLevel <= MPStoreMigrationLevelV1 && ![self migrateV1LocalStore]) {
         inf( @"Failed to migrate old V1 to new local store." );
         return;
     }
-    if (migrationLevel == MPStoreMigrationLevelV2 && ![self migrateV2LocalStore]) {
+    if (migrationLevel <= MPStoreMigrationLevelV2 && ![self migrateV2LocalStore]) {
         inf( @"Failed to migrate old V2 to new local store." );
         return;
     }
 
-    [[NSUserDefaults standardUserDefaults] setInteger:MPStoreMigrationLevelCurrent forKey:MPStoreMigrationLevelKey];
+    [[NSUserDefaults standardUserDefaults] setInteger:MPStoreMigrationLevelCurrent forKey:MPMigrationLevelLocalStoreKey];
     inf( @"Successfully migrated old to new local store." );
+    if (![[NSUserDefaults standardUserDefaults] synchronize])
+        wrn( @"Couldn't synchronize after store migration." );
 }
 
 - (BOOL)migrateV1LocalStore {
@@ -319,14 +342,16 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
 
     inf( @"Migrating V1 local store" );
     NSURL *newLocalStoreURL = [self localStoreURL];
-    NSError *error = nil;
-    if (![[NSFileManager defaultManager] createDirectoryAtURL:[newLocalStoreURL URLByDeletingLastPathComponent]
-                                  withIntermediateDirectories:YES attributes:nil error:&error]) {
-        err( @"Couldn't create our application support directory: %@", [error fullDescription] );
-        return NO;
+    if (![[NSFileManager defaultManager] fileExistsAtPath:newLocalStoreURL.path isDirectory:NULL]) {
+        inf( @"New local store already exists." );
+        return YES;
     }
-    if (![[NSFileManager defaultManager] moveItemAtURL:oldLocalStoreURL toURL:newLocalStoreURL error:&error]) {
-        err( @"Couldn't move the old store to the new location: %@", [error fullDescription] );
+
+    NSError *error = nil;
+    if (![NSPersistentStore migrateStore:oldLocalStoreURL withOptions:@{ STORE_OPTIONS }
+                                 toStore:newLocalStoreURL withOptions:@{ STORE_OPTIONS }
+                                   model:nil error:&error]) {
+        err( @"Couldn't migrate the old store to the new location: %@", [error fullDescription] );
         return NO;
     }
 
@@ -358,14 +383,22 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
 
     inf( @"Migrating V2 local store" );
     NSURL *newLocalStoreURL = [self localStoreURL];
-    NSError *error = nil;
-    if (![[NSFileManager defaultManager] createDirectoryAtURL:[newLocalStoreURL URLByDeletingLastPathComponent]
-                                  withIntermediateDirectories:YES attributes:nil error:&error]) {
-        err( @"Couldn't create our application support directory: %@", [error fullDescription] );
-        return NO;
+    if ([[NSFileManager defaultManager] fileExistsAtPath:newLocalStoreURL.path isDirectory:NULL]) {
+        inf( @"New local store already exists." );
+        return YES;
     }
-    if (![[NSFileManager defaultManager] moveItemAtURL:oldLocalStoreURL toURL:newLocalStoreURL error:&error]) {
-        err( @"Couldn't move the old store to the new location: %@", [error fullDescription] );
+
+    NSError *error = nil;
+    if (![NSPersistentStore migrateStore:oldLocalStoreURL withOptions:@{
+            NSMigratePersistentStoresAutomaticallyOption : @YES,
+            NSInferMappingModelAutomaticallyOption       : @YES,
+            STORE_OPTIONS
+    }                            toStore:newLocalStoreURL withOptions:@{
+            NSMigratePersistentStoresAutomaticallyOption : @YES,
+            NSInferMappingModelAutomaticallyOption       : @YES,
+            STORE_OPTIONS
+    }                              model:nil error:&error]) {
+        err( @"Couldn't migrate the old store to the new location: %@", [error fullDescription] );
         return NO;
     }
 
@@ -697,6 +730,10 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
 
         // Create new site.
         NSString *typeEntityName = [MPAlgorithmForVersion( version ) classNameOfType:type];
+        if (!typeEntityName) {
+            err( @"Invalid site type in import file: %@ has type %lu", siteName, (long)type );
+            return MPImportResultInternalError;
+        }
         MPSiteEntity *site = [NSEntityDescription insertNewObjectForEntityForName:typeEntityName inManagedObjectContext:context];
         site.name = siteName;
         site.loginName = loginName;
@@ -721,7 +758,6 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         return MPImportResultInternalError;
 
     inf( @"Import completed successfully." );
-    MPCheckpoint( MPCheckpointSitesImported, nil );
 
     [[NSNotificationCenter defaultCenter] postNotificationName:MPSitesImportedNotification object:nil userInfo:@{
             MPSitesImportedNotificationUserKey : user
@@ -789,10 +825,6 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                              [(loginName?: @"") UTF8String], [siteName UTF8String], content?: @""];
     }
 
-    MPCheckpoint( MPCheckpointSitesExported, @{
-            @"showPasswords" : @(revealPasswords)
-    } );
-
     return export;
 }
 

MasterPassword/ObjC/MPEntities.m

@@ -23,7 +23,7 @@
             }
             @catch (NSException *exception) {
                 success = NO;
-                err( @"While saving: %@", exception );
+                err( @"While saving: %@", [exception fullDescription] );
             }
         }];
     }
@@ -128,10 +128,15 @@
 
 - (NSString *)debugDescription {
 
-    return strf( @"{%@: name=%@, user=%@, type=%lu, uses=%ld, lastUsed=%@, version=%ld, loginName=%@, requiresExplicitMigration=%d}",
-            NSStringFromClass( [self class] ), self.name, self.user.name, (long)self.type, (long)self.uses, self.lastUsed,
-            (long)self.version,
-            self.loginName, self.requiresExplicitMigration );
+    @try {
+        return strf( @"{%@: name=%@, user=%@, type=%lu, uses=%ld, lastUsed=%@, version=%ld, loginName=%@, requiresExplicitMigration=%d}",
+                NSStringFromClass( [self class] ), self.name, self.user.name, (long)self.type, (long)self.uses, self.lastUsed,
+                (long)self.version,
+                self.loginName, self.requiresExplicitMigration );
+    } @catch (NSException *exception) {
+        return strf( @"{%@: inaccessible: %@}",
+                NSStringFromClass( [self class] ), [exception fullDescription] );
+    }
 }
 
 - (BOOL)tryMigrateExplicitly:(BOOL)explicit {

MasterPassword/ObjC/MPTypes.h

@@ -47,35 +47,6 @@ typedef NS_ENUM(NSUInteger, MPSiteType) {
 
 #define MPErrorDomain                         @"MPErrorDomain"
 
-#define MPCheckpointHelpChapter               @"MPCheckpointHelpChapter"
-#define MPCheckpointCopyToPasteboard          @"MPCheckpointCopyToPasteboard"
-#define MPCheckpointCopyLoginNameToPasteboard @"MPCheckpointCopyLoginNameToPasteboard"
-#define MPCheckpointResetPasswordCounter      @"MPCheckpointResetPasswordCounter"
-#define MPCheckpointIncrementPasswordCounter  @"MPCheckpointIncrementPasswordCounter"
-#define MPCheckpointEditPassword              @"MPCheckpointEditPassword"
-#define MPCheckpointEditLoginName             @"MPCheckpointEditLoginName"
-#define MPCheckpointUseType                   @"MPCheckpointUseType"
-#define MPCheckpointDeleteSite                @"MPCheckpointDeleteSite"
-#define MPCheckpointShowGuide                 @"MPCheckpointShowGuide"
-#define MPCheckpointShowSetup                 @"MPCheckpointShowSetup"
-#define MPCheckpointChangeMP                  @"MPCheckpointChangeMP"
-#define MPCheckpointMPErrorUbiquity           @"MPCheckpointMPErrorUbiquity"
-#define MPCheckpointLocalStoreReset           @"MPCheckpointLocalStoreReset"
-#define MPCheckpointCloudStoreReset           @"MPCheckpointCloudStoreReset"
-#define MPCheckpointSignInFailed              @"MPCheckpointSignInFailed"
-#define MPCheckpointSignedIn                  @"MPCheckpointSignedIn"
-#define MPCheckpointConfig                    @"MPCheckpointConfig"
-#define MPCheckpointCloud                     @"MPCheckpointCloud"
-#define MPCheckpointSitesImported             @"MPCheckpointSitesImported"
-#define MPCheckpointSitesExported             @"MPCheckpointSitesExported"
-#define MPCheckpointExplicitMigration         @"MPCheckpointExplicitMigration"
-#define MPCheckpointReview                    @"MPCheckpointReview"
-#define MPCheckpointApps                      @"MPCheckpointApps"
-#define MPCheckpointApp                       @"MPCheckpointApp"
-#define MPCheckpointEmergencyGenerator        @"MPCheckpointEmergencyGenerator"
-#define MPCheckpointLogs                      @"MPCheckpointLogs"
-#define MPCheckpointStarted                   @"MPCheckpointStarted"
-
 #define MPSignedInNotification                @"MPSignedInNotification"
 #define MPSignedOutNotification               @"MPSignedOutNotification"
 #define MPKeyForgottenNotification            @"MPKeyForgottenNotification"
@@ -86,8 +57,3 @@ typedef NS_ENUM(NSUInteger, MPSiteType) {
 
 #define MPSitesImportedNotificationUserKey    @"MPSitesImportedNotificationUserKey"
 #define MPInconsistenciesFixResultUserKey     @"MPInconsistenciesFixResultUserKey"
-
-static void MPCheckpoint(NSString *checkpoint, NSDictionary *attributes) {
-
-    inf(@"%@: %@", checkpoint, attributes);
-}

MasterPassword/ObjC/Mac/MPMacAppDelegate.h

@@ -8,13 +8,12 @@
 
 #import <Cocoa/Cocoa.h>
 #import "MPAppDelegate_Shared.h"
-#import "RHStatusItemView.h"
 #import "MPPasswordWindowController.h"
 #import "MPInitialWindowController.h"
 
 @interface MPMacAppDelegate : MPAppDelegate_Shared<NSApplicationDelegate>
 
-@property(nonatomic, strong) RHStatusItemView *statusView;
+@property(nonatomic, strong) NSStatusItem *statusView;
 @property(nonatomic, strong) MPPasswordWindowController *passwordWindowController;
 @property(nonatomic, strong) MPInitialWindowController *initialWindowController;
 @property(nonatomic, weak) IBOutlet NSMenuItem *lockItem;

MasterPassword/ObjC/Mac/MPMacAppDelegate.m

@@ -9,8 +9,6 @@
 #import "MPMacAppDelegate.h"
 #import "MPAppDelegate_Key.h"
 #import "MPAppDelegate_Store.h"
-#import "MPPasswordWindowController.h"
-#import "PearlProfiler.h"
 #import <Carbon/Carbon.h>
 #import <ServiceManagement/ServiceManagement.h>
 
@@ -75,36 +73,43 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     }           forKeyPath:@"activeUser" options:0 context:nil];
 
     // Status item.
-    self.statusView = [[RHStatusItemView alloc] initWithStatusBarItem:
-            [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength]];
+    self.statusView = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
     self.statusView.image = [NSImage imageNamed:@"menu-icon"];
+    self.statusView.image.template = YES;
     self.statusView.menu = self.statusMenu;
     self.statusView.target = self;
     self.statusView.action = @selector( showMenu );
 
-    [[NSNotificationCenter defaultCenter] addObserverForName:USMStoreDidChangeNotification object:nil
-                                                       queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        [self updateUsers];
-    }];
-    [[NSNotificationCenter defaultCenter] addObserverForName:USMStoreDidImportChangesNotification object:nil
-                                                       queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        [self updateUsers];
-    }];
-    [[NSNotificationCenter defaultCenter] addObserverForName:MPCheckConfigNotification object:nil
-                                                       queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        NSString *key = note.object;
-        if (!key || [key isEqualToString:NSStringFromSelector( @selector( hidePasswords ) )])
-            self.hidePasswordsItem.state = [[MPConfig get].hidePasswords boolValue]? NSOnState: NSOffState;
-        if (!key || [key isEqualToString:NSStringFromSelector( @selector( rememberLogin ) )])
-            self.rememberPasswordItem.state = [[MPConfig get].rememberLogin boolValue]? NSOnState: NSOffState;
-    }];
+    PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresWillChangeNotification, self.storeCoordinator, nil,
+            ^(id self, NSNotification *note) {
+                PearlMainQueue( ^{
+                    [self updateUsers];
+                } );
+            } );
+    PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresDidChangeNotification, self.storeCoordinator, nil,
+            ^(id self, NSNotification *note) {
+                PearlMainQueue( ^{
+                    [self updateUsers];
+                } );
+            } );
+    PearlAddNotificationObserver( MPCheckConfigNotification, nil, nil,
+            ^(MPMacAppDelegate *self, NSNotification *note) {
+                PearlMainQueue( ^{
+                    NSString *key = note.object;
+                    if (!key || [key isEqualToString:NSStringFromSelector( @
+                        selector( hidePasswords ) )])
+                    self.hidePasswordsItem.state = [[MPConfig get].hidePasswords boolValue]? NSOnState: NSOffState;
+                    if (!key || [key isEqualToString:NSStringFromSelector( @
+                        selector( rememberLogin ) )])
+                    self.rememberPasswordItem.state = [[MPConfig get].rememberLogin boolValue]? NSOnState: NSOffState;
+                } );
+            } );
     [self updateUsers];
 
     // Global hotkey.
     EventHotKeyRef hotKeyRef;
     EventTypeSpec hotKeyEvents[1] = { { .eventClass = kEventClassKeyboard, .eventKind = kEventHotKeyPressed } };
-    OSStatus status = InstallApplicationEventHandler( NewEventHandlerUPP( MPHotKeyHander ), GetEventTypeCount( hotKeyEvents ),
-            hotKeyEvents, (__bridge void *)self, NULL );
+    OSStatus status = InstallApplicationEventHandler( NewEventHandlerUPP( MPHotKeyHander ), GetEventTypeCount( hotKeyEvents ), hotKeyEvents, (__bridge void *)self, NULL );
     if (status != noErr)
         err( @"Error installing application event handler: %i", (int)status );
     status = RegisterEventHotKey( 35 /* p */, controlKey + cmdKey, MPShowHotKey, GetApplicationEventTarget(), 0, &hotKeyRef );
@@ -178,12 +183,9 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     NSArray *jobs = (__bridge_transfer NSArray *)SMCopyAllJobDictionaries( kSMDomainUserLaunchd );
 
     for (NSDictionary *job in jobs)
-        if ([LOGIN_HELPER_BUNDLE_ID isEqualToString:[job objectForKey:@"Label"]]) {
-            dbg( @"loginItemEnabled: %@", @([[job objectForKey:@"OnDemand"] boolValue]) );
-            return [[job objectForKey:@"OnDemand"] boolValue];
-        }
+        if ([LOGIN_HELPER_BUNDLE_ID isEqualToString:job[@"Label"]])
+            return [job[@"OnDemand"] boolValue];
 
-    dbg( @"loginItemEnabled: not found" );
     return NO;
 }
 
@@ -305,9 +307,9 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 - (IBAction)togglePreference:(id)sender {
 
     if (sender == self.hidePasswordsItem)
-        [MPConfig get].hidePasswords = [NSNumber numberWithBool:![[MPConfig get].hidePasswords boolValue]];
+        [MPConfig get].hidePasswords = @(![[MPConfig get].hidePasswords boolValue]);
     if (sender == self.rememberPasswordItem)
-        [MPConfig get].rememberLogin = [NSNumber numberWithBool:![[MPConfig get].rememberLogin boolValue]];
+        [MPConfig get].rememberLogin = @(![[MPConfig get].rememberLogin boolValue]);
     if (sender == self.openAtLoginItem)
         [self setLoginItemEnabled:self.openAtLoginItem.state != NSOnState];
     if (sender == self.savePasswordItem) {
@@ -391,7 +393,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
 - (IBAction)showPopup:(id)sender {
 
-    [self.statusView popUpMenu];
+    [self.statusView popUpStatusItemMenu:self.statusView.menu];
 }
 
 - (IBAction)showPasswordWindow:(id)sender {
@@ -409,13 +411,10 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     }
 
     // Don't show window if we weren't already running (ie. if we haven't been activated before).
-    PearlProfiler *profiler = [PearlProfiler profilerForTask:@"passwordWindowController"];
     if (!self.passwordWindowController)
         self.passwordWindowController = [[MPPasswordWindowController alloc] initWithWindowNibName:@"MPPasswordWindowController"];
-    [profiler finishJob:@"init"];
 
     [self.passwordWindowController showWindow:self];
-    [profiler finishJob:@"show"];
 }
 
 #pragma mark - Private
@@ -463,12 +462,14 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     NSString *exportedSites = [self exportSitesRevealPasswords:revealPasswords];
     [[[NSFileCoordinator alloc] initWithFilePresenter:nil] coordinateWritingItemAtURL:savePanel.URL options:0 error:&coordinateError
                                                                            byAccessor:^(NSURL *newURL) {
-        NSError *writeError = nil;
-        if (![exportedSites writeToURL:newURL atomically:NO encoding:NSUTF8StringEncoding error:&writeError])
-            PearlMainQueue( ^{
-                [[NSAlert alertWithError:writeError] runModal];
-            } );
-    }];
+                                                                               NSError *writeError = nil;
+                                                                               if (![exportedSites writeToURL:newURL atomically:NO
+                                                                                                     encoding:NSUTF8StringEncoding
+                                                                                                        error:&writeError])
+                                                                                   PearlMainQueue( ^{
+                                                                                       [[NSAlert alertWithError:writeError] runModal];
+                                                                                   } );
+                                                                           }];
     if (coordinateError)
         PearlMainQueue( ^{
             [[NSAlert alertWithError:coordinateError] runModal];
@@ -543,7 +544,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
     [self updateMenuItems];
 
-    [self.statusView popUpMenu];
+    [self.statusView popUpStatusItemMenu:self.statusView.menu];
 }
 
 - (void)updateMenuItems {
@@ -596,30 +597,6 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     }
 }
 
-#pragma mark - UbiquityStoreManagerDelegate
-
-- (void)ubiquityStoreManager:(UbiquityStoreManager *)manager didLoadStoreForCoordinator:(NSPersistentStoreCoordinator *)coordinator
-                     isCloud:(BOOL)isCloudStore {
-
-    [super ubiquityStoreManager:manager didLoadStoreForCoordinator:coordinator isCloud:isCloudStore];
-
-    if (isCloudStore) {
-        NSAlert *alert = [NSAlert new];
-        alert.messageText = @"iCloud Support Deprecated";
-        alert.informativeText = @"Master Password is moving away from iCloud due to limited platform support and reliability issues.  "
-                @"\n\nMaster Password's generated passwords do not require syncing.  "
-                @"Your sites will always have the same passwords on all your devices.  "
-                @"\n\niCloud continues to work for now but will be deactivated in a future update.  "
-                @"Disable iCloud now to copy your iCloud sites to your device and avoid losing them when iCloud becomes discontinued.";
-        [alert addButtonWithTitle:@"Disable iCloud"];
-        [alert addButtonWithTitle:@"Ignore For Now"];
-
-        NSInteger response = [alert runModal];
-        if (response == NSAlertFirstButtonReturn)
-            [[self storeManager] migrateCloudToLocal];
-    }
-}
-
 #pragma mark - PearlConfigDelegate
 
 - (void)didUpdateConfigForKey:(SEL)configKey fromValue:(id)oldValue {

MasterPassword/ObjC/Mac/MPNoStateButton.h

@@ -0,0 +1,23 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPNoStateButton.h
+//  MPNoStateButton
+//
+//  Created by lhunath on 14-10-27.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface MPNoStateButtonCell : NSButtonCell
+@end

MasterPassword/ObjC/Mac/MPNoStateButton.m

@@ -0,0 +1,31 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPNoStateButton.h
+//  MPNoStateButton
+//
+//  Created by lhunath on 14-10-27.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import "MPNoStateButton.h"
+
+
+@implementation MPNoStateButtonCell {
+
+}
+
+- (void)setState:(NSInteger)state {
+
+    [super setState:NSOnState];
+}
+
+@end

MasterPassword/ObjC/Mac/MPPasswordWindowController.m

@@ -20,9 +20,7 @@
 #import "MPPasswordWindowController.h"
 #import "MPMacAppDelegate.h"
 #import "MPAppDelegate_Store.h"
-#import "MPSiteModel.h"
 #import "MPAppDelegate_Key.h"
-#import "PearlProfiler.h"
 
 #define MPAlertIncorrectMP      @"MPAlertIncorrectMP"
 #define MPAlertChangeMP         @"MPAlertChangeMP"
@@ -34,11 +32,11 @@
 
 @interface MPPasswordWindowController()
 
-@property(nonatomic, copy) NSString *currentSiteText;
 @property(nonatomic, strong) CAGradientLayer *siteGradient;
+
 @end
 
-@implementation MPPasswordWindowController { BOOL _skipTextChange; }
+@implementation MPPasswordWindowController
 
 #pragma mark - Life
 
@@ -56,31 +54,33 @@
 //    }];
     [[NSNotificationCenter defaultCenter] addObserverForName:NSWindowDidBecomeKeyNotification object:self.window
                                                        queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        [self fadeIn];
-        [self updateUser];
-    }];
+                [self fadeIn];
+                [self updateUser];
+            }];
     [[NSNotificationCenter defaultCenter] addObserverForName:NSWindowWillCloseNotification object:self.window
                                                        queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        NSWindow *sheet = [self.window attachedSheet];
-        if (sheet)
-            [NSApp endSheet:sheet];
-    }];
+                NSWindow *sheet = [self.window attachedSheet];
+                if (sheet)
+                    [NSApp endSheet:sheet];
+            }];
     [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationWillResignActiveNotification object:nil
                                                        queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+#ifndef DEBUG
         [self fadeOut];
-    }];
+#endif
+            }];
     [[NSNotificationCenter defaultCenter] addObserverForName:MPSignedInNotification object:nil
                                                        queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        [self updateUser];
-    }];
+                [self updateUser];
+            }];
     [[NSNotificationCenter defaultCenter] addObserverForName:MPSignedOutNotification object:nil
                                                        queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        [self updateUser];
-    }];
+                [self updateUser];
+            }];
     [self observeKeyPath:@"sitesController.selection"
                withBlock:^(id from, id to, NSKeyValueChange cause, id _self) {
-        [_self updateSelection];
-    }];
+                   [_self updateSelection];
+               }];
 
     NSSearchFieldCell *siteFieldCell = self.siteField.cell;
     siteFieldCell.searchButtonCell = nil;
@@ -118,7 +118,6 @@
 
 - (void)doCommandBySelector:(SEL)commandSelector {
 
-    dbg( @"doCommandBySelector: %@", NSStringFromSelector( commandSelector ) );
     [self handleCommand:commandSelector];
 }
 
@@ -126,12 +125,9 @@
 
 - (BOOL)control:(NSControl *)control textView:(NSTextView *)fieldEditor doCommandBySelector:(SEL)commandSelector {
 
-    dbg( @"@control:%@ textView:%@ doCommandBySelector:%@", control, fieldEditor, NSStringFromSelector( commandSelector ) );
     if (control == self.siteField) {
-        if ([NSStringFromSelector( commandSelector ) rangeOfString:@"delete"].location == 0) {
-            _skipTextChange = YES;
+        if ([NSStringFromSelector( commandSelector ) rangeOfString:@"delete"].location == 0)
             return NO;
-        }
     }
     if (control == self.securePasswordField || control == self.revealPasswordField) {
         if (commandSelector == @selector( insertNewline: ))
@@ -178,7 +174,6 @@
 
 - (BOOL)textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector {
 
-    dbg( @"textView:%@doCommandBySelector:%@", textView, NSStringFromSelector( commandSelector ) );
     return [self handleCommand:commandSelector];
 }
 
@@ -231,9 +226,9 @@
                 // "Create" button.
                 [[MPMacAppDelegate get] addSiteNamed:[self.siteField stringValue] completion:
                         ^(MPSiteEntity *site, NSManagedObjectContext *context) {
-                    if (site)
-                        PearlMainQueue( ^{ [self updateSites]; } );
-                }];
+                            if (site)
+                                PearlMainQueue( ^{ [self updateSites]; } );
+                        }];
                 break;
             }
             default:
@@ -309,11 +304,6 @@
 
 #pragma mark - State
 
-- (NSString *)query {
-
-    return [self.siteField.stringValue stringByReplacingCharactersInRange:self.siteField.currentEditor.selectedRange withString:@""]?: @"";
-}
-
 - (void)insertObject:(MPSiteModel *)model inSitesAtIndex:(NSUInteger)index {
 
     [self.sites insertObject:model atIndex:index];
@@ -343,7 +333,7 @@
     [alert addButtonWithTitle:@"Delete"];
     [alert addButtonWithTitle:@"Cancel"];
     [alert setMessageText:@"Delete Site?"];
-    [alert setInformativeText:strf( @"Do you want to delete the site named:\n\n%@", self.selectedSite.siteName )];
+    [alert setInformativeText:strf( @"Do you want to delete the site named:\n\n%@", self.selectedSite.name )];
     [alert beginSheetModalForWindow:self.window modalDelegate:self
                      didEndSelector:@selector( alertDidEnd:returnCode:contextInfo: ) contextInfo:MPAlertDeleteSite];
 }
@@ -354,7 +344,7 @@
     [alert addButtonWithTitle:@"Save"];
     [alert addButtonWithTitle:@"Cancel"];
     [alert setMessageText:@"Change Login Name"];
-    [alert setInformativeText:strf( @"Enter the login name for: %@", self.selectedSite.siteName )];
+    [alert setInformativeText:strf( @"Enter the login name for: %@", self.selectedSite.name )];
     NSTextField *loginField = [[NSTextField alloc] initWithFrame:NSMakeRect( 0, 0, 200, 22 )];
     loginField.stringValue = self.selectedSite.loginName?: @"";
     [loginField selectText:self];
@@ -388,7 +378,7 @@
     [alert addButtonWithTitle:@"Save"];
     [alert addButtonWithTitle:@"Cancel"];
     [alert setMessageText:@"Change Password"];
-    [alert setInformativeText:strf( @"Enter the new password for: %@", self.selectedSite.siteName )];
+    [alert setInformativeText:strf( @"Enter the new password for: %@", self.selectedSite.name )];
     [alert setAccessoryView:[[NSSecureTextField alloc] initWithFrame:NSMakeRect( 0, 0, 200, 22 )]];
     [alert layout];
     [alert beginSheetModalForWindow:self.window modalDelegate:self
@@ -404,8 +394,9 @@
         MPSiteType type = [types[t] unsignedIntegerValue];
         NSString *title = [site.algorithm nameOfType:type];
         if (type & MPSiteTypeClassGenerated)
-            title = [site.algorithm generatePasswordForSiteNamed:site.siteName ofType:type
-                                                        withCounter:site.counter usingKey:[MPMacAppDelegate get].key];
+            title = [site.algorithm generatePasswordForSiteNamed:site.name ofType:type
+                                                     withCounter:site.counter
+                                                        usingKey:[MPMacAppDelegate get].key];
 
         NSButtonCell *cell = [self.passwordTypesMatrix cellAtRow:(NSInteger)t column:0];
         cell.tag = type;
@@ -417,7 +408,7 @@
     [alert addButtonWithTitle:@"Save"];
     [alert addButtonWithTitle:@"Cancel"];
     [alert setMessageText:@"Change Password Type"];
-    [alert setInformativeText:strf( @"Choose a new password type for: %@", site.siteName )];
+    [alert setInformativeText:strf( @"Choose a new password type for: %@", site.name )];
     [alert setAccessoryView:self.passwordTypesBox];
     [alert layout];
     [alert beginSheetModalForWindow:self.window modalDelegate:self
@@ -460,9 +451,9 @@
         NSUserNotification *notification = [NSUserNotification new];
         notification.title = @"Password Copied";
         if (selectedSite.loginName.length)
-            notification.subtitle = strf( @"%@ at %@", selectedSite.loginName, selectedSite.siteName );
+            notification.subtitle = strf( @"%@ at %@", selectedSite.loginName, selectedSite.name );
         else
-            notification.subtitle = selectedSite.siteName;
+            notification.subtitle = selectedSite.name;
         [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
     }
     else {
@@ -511,15 +502,24 @@
         return;
     }
 
-    PearlProfiler *profiler = [PearlProfiler profilerForTask:@"updateSites"];
-    NSString *query = [self query];
-    [profiler finishJob:@"query"];
+    static NSRegularExpression *fuzzyRE;
+    static dispatch_once_t once = 0;
+    dispatch_once( &once, ^{
+        fuzzyRE = [NSRegularExpression regularExpressionWithPattern:@"(.)" options:0 error:nil];
+    } );
+
+    NSString *queryString = self.siteField.stringValue;
+    NSString *queryPattern = [queryString stringByReplacingMatchesOfExpression:fuzzyRE withTemplate:@"*$1*"];
+    NSMutableArray *fuzzyGroups = [NSMutableArray new];
+    [fuzzyRE enumerateMatchesInString:queryString options:0 range:NSMakeRange( 0, queryString.length )
+                           usingBlock:^(NSTextCheckingResult *result, NSMatchingFlags flags, BOOL *stop) {
+                               [fuzzyGroups addObject:[queryString substringWithRange:result.range] ];
+                           }];
     [MPMacAppDelegate managedObjectContextPerformBlockAndWait:^(NSManagedObjectContext *context) {
         NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPSiteEntity class] )];
-        fetchRequest.sortDescriptors = [NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"lastUsed" ascending:NO]];
-        fetchRequest.predicate = [NSPredicate predicateWithFormat:@"(%@ == '' OR name BEGINSWITH[cd] %@) AND user == %@",
-                                                                  query, query, [[MPMacAppDelegate get] activeUserInContext:context]];
-        [profiler finishJob:@"setup fetch"];
+        fetchRequest.sortDescriptors = @[ [[NSSortDescriptor alloc] initWithKey:@"lastUsed" ascending:NO] ];
+        fetchRequest.predicate = [NSPredicate predicateWithFormat:@"(%@ == '' OR name LIKE[cd] %@) AND user == %@",
+                        queryPattern, queryPattern, [MPMacAppDelegate get].activeUserOID];
 
         NSError *error = nil;
         NSArray *siteResults = [context executeFetchRequest:fetchRequest error:&error];
@@ -527,43 +527,17 @@
             err( @"While fetching sites for completion: %@", [error fullDescription] );
             return;
         }
-        [profiler finishJob:@"do fetch"];
 
         NSMutableArray *newSites = [NSMutableArray arrayWithCapacity:[siteResults count]];
         for (MPSiteEntity *site in siteResults)
-            [newSites addObject:[[MPSiteModel alloc] initWithEntity:site]];
-        [profiler finishJob:@"make models"];
+            [newSites addObject:[[MPSiteModel alloc] initWithEntity:site fuzzyGroups:fuzzyGroups]];
         self.sites = newSites;
-        [profiler finishJob:@"update sites"];
     }];
-    [profiler finishJob:@"done"];
 }
 
 - (void)updateSelection {
 
-    if (_skipTextChange) {
-        _skipTextChange = NO;
-        return;
-    }
-
-    NSString *siteName = self.selectedSite.siteName;
-    if (!siteName)
-        return;
-
-    if ([self.window isKeyWindow] && [self.siteField isEqual:[self.window firstResponder]]) {
-        NSRange siteNameQueryRange = [siteName rangeOfString:[self query]];
-        self.siteField.stringValue = siteName;
-
-        if (siteNameQueryRange.location == 0)
-            self.siteField.currentEditor.selectedRange =
-                    NSMakeRange( siteNameQueryRange.length, siteName.length - siteNameQueryRange.length );
-    }
-
     [self.siteTable scrollRowToVisible:(NSInteger)self.sitesController.selectionIndex];
-    [self updateGradient];
-}
-
-- (void)updateGradient {
 
     NSView *siteScrollView = self.siteTable.superview.superview;
     NSRect selectedCellFrame = [self.siteTable frameOfCellAtColumn:0 row:((NSInteger)self.sitesController.selectionIndex)];
@@ -590,7 +564,7 @@
 
 - (void)copyContent:(NSString *)content {
 
-    [[NSPasteboard generalPasteboard] declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];
+    [[NSPasteboard generalPasteboard] declareTypes:@[ NSStringPboardType ] owner:nil];
     if (![[NSPasteboard generalPasteboard] setString:content forType:NSPasteboardTypeString]) {
         wrn( @"Couldn't copy password to pasteboard." );
         return;
@@ -607,7 +581,6 @@
     if ([self.window isOnActiveSpace] && self.window.alphaValue)
         return;
 
-    PearlProfiler *profiler = [PearlProfiler profilerForTask:@"fadeIn"];
     CGDirectDisplayID displayID = [self.window.screen.deviceDescription[@"NSScreenNumber"] unsignedIntValue];
     CGImageRef capturedImage = CGDisplayCreateImage( displayID );
     if (!capturedImage || CGImageGetWidth( capturedImage ) <= 1) {
@@ -615,11 +588,9 @@
         return;
     }
 
-    [profiler finishJob:@"captured window: %d, on screen: %@", displayID, self.window.screen.deviceDescription];
     NSImage *screenImage = [[NSImage alloc] initWithCGImage:capturedImage size:NSMakeSize(
             CGImageGetWidth( capturedImage ) / self.window.backingScaleFactor,
             CGImageGetHeight( capturedImage ) / self.window.backingScaleFactor )];
-    [profiler finishJob:@"image size: %@, bytes: %ld", NSStringFromSize( screenImage.size ), screenImage.TIFFRepresentation.length];
 
     NSImage *smallImage = [[NSImage alloc] initWithSize:NSMakeSize(
             CGImageGetWidth( capturedImage ) / 20,
@@ -631,16 +602,12 @@
                   operation:NSCompositeSourceOver
                    fraction:1.0];
     [smallImage unlockFocus];
-    [profiler finishJob:@"small image size: %@, bytes: %ld", NSStringFromSize( screenImage.size ), screenImage.TIFFRepresentation.length];
 
     self.blurView.image = smallImage;
-    [profiler finishJob:@"assigned image"];
 
     [self.window setFrame:self.window.screen.frame display:YES];
-    [profiler finishJob:@"assigned frame"];
     [NSAnimationContext currentContext].timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
     self.window.animator.alphaValue = 1.0;
-    [profiler finishJob:@"animating window"];
 }
 
 - (void)fadeOut {

MasterPassword/ObjC/Mac/MPPasswordWindowController.xib

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPPasswordWindowController">
             <connections>
                 <outlet property="blurView" destination="Bwc-sd-6gm" id="wNV-0x-LJn"/>
-                <outlet property="sitesController" destination="mcS-ik-b0n" id="cdF-BL-lfg"/>
                 <outlet property="inputLabel" destination="OnR-s6-d4P" id="p6G-Ut-cdu"/>
                 <outlet property="passwordTypesBox" destination="bZe-7q-i6q" id="Ai3-pt-i6K"/>
                 <outlet property="passwordTypesMatrix" destination="3fr-Fd-pxx" id="T8g-mS-lxP"/>
@@ -17,11 +16,12 @@
                 <outlet property="securePasswordField" destination="iGR-wo-ual" id="DGh-5i-3u4"/>
                 <outlet property="siteField" destination="CnS-iI-dhr" id="Ogo-lS-dcT"/>
                 <outlet property="siteTable" destination="xvJ-5c-vDp" id="ClP-j8-DyI"/>
+                <outlet property="sitesController" destination="mcS-ik-b0n" id="cdF-BL-lfg"/>
                 <outlet property="window" destination="QvC-M9-y7g" id="dPy-F3-9rn"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Master Password" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hasShadow="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MPPasswordWindow">
             <windowCollectionBehavior key="collectionBehavior" transient="YES" ignoresCycle="YES" fullScreenAuxiliary="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
@@ -32,18 +32,24 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Bwc-sd-6gm" userLabel="Screen Capture">
-                        <rect key="frame" x="0.0" y="0.0" width="640" height="560"/>
+                        <rect key="frame" x="-80" y="-80" width="800" height="720"/>
                         <contentFilters>
                             <ciFilter name="CIGaussianBlur">
                                 <configuration>
                                     <null key="inputImage"/>
-                                    <real key="inputRadius" value="40"/>
+                                    <real key="inputRadius" value="30"/>
                                 </configuration>
                             </ciFilter>
                             <ciFilter name="CISepiaTone">
                                 <configuration>
                                     <null key="inputImage"/>
-                                    <real key="inputIntensity" value="0.40000000000000002"/>
+                                    <real key="inputIntensity" value="0.20000000000000001"/>
+                                </configuration>
+                            </ciFilter>
+                            <ciFilter name="CIExposureAdjust">
+                                <configuration>
+                                    <real key="inputEV" value="-1"/>
+                                    <null key="inputImage"/>
                                 </configuration>
                             </ciFilter>
                         </contentFilters>
@@ -51,13 +57,13 @@
                     </imageView>
                     <secureTextField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iGR-wo-ual" userLabel="Secure Master Password">
                         <rect key="frame" x="18" y="258" width="604" height="44"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         </shadow>
                         <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" focusRingType="none" alignment="center" usesSingleLineMode="YES" id="NcX-1Z-2OC">
                             <font key="font" metaFont="system" size="36"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <allowedInputSourceLocales>
                                 <string>NSAllRomanInputSourcesLocaleIdentifier</string>
@@ -86,13 +92,13 @@
                     </secureTextField>
                     <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="v80-wd-hUR" userLabel="Reveal Master Password">
                         <rect key="frame" x="18" y="258" width="604" height="44"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" state="on" focusRingType="none" alignment="center" placeholderString="" usesSingleLineMode="YES" id="gRw-5C-YUN">
                             <font key="font" metaFont="system" size="36"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <allowedInputSourceLocales>
                                 <string>NSAllRomanInputSourcesLocaleIdentifier</string>
@@ -123,11 +129,11 @@
                             <outlet property="delegate" destination="-2" id="2nK-Rc-uyR"/>
                         </connections>
                     </textField>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="R46-fx-n14" userLabel="Reset Master Password">
-                        <rect key="frame" x="242" y="19" width="156" height="20"/>
-                        <buttonCell key="cell" type="inline" title="Reset My Master Password" bezelStyle="inline" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="B7Z-72-fVP">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="11" name="HelveticaNeue-Bold"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="R46-fx-n14" userLabel="Reset Button">
+                        <rect key="frame" x="230" y="19" width="181" height="19"/>
+                        <buttonCell key="cell" type="recessed" title="Reset My Master Password" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="B7Z-72-fVP" customClass="MPNoStateButtonCell">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                            <font key="font" metaFont="systemBold" size="12"/>
                         </buttonCell>
                         <connections>
                             <action selector="resetMasterPassword:" target="-2" id="kCy-X0-teH"/>
@@ -144,11 +150,10 @@
                             <rect key="frame" x="0.0" y="0.0" width="512" height="147"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="33" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="xvJ-5c-vDp" customClass="MPSitesTableView">
-                                    <rect key="frame" x="0.0" y="0.0" width="515" height="147"/>
+                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="33" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="xvJ-5c-vDp" customClass="MPSitesTableView">
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+                                    <color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
                                     <color key="gridColor" name="selectedControlColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
                                         <tableColumn editable="NO" width="512" minWidth="512" maxWidth="512" id="S71-gk-yF7">
@@ -170,17 +175,17 @@
                                                     <subviews>
                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ydd-Rv-tra">
                                                             <rect key="frame" x="-2" y="2" width="516" height="29"/>
-                                                            <shadow key="shadow" blurRadius="1">
+                                                            <shadow key="shadow" blurRadius="0.5">
                                                                 <size key="offset" width="0.0" height="1"/>
                                                                 <color key="color" white="0.0" alpha="0.80000000000000004" colorSpace="calibratedWhite"/>
                                                             </shadow>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" alignment="center" title="apple.com" id="o0g-Zv-pH4">
                                                                 <font key="font" size="24" name="HelveticaNeue-Thin"/>
-                                                                <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="textColor" name="alternateSelectedControlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                             <connections>
-                                                                <binding destination="xQb-o5-M5U" name="value" keyPath="objectValue.siteName" id="CZi-gD-5Ec">
+                                                                <binding destination="xQb-o5-M5U" name="value" keyPath="objectValue.displayedName" id="CZi-gD-5Ec">
                                                                     <dictionary key="options">
                                                                         <bool key="NSContinuouslyUpdatesValue" value="YES"/>
                                                                     </dictionary>
@@ -195,11 +200,10 @@
                                                         <constraint firstItem="ydd-Rv-tra" firstAttribute="top" secondItem="xQb-o5-M5U" secondAttribute="top" constant="2" id="eZT-Sd-wW5"/>
                                                     </constraints>
                                                     <backgroundFilters>
-                                                        <ciFilter name="CIGloom">
+                                                        <ciFilter name="CIGaussianBlur">
                                                             <configuration>
                                                                 <null key="inputImage"/>
-                                                                <real key="inputIntensity" value="1"/>
-                                                                <real key="inputRadius" value="10"/>
+                                                                <real key="inputRadius" value="20"/>
                                                             </configuration>
                                                         </ciFilter>
                                                     </backgroundFilters>
@@ -237,13 +241,13 @@
                     </scrollView>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OnR-s6-d4P" userLabel="Input Label">
                         <rect key="frame" x="209" y="310" width="223" height="20"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Maarten Billemont's password for:" id="1Lb-d0-fQD">
                             <font key="font" size="14" name="HelveticaNeue"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
@@ -252,14 +256,14 @@
                         <constraints>
                             <constraint firstAttribute="width" constant="512" id="rW7-Vq-4Xy"/>
                         </constraints>
-                        <shadow key="shadow" blurRadius="1">
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
                         </shadow>
                         <searchFieldCell key="cell" selectable="YES" editable="YES" focusRingType="none" alignment="center" placeholderString="Site Name" sendsSearchStringImmediately="YES" id="ppl-2c-1E9">
                             <font key="font" size="36" name="HelveticaNeue-Thin"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </searchFieldCell>
                         <connections>
                             <action selector="doSearchSites:" target="-2" id="NJO-iR-OXt"/>
@@ -268,10 +272,10 @@
                         </connections>
                     </searchField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vES-W5-m4x" userLabel="Type Button">
-                        <rect key="frame" x="253" y="19" width="135" height="20"/>
-                        <buttonCell key="cell" type="inline" title="Change Password Type" bezelStyle="inline" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Fom-sN-EtZ">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="11" name="HelveticaNeue-Bold"/>
+                        <rect key="frame" x="242" y="19" width="157" height="19"/>
+                        <buttonCell key="cell" type="recessed" title="Change Password Type" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Fom-sN-EtZ" customClass="MPNoStateButtonCell">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                            <font key="font" metaFont="systemBold" size="12"/>
                             <string key="keyEquivalent">t</string>
                             <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                         </buttonCell>
@@ -285,7 +289,7 @@
                         </connections>
                     </button>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="d3u-Ze-9uf" userLabel="Counter Container">
-                        <rect key="frame" x="306" y="47" width="28" height="22"/>
+                        <rect key="frame" x="306" y="46" width="28" 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="27"/>
@@ -296,13 +300,13 @@
                             </stepper>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NvO-kt-eZ2" userLabel="Counter Field">
                                 <rect key="frame" x="19" y="2" width="11" height="19"/>
-                                <shadow key="shadow" blurRadius="1">
+                                <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1" id="dhQ-bJ-rn3">
                                     <font key="font" size="12" name="HelveticaNeue-Medium"/>
-                                    <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
                                 </textFieldCell>
                                 <connections>
@@ -338,10 +342,10 @@
                         </connections>
                     </customView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Qo-iG-CQt" userLabel="Login Button">
-                        <rect key="frame" x="149" y="19" width="96" height="20"/>
-                        <buttonCell key="cell" type="inline" title="Set Login Name" bezelStyle="inline" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QFo-9y-aVe">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="11" name="HelveticaNeue-Bold"/>
+                        <rect key="frame" x="123" y="19" width="111" height="19"/>
+                        <buttonCell key="cell" type="recessed" title="Set Login Name" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QFo-9y-aVe" customClass="MPNoStateButtonCell">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                            <font key="font" metaFont="systemBold" size="12"/>
                             <string key="keyEquivalent">l</string>
                             <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                         </buttonCell>
@@ -352,7 +356,7 @@
                                     <string key="NSValueTransformerName">NSNegateBoolean</string>
                                 </dictionary>
                             </binding>
-                            <binding destination="mcS-ik-b0n" name="title" keyPath="selection.loginName" id="g1z-0F-hE9">
+                            <binding destination="mcS-ik-b0n" name="title" keyPath="selection.loginName" id="uub-7k-XZ8">
                                 <dictionary key="options">
                                     <string key="NSNullPlaceholder">Set Login Name</string>
                                 </dictionary>
@@ -363,10 +367,10 @@
                         <rect key="frame" x="312" y="524" width="16" height="16"/>
                     </progressIndicator>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XuF-Sp-6JD" userLabel="Delete Button">
-                        <rect key="frame" x="396" y="19" width="70" height="20"/>
-                        <buttonCell key="cell" type="inline" title="Delete Site" bezelStyle="inline" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="26m-of-YMQ">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="11" name="HelveticaNeue-Bold"/>
+                        <rect key="frame" x="407" y="19" width="81" height="19"/>
+                        <buttonCell key="cell" type="recessed" title="Delete Site" bezelStyle="recessed" alignment="center" refusesFirstResponder="YES" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="26m-of-YMQ" customClass="MPNoStateButtonCell">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                            <font key="font" metaFont="systemBold" size="12"/>
                             <string key="keyEquivalent">d</string>
                             <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                         </buttonCell>
@@ -380,10 +384,10 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="brI-fg-Kav" userLabel="Password Button">
-                        <rect key="frame" x="266" y="46" width="108" height="20"/>
-                        <buttonCell key="cell" type="inline" title="Change Password" bezelStyle="inline" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="FQu-fM-NWY">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="11" name="HelveticaNeue-Bold"/>
+                        <rect key="frame" x="258" y="45" width="125" height="19"/>
+                        <buttonCell key="cell" type="recessed" title="Change Password" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="FQu-fM-NWY" customClass="MPNoStateButtonCell">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                            <font key="font" metaFont="systemBold" size="12"/>
                             <string key="keyEquivalent">p</string>
                             <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                         </buttonCell>
@@ -410,7 +414,7 @@
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XUV-zU-Y9c">
                                 <rect key="frame" x="298" y="41" width="4" height="97"/>
-                                <shadow key="shadow" blurRadius="1">
+                                <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                 </shadow>
@@ -418,8 +422,8 @@
                                     <ciFilter name="CIGloom">
                                         <configuration>
                                             <null key="inputImage"/>
-                                            <real key="inputIntensity" value="1"/>
-                                            <real key="inputRadius" value="10"/>
+                                            <real key="inputIntensity" value="0.80000000000000004"/>
+                                            <real key="inputRadius" value="8"/>
                                         </configuration>
                                     </ciFilter>
                                 </contentFilters>
@@ -434,18 +438,18 @@
                                             <string key="NSValueTransformerName">NSNegateBoolean</string>
                                         </dictionary>
                                     </binding>
-                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.contentDisplay" id="djg-i5-pwt"/>
+                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.displayedContent" id="djg-i5-pwt"/>
                                 </connections>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ia6-7b-dFr">
-                                <rect key="frame" x="114" y="82" width="372" height="14"/>
-                                <shadow key="shadow" blurRadius="1">
+                                <rect key="frame" x="111" y="82" width="378" height="14"/>
+                                <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="No password set.  Click &quot;Change Password&quot; on the bottom to set one." id="eDQ-iz-97a">
                                     <font key="font" metaFont="smallSystem"/>
-                                    <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
@@ -475,16 +479,21 @@
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OaQ-of-zmb">
                                 <rect key="frame" x="39" y="142" width="522" height="23"/>
-                                <shadow key="shadow" blurRadius="1">
+                                <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Master Password generates passwords for your sites (and other things)." id="YyD-hd-wi3">
                                     <font key="font" size="16" name="HelveticaNeue"/>
-                                    <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
+                                    <binding destination="-2" name="hidden" keyPath="locked" id="I7S-x6-XZk">
+                                        <dictionary key="options">
+                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                        </dictionary>
+                                    </binding>
                                     <binding destination="-2" name="hidden2" keyPath="newUser" previousBinding="I7S-x6-XZk" id="HKK-Eu-1qV">
                                         <dictionary key="options">
                                             <integer key="NSMultipleValuesPlaceholder" value="-1"/>
@@ -494,16 +503,11 @@
                                             <string key="NSValueTransformerName">NSNegateBoolean</string>
                                         </dictionary>
                                     </binding>
-                                    <binding destination="-2" name="hidden" keyPath="locked" id="I7S-x6-XZk">
-                                        <dictionary key="options">
-                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                        </dictionary>
-                                    </binding>
                                 </connections>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sYt-eL-uwt">
                                 <rect key="frame" x="46" y="44" width="508" height="90"/>
-                                <shadow key="shadow" blurRadius="1">
+                                <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                 </shadow>
@@ -514,10 +518,15 @@
 — Your "site name" can be any name; we recommend the bare domain name (eg. apple.com).
 — Make your new master password strong (eg. a short sentence) and tell *nobody*.
 — Share your site's password instead.  You can change it if necessary.</string>
-                                    <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
+                                    <binding destination="-2" name="hidden" keyPath="locked" id="yDL-cR-bDf">
+                                        <dictionary key="options">
+                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                        </dictionary>
+                                    </binding>
                                     <binding destination="-2" name="hidden2" keyPath="newUser" previousBinding="yDL-cR-bDf" id="fus-M7-S1J">
                                         <dictionary key="options">
                                             <integer key="NSMultipleValuesPlaceholder" value="-1"/>
@@ -527,11 +536,6 @@
                                             <string key="NSValueTransformerName">NSNegateBoolean</string>
                                         </dictionary>
                                     </binding>
-                                    <binding destination="-2" name="hidden" keyPath="locked" id="yDL-cR-bDf">
-                                        <dictionary key="options">
-                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                        </dictionary>
-                                    </binding>
                                 </connections>
                             </textField>
                         </subviews>
@@ -546,15 +550,15 @@
                             <constraint firstAttribute="centerY" secondItem="sYt-eL-uwt" secondAttribute="centerY" id="zLS-QG-MKS"/>
                         </constraints>
                     </customView>
-                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="npC-Kk-gUM">
-                        <rect key="frame" x="140" y="235" width="359" height="15"/>
-                        <shadow key="shadow" blurRadius="1">
+                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="npC-Kk-gUM">
+                        <rect key="frame" x="101" y="235" width="438" height="15"/>
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="0.69999999999999996" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Type the name of your site (eg. apple.com), then hit enter ⏎ to create a password for it." id="QTI-cz-Onx">
                             <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -571,13 +575,13 @@
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rhm-sC-xFS">
                         <rect key="frame" x="37" y="235" width="566" height="15"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="0.80000000000000004" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hit enter ⏎ to copy the password, then paste it using ⌘V.  Use the arrows ⇅ to navigate the list or esc ⎋ to exit." id="n3W-XU-dya">
                             <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -595,13 +599,13 @@
                     </textField>
                     <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lW3-2z-cEa">
                         <rect key="frame" x="190" y="235" width="260" height="15"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="0.70000000000000007" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to temporarily reveal what you've typed." id="4Ep-xX-Ky8">
                             <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -612,7 +616,7 @@
                             </binding>
                         </connections>
                     </textField>
-                    <button translatesAutoresizingMaskIntoConstraints="NO" id="Aue-Zx-6Mf">
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="Aue-Zx-6Mf" userLabel="Settings Button">
                         <rect key="frame" x="588" y="508" width="32" height="32"/>
                         <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="icon_gear" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="i8r-9N-vcQ">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -625,14 +629,14 @@
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qal-PP-YtO">
-                        <rect key="frame" x="420" y="1" width="23" height="15"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <rect key="frame" x="436" y="1" width="23" height="15"/>
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘D" id="PPC-be-w4E">
                             <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -654,13 +658,13 @@
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9b3-wy-KBb">
                         <rect key="frame" x="309" y="2" width="22" height="14"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘T" id="HFM-Bk-akx">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -681,14 +685,14 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ido-NQ-3MY">
-                        <rect key="frame" x="186" y="1" width="22" height="15"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <rect key="frame" x="167" y="1" width="22" height="15"/>
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘L" id="fUB-rF-7x8">
                             <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -709,14 +713,14 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uol-dE-I8H">
-                        <rect key="frame" x="309" y="70" width="22" height="14"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <rect key="frame" x="309" y="68" width="23" height="14"/>
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘P" id="MyN-x6-dMk">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -746,14 +750,14 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UpZ-rb-NXd">
-                        <rect key="frame" x="242" y="70" width="157" height="14"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <rect key="frame" x="241" y="68" width="158" height="14"/>
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Click here to set a password:" id="gjc-Fw-xa1">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -788,13 +792,13 @@
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gAU-xs-aae">
                         <rect key="frame" x="595" y="490" width="19" height="14"/>
-                        <shadow key="shadow" blurRadius="1">
+                        <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘," id="Xm1-qb-6EP">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -810,7 +814,7 @@
                     <constraint firstItem="v80-wd-hUR" firstAttribute="top" secondItem="iGR-wo-ual" secondAttribute="top" id="1iV-OU-5Ay"/>
                     <constraint firstItem="brI-fg-Kav" firstAttribute="centerX" secondItem="vES-W5-m4x" secondAttribute="centerX" id="1tN-p4-2m4"/>
                     <constraint firstItem="Ido-NQ-3MY" firstAttribute="top" secondItem="1Qo-iG-CQt" secondAttribute="bottom" constant="4" id="3MM-M7-OKF"/>
-                    <constraint firstAttribute="bottom" secondItem="Bwc-sd-6gm" secondAttribute="bottom" id="3fF-7g-c6C"/>
+                    <constraint firstAttribute="bottom" secondItem="Bwc-sd-6gm" secondAttribute="bottom" constant="-80" id="3fF-7g-c6C"/>
                     <constraint firstItem="XuF-Sp-6JD" firstAttribute="centerX" secondItem="qal-PP-YtO" secondAttribute="centerX" id="7mj-3B-j0X"/>
                     <constraint firstItem="NGk-Io-Buc" firstAttribute="top" secondItem="oSh-Ec-8Nf" secondAttribute="bottom" constant="8" symbolic="YES" id="8AC-MT-cz4"/>
                     <constraint firstItem="vES-W5-m4x" firstAttribute="centerX" secondItem="CnS-iI-dhr" secondAttribute="centerX" id="92S-HP-Vk7"/>
@@ -822,7 +826,7 @@
                     <constraint firstAttribute="centerY" secondItem="iGR-wo-ual" secondAttribute="centerY" id="GZE-mX-kjj"/>
                     <constraint firstAttribute="centerY" secondItem="CnS-iI-dhr" secondAttribute="centerY" id="HjG-vb-3Qg"/>
                     <constraint firstItem="iGR-wo-ual" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="KNz-B2-qfi"/>
-                    <constraint firstItem="Bwc-sd-6gm" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="Kqb-ig-5cP"/>
+                    <constraint firstItem="Bwc-sd-6gm" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="-80" id="Kqb-ig-5cP"/>
                     <constraint firstAttribute="trailing" secondItem="iGR-wo-ual" secondAttribute="trailing" constant="20" symbolic="YES" id="LW8-vu-scs"/>
                     <constraint firstItem="Aue-Zx-6Mf" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="Lts-go-pIX"/>
                     <constraint firstAttribute="bottom" secondItem="Bme-XK-MMc" secondAttribute="bottom" constant="80" id="MbE-Oa-J9k"/>
@@ -845,7 +849,7 @@
                     <constraint firstItem="OnR-s6-d4P" firstAttribute="top" secondItem="NGk-Io-Buc" secondAttribute="bottom" constant="8" symbolic="YES" id="dr2-eR-Yup"/>
                     <constraint firstAttribute="bottom" secondItem="vES-W5-m4x" secondAttribute="bottom" constant="20" symbolic="YES" id="eHI-Tn-bYD"/>
                     <constraint firstItem="rhm-sC-xFS" firstAttribute="top" secondItem="CnS-iI-dhr" secondAttribute="bottom" constant="8" symbolic="YES" id="f1g-ug-BVL"/>
-                    <constraint firstAttribute="trailing" secondItem="Bwc-sd-6gm" secondAttribute="trailing" id="gKu-JH-NDR"/>
+                    <constraint firstAttribute="trailing" secondItem="Bwc-sd-6gm" secondAttribute="trailing" constant="-80" id="gKu-JH-NDR"/>
                     <constraint firstItem="CnS-iI-dhr" firstAttribute="centerX" secondItem="rhm-sC-xFS" secondAttribute="centerX" id="gmg-aZ-1Si"/>
                     <constraint firstItem="Bme-XK-MMc" firstAttribute="top" secondItem="rhm-sC-xFS" secondAttribute="bottom" constant="8" symbolic="YES" id="gsL-Ww-yLa"/>
                     <constraint firstItem="9b3-wy-KBb" firstAttribute="top" secondItem="vES-W5-m4x" secondAttribute="bottom" constant="4" id="hKa-2u-uL3"/>
@@ -858,7 +862,7 @@
                     <constraint firstItem="vES-W5-m4x" firstAttribute="top" secondItem="brI-fg-Kav" secondAttribute="bottom" constant="8" symbolic="YES" id="rCP-oh-rWr"/>
                     <constraint firstItem="v80-wd-hUR" firstAttribute="trailing" secondItem="iGR-wo-ual" secondAttribute="trailing" id="rIx-cQ-PNt"/>
                     <constraint firstItem="brI-fg-Kav" firstAttribute="centerX" secondItem="uol-dE-I8H" secondAttribute="centerX" id="s5w-Nc-YJY"/>
-                    <constraint firstItem="Bwc-sd-6gm" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="tea-fv-b1S"/>
+                    <constraint firstItem="Bwc-sd-6gm" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="-80" id="tea-fv-b1S"/>
                     <constraint firstItem="lW3-2z-cEa" firstAttribute="centerX" secondItem="iGR-wo-ual" secondAttribute="centerX" id="vML-2u-shw"/>
                     <constraint firstItem="v80-wd-hUR" firstAttribute="bottom" secondItem="iGR-wo-ual" secondAttribute="bottom" id="xiX-8e-pNR"/>
                     <constraint firstItem="v80-wd-hUR" firstAttribute="leading" secondItem="iGR-wo-ual" secondAttribute="leading" id="yVZ-Ar-5ov"/>
@@ -867,6 +871,7 @@
                 </constraints>
                 <animations/>
             </view>
+            <point key="canvasLocation" x="-267" y="279"/>
         </window>
         <userDefaultsController representsSharedInstance="YES" id="yy2-3W-Ocj"/>
         <arrayController objectClassName="MPSiteModel" id="mcS-ik-b0n">

MasterPassword/ObjC/Mac/MPSiteModel.h

@@ -17,15 +17,17 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "MPSiteEntity.h"
 @class MPSiteEntity;
 
 @interface MPSiteModel : NSObject
 
-@property (nonatomic) NSString *siteName;
+@property (nonatomic) NSString *name;
+@property (nonatomic) NSAttributedString *displayedName;
 @property (nonatomic) MPSiteType type;
 @property (nonatomic) NSString *typeName;
 @property (nonatomic) NSString *content;
-@property (nonatomic) NSString *contentDisplay;
+@property (nonatomic) NSString *displayedContent;
 @property (nonatomic) NSString *loginName;
 @property (nonatomic) NSNumber *uses;
 @property (nonatomic) NSUInteger counter;
@@ -34,7 +36,7 @@
 @property (nonatomic) BOOL generated;
 @property (nonatomic) BOOL stored;
 
-- (id)initWithEntity:(MPSiteEntity *)entity;
+- (instancetype)initWithEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups;
 - (MPSiteEntity *)entityInContext:(NSManagedObjectContext *)moc;
 
 - (void)updateContent;

MasterPassword/ObjC/Mac/MPSiteModel.m

@@ -28,27 +28,42 @@
     BOOL _initialized;
 }
 
-- (id)initWithEntity:(MPSiteEntity *)entity {
+- (id)initWithEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups {
 
     if (!(self = [super init]))
         return nil;
 
-    [self setEntity:entity];
+    [self setEntity:entity fuzzyGroups:fuzzyGroups];
     _initialized = YES;
 
     return self;
 }
 
-- (void)setEntity:(MPSiteEntity *)entity {
+- (void)setEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups {
 
     if ([_entityOID isEqual:entity.objectID])
         return;
     _entityOID = entity.objectID;
 
+    NSString *siteName = entity.name;
+    NSMutableAttributedString *attributedSiteName = [[NSMutableAttributedString alloc] initWithString:siteName];
+    for (NSUInteger f = 0, s = (NSUInteger)-1; f < [fuzzyGroups count]; ++f) {
+        s = [siteName rangeOfString:fuzzyGroups[f] options:NSDiacriticInsensitiveSearch | NSCaseInsensitiveSearch
+                              range:NSMakeRange( s + 1, [siteName length] - (s + 1) )].location;
+        if (s == NSNotFound)
+            break;
+
+        [attributedSiteName addAttribute:NSBackgroundColorAttributeName value:[NSColor alternateSelectedControlColor]
+                                   range:NSMakeRange( s, [fuzzyGroups[f] length] )];
+    }
+    NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
+    paragraphStyle.alignment = NSCenterTextAlignment;
+    [attributedSiteName addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange( 0, [siteName length] )];
+    
+    self.displayedName = attributedSiteName;
+    self.name = siteName;
     self.algorithm = entity.algorithm;
-    self.siteName = entity.name;
     self.lastUsed = entity.lastUsed;
-    self.loginName = entity.loginName;
     self.type = entity.type;
     self.typeName = entity.typeName;
     self.uses = entity.uses_;
@@ -124,7 +139,12 @@
 
         PearlMainQueue( ^{
             self.content = result;
-            self.contentDisplay = displayResult;
+            self.displayedContent = displayResult;
+        } );
+    }];
+    [entity resolveLoginUsingKey:[MPAppDelegate_Shared get].key result:^(NSString *result) {
+        PearlMainQueue( ^{
+            self.loginName = result;
         } );
     }];
 }

MasterPassword/ObjC/Mac/MasterPassword-Info.plist

@@ -39,8 +39,6 @@
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>MasterPassword</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.lyndir.lhunath.MasterPassword.Mac</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -62,7 +60,7 @@
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2011-2013 Lyndir. All rights reserved.</string>
+	<string>Copyright © 2011-2014 Lyndir</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

MasterPassword/ObjC/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj

@@ -103,7 +103,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = MP;
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = "Maarten Billemont";
 				TargetAttributes = {
 					DAD9B5C0176299B9001835F9 = {
@@ -209,6 +209,7 @@
 				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper-Info.plist";
+				PROVISIONING_PROFILE = "8ea8f441-a2d3-4119-ad85-f18953e17648";
 			};
 			name = "AppStore-Mac";
 		};

MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		93D390C676DF52DA7E459F19 /* MPPasswordWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D9D0061FF1159998F06 /* MPPasswordWindow.m */; };
 		93D392EC39DA43C46C692C12 /* NSDictionary+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */; };
 		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 */; };
 		93D3970BCF85F7902E611168 /* PearlProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39DB3A8ADED08C39A6228 /* PearlProfiler.m */; };
 		93D39784E725A34D1EE3FB3B /* MPInitialWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D3CB30874147D9A9E1B /* MPInitialWindowController.m */; };
@@ -22,13 +23,11 @@
 		DA0933D01747B91B00DE1CEF /* appstore.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0933CF1747B91B00DE1CEF /* appstore.png */; };
 		DA10007F1998A4C6002B873F /* scrypt in Headers */ = {isa = PBXBuildFile; fileRef = DAE8E65619867AF500416A0F /* scrypt */; settings = {ATTRIBUTES = (Public, ); }; };
 		DA1000801998A4C6002B873F /* openssl in Headers */ = {isa = PBXBuildFile; fileRef = DAE8E65719867AF500416A0F /* openssl */; settings = {ATTRIBUTES = (Public, ); }; };
-		DA16B33F170661D4000A0EAB /* libUbiquityStoreManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */; };
 		DA16B341170661DB000A0EAB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B340170661DB000A0EAB /* Carbon.framework */; };
 		DA16B342170661E0000A0EAB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC632871486D95D0075AEA5 /* Security.framework */; };
 		DA16B344170661EE000A0EAB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B343170661EE000A0EAB /* Cocoa.framework */; };
 		DA16B345170661F2000A0EAB /* libPearl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC77CAD148291A600BCF976 /* libPearl.a */; };
 		DA2508F119511D3600AC23F1 /* MPPasswordWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA2508F019511D3600AC23F1 /* MPPasswordWindowController.xib */; };
-		DA2508F719513C1400AC23F1 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B343170661EE000A0EAB /* Cocoa.framework */; };
 		DA250925195148E200AC23F1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAEBC45214F6364500987BF6 /* QuartzCore.framework */; };
 		DA29992C19C6A89900AF7DF1 /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA29992619C6A89900AF7DF1 /* MasterPassword.xcdatamodeld */; };
 		DA2CA4ED18D323D3007798F8 /* NSError+PearlFullDescription.m in Sources */ = {isa = PBXBuildFile; fileRef = DA2CA4E718D323D3007798F8 /* NSError+PearlFullDescription.m */; };
@@ -55,15 +54,15 @@
 		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 */; };
-		DA4425CC1557BED40052177D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; };
+		DA5180CA19FF2F9200A587E9 /* MPAlgorithmV2.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5180C719FF2F9200A587E9 /* MPAlgorithmV2.m */; };
+		DA5180CE19FF307E00A587E9 /* MPAppDelegate_Store.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5180CD19FF307E00A587E9 /* MPAppDelegate_Store.m */; };
 		DA5E5C9417248AA1003798D8 /* libscryptenc-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */; };
 		DA5E5CF61724A667003798D8 /* MPAlgorithm.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5C981724A667003798D8 /* MPAlgorithm.m */; };
 		DA5E5CF71724A667003798D8 /* MPAlgorithmV0.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5C9A1724A667003798D8 /* MPAlgorithmV0.m */; };
 		DA5E5CF81724A667003798D8 /* MPAlgorithmV1.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5C9C1724A667003798D8 /* MPAlgorithmV1.m */; };
 		DA5E5CF91724A667003798D8 /* MPAppDelegate_Key.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5C9E1724A667003798D8 /* MPAppDelegate_Key.m */; };
 		DA5E5CFA1724A667003798D8 /* MPAppDelegate_Shared.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CA01724A667003798D8 /* MPAppDelegate_Shared.m */; };
-		DA5E5CFB1724A667003798D8 /* MPAppDelegate_Store.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CA21724A667003798D8 /* MPAppDelegate_Store.m */; };
 		DA5E5CFC1724A667003798D8 /* MPConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CA41724A667003798D8 /* MPConfig.m */; };
 		DA5E5D001724A667003798D8 /* MPEntities.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CAC1724A667003798D8 /* MPEntities.m */; };
 		DA5E5D011724A667003798D8 /* MPKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CAE1724A667003798D8 /* MPKey.m */; };
@@ -80,15 +79,14 @@
 		DA8ED896192906920099B726 /* PearlTween.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8ED892192906920099B726 /* PearlTween.h */; };
 		DA8ED897192906920099B726 /* map-macro.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8ED894192906920099B726 /* map-macro.h */; };
 		DAAA81B0195A8D1300FA30D9 /* gradient.png in Resources */ = {isa = PBXBuildFile; fileRef = DAAA81AF195A8D1300FA30D9 /* gradient.png */; };
-		DABC6C02175D8C85000C15D4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
-		DABC6C15175D8CE1000C15D4 /* RHStatusItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = DABC6C14175D8CE1000C15D4 /* RHStatusItemView.m */; };
-		DABC6C16175D8E3A000C15D4 /* libRHStatusItemView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DABC6C01175D8C85000C15D4 /* libRHStatusItemView.a */; };
+		DAADCC4719FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */; };
+		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 */; };
 		DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
-		DACA22BB1705DE7D002C6C22 /* UbiquityStoreManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA22B71705DE7D002C6C22 /* UbiquityStoreManager.m */; };
-		DACA22BC1705DE7D002C6C22 /* NSError+UbiquityStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA22B81705DE7D002C6C22 /* NSError+UbiquityStoreManager.h */; };
-		DACA22BD1705DE7D002C6C22 /* NSError+UbiquityStoreManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA22B91705DE7D002C6C22 /* NSError+UbiquityStoreManager.m */; };
-		DACA22BE1705DE7D002C6C22 /* UbiquityStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA22BA1705DE7D002C6C22 /* UbiquityStoreManager.h */; };
 		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 */; };
 		DACA27131705DF81002C6C22 /* avatar-3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DACA24331705DF7D002C6C22 /* avatar-3@2x.png */; };
@@ -213,6 +211,15 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		DAADCC4E19FB006500987B1D /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		DAD9B5EE1762CA3A001835F9 /* Copy LoginHelper */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -229,11 +236,13 @@
 /* Begin PBXFileReference section */
 		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>"; };
+		93D392A4F3DE0BD758B9B056 /* MPNoStateButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPNoStateButton.h; sourceTree = "<group>"; };
 		93D392C3918763B3B72CF366 /* MPPasswordWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordWindowController.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>"; };
 		93D39423D7BF4FD31FE6D27C /* MPSitesTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSitesTableView.m; sourceTree = "<group>"; };
 		93D394EEFF5BF555A55AF361 /* PearlProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PearlProfiler.h; path = ../../../External/Pearl/Pearl/PearlProfiler.h; 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 /* MPPasswordWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordWindow.h; sourceTree = "<group>"; };
 		93D39A57A7823DE98A0FF83C /* MPPasswordWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordWindowController.m; sourceTree = "<group>"; };
@@ -249,7 +258,6 @@
 		DA16B340170661DB000A0EAB /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		DA16B343170661EE000A0EAB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		DA2508F019511D3600AC23F1 /* MPPasswordWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MPPasswordWindowController.xib; sourceTree = "<group>"; };
-		DA2508F619513C1400AC23F1 /* libRMBlurredView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRMBlurredView.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA2508F919513C1400AC23F1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		DA2508FA19513C1400AC23F1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		DA2508FB19513C1400AC23F1 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -292,7 +300,10 @@
 		DA3B8454190FC89700246EEA /* MPFixable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPFixable.m; sourceTree = "<group>"; };
 		DA3B8455190FC89700246EEA /* MPFixable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPFixable.h; sourceTree = "<group>"; };
 		DA3BCFCC19BD09E0006B2681 /* SourceCodePro-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-Regular.otf"; sourceTree = "<group>"; };
-		DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libUbiquityStoreManager.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		DA5180C619FF2F9200A587E9 /* MPAlgorithmV2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAlgorithmV2.h; sourceTree = "<group>"; };
+		DA5180C719FF2F9200A587E9 /* MPAlgorithmV2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAlgorithmV2.m; sourceTree = "<group>"; };
+		DA5180CC19FF307E00A587E9 /* MPAppDelegate_Store.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAppDelegate_Store.h; sourceTree = "<group>"; };
+		DA5180CD19FF307E00A587E9 /* MPAppDelegate_Store.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate_Store.m; sourceTree = "<group>"; };
 		DA5BFA44147E415C00F98B1E /* Master Password.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Master Password.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -308,8 +319,6 @@
 		DA5E5C9E1724A667003798D8 /* MPAppDelegate_Key.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate_Key.m; sourceTree = "<group>"; };
 		DA5E5C9F1724A667003798D8 /* MPAppDelegate_Shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAppDelegate_Shared.h; sourceTree = "<group>"; };
 		DA5E5CA01724A667003798D8 /* MPAppDelegate_Shared.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate_Shared.m; sourceTree = "<group>"; };
-		DA5E5CA11724A667003798D8 /* MPAppDelegate_Store.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAppDelegate_Store.h; sourceTree = "<group>"; };
-		DA5E5CA21724A667003798D8 /* MPAppDelegate_Store.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate_Store.m; sourceTree = "<group>"; };
 		DA5E5CA31724A667003798D8 /* MPConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPConfig.h; sourceTree = "<group>"; };
 		DA5E5CA41724A667003798D8 /* MPConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPConfig.m; sourceTree = "<group>"; };
 		DA5E5CAB1724A667003798D8 /* MPEntities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEntities.h; sourceTree = "<group>"; };
@@ -737,18 +746,17 @@
 		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>"; };
 		DAAA81AF195A8D1300FA30D9 /* gradient.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gradient.png; sourceTree = "<group>"; };
+		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>"; };
 		DABB981515100B4000B05417 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
-		DABC6C01175D8C85000C15D4 /* libRHStatusItemView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRHStatusItemView.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		DABC6C13175D8CE1000C15D4 /* RHStatusItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RHStatusItemView.h; sourceTree = "<group>"; };
-		DABC6C14175D8CE1000C15D4 /* RHStatusItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RHStatusItemView.m; 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; };
 		DAC77CB1148291A600BCF976 /* Pearl-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Pearl-Prefix.pch"; path = "../../MasterPassword/ObjC/Pearl/Pearl-Prefix.pch"; sourceTree = "<group>"; };
-		DACA22B71705DE7D002C6C22 /* UbiquityStoreManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UbiquityStoreManager.m; sourceTree = "<group>"; };
-		DACA22B81705DE7D002C6C22 /* NSError+UbiquityStoreManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+UbiquityStoreManager.h"; sourceTree = "<group>"; };
-		DACA22B91705DE7D002C6C22 /* NSError+UbiquityStoreManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+UbiquityStoreManager.m"; sourceTree = "<group>"; };
-		DACA22BA1705DE7D002C6C22 /* UbiquityStoreManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UbiquityStoreManager.h; sourceTree = "<group>"; };
 		DACA241C1705DF7D002C6C22 /* logo-bare.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-bare.png"; sourceTree = "<group>"; };
 		DACA24321705DF7D002C6C22 /* avatar-13@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-13@2x.png"; sourceTree = "<group>"; };
 		DACA24331705DF7D002C6C22 /* avatar-3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-3@2x.png"; sourceTree = "<group>"; };
@@ -796,6 +804,17 @@
 		DACA29721705E1A8002C6C22 /* dictionary.lst */ = {isa = PBXFileReference; fileEncoding = 4; 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>"; };
+		DAD0C5F619FD6034009CB08D /* icon_128x128.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_128x128.png; sourceTree = "<group>"; };
+		DAD0C5F719FD6034009CB08D /* icon_128x128@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_128x128@2x.png"; sourceTree = "<group>"; };
+		DAD0C5F819FD6034009CB08D /* icon_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_16x16.png; sourceTree = "<group>"; };
+		DAD0C5F919FD6034009CB08D /* icon_16x16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_16x16@2x.png"; sourceTree = "<group>"; };
+		DAD0C5FA19FD6034009CB08D /* icon_256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_256x256.png; sourceTree = "<group>"; };
+		DAD0C5FB19FD6034009CB08D /* icon_256x256@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_256x256@2x.png"; sourceTree = "<group>"; };
+		DAD0C5FC19FD6034009CB08D /* icon_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_32x32.png; sourceTree = "<group>"; };
+		DAD0C5FD19FD6034009CB08D /* icon_32x32@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_32x32@2x.png"; sourceTree = "<group>"; };
+		DAD0C5FE19FD6034009CB08D /* icon_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_512x512.png; sourceTree = "<group>"; };
+		DAD0C5FF19FD6034009CB08D /* icon_512x512@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_512x512@2x.png"; sourceTree = "<group>"; };
+		DAD0C60019FD6034009CB08D /* icon.sketch */ = {isa = PBXFileReference; lastKnownFileType = file; path = icon.sketch; sourceTree = "<group>"; };
 		DAD312C01552A20800A3F9ED /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
 		DAD9B5E1176299B9001835F9 /* MasterPassword-Mac-LoginHelper.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "MasterPassword-Mac-LoginHelper.xcodeproj"; path = "MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj"; sourceTree = "<group>"; };
 		DAD9B5EF1762CAA4001835F9 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
@@ -854,30 +873,13 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		DA2508F319513C1400AC23F1 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DA2508F719513C1400AC23F1 /* Cocoa.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DA4425C81557BED40052177D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DA4425CC1557BED40052177D /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DA5BFA41147E415C00F98B1E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DAADCC6A19FB00B500987B1D /* libKCOrderedAccessorFix.a in Frameworks */,
 				DA250925195148E200AC23F1 /* QuartzCore.framework in Frameworks */,
 				DAD9B5F01762CAA4001835F9 /* ServiceManagement.framework in Frameworks */,
-				DABC6C16175D8E3A000C15D4 /* libRHStatusItemView.a in Frameworks */,
-				DA16B33F170661D4000A0EAB /* libUbiquityStoreManager.a in Frameworks */,
 				DA16B341170661DB000A0EAB /* Carbon.framework in Frameworks */,
 				DA16B342170661E0000A0EAB /* Security.framework in Frameworks */,
 				DA16B345170661F2000A0EAB /* libPearl.a in Frameworks */,
@@ -886,11 +888,10 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DABC6BFE175D8C85000C15D4 /* Frameworks */ = {
+		DAADCC4D19FB006500987B1D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DABC6C02175D8C85000C15D4 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -906,6 +907,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DAADCC4B19FB000C00987B1D /* QuartzCore.framework in Frameworks */,
 				DAE8E65519867AE200416A0F /* libopensslcrypto-osx.a in Frameworks */,
 				DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */,
 				DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */,
@@ -953,9 +955,7 @@
 				DA5BFA44147E415C00F98B1E /* Master Password.app */,
 				DAC77CAD148291A600BCF976 /* libPearl.a */,
 				DAC6326C148680650075AEA5 /* libjrswizzle.a */,
-				DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */,
-				DABC6C01175D8C85000C15D4 /* libRHStatusItemView.a */,
-				DA2508F619513C1400AC23F1 /* libRMBlurredView.a */,
+				DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -995,39 +995,41 @@
 		DA5E5C961724A667003798D8 /* ObjC */ = {
 			isa = PBXGroup;
 			children = (
-				DA32CFE319CF1C71004F3F0E /* MPUserEntity.h */,
-				DA32CFE419CF1C71004F3F0E /* MPUserEntity.m */,
-				DA32CFE019CF1C71004F3F0E /* MPSiteQuestionEntity.h */,
-				DA32CFE119CF1C71004F3F0E /* MPSiteQuestionEntity.m */,
-				DA32CFDD19CF1C70004F3F0E /* MPSiteEntity.h */,
-				DA32CFDE19CF1C70004F3F0E /* MPSiteEntity.m */,
-				DA32CFDA19CF1C70004F3F0E /* MPStoredSiteEntity.h */,
-				DA32CFDB19CF1C70004F3F0E /* MPStoredSiteEntity.m */,
-				DA32CFD719CF1C70004F3F0E /* MPGeneratedSiteEntity.h */,
-				DA32CFD819CF1C70004F3F0E /* MPGeneratedSiteEntity.m */,
-				DA3B8454190FC89700246EEA /* MPFixable.m */,
-				DA3B8455190FC89700246EEA /* MPFixable.h */,
 				DA5E5CB21724A667003798D8 /* Mac */,
+				DA29992619C6A89900AF7DF1 /* MasterPassword.xcdatamodeld */,
 				DA5E5C971724A667003798D8 /* MPAlgorithm.h */,
 				DA5E5C981724A667003798D8 /* MPAlgorithm.m */,
 				DA5E5C991724A667003798D8 /* MPAlgorithmV0.h */,
 				DA5E5C9A1724A667003798D8 /* MPAlgorithmV0.m */,
 				DA5E5C9B1724A667003798D8 /* MPAlgorithmV1.h */,
 				DA5E5C9C1724A667003798D8 /* MPAlgorithmV1.m */,
+				DA5180C619FF2F9200A587E9 /* MPAlgorithmV2.h */,
+				DA5180C719FF2F9200A587E9 /* MPAlgorithmV2.m */,
 				DA5E5C9D1724A667003798D8 /* MPAppDelegate_Key.h */,
 				DA5E5C9E1724A667003798D8 /* MPAppDelegate_Key.m */,
 				DA5E5C9F1724A667003798D8 /* MPAppDelegate_Shared.h */,
 				DA5E5CA01724A667003798D8 /* MPAppDelegate_Shared.m */,
-				DA5E5CA11724A667003798D8 /* MPAppDelegate_Store.h */,
-				DA5E5CA21724A667003798D8 /* MPAppDelegate_Store.m */,
+				DA5180CC19FF307E00A587E9 /* MPAppDelegate_Store.h */,
+				DA5180CD19FF307E00A587E9 /* MPAppDelegate_Store.m */,
 				DA5E5CA31724A667003798D8 /* MPConfig.h */,
 				DA5E5CA41724A667003798D8 /* MPConfig.m */,
 				DA5E5CAB1724A667003798D8 /* MPEntities.h */,
 				DA5E5CAC1724A667003798D8 /* MPEntities.m */,
+				DA3B8455190FC89700246EEA /* MPFixable.h */,
+				DA3B8454190FC89700246EEA /* MPFixable.m */,
+				DA32CFD719CF1C70004F3F0E /* MPGeneratedSiteEntity.h */,
+				DA32CFD819CF1C70004F3F0E /* MPGeneratedSiteEntity.m */,
 				DA5E5CAD1724A667003798D8 /* MPKey.h */,
 				DA5E5CAE1724A667003798D8 /* MPKey.m */,
+				DA32CFDD19CF1C70004F3F0E /* MPSiteEntity.h */,
+				DA32CFDE19CF1C70004F3F0E /* MPSiteEntity.m */,
+				DA32CFE019CF1C71004F3F0E /* MPSiteQuestionEntity.h */,
+				DA32CFE119CF1C71004F3F0E /* MPSiteQuestionEntity.m */,
+				DA32CFDA19CF1C70004F3F0E /* MPStoredSiteEntity.h */,
+				DA32CFDB19CF1C70004F3F0E /* MPStoredSiteEntity.m */,
 				DA5E5CAF1724A667003798D8 /* MPTypes.h */,
-				DA29992619C6A89900AF7DF1 /* MasterPassword.xcdatamodeld */,
+				DA32CFE319CF1C71004F3F0E /* MPUserEntity.h */,
+				DA32CFE419CF1C71004F3F0E /* MPUserEntity.m */,
 			);
 			name = ObjC;
 			path = ..;
@@ -1059,6 +1061,8 @@
 				93D39368EF3CBFEF2AFCA15A /* MPInitialWindowController.h */,
 				93D39423D7BF4FD31FE6D27C /* MPSitesTableView.m */,
 				93D39AC6360DDC16AEAA4119 /* MPSitesTableView.h */,
+				93D39538C4CEFF46DF379254 /* MPNoStateButton.m */,
+				93D392A4F3DE0BD758B9B056 /* MPNoStateButton.h */,
 			);
 			path = Mac;
 			sourceTree = "<group>";
@@ -1480,14 +1484,13 @@
 			path = include;
 			sourceTree = "<group>";
 		};
-		DABC6C0E175D8CE1000C15D4 /* RHStatusItemView */ = {
+		DAADCC6819FB007F00987B1D /* KCOrderedAccessorFix */ = {
 			isa = PBXGroup;
 			children = (
-				DABC6C13175D8CE1000C15D4 /* RHStatusItemView.h */,
-				DABC6C14175D8CE1000C15D4 /* RHStatusItemView.m */,
+				DAADCC6619FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.h */,
+				DAADCC6719FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m */,
 			);
-			name = RHStatusItemView;
-			path = RHStatusItemView/RHStatusItemView;
+			path = KCOrderedAccessorFix;
 			sourceTree = "<group>";
 		};
 		DAC77CAF148291A600BCF976 /* Pearl */ = {
@@ -1503,28 +1506,15 @@
 		DACA22121705DDC5002C6C22 /* External */ = {
 			isa = PBXGroup;
 			children = (
+				DAADCC6819FB007F00987B1D /* KCOrderedAccessorFix */,
 				DA3B8449190FC5A900246EEA /* Mac */,
-				DABC6C0E175D8CE1000C15D4 /* RHStatusItemView */,
 				DACA29751705E2BD002C6C22 /* jrswizzle */,
 				DAC77CAF148291A600BCF976 /* Pearl */,
-				DACA22B61705DE7D002C6C22 /* UbiquityStoreManager */,
 			);
 			name = External;
 			path = ../../../External;
 			sourceTree = "<group>";
 		};
-		DACA22B61705DE7D002C6C22 /* UbiquityStoreManager */ = {
-			isa = PBXGroup;
-			children = (
-				DACA22BA1705DE7D002C6C22 /* UbiquityStoreManager.h */,
-				DACA22B71705DE7D002C6C22 /* UbiquityStoreManager.m */,
-				DACA22B81705DE7D002C6C22 /* NSError+UbiquityStoreManager.h */,
-				DACA22B91705DE7D002C6C22 /* NSError+UbiquityStoreManager.m */,
-			);
-			name = UbiquityStoreManager;
-			path = UbiquityStoreManager/UbiquityStoreManager;
-			sourceTree = "<group>";
-		};
 		DACA23B41705DF7D002C6C22 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
@@ -1539,6 +1529,7 @@
 		DACA23B51705DF7D002C6C22 /* Media */ = {
 			isa = PBXGroup;
 			children = (
+				DAD0C5F419FD6034009CB08D /* mac */,
 				DA6558A319A99609009A0BEB /* Images.xcassets */,
 				DA606FE9195D03E200CA98B5 /* Insignia */,
 				DAAA81AF195A8D1300FA30D9 /* gradient.png */,
@@ -1636,8 +1627,33 @@
 				DACA29771705E2BD002C6C22 /* JRSwizzle.h */,
 				DACA298C1705E2BD002C6C22 /* JRSwizzle.m */,
 			);
-			name = jrswizzle;
-			path = Pearl/External/jrswizzle;
+			path = jrswizzle;
+			sourceTree = "<group>";
+		};
+		DAD0C5F419FD6034009CB08D /* mac */ = {
+			isa = PBXGroup;
+			children = (
+				DAD0C5F519FD6034009CB08D /* icon */,
+				DAD0C60019FD6034009CB08D /* icon.sketch */,
+			);
+			path = mac;
+			sourceTree = "<group>";
+		};
+		DAD0C5F519FD6034009CB08D /* icon */ = {
+			isa = PBXGroup;
+			children = (
+				DAD0C5F619FD6034009CB08D /* icon_128x128.png */,
+				DAD0C5F719FD6034009CB08D /* icon_128x128@2x.png */,
+				DAD0C5F819FD6034009CB08D /* icon_16x16.png */,
+				DAD0C5F919FD6034009CB08D /* icon_16x16@2x.png */,
+				DAD0C5FA19FD6034009CB08D /* icon_256x256.png */,
+				DAD0C5FB19FD6034009CB08D /* icon_256x256@2x.png */,
+				DAD0C5FC19FD6034009CB08D /* icon_32x32.png */,
+				DAD0C5FD19FD6034009CB08D /* icon_32x32@2x.png */,
+				DAD0C5FE19FD6034009CB08D /* icon_512x512.png */,
+				DAD0C5FF19FD6034009CB08D /* icon_512x512@2x.png */,
+			);
+			path = icon;
 			sourceTree = "<group>";
 		};
 		DAD9B5E2176299B9001835F9 /* Products */ = {
@@ -1660,6 +1676,9 @@
 		DAFE45D715039823003ABA7C /* Pearl */ = {
 			isa = PBXGroup;
 			children = (
+				DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */,
+				DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */,
+				DAADCC4019FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m */,
 				DA8ED891192906920099B726 /* PearlTween.m */,
 				DA8ED892192906920099B726 /* PearlTween.h */,
 				DA8ED893192906920099B726 /* include */,
@@ -1750,22 +1769,6 @@
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		DA2508F419513C1400AC23F1 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DA4425C91557BED40052177D /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DACA22BC1705DE7D002C6C22 /* NSError+UbiquityStoreManager.h in Headers */,
-				DACA22BE1705DE7D002C6C22 /* UbiquityStoreManager.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DAC6326A148680650075AEA5 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -1807,12 +1810,14 @@
 				DAFE4A3A15039824003ABA7C /* PearlSCrypt.h in Headers */,
 				DA30E9CE15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h in Headers */,
 				DA30E9D715723E6900A68B4C /* PearlLazy.h in Headers */,
+				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 */,
 				DA2CA4EE18D323D3007798F8 /* NSError+PearlFullDescription.h in Headers */,
+				DAADCC4819FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h in Headers */,
 				93D39D304F73B3BBA031522A /* PearlProfiler.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1820,44 +1825,11 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		DA2508F519513C1400AC23F1 /* RMBlurredView */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DA25091519513C1500AC23F1 /* Build configuration list for PBXNativeTarget "RMBlurredView" */;
-			buildPhases = (
-				DA2508F219513C1400AC23F1 /* Sources */,
-				DA2508F319513C1400AC23F1 /* Frameworks */,
-				DA2508F419513C1400AC23F1 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = RMBlurredView;
-			productName = RMBlurredView;
-			productReference = DA2508F619513C1400AC23F1 /* libRMBlurredView.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		DA4425CA1557BED40052177D /* UbiquityStoreManager */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DA4425D31557BED40052177D /* Build configuration list for PBXNativeTarget "UbiquityStoreManager" */;
-			buildPhases = (
-				DA4425C71557BED40052177D /* Sources */,
-				DA4425C81557BED40052177D /* Frameworks */,
-				DA4425C91557BED40052177D /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = UbiquityStoreManager;
-			productName = iCloudStoreManager;
-			productReference = DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */;
-			productType = "com.apple.product-type.library.static";
-		};
 		DA5BFA43147E415C00F98B1E /* MasterPassword */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */;
 			buildPhases = (
+				DA4EF9CB19FD4B600032ECB5 /* Run Script: genassets */,
 				DA5BFA40147E415C00F98B1E /* Sources */,
 				DA5BFA41147E415C00F98B1E /* Frameworks */,
 				DA5BFA42147E415C00F98B1E /* Resources */,
@@ -1875,20 +1847,21 @@
 			productReference = DA5BFA44147E415C00F98B1E /* Master Password.app */;
 			productType = "com.apple.product-type.application";
 		};
-		DABC6C00175D8C85000C15D4 /* RHStatusItemView */ = {
+		DAADCC4F19FB006500987B1D /* KCOrderedAccessorFix */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = DABC6C0A175D8C85000C15D4 /* Build configuration list for PBXNativeTarget "RHStatusItemView" */;
+			buildConfigurationList = DAADCC5E19FB006500987B1D /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */;
 			buildPhases = (
-				DABC6BFD175D8C85000C15D4 /* Sources */,
-				DABC6BFE175D8C85000C15D4 /* Frameworks */,
+				DAADCC4C19FB006500987B1D /* Sources */,
+				DAADCC4D19FB006500987B1D /* Frameworks */,
+				DAADCC4E19FB006500987B1D /* CopyFiles */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
-			name = RHStatusItemView;
-			productName = RHStatusItemView;
-			productReference = DABC6C01175D8C85000C15D4 /* libRHStatusItemView.a */;
+			name = KCOrderedAccessorFix;
+			productName = KCOrderedAccessorFix;
+			productReference = DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		DAC6326B148680650075AEA5 /* jrswizzle */ = {
@@ -1935,7 +1908,7 @@
 			attributes = {
 				CLASSPREFIX = MP;
 				LastTestingUpgradeCheck = 0510;
-				LastUpgradeCheck = 0600;
+				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = Lyndir;
 				TargetAttributes = {
 					DA5BFA43147E415C00F98B1E = {
@@ -1946,6 +1919,9 @@
 							};
 						};
 					};
+					DAADCC4F19FB006500987B1D = {
+						CreatedOnToolsVersion = 6.0.1;
+					};
 				};
 			};
 			buildConfigurationList = DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-Mac" */;
@@ -1954,6 +1930,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				nl,
 			);
 			mainGroup = DA5BFA39147E415C00F98B1E;
 			productRefGroup = DA5BFA45147E415C00F98B1E /* Products */;
@@ -1969,9 +1946,7 @@
 				DA5BFA43147E415C00F98B1E /* MasterPassword */,
 				DAC77CAC148291A600BCF976 /* Pearl */,
 				DAC6326B148680650075AEA5 /* jrswizzle */,
-				DA4425CA1557BED40052177D /* UbiquityStoreManager */,
-				DABC6C00175D8C85000C15D4 /* RHStatusItemView */,
-				DA2508F519513C1400AC23F1 /* RMBlurredView */,
+				DAADCC4F19FB006500987B1D /* KCOrderedAccessorFix */,
 			);
 		};
 /* End PBXProject section */
@@ -2072,6 +2047,21 @@
 			shellPath = /bin/sh;
 			shellScript = "";
 		};
+		DA4EF9CB19FD4B600032ECB5 /* Run Script: genassets */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script: genassets";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = "/bin/sh -e";
+			shellScript = "exec ../../../Scripts/genassets";
+			showEnvVarsInLog = 0;
+		};
 		DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -2083,8 +2073,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = "/bin/bash -e";
-			shellScript = "PATH+=:/usr/libexec\n\naddPlistWithKey() {\n    local key=$1 type=$2 value=$3 plist=${4:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Delete :'$key'\" \"$plist\" 2>/dev/null || true\n    PlistBuddy -c \"Add :'$key' '$type' '$value'\" \"$plist\"\n}\nsetPlistWithKey() {\n    local key=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Set :'$key' '$value'\" \"$plist\"\n}\ngetPlistWithKey() {\n    local key=$1 plist=${2:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Print :'$key'\" \"$plist\"\n}\nsetSettingWithTitle() {\n    local i title=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Settings.bundle/Root.plist\"}\n    \n    for (( i=0; 1; ++i )); do\n        PlistBuddy -c \"Print :PreferenceSpecifiers:$i\" \"$plist\" &>/dev/null || break\n        echo \"Checking preference specifier $i\"\n    \n        [[ $(PlistBuddy -c \"Print :PreferenceSpecifiers:$i:Title\" \"$plist\" 2>/dev/null) = $title ]] || continue\n    \n        echo \"Correct title, setting value.\"\n        PlistBuddy -c \"Set :PreferenceSpecifiers:$i:DefaultValue $value\" \"$plist\"\n        break\n    done\n}\n\ndescription=$(git describe --always --dirty --long)\nversion=${description%-g*}\nIFS=- read major minor <<< \"$version\"\nprintf -v version '%s.%02d' \"$major\" \"$minor\"\nprintf -v commit '%09d' \"$((16#${description##*-g}))\"\n\naddPlistWithKey GITDescription string \"$description\"\nsetPlistWithKey CFBundleVersion \"${version//.}$commit\" # No separator between version and commit because I had already submitted a CFBundleVersion with a really high major.  Cry.\nsetPlistWithKey CFBundleShortVersionString \"$version\"\n\nsetSettingWithTitle \"Build\" \"$commit\"\nsetSettingWithTitle \"Version\" \"$version\"\nsetSettingWithTitle \"Copyright\" \"$(getPlistWithKey NSHumanReadableCopyright)\"\n\nif [[ $DEPLOYMENT_LOCATION = YES ]]; then\n    # This build is a release.  Do some release checks.\n    passed=1\n    [[ $description != *-dirty ]] || \\\n        { passed=0; echo >&2 \"ERROR: Cannot release a dirty version, first commit any changes.\"; }\n    [[ $(PlistBuddy -c \"Print :'API Key'\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Crashlytics.plist\") ]] || \\\n        { passed=0; echo >&2 \"ERROR: Cannot release: Crashlytics API key is missing.\"; }\n    (( passed )) || \\\n        { echo >&2 \"Failed to pass release checks.  Fix the above errors and re-try.  Aborting.\"; exit 1; }\nfi";
+			shellPath = "/bin/sh -e";
+			shellScript = "exec ../../../Scripts/updatePlist";
 			showEnvVarsInLog = 0;
 		};
 		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
@@ -2105,22 +2095,6 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		DA2508F219513C1400AC23F1 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DA4425C71557BED40052177D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DACA22BB1705DE7D002C6C22 /* UbiquityStoreManager.m in Sources */,
-				DACA22BD1705DE7D002C6C22 /* NSError+UbiquityStoreManager.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		DA5BFA40147E415C00F98B1E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2131,8 +2105,8 @@
 				DA5E5CF71724A667003798D8 /* MPAlgorithmV0.m in Sources */,
 				DA5E5CF81724A667003798D8 /* MPAlgorithmV1.m in Sources */,
 				DA5E5CF91724A667003798D8 /* MPAppDelegate_Key.m in Sources */,
+				DA5180CE19FF307E00A587E9 /* MPAppDelegate_Store.m in Sources */,
 				DA5E5CFA1724A667003798D8 /* MPAppDelegate_Shared.m in Sources */,
-				DA5E5CFB1724A667003798D8 /* MPAppDelegate_Store.m in Sources */,
 				DA5E5CFC1724A667003798D8 /* MPConfig.m in Sources */,
 				DA29992C19C6A89900AF7DF1 /* MasterPassword.xcdatamodeld in Sources */,
 				DA3B8456190FC89700246EEA /* MPFixable.m in Sources */,
@@ -2143,20 +2117,22 @@
 				DA5E5D041724A667003798D8 /* MPMacConfig.m in Sources */,
 				DA5E5D0C1724A667003798D8 /* main.m in Sources */,
 				93D39C5789EFA607CF788082 /* MPSiteModel.m in Sources */,
+				DA5180CA19FF2F9200A587E9 /* MPAlgorithmV2.m in Sources */,
 				93D39F833DEC1C89B2F795AC /* MPPasswordWindowController.m in Sources */,
 				DA32CFD919CF1C70004F3F0E /* MPGeneratedSiteEntity.m in Sources */,
 				93D390C676DF52DA7E459F19 /* MPPasswordWindow.m in Sources */,
 				93D39784E725A34D1EE3FB3B /* MPInitialWindowController.m in Sources */,
 				DA32CFDF19CF1C70004F3F0E /* MPSiteEntity.m in Sources */,
 				93D394C4254EEB45FB335AFB /* MPSitesTableView.m in Sources */,
+				93D395E4830290EBB6E71F34 /* MPNoStateButton.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DABC6BFD175D8C85000C15D4 /* Sources */ = {
+		DAADCC4C19FB006500987B1D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DABC6C15175D8CE1000C15D4 /* RHStatusItemView.m in Sources */,
+				DAADCC6919FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2173,6 +2149,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				DAFE4A1415039824003ABA7C /* NSObject+PearlExport.m in Sources */,
+				DAADCC4919FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m in Sources */,
 				DAFE4A1615039824003ABA7C /* NSString+PearlNSArrayFormat.m in Sources */,
 				DAFE4A1815039824003ABA7C /* NSString+PearlSEL.m in Sources */,
 				DA2CA4ED18D323D3007798F8 /* NSError+PearlFullDescription.m in Sources */,
@@ -2250,54 +2227,6 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		DA25091619513C1500AC23F1 /* Debug-Mac */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-			};
-			name = "Debug-Mac";
-		};
-		DA25091719513C1500AC23F1 /* AdHoc-Mac */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-			};
-			name = "AdHoc-Mac";
-		};
-		DA25091819513C1500AC23F1 /* AppStore-Mac */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-			};
-			name = "AppStore-Mac";
-		};
-		DA4425D41557BED40052177D /* Debug-Mac */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-			};
-			name = "Debug-Mac";
-		};
-		DA4425D51557BED40052177D /* AdHoc-Mac */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-			};
-			name = "AdHoc-Mac";
-		};
-		DA4425D61557BED40052177D /* AppStore-Mac */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-			};
-			name = "AppStore-Mac";
-		};
 		DA5BFA6B147E415C00F98B1E /* Debug-Mac */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -2630,23 +2559,26 @@
 			};
 			name = "AppStore-Mac";
 		};
-		DABC6C0B175D8C85000C15D4 /* Debug-Mac */ = {
+		DAADCC5F19FB006500987B1D /* Debug-Mac */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 			};
 			name = "Debug-Mac";
 		};
-		DABC6C0C175D8C85000C15D4 /* AdHoc-Mac */ = {
+		DAADCC6019FB006500987B1D /* AdHoc-Mac */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 			};
 			name = "AdHoc-Mac";
 		};
-		DABC6C0D175D8C85000C15D4 /* AppStore-Mac */ = {
+		DAADCC6119FB006500987B1D /* AppStore-Mac */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 			};
 			name = "AppStore-Mac";
@@ -2720,26 +2652,6 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		DA25091519513C1500AC23F1 /* Build configuration list for PBXNativeTarget "RMBlurredView" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DA25091619513C1500AC23F1 /* Debug-Mac */,
-				DA25091719513C1500AC23F1 /* AdHoc-Mac */,
-				DA25091819513C1500AC23F1 /* AppStore-Mac */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = "AdHoc-Mac";
-		};
-		DA4425D31557BED40052177D /* Build configuration list for PBXNativeTarget "UbiquityStoreManager" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DA4425D41557BED40052177D /* Debug-Mac */,
-				DA4425D51557BED40052177D /* AdHoc-Mac */,
-				DA4425D61557BED40052177D /* AppStore-Mac */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = "AdHoc-Mac";
-		};
 		DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-Mac" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -2760,12 +2672,12 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = "AdHoc-Mac";
 		};
-		DABC6C0A175D8C85000C15D4 /* Build configuration list for PBXNativeTarget "RHStatusItemView" */ = {
+		DAADCC5E19FB006500987B1D /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				DABC6C0B175D8C85000C15D4 /* Debug-Mac */,
-				DABC6C0C175D8C85000C15D4 /* AdHoc-Mac */,
-				DABC6C0D175D8C85000C15D4 /* AppStore-Mac */,
+				DAADCC5F19FB006500987B1D /* Debug-Mac */,
+				DAADCC6019FB006500987B1D /* AdHoc-Mac */,
+				DAADCC6119FB006500987B1D /* AppStore-Mac */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = "AdHoc-Mac";

MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

MasterPassword/ObjC/iOS/MPCoachmarkViewController.m

@@ -99,6 +99,8 @@
 - (void)setCoached:(BOOL)coached {
 
     [[NSUserDefaults standardUserDefaults] setBool:coached forKey:strf( @"%@.%ld.coached", self.coachedClass, (long)self.coachedVersion )];
+    if (![[NSUserDefaults standardUserDefaults] synchronize])
+        wrn( @"Couldn't synchronize after coachmark updates." );
 }
 
 @end

MasterPassword/ObjC/iOS/MPPasswordCell.h

@@ -27,6 +27,8 @@ typedef NS_ENUM ( NSUInteger, MPPasswordCellMode ) {
 
 @interface MPPasswordCell : MPCell <UIScrollViewDelegate, UITextFieldDelegate>
 
+@property (nonatomic) NSArray *fuzzyGroups;
+
 - (void)setSite:(MPSiteEntity *)site animated:(BOOL)animated;
 - (void)setTransientSite:(NSString *)siteName animated:(BOOL)animated;
 - (void)setMode:(MPPasswordCellMode)mode animated:(BOOL)animated;

MasterPassword/ObjC/iOS/MPPasswordCell.m

@@ -133,6 +133,7 @@
     [super prepareForReuse];
 
     _siteOID = nil;
+    _fuzzyGroups = nil;
     self.transientSite = nil;
     self.mode = MPPasswordCellModePassword;
     [self updateAnimated:NO];
@@ -147,6 +148,15 @@
 
 #pragma mark - State
 
+- (void)setFuzzyGroups:(NSArray *)fuzzyGroups {
+
+    if (_fuzzyGroups == fuzzyGroups)
+        return;
+    _fuzzyGroups = fuzzyGroups;
+
+    [self updateSiteName:[self siteInContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]]];
+}
+
 - (void)setMode:(MPPasswordCellMode)mode animated:(BOOL)animated {
 
     if (mode == _mode)
@@ -257,8 +267,11 @@
                     return;
 
                 [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-                    [context deleteObject:[self siteInContext:context]];
-                    [context saveToStore];
+                    MPSiteEntity *site_ = [self siteInContext:context];
+                    if (site_) {
+                        [context deleteObject:site_];
+                        [context saveToStore];
+                    }
                 }];
             }          cancelTitle:@"Cancel" destructiveTitle:@"Delete Site" otherTitles:nil];
 }
@@ -487,8 +500,7 @@
             [self.loginNameButton setTitle:@"Tap the pencil to save a username" forState:UIControlStateNormal];
 
         // Site Name
-        self.siteNameLabel.text = strl( @"%@ - %@", self.transientSite?: mainSite.name,
-                self.transientSite? @"Tap to create": [mainSite.algorithm shortNameOfType:mainSite.type] );
+        [self updateSiteName:mainSite];
 
         // Site Password
         self.passwordField.secureTextEntry = [[MPiOSConfig get].hidePasswords boolValue];
@@ -554,6 +566,26 @@
     }];
 }
 
+- (void)updateSiteName:(MPSiteEntity *)site {
+
+    NSString *siteName = self.transientSite?: site.name;
+    NSMutableAttributedString *attributedSiteName = [[NSMutableAttributedString alloc] initWithString:siteName?: @""];
+    if ([attributedSiteName length])
+        for (NSUInteger f = 0, s = (NSUInteger)-1; f < [self.fuzzyGroups count]; ++f) {
+            s = [siteName rangeOfString:self.fuzzyGroups[f] options:NSDiacriticInsensitiveSearch | NSCaseInsensitiveSearch
+                                  range:NSMakeRange( s + 1, [siteName length] - (s + 1) )].location;
+            if (s == NSNotFound)
+                break;
+
+            [attributedSiteName addAttribute:NSBackgroundColorAttributeName value:[UIColor redColor]
+                                       range:NSMakeRange( s, [self.fuzzyGroups[f] length] )];
+        }
+
+    [attributedSiteName appendAttributedString:stra(
+            strf( @" - %@", self.transientSite? @"Tap to create": [site.algorithm shortNameOfType:site.type] ), @{ } )];
+    self.siteNameLabel.attributedText = attributedSiteName;
+}
+
 - (BOOL)copyContentOfSite:(MPSiteEntity *)site saveInContext:(NSManagedObjectContext *)context {
 
     inf( @"Copying password for: %@", site.name );

MasterPassword/ObjC/iOS/MPPasswordsViewController.m

@@ -44,6 +44,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     BOOL _showTransientItem;
     NSUInteger _transientItem;
     NSCharacterSet *_siteNameAcceptableCharactersSet;
+    NSArray *_fuzzyGroups;
 }
 
 #pragma mark - Life
@@ -64,7 +65,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     self.view.backgroundColor = [UIColor clearColor];
     [self.passwordCollectionView automaticallyAdjustInsetsForKeyboard];
     self.passwordsSearchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    if ([self.passwordsSearchBar respondsToSelector:@selector(keyboardAppearance)])
+    if ([self.passwordsSearchBar respondsToSelector:@selector( keyboardAppearance )])
         self.passwordsSearchBar.keyboardAppearance = UIKeyboardAppearanceDark;
     else
         [self.passwordsSearchBar enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
@@ -147,6 +148,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
 
     MPPasswordCell *cell = [MPPasswordCell dequeueCellFromCollectionView:collectionView indexPath:indexPath];
+    [cell setFuzzyGroups:_fuzzyGroups];
     if (indexPath.item < ((id<NSFetchedResultsSectionInfo>)self.fetchedResultsController.sections[indexPath.section]).numberOfObjects)
         [cell setSite:[self.fetchedResultsController objectAtIndexPath:indexPath] animated:NO];
     else
@@ -170,23 +172,29 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
      forChangeType:(NSFetchedResultsChangeType)type newIndexPath:(NSIndexPath *)newIndexPath {
 
     if (controller == _fetchedResultsController) {
-        [self.passwordCollectionView performBatchUpdates:^{
-            [self fetchedItemsDidUpdate];
-            switch (type) {
-                case NSFetchedResultsChangeInsert:
-                    [self.passwordCollectionView insertItemsAtIndexPaths:@[ newIndexPath ]];
-                    break;
-                case NSFetchedResultsChangeDelete:
-                    [self.passwordCollectionView deleteItemsAtIndexPaths:@[ indexPath ]];
-                    break;
-                case NSFetchedResultsChangeMove:
-                    [self.passwordCollectionView moveItemAtIndexPath:indexPath toIndexPath:newIndexPath];
-                    break;
-                case NSFetchedResultsChangeUpdate:
-                    [self.passwordCollectionView reloadItemsAtIndexPaths:@[ indexPath ]];
-                    break;
-            }
-        }                                     completion:nil];
+        @try {
+            [self.passwordCollectionView performBatchUpdates:^{
+                [self fetchedItemsDidUpdate];
+                switch (type) {
+                    case NSFetchedResultsChangeInsert:
+                        [self.passwordCollectionView insertItemsAtIndexPaths:@[ newIndexPath ]];
+                        break;
+                    case NSFetchedResultsChangeDelete:
+                        [self.passwordCollectionView deleteItemsAtIndexPaths:@[ indexPath ]];
+                        break;
+                    case NSFetchedResultsChangeMove:
+                        [self.passwordCollectionView moveItemAtIndexPath:indexPath toIndexPath:newIndexPath];
+                        break;
+                    case NSFetchedResultsChangeUpdate:
+                        [self.passwordCollectionView reloadItemsAtIndexPaths:@[ indexPath ]];
+                        break;
+                }
+            }                                     completion:nil];
+        }
+        @catch (NSException *exception) {
+            wrn( @"While updating password cells: %@", [exception fullDescription] );
+            [self.passwordCollectionView reloadData];
+        }
     }
 }
 
@@ -247,9 +255,9 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 - (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText {
 
     if (searchBar == self.passwordsSearchBar) {
-        if ([self.query length] && [[self.query stringByTrimmingCharactersInSet:_siteNameAcceptableCharactersSet] length])
+        if ([[self.query stringByTrimmingCharactersInSet:_siteNameAcceptableCharactersSet] length])
             [self showTips:MPPasswordsBadNameTip];
-        
+
         [self updatePasswords];
     }
 }
@@ -261,7 +269,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     [UIView animateWithDuration:0.3f animations:^{
         if (showTips & MPPasswordsBadNameTip)
             self.badNameTipContainer.alpha = 1;
-    } completion:^(BOOL finished) {
+    }                completion:^(BOOL finished) {
         if (finished)
             PearlMainQueueAfter( 5, ^{
                 [UIView animateWithDuration:0.3f animations:^{
@@ -310,25 +318,33 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
                     self.passwordSelectionContainer.alpha = 1;
                 }];
             } );
-    PearlAddNotificationObserver( MPSignedOutNotification, nil, [NSOperationQueue mainQueue],
+    PearlAddNotificationObserver( MPSignedOutNotification, nil, nil,
             ^(MPPasswordsViewController *self, NSNotification *note) {
-                _fetchedResultsController = nil;
-                self.passwordsSearchBar.text = nil;
-                [self.passwordCollectionView reloadData];
+                PearlMainQueue( ^{
+                    _fetchedResultsController = nil;
+                    self.passwordsSearchBar.text = nil;
+                    [self.passwordCollectionView reloadData];
+                } );
             } );
-    PearlAddNotificationObserver( MPCheckConfigNotification, nil, [NSOperationQueue mainQueue],
+    PearlAddNotificationObserver( MPCheckConfigNotification, nil, nil,
             ^(MPPasswordsViewController *self, NSNotification *note) {
-                [self updateConfigKey:note.object];
+                PearlMainQueue( ^{
+                    [self updateConfigKey:note.object];
+                } );
             } );
     PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresWillChangeNotification, nil, nil,
             ^(MPPasswordsViewController *self, NSNotification *note) {
                 self->_fetchedResultsController = nil;
-                [self.passwordCollectionView reloadData];
+                PearlMainQueue( ^{
+                    [self.passwordCollectionView reloadData];
+                } );
             } );
     PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresDidChangeNotification, nil, nil,
             ^(MPPasswordsViewController *self, NSNotification *note) {
-                [self updatePasswords];
-                [self registerObservers];
+                PearlMainQueue( ^{
+                    [self updatePasswords];
+                    [self registerObservers];
+                } );
             } );
 
     NSManagedObjectContext *mainContext = [MPiOSAppDelegate managedObjectContextForMainThreadIfReady];
@@ -350,7 +366,6 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 
 - (void)updatePasswords {
 
-    NSString *query = self.query;
     NSManagedObjectID *activeUserOID = [MPiOSAppDelegate get].activeUserOID;
     if (!activeUserOID) {
         PearlMainQueue( ^{
@@ -361,6 +376,20 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
         return;
     }
 
+    static NSRegularExpression *fuzzyRE;
+    static dispatch_once_t once = 0;
+    dispatch_once( &once, ^{
+        fuzzyRE = [NSRegularExpression regularExpressionWithPattern:@"(.)" options:0 error:nil];
+    } );
+
+    NSString *queryString = self.query;
+    NSString *queryPattern = [queryString stringByReplacingMatchesOfExpression:fuzzyRE withTemplate:@"*$1*"];
+    NSMutableArray *fuzzyGroups = [NSMutableArray arrayWithCapacity:[queryString length]];
+    [fuzzyRE enumerateMatchesInString:queryString options:0 range:NSMakeRange( 0, queryString.length )
+                           usingBlock:^(NSTextCheckingResult *result, NSMatchingFlags flags, BOOL *stop) {
+                               [fuzzyGroups addObject:[queryString substringWithRange:result.range]];
+                           }];
+    _fuzzyGroups = fuzzyGroups;
     [self.fetchedResultsController.managedObjectContext performBlock:^{
         NSArray *oldSectionInfos = [self.fetchedResultsController sections];
         NSMutableArray *oldSections = [[NSMutableArray alloc] initWithCapacity:[oldSectionInfos count]];
@@ -369,34 +398,41 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 
         NSError *error = nil;
         self.fetchedResultsController.fetchRequest.predicate =
-                [query length]?
-                [NSPredicate predicateWithFormat:@"user == %@ AND name BEGINSWITH[cd] %@", activeUserOID, query]:
-                [NSPredicate predicateWithFormat:@"user == %@", activeUserOID];
+                [NSPredicate predicateWithFormat:@"(%@ == '' OR name LIKE[cd] %@) AND user == %@",
+                                                 queryPattern, queryPattern, activeUserOID];
         if (![self.fetchedResultsController performFetch:&error])
             err( @"Couldn't fetch sites: %@", [error fullDescription] );
 
-        [self.passwordCollectionView performBatchUpdates:^{
-            [self fetchedItemsDidUpdate];
+        @try {
+            [self.passwordCollectionView performBatchUpdates:^{
+                [self fetchedItemsDidUpdate];
 
-            NSInteger fromSections = self.passwordCollectionView.numberOfSections;
-            NSInteger toSections = [self numberOfSectionsInCollectionView:self.passwordCollectionView];
-            for (NSInteger section = 0; section < MAX( toSections, fromSections ); ++section) {
-                if (section >= fromSections)
-                    [self.passwordCollectionView insertSections:[NSIndexSet indexSetWithIndex:section]];
-                else if (section >= toSections)
-                    [self.passwordCollectionView deleteSections:[NSIndexSet indexSetWithIndex:section]];
-                else if (section < [oldSections count])
-                    [self.passwordCollectionView reloadItemsFromArray:oldSections[section]
-                                                              toArray:[[self.fetchedResultsController sections][section] objects]
-                                                            inSection:section];
-                else
-                    [self.passwordCollectionView reloadSections:[NSIndexSet indexSetWithIndex:section]];
-            }
-        }                                     completion:^(BOOL finished) {
-            if (finished)
-                [self.passwordCollectionView setContentOffset:CGPointMake( 0, -self.passwordCollectionView.contentInset.top )
-                                                     animated:YES];
-        }];
+                NSInteger fromSections = self.passwordCollectionView.numberOfSections;
+                NSInteger toSections = [self numberOfSectionsInCollectionView:self.passwordCollectionView];
+                for (NSInteger section = 0; section < MAX( toSections, fromSections ); ++section) {
+                    if (section >= fromSections)
+                        [self.passwordCollectionView insertSections:[NSIndexSet indexSetWithIndex:section]];
+                    else if (section >= toSections)
+                        [self.passwordCollectionView deleteSections:[NSIndexSet indexSetWithIndex:section]];
+                    else if (section < [oldSections count])
+                        [self.passwordCollectionView reloadItemsFromArray:oldSections[section]
+                                                                  toArray:[[self.fetchedResultsController sections][section] objects]
+                                                                inSection:section];
+                    else
+                        [self.passwordCollectionView reloadSections:[NSIndexSet indexSetWithIndex:section]];
+                }
+            }                                     completion:^(BOOL finished) {
+                if (finished)
+                    [self.passwordCollectionView setContentOffset:CGPointMake( 0, -self.passwordCollectionView.contentInset.top )
+                                                         animated:YES];
+                for (MPPasswordCell *cell in self.passwordCollectionView.visibleCells)
+                    [cell setFuzzyGroups:_fuzzyGroups];
+            }];
+        }
+        @catch (NSException *exception) {
+            wrn( @"While updating password cells: %@", [exception fullDescription] );
+            [self.passwordCollectionView reloadData];
+        }
     }];
 }
 

MasterPassword/ObjC/iOS/MPPreferencesViewController.m

@@ -32,6 +32,8 @@
     inf( @"Preferences will appear" );
     [super viewWillAppear:animated];
     [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"tipped.passwordsPreferences"];
+    if (![[NSUserDefaults standardUserDefaults] synchronize])
+        wrn( @"Couldn't synchronize after preferences appearance." );
 
     MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserForMainThread];
     self.generatedTypeControl.selectedSegmentIndex = [self generatedSegmentIndexForType:activeUser.defaultType];

MasterPassword/ObjC/iOS/MPStoreViewController.m

@@ -37,6 +37,8 @@ PearlEnum( MPDevelopmentFuelConsumption,
         return nil;
 
     [[NSUserDefaults standardUserDefaults] setInteger:storeVersion forKey:@"storeVersion"];
+    if (![[NSUserDefaults standardUserDefaults] synchronize])
+        wrn( @"Couldn't synchronize store version update." );
     return features;
 }
 

MasterPassword/ObjC/iOS/MPUsersViewController.m

@@ -666,7 +666,7 @@ referenceSizeForFooterInSection:(NSInteger)section {
         [self.storeLoadingActivity startAnimating];
 
     if (mainContext)
-        PearlAddNotificationObserver( NSManagedObjectContextObjectsDidChangeNotification, mainContext, [NSOperationQueue mainQueue],
+        PearlAddNotificationObserver( NSManagedObjectContextObjectsDidChangeNotification, mainContext, nil,
                 ^(MPUsersViewController *self, NSNotification *note) {
                     NSSet *insertedObjects = note.userInfo[NSInsertedObjectsKey];
                     NSSet *deletedObjects = note.userInfo[NSDeletedObjectsKey];
@@ -676,14 +676,16 @@ referenceSizeForFooterInSection:(NSInteger)section {
                             }]] count])
                         [self reloadUsers];
                 } );
-    PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresWillChangeNotification, nil, [NSOperationQueue mainQueue],
+    PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresWillChangeNotification, [MPiOSAppDelegate get].storeCoordinator, nil,
             ^(MPUsersViewController *self, NSNotification *note) {
                 self.userIDs = nil;
             } );
-    PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresDidChangeNotification, nil, [NSOperationQueue mainQueue],
+    PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresDidChangeNotification, [MPiOSAppDelegate get].storeCoordinator, nil,
             ^(MPUsersViewController *self, NSNotification *note) {
-                [self registerObservers];
-                [self reloadUsers];
+                PearlMainQueue( ^{
+                    [self registerObservers];
+                    [self reloadUsers];
+                } );
             } );
 }
 

MasterPassword/ObjC/iOS/MPWebViewController.m

@@ -50,8 +50,11 @@
 - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request
  navigationType:(UIWebViewNavigationType)navigationType {
 
-    if ([[request.URL absoluteString] rangeOfString:@"thanks.lhunath.com"].location != NSNotFound)
+    if ([[request.URL absoluteString] rangeOfString:@"thanks.lhunath.com"].location != NSNotFound) {
         [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"tipped.thanks"];
+        if (![[NSUserDefaults standardUserDefaults] synchronize])
+            wrn( @"Couldn't synchronize thanks tip." );
+    }
 
     if ([request.URL isEqual:request.mainDocumentURL]) {
         self.webNavigationItem.title = request.URL.host;

MasterPassword/ObjC/iOS/MPiOSAppDelegate.m

@@ -138,18 +138,6 @@
                                     @"Find the store from the user pull‑down after logging in.", latestFeatures )
                                  viewStyle:UIAlertViewStyleDefault initAlert:nil tappedButtonBlock:nil
                                cancelTitle:@"Thanks" otherTitles:nil];
-
-        MPCheckpoint( MPCheckpointStarted, @{
-                @"simulator"  : PearlStringB( [PearlDeviceUtils isSimulator] ),
-                @"encrypted"  : PearlStringB( [PearlDeviceUtils isAppEncrypted] ),
-                @"jailbroken" : PearlStringB( [PearlDeviceUtils isJailbroken] ),
-                @"platform"   : [PearlDeviceUtils platform],
-#ifdef APPSTORE
-                @"legal"      : PearlStringB([PearlDeviceUtils isAppEncrypted]),
-#else
-                @"legal"      : @"YES",
-#endif
-        } );
     }
     @catch (id exception) {
         err( @"During Post-Startup: %@", exception );
@@ -293,33 +281,28 @@
     inf( @"Re-activated" );
     [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:nil];
 
-    NSString *importHeader = @"# Master Password site export";
-    NSString *importedSitesString = [UIPasteboard generalPasteboard].string;
-    if ([importedSitesString length] > [importHeader length] &&
-        [[importedSitesString substringToIndex:[importHeader length]] isEqualToString:importHeader])
-        [PearlAlert showAlertWithTitle:@"Import Sites?" message:
-                        @"We've detected Master Password import sites on your pasteboard, would you like to import them?"
-                             viewStyle:UIAlertViewStyleDefault initAlert:nil
-                     tappedButtonBlock:^(UIAlertView *alert, NSInteger buttonIndex) {
-                         if (buttonIndex == [alert cancelButtonIndex])
-                             return;
+    PearlNotMainQueue( ^{
+        NSString *importHeader = @"# Master Password site export";
+        NSString *importedSitesString = [UIPasteboard generalPasteboard].string;
+        if ([importedSitesString length] > [importHeader length] &&
+            [[importedSitesString substringToIndex:[importHeader length]] isEqualToString:importHeader])
+            [PearlAlert showAlertWithTitle:@"Import Sites?" message:
+                            @"We've detected Master Password import sites on your pasteboard, would you like to import them?"
+                                 viewStyle:UIAlertViewStyleDefault initAlert:nil
+                         tappedButtonBlock:^(UIAlertView *alert, NSInteger buttonIndex) {
+                             if (buttonIndex == [alert cancelButtonIndex])
+                                 return;
 
-                         [self importSites:importedSitesString];
-                         [UIPasteboard generalPasteboard].string = nil;
-                     } cancelTitle:@"No" otherTitles:@"Import Sites", nil];
+                             [self importSites:importedSitesString];
+                             [UIPasteboard generalPasteboard].string = @"";
+                         } cancelTitle:@"No" otherTitles:@"Import Sites", nil];
+    } );
 
     [super applicationDidBecomeActive:application];
 }
 
 #pragma mark - Behavior
 
-- (void)showReview {
-
-    [super showReview];
-
-    MPCheckpoint( MPCheckpointReview, nil );
-}
-
 - (void)showFeedbackWithLogs:(BOOL)logs forVC:(UIViewController *)viewController {
 
     if (![PearlEMail canSendMail])
@@ -522,8 +505,6 @@
                 [self signOutAnimated:YES];
                 if (didReset)
                     didReset();
-
-                MPCheckpoint( MPCheckpointChangeMP, nil );
             }
                        cancelTitle:[PearlStrings get].commonButtonAbort
                        otherTitles:[PearlStrings get].commonButtonContinue, nil];
@@ -554,28 +535,25 @@
             [PearlLogger get].printLevel = PearlLogLevelInfo;
 
 #ifdef CRASHLYTICS
-                        [[Crashlytics sharedInstance] setBoolValue:[[MPConfig get].rememberLogin boolValue] forKey:@"rememberLogin"];
-                        [[Crashlytics sharedInstance] setBoolValue:[[MPiOSConfig get].sendInfo boolValue] forKey:@"sendInfo"];
-                        [[Crashlytics sharedInstance] setBoolValue:[[MPiOSConfig get].helpHidden boolValue] forKey:@"helpHidden"];
-                        [[Crashlytics sharedInstance] setBoolValue:[[MPiOSConfig get].showSetup boolValue] forKey:@"showQuickStart"];
-                        [[Crashlytics sharedInstance] setBoolValue:[[PearlConfig get].firstRun boolValue] forKey:@"firstRun"];
-                        [[Crashlytics sharedInstance] setIntValue:[[PearlConfig get].launchCount intValue] forKey:@"launchCount"];
-                        [[Crashlytics sharedInstance] setBoolValue:[[PearlConfig get].askForReviews boolValue] forKey:@"askForReviews"];
-                        [[Crashlytics sharedInstance] setIntValue:[[PearlConfig get].reviewAfterLaunches intValue] forKey:@"reviewAfterLaunches"];
-                        [[Crashlytics sharedInstance] setObjectValue:[PearlConfig get].reviewedVersion forKey:@"reviewedVersion"];
+        [[Crashlytics sharedInstance] setBoolValue:[[MPConfig get].rememberLogin boolValue] forKey:@"rememberLogin"];
+        [[Crashlytics sharedInstance] setBoolValue:[[MPiOSConfig get].sendInfo boolValue] forKey:@"sendInfo"];
+        [[Crashlytics sharedInstance] setBoolValue:[[MPiOSConfig get].helpHidden boolValue] forKey:@"helpHidden"];
+        [[Crashlytics sharedInstance] setBoolValue:[[MPiOSConfig get].showSetup boolValue] forKey:@"showQuickStart"];
+        [[Crashlytics sharedInstance] setBoolValue:[[PearlConfig get].firstRun boolValue] forKey:@"firstRun"];
+        [[Crashlytics sharedInstance] setIntValue:[[PearlConfig get].launchCount intValue] forKey:@"launchCount"];
+        [[Crashlytics sharedInstance] setBoolValue:[[PearlConfig get].askForReviews boolValue] forKey:@"askForReviews"];
+        [[Crashlytics sharedInstance] setIntValue:[[PearlConfig get].reviewAfterLaunches intValue] forKey:@"reviewAfterLaunches"];
+        [[Crashlytics sharedInstance] setObjectValue:[PearlConfig get].reviewedVersion forKey:@"reviewedVersion"];
+        [[Crashlytics sharedInstance] setBoolValue:[PearlDeviceUtils isSimulator] forKey:@"simulator"];
+        [[Crashlytics sharedInstance] setBoolValue:[PearlDeviceUtils isAppEncrypted] forKey:@"encrypted"];
+        [[Crashlytics sharedInstance] setBoolValue:[PearlDeviceUtils isJailbroken] forKey:@"jailbroken"];
+        [[Crashlytics sharedInstance] setObjectValue:[PearlDeviceUtils platform] forKey:@"platform"];
+#ifdef APPSTORE
+        [[Crashlytics sharedInstance] setBoolValue:[PearlDeviceUtils isAppEncrypted] forKey:@"reviewedVersion"];
+#else
+        [[Crashlytics sharedInstance] setBoolValue:YES forKey:@"reviewedVersion"];
+#endif
 #endif
-
-        MPCheckpoint( MPCheckpointConfig, @{
-                @"rememberLogin"       : @([[MPConfig get].rememberLogin boolValue]),
-                @"sendInfo"            : @([[MPiOSConfig get].sendInfo boolValue]),
-                @"helpHidden"          : @([[MPiOSConfig get].helpHidden boolValue]),
-                @"showQuickStart"      : @([[MPiOSConfig get].showSetup boolValue]),
-                @"firstRun"            : @([[PearlConfig get].firstRun boolValue]),
-                @"launchCount"         : NilToNSNull( [PearlConfig get].launchCount ),
-                @"askForReviews"       : @([[PearlConfig get].askForReviews boolValue]),
-                @"reviewAfterLaunches" : NilToNSNull( [PearlConfig get].reviewAfterLaunches ),
-                @"reviewedVersion"     : NilToNSNull( [PearlConfig get].reviewedVersion )
-        } );
     }
 }
 

MasterPassword/ObjC/iOS/MasterPassword-Info.plist

@@ -46,7 +46,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>© 2011-2014, Lyndir</string>
+	<string>Copyright © 2011-2014 Lyndir</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Exo2.0-Bold.otf</string>

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -11,6 +11,7 @@
 		93D391ECBD9BD2C64115B5DD /* PearlSizedTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39156E806BB78E04F78B9 /* PearlSizedTextView.m */; };
 		93D3922A53E41A54832E90D9 /* PearlOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D390FADEB325D8D54A957D /* PearlOverlay.m */; };
 		93D39262A8A97DB748213309 /* PearlEMail.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D393BB973253D4BAAC84AA /* PearlEMail.m */; };
+		93D3928D629EA563F9EC4909 /* NSPersistentStore+PearlMigration.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D399C2F3D48E57C4803BDC /* NSPersistentStore+PearlMigration.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 */; };
@@ -40,6 +41,7 @@
 		93D39A53D76CA70786423458 /* UICollectionView+PearlReloadFromArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39246FC21C6E63E35D615 /* UICollectionView+PearlReloadFromArray.h */; };
 		93D39A5FF670957C0AF8298D /* MPPasswordCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39DEA995041A13DC9CAF7 /* MPPasswordCell.m */; };
 		93D39A8EA1C49CE43B63F47B /* PearlUICollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D8A953779B35403AF6E /* PearlUICollectionView.m */; };
+		93D39AA4A0BE66A872CCC02E /* NSPersistentStore+PearlMigration.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D397F4BAFFF7CF3F1B21A4 /* NSPersistentStore+PearlMigration.h */; };
 		93D39B429C67A62E29DC02DA /* MPRootSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D399493FEDDE74DD1A0C15 /* MPRootSegue.m */; };
 		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 */; };
@@ -483,6 +485,7 @@
 		93D39730673227EFF6DEFF19 /* MPSetupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSetupViewController.h; sourceTree = "<group>"; };
 		93D3977321EB249981821AB0 /* UITextView+PearlAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextView+PearlAttributes.m"; sourceTree = "<group>"; };
 		93D3979190DACEBD1F6AE9F4 /* MPLogsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLogsViewController.m; sourceTree = "<group>"; };
+		93D397F4BAFFF7CF3F1B21A4 /* NSPersistentStore+PearlMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPersistentStore+PearlMigration.h"; sourceTree = "<group>"; };
 		93D398567FD02DB2647B8CF3 /* PearlNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlNavigationController.h; sourceTree = "<group>"; };
 		93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+PearlFullDescription.h"; sourceTree = "<group>"; };
 		93D3990E0CD1B5CF9FBB2C07 /* MPWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPWebViewController.m; sourceTree = "<group>"; };
@@ -491,6 +494,7 @@
 		93D39975CE5AEC99E3F086C7 /* MPPasswordCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordCell.h; sourceTree = "<group>"; };
 		93D3999693660C89A7465F4E /* MPCoachmarkViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCoachmarkViewController.h; sourceTree = "<group>"; };
 		93D399A8E3181B442D347CD7 /* MPAlgorithmV2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAlgorithmV2.m; sourceTree = "<group>"; };
+		93D399C2F3D48E57C4803BDC /* NSPersistentStore+PearlMigration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSPersistentStore+PearlMigration.m"; sourceTree = "<group>"; };
 		93D399E571F61E50A9BF8FAF /* MPUsersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUsersViewController.m; sourceTree = "<group>"; };
 		93D399F244BB522A317811BB /* MPFixable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPFixable.h; sourceTree = "<group>"; };
 		93D39A1DDFA09AE2E14D26DC /* UIResponder+PearlFirstResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIResponder+PearlFirstResponder.m"; sourceTree = "<group>"; };
@@ -2790,6 +2794,8 @@
 				93D39F9106F2CCFB94283188 /* NSError+PearlFullDescription.m */,
 				93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */,
 				93D391AA32F24290C424438E /* NSNotificationCenter+PearlEasyCleanup.h */,
+				93D399C2F3D48E57C4803BDC /* NSPersistentStore+PearlMigration.m */,
+				93D397F4BAFFF7CF3F1B21A4 /* NSPersistentStore+PearlMigration.h */,
 			);
 			path = Pearl;
 			sourceTree = "<group>";
@@ -3013,6 +3019,7 @@
 				93D393DB5325820241BA90A7 /* PearlSizedTextView.h in Headers */,
 				93D392A8777DC30C11361647 /* UITextView+PearlAttributes.h in Headers */,
 				93D39A53D76CA70786423458 /* UICollectionView+PearlReloadFromArray.h in Headers */,
+				93D39AA4A0BE66A872CCC02E /* NSPersistentStore+PearlMigration.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3147,7 +3154,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = MP;
-				LastUpgradeCheck = 0600;
+				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = Lyndir;
 				TargetAttributes = {
 					DA32D01F19D111C6004F3F0E = {
@@ -3483,8 +3490,9 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = "/bin/bash -e";
-			shellScript = "PATH+=:/usr/libexec\n\naddPlistWithKey() {\n    local key=$1 type=$2 value=$3 plist=${4:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Delete :'$key'\" \"$plist\" 2>/dev/null || true\n    PlistBuddy -c \"Add :'$key' '$type' '$value'\" \"$plist\"\n}\nsetPlistWithKey() {\n    local key=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Set :'$key' '$value'\" \"$plist\"\n}\ngetPlistWithKey() {\n    local key=$1 plist=${2:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Print :'$key'\" \"$plist\"\n}\nsetSettingWithTitle() {\n    local i title=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Settings.bundle/Root.plist\"}\n    \n    for (( i=0; 1; ++i )); do\n        PlistBuddy -c \"Print :PreferenceSpecifiers:$i\" \"$plist\" &>/dev/null || break\n        echo \"Checking preference specifier $i\"\n    \n        [[ $(PlistBuddy -c \"Print :PreferenceSpecifiers:$i:Title\" \"$plist\" 2>/dev/null) = $title ]] || continue\n    \n        echo \"Correct title, setting value.\"\n        PlistBuddy -c \"Set :PreferenceSpecifiers:$i:DefaultValue $value\" \"$plist\"\n        break\n    done\n}\n\ndescription=$(git describe --always --dirty --long)\nversion=${description%-g*}\nIFS=- read major minor <<< \"$version\"\nprintf -v version '%s.%02d' \"$major\" \"$minor\"\nprintf -v commit '%09d' \"$((16#${description##*-g}))\"\n\naddPlistWithKey GITDescription string \"$description\"\nsetPlistWithKey CFBundleVersion \"${version//.}$commit\" # No separator between version and commit because I had already submitted a CFBundleVersion with a really high major.  Cry.\nsetPlistWithKey CFBundleShortVersionString \"$version\"\n\nsetSettingWithTitle \"Build\" \"$commit\"\nsetSettingWithTitle \"Version\" \"$version\"\nsetSettingWithTitle \"Copyright\" \"$(getPlistWithKey NSHumanReadableCopyright)\"\n\nif [[ $DEPLOYMENT_LOCATION = YES ]]; then\n    # This build is a release.  Do some release checks.\n    passed=1\n    [[ $description != *-dirty ]] || \\\n        { passed=0; echo >&2 \"ERROR: Cannot release a dirty version, first commit any changes.\"; }\n    [[ $(PlistBuddy -c \"Print :'API Key'\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Crashlytics.plist\") ]] || \\\n        { passed=0; echo >&2 \"ERROR: Cannot release: Crashlytics API key is missing.\"; }\n    (( passed )) || \\\n        { echo >&2 \"Failed to pass release checks.  Fix the above errors and re-try.  Aborting.\"; exit 1; }\nfi";
+			shellPath = "/bin/sh -e";
+			shellScript = "exec ../../../Scripts/updatePlist";
+			showEnvVarsInLog = 0;
 		};
 		DA8D88E019DA412A00B189D0 /* Run Script: genassets */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -3498,7 +3506,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/sh -e";
-			shellScript = "exec env PATH=\"/usr/local/bin:$PATH\" ../../../Scripts/genassets";
+			shellScript = "exec ../../../Scripts/genassets";
 			showEnvVarsInLog = 0;
 		};
 		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
@@ -3679,6 +3687,7 @@
 				93D391ECBD9BD2C64115B5DD /* PearlSizedTextView.m in Sources */,
 				93D39E34FD28D24FE3442C48 /* UITextView+PearlAttributes.m in Sources */,
 				93D39D47FC623E91FC39D20C /* UICollectionView+PearlReloadFromArray.m in Sources */,
+				93D3928D629EA563F9EC4909 /* NSPersistentStore+PearlMigration.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Scripts/bashlib

@@ -27,7 +27,7 @@
 
 #  ______________________________________________________________________ 
 # |                                                                      |
-# |                                            .:: TABLE OF CONTENTS ::. |
+# |                                            .:  TABLE OF CONTENTS  :. |
 # |______________________________________________________________________|
 # 
 #     chr decimal
@@ -132,7 +132,7 @@ _tocHash=71e13f42e1ea82c1c7019b27a3bc71f3
 
 #  ______________________________________________________________________ 
 # |                                                                      |
-# |                                         .:: GLOBAL CONFIGURATION ::. |
+# |                                         .:  GLOBAL CONFIGURATION  :. |
 # |______________________________________________________________________|
 
 # Unset all exported functions.  Exported functions are evil.
@@ -177,7 +177,7 @@ genToc() {
 
 #  ______________________________________________________________________ 
 # |                                                                      |
-# |                                          .:: GLOBAL DECLARATIONS ::. |
+# |                                          .:  GLOBAL DECLARATIONS  :. |
 # |______________________________________________________________________|
 
 # Variables for convenience sequences.
@@ -230,7 +230,7 @@ runner=(     '> >'           \
                 tput eA; tput as;
                 tput ac; tput ae;         } )   # Drawing characters
     back=$'\b'
-} 2>/dev/null ||:
+} ||:
 
 
 
@@ -238,7 +238,7 @@ runner=(     '> >'           \
 
 #  ______________________________________________________________________ 
 # |                                                                      |
-# |                                        .:: FUNCTION DECLARATIONS ::. |
+# |                                        .:  FUNCTION DECLARATIONS  :. |
 # |______________________________________________________________________|
 
 
@@ -465,44 +465,6 @@ readwhile() {
 
 
 
-#  ___________________________________________________________________________
-# |__ pushqueue ______________________________________________________________|
-#
-#       pushqueue element ...
-#
-# Pushes the given arguments as elements onto the queue.
-#
-pushqueue() {
-    [[ $_queue ]] || {
-        coproc _queue {
-            while IFS= read -r -d ''; do
-                printf '%s\0' "$REPLY"
-            done
-        }
-    }
-
-    printf '%s\0' "$@" >&"${_queue[1]}"
-} # _____________________________________________________________________
-
-
-
-#  __________________________________________________________________________
-# |__ popqueue ______________________________________________________________|
-#
-#       popqueue
-#
-# Pops one element off the queue.
-# If no elements are available on the queue, this command fails with exit code 1.
-#
-popqueue() {
-    local REPLY
-    [[ $_queue ]] && read -t0 <&"${_queue[0]}" || return
-    IFS= read -r -d '' <&"${_queue[0]}"
-    printf %s "$REPLY"
-} # _____________________________________________________________________
-
-
-
 #  ______________________________________________________________________
 # |__ Latest ____________________________________________________________|
 #
@@ -1587,7 +1549,7 @@ stackTrace() {
 
 #  ______________________________________________________________________ 
 # |                                                                      |
-# |                                                  .:: ENTRY POINT ::. |
+# |                                                  .:  ENTRY POINT  :. |
 # |______________________________________________________________________|
 
 # Make sure this file is sourced and not executed.
@@ -1607,6 +1569,6 @@ stackTrace() {
 }
 
 :
-:                                                   .:: END SOURCING ::.  
+:                                                   .:  END SOURCING  :.
 :  ______________________________________________________________________ 
 :

Scripts/genassets

@@ -2,10 +2,24 @@
 # See https://developer.apple.com/library/ios/qa/qa1686/_index.html
 cd "${BASH_SOURCE%/*}"
 source bashlib
+set -e
 cd ..
+export PATH+=/usr/local/bin
 
 # icons format: [pixel size]@[scale]@[idiom]@[os]:[filename] -- if os is "anything lower", omit it
 icons=(
+# Mac
+    16@1@mac@:
+    32@2@mac@:
+    32@1@mac@:
+    64@2@mac@:
+    128@1@mac@:
+    256@2@mac@:
+    256@1@mac@:
+    512@2@mac@:
+    512@1@mac@:
+    1024@2@mac@:
+# iPhone
     180@3@iphone@8.0:Icon-60@3x.png
     120@3@iphone@8.0:Icon-Small-40@3x.png
     120@2@iphone@7.0:Icon-60@2x.png
@@ -15,7 +29,7 @@ icons=(
     58@2@iphone@:Icon-Small@2x.png
 #    57@1@iphone@:Icon.png
 #    29@1@iphone@:Icon-Small.png
-#
+# iPad
     76@1@ipad@7.0:Icon-76.png
     152@2@ipad@7.0:Icon-76@2x.png
     40@1@ipad@7.0:Icon-Small-40.png
@@ -64,8 +78,10 @@ appiconset="$xcassets/AppIcon.appiconset"
 launchimage="$xcassets/LaunchImage.launchimage"
 ios_icon=MasterPassword/Resources/Media/ios/icon
 ios_launch=MasterPassword/Resources/Media/ios/launch
+mac_icon=MasterPassword/Resources/Media/mac/icon
 
-if [[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]]; then
+if [[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]] ||
+   [[ "$(latest "$mac_icon"/*)" -nt "$appiconset/Contents.json" ]]; then
     rm -rf "$appiconset"; mkdir -p "$appiconset"
     {
         comma=
@@ -75,7 +91,19 @@ if [[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]]; then
             IFS=@ read px scale idiom os <<< "$icon"
             pt=$(( px / scale ))
 
-            if imageProps=$(copyImage "$ios_icon/$filename" "$appiconset/$filename"); then
+            suffix=
+            [[ $scale != 1 ]] && suffix=@${scale}x
+            [[ $filename ]] || filename="icon_${pt}x${pt}${suffix}.png"
+            source=$ios_icon/$filename
+            if [[ ! -e $source ]]; then
+                source=$mac_icon/$filename
+                if [[ ! -e $source ]]; then
+                    err 'No icon for: %s' "$filename"
+                    exit 1
+                fi
+            fi
+
+            if imageProps=$(copyImage "$source" "$appiconset/$filename"); then
                 printf '%s{"size":"%dx%d","filename":"%s","scale":"%sx"' \
                     "$comma" "$pt" "$pt" "$filename" "$scale"
                 [[ $idiom ]] && printf ',"idiom":"%s"' "$idiom"

Scripts/updatePlist

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+cd "${BASH_SOURCE%/*}"
+source ./bashlib
+cd ..
+export PATH+=:/usr/libexec
+
+addPlistWithKey() {
+    local key=$1 type=$2 value=$3 plist=${4:-"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH"}
+    
+    PlistBuddy -c "Delete :'$key'" "$plist" 2>/dev/null || true
+    PlistBuddy -c "Add :'$key' '$type' '$value'" "$plist"
+}
+setPlistWithKey() {
+    local key=$1 value=$2 plist=${3:-"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH"}
+    
+    PlistBuddy -c "Set :'$key' '$value'" "$plist"
+}
+getPlistWithKey() {
+    local key=$1 plist=${2:-"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH"}
+    
+    PlistBuddy -c "Print :'$key'" "$plist"
+}
+setSettingWithTitle() {
+    local i title=$1 value=$2 plist=${3:-"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Settings.bundle/Root.plist"}
+    
+    for (( i=0; 1; ++i )); do
+        PlistBuddy -c "Print :PreferenceSpecifiers:$i" "$plist" &>/dev/null || break
+        inf "Checking preference specifier $i"
+    
+        [[ $(PlistBuddy -c "Print :PreferenceSpecifiers:$i:Title" "$plist" 2>/dev/null) = $title ]] || continue
+    
+        inf "Correct title, setting value."
+        PlistBuddy -c "Set :PreferenceSpecifiers:$i:DefaultValue $value" "$plist"
+        break
+    done
+}
+
+description=$(git describe --always --dirty --long --match '*-release')
+version=${description%-g*}
+major=${version%%-*} minor=${version##*-}
+printf -v version '%s.%02d' "$major" "$minor"
+printf -v commit '%09d' "$((16#${description##*-g}))"
+
+addPlistWithKey GITDescription string "$description"
+setPlistWithKey CFBundleVersion "${version//.}$commit" # No separator between version and commit because I had already submitted a CFBundleVersion with a really high major.  Cry.
+setPlistWithKey CFBundleShortVersionString "$version"
+
+setSettingWithTitle "Build" "$commit"
+setSettingWithTitle "Version" "$version"
+setSettingWithTitle "Copyright" "$(getPlistWithKey NSHumanReadableCopyright)"
+
+if [[ $DEPLOYMENT_LOCATION = YES ]]; then
+    # This build is a release.  Do some release checks.
+    passed=1
+    [[ $description != *-dirty ]] || \
+        { passed=0; err 'ERROR: Cannot release a dirty version, first commit any changes.'; }
+    [[ $(PlistBuddy -c "Print :'API Key'" "$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Crashlytics.plist") ]] || \
+        { passed=0; err 'ERROR: Cannot release: Crashlytics API key is missing.'; }
+    (( passed )) || \
+        { ftl "Failed to pass release checks.  Fix the above errors and re-try.  Aborting."; exit 1; }
+fi