The root of the users VC interferes with touches from the sites VC when it appears.

[ADDED]     Calculate cost for cracking a password.
[UPDATED]   Hardware cost data based on various GPUs with updated hashcat metrics.
[ADDED]     Ability to calculate the strength of an arbitrary password.

.gitlab-ci.yml

@@ -9,10 +9,12 @@ build_project:
     - "( ./lib/bin/build_libsodium-macos clean && ./lib/bin/build_libsodium-macos )"
     - "( ./lib/bin/build_libjson-c-macos clean && ./lib/bin/build_libjson-c-macos )"
     - "( cd ./platform-independent/c/cli && ./clean && targets=all ./build && ./mpw-tests && ./mpw-cli-tests )"
-    - "( export JAVA_HOME=$(java_home -Fv 10 || java_home -Fv 9* ) && ./gradlew --stacktrace clean test )"
-    - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator clean build )"
-    - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' clean build )"
+    - "( ./gradlew --stacktrace --info clean test )"
+    - "( cd platform-darwin && pod install )"
+    - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Release' -scheme 'MasterPassword iOS' -sdk iphonesimulator clean build )"
+    - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Release' -scheme 'MasterPassword macOS' clean build )"
   tags:
     - brew
-    - java_9
-    - xcode_9
+    - java
+    - cocoapods
+    - xcode

Dockerfile

@@ -7,6 +7,6 @@ FROM debian:stable-slim
 RUN mkdir -p /usr/share/man/man1
 
 RUN apt-get update && apt-get install -y default-jdk-headless git-core bash libtool automake autoconf make g++-multilib
-RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules --branch rewrite https://gitlab.com/MasterPassword/MasterPassword.git /mpw
+RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules https://gitlab.com/MasterPassword/MasterPassword.git /mpw
 RUN cd /mpw && ./gradlew -i clean
 RUN cd /mpw && git pull && git log -1 && ./gradlew -i check

README.md

@@ -4,197 +4,38 @@ Master Password is a completely new way of thinking about passwords.
 
 It consists of an algorithm that implements the core idea and applications for various platforms making the alogirthm available to users on a variety of devices and platforms.
 
-To skip the intro and go straight to the information on how to use the code, [click here](#source-code).
 
-Master Password is available for [📲 iOS](https://itunes.apple.com/app/id510296984), [🖥 macOS](https://masterpassword.app/masterpassword-mac.zip), [📲 Android](https://masterpassword.app/masterpassword-android.apk), [🖥 Desktop](https://masterpassword.app/masterpassword-gui.jar), and [⌨ Console](https://masterpassword.app/masterpassword-cli.tar.gz).
+## PROJECT MOVED
 
-Master Password is also available from: [macOS: Homebrew](https://brew.sh/) (`brew install mpw`) and [Docker](https://www.docker.com/) (`docker run -ti registry.gitlab.com/masterpassword/masterpassword`).
-Get in touch if you are interested in adding Master Password to any other package managers.
+Master Password is announcing a massive rewrite, modernizing the solution and clearing the way for exciting new capabilities.
 
-There are many reasons for using Master Password instead of an ordinary password manager, read below for the details, but if you want my personal favourites, they would be:
+The project is re-launching as [Spectre](https://gitlab.com/spectre.app), still fully open-source Free Software here on GitLab.
 
- - I don't need to worry about keeping backups of my countless authentication credentials.
- - I don't need to worry that when I travel, I might not have access to my passwords vault.
- - I don't need to trust an external party, proprietary code or a service to be online and stay online.
- - If I feel at risk of my device being stolen or confiscated, I can set a fake master password, delete my user or wipe it worry-free.
+Any interested parties are invited to participate in [the alpha or beta programs](https://spectre.app/#beta), to participate in the new Spectre identity platform.
 
-We also have a [Frequently Asked Questions](#faq).
-
-
-
-## What is a password?
-
-Ah, the "password".  Somehow, passwords have become the default solution to authentication across the web.  We've long since accepted this as the way things are, but let's stop to think for a moment about what passwords actually are:
-
-A password is a secret that is known only to the party providing a service and the party that should be allowed access to this service.
-
-Simple enough - a secret that you know and your website knows but nobody else, thereby guaranteeing that you and only you have access to your account on this website.  Unfortunately, in practice, the ubiquitous use of passwords has us completely overwhelmed.  And the only way we can cope with that is by finding ways of making the problem manageable.
-
-
-
-## What's the problem?
-
-Coming up with a secret password is pretty easy.  Say you're organizing a secret meeting and will only let people in if they know the password at the door.  You tell those you trust, the password for tonight's meeting is "purple oranges with a smile".
-
-The problem we have in our daily lives, however, is the fact that we need secret passwords for almost everything now.  A password for our email, twitter, 9gag, facebook, imgur, amazon, ebay, paypal, bank, reddit, etc.  And every time we want to use a new site, we need another one.  The problem now becomes clear: passwords are meant to be remembered and recalled with ease when needed, but this becomes impossible when we have secrets for every distinct activity in our lives.
-
-We cannot recall passwords the way we are expected to when there are too many.
-
-
-
-## Coping
-
-Life gives us no advice on how to deal with this problem.  So we find our own ways:
-
- - We use a single personal secret for all our websites, thereby violating the secrecy of these passwords (eg. you've given your email secret to twitter).
- - We use simple variations of a personal secret or pattern, thereby trivializing the complexity of these passwords (eg. google98, twitter98; reversals, eg. 8991elgoog)
- - We use external means of remembering passwords, thereby increasing the risk of loss (both loss of access when we lose the tool and theft when a thief finds our tool)
-
-These coping mechanisms come in various forms, and they all have down-sides, because at the root of each of these lies an undeniable truth:
-
-Our passwords are no longer true to the original definition.
-
-
-
-## Master Password's approach
-
-The theory behind Master Password starts with accepting that it is impossible to keep track of passwords for all your accounts.  Instead, we return to the core premise of the password: a secret phrase that you can remember easily, all by yourself.
-
-Master Password solves this problem by letting you remember one and only one password.  You use this password with Master Password only.  Master Password then gives you access to any website or service you want by creating a website-specific key for it.
-
-1. You sign into Master Password using your one password.
-2. You ask Master Password for the key to enter your website, eg. twitter.
-3. You log into twitter using your username and the key from Master Password.
-
-Master Password is *not* a password manager.  It does not store your website passwords.  Therefore, there is zero risk of you losing your website passwords (or them falling in the wrong hands).  Master Password simply uses your one password and the name of the site to generate a site-specific secret.
-
-
-
-## Benefits
-
- - You don't need to think up a new strong password every time you make a new account - Master Password gives you the key for it.
- - You don't need to try remembering a password you created two years ago for that one account - Master Password just gives you the key for it.
- - You don't need to worry about getting into that account you made at work after you come home because you don't have your office passwords with you - Master Password is availale everywhere, even offline.
- - You don't need to try to keep password lists in sync or stored somewhere easily accessible - Master Password keys can be created anywhere.
- - You don't need to worry what you'll do if your computer dies or you need to log into your bank while you're in the airport transit zone - your Master Password keys are always available, even when starting empty.
- - You don't need to worry about your password manager website getting hacked, your phone getting duplicated, somebody taking a picture of your passwords book - Master Password stores no secrets.
-
-
-
-## How does it work?
-
-The details of how Master Password works [are available here](https://masterpassword.app/masterpassword-algorithm.pdf).
-
-In short:
-
-    master-key = SCRYPT( user-name, master-password )
-    site-key = HMAC-SHA-256( site-name . site-counter, master-key )
-    site-password = PW-TEMPLATE( site-key, site-template )
-
-Master Password can derive the `site-password` in an entirely stateless manner.  It is therefore better defined as a calculator than a manager.  It is the user's responsibility to remember the inputs: `user-name`, `master-password`, `site-name`, `site-counter` and `site-template`.
-
-We standardize `user-name` as your full name, `site-name` as the domain name of the site, `site-counter` to `1` (unless you explicitly increment it) and `site-template` to `Long Password`; as a result the only token the user really needs to remember actively is `master-password`.
+The Beta program is now open for users with iOS devices.  The Spectre Beta introduces a new app, rewritten under Swift, and new capabilities such as AutoFill.
 
+All development effort has moved to the Spectre project.  Master Password is no longer actively maintained.
 
 
 ## FAQ
 
- 1. If I lose my master password and need to set a new one, will I need to change all of my site passwords?
+1. Has there been a change in ownership?
 
-Yes.  If your master password is compromised, it is only sensible for you to change all of your site passwords.  Just like if you lose the keys in your pocket, you'll have to change all the locks they open.  Master Password effectively enforces this security practice.
+No. This project is still owned and maintained exclusively by [Maarten Billemont](https://gitlab.com/lhunath).
 
- 2. But what if I just forget my master password or I just want to change it to something else?
+2. How can I trust Spectre?
 
-Sorry, still yes.  Your master password is the secret component to your Master Password identity.  If it changes, your identity changes.  I wholly encourage you to think very carefully about what makes for a really memorable and good master password before just diving in with something lazy.  A short phrase works great, eg. `banana coloured duckling`.
+Spectre's code-base is based on the Master Password code-base.  The algorithm is exactly the same.  The license is the same.  The author is the same.
 
- 3. Doesn't this mean an attacker can reverse my master password from any of my site passwords?
+The applications are being rewritten for modern platforms.  Spectre has the exact same trust parameters as Master Password.
 
-Technically, yes.  Practically, no.
+3. Why is the project changing?
 
-You could argue that site passwords are "breadcrumbs" of your master password, but the same argument would suggest encrypted messages are breadcrumbs to the encryption key.  Encryption works because it is computationally unfeasible to "guess" the encryption key that made the encrypted message, just like Master Password works because it is computationally unfeasible to "guess" your master password that made the site password.
+Several reasons, in fact.  Master Password as a name is too ubiquitous in popular culture, which is a cause for confusion.  We are also looking to evolve the capabilities of the platform beyond simply passwords, into a fully decentralized identity platform.  We're also looking to be socially inclusive and conscious of the implicit biases present in terminology we've inherited from past societies.
 
- 4. The second step is just a HMAC-SHA-256, doesn't that make the SCRYPT completely pointless?
+All that said - Spectre is the mark of a complete refresh of the Master Password solution.  Hope you'll love it!
 
-No.  They are used for different reasons and one is not weaker than the other.
+4. How do I migrate?
 
-HMAC-SHA-256 is much faster to compute than SCRYPT, which leads some people to think "all an attacker needs to do is brute-force the SHA and ignore the SCRYPT".  The reality is that the HMAC-SHA-256 guards a 64-byte authentication key (the `master-key`) which makes the search space for brute-forcing the HMAC wildly too large to compute.
-The `master-password` on the other hand, is only a simple phrase, which means its search space is much smaller.  This is why it is guarded by a much tougher SCRYPT operation.
-
- 5. I have another question.
-
-Please don't hesitate to [get in touch](#support), we're more than happy to answer all your Master Password questions.  Any problems or suggestions can be reported [as GitLab issues](https://gitlab.com/MasterPassword/MasterPassword/issues/).
-
-
-
-
-# Source Code
-
-Master Password's algorithm is [documented](https://masterpassword.app/masterpassword-algorithm.pdf) and its implementation is [Free Software (GPLv3)](LICENSE).
-
-
-
-## Components
-
-There are several components available here.  As an end-user, you can currently use the iOS app, the Android app, the OS X app, the Java desktop app, the C CLI app or the Java CLI app.  There are also several components that are useful for developers:
-
- - `core/c`: This is the reference implementation of the Master Password algorithm, written in C.
- - `core/java/algorithm`: This is a Java implementation of the Master Password algorithm.
- - `core/java/model`: This is an object model to simplify use of Master Password by Java applications.
- - `core/java/tests`: These are Java integration tests designed to ensure Master Password performs as expected.
- - `platform-android`: This is the official Android implementation of Master Password in Java.
- - `platform-darwin`: This is the official iOS and OS X implementation of Master Password in Objective-C.
- - `platform-independent/cli-c`: This is the platform-independent console implementation of Master Password, written in C.
- - `platform-independent/cli-java`: This is the platform-independent console implementation of Master Password, written in Java.
- - `platform-independent/gui-java`: This is the platform-independent desktop implementation of Master Password, written in Java.
- - `platform-independent/web-js`: This is the platform-independent browser application for Master Password, written in JavaScript.
-
-
-
-## Building and running
-
-
-### macOS or iOS
-
-Make sure you have all relevant submodules checked out.
-
-Go into `platform-darwin` and open `MasterPassword.xcworkspace` in Xcode.  Select the desired target from the Scheme Selector and build, run or archive.
-
-
-### Web
-
-Make sure you have all relevant submodules checked out.
-
-Go into `platform-independent/web-js` and open `index.html` in your browser.  You should be able to run this locally, there is no need for hosting or an application server.
-
-
-### Java
-
-Go into the `gradle` directory and run `./gradlew build`.  All Java components will then be built:
-
- - `platform-independent/gui-java/build/distributions`:
-   contains an archive with the Master Password Java GUI.  Unpack it and run the `gui` script.
- - `platform-independent/cli-java/build/distributions`:
-   contains an archive with the Master Password Java command-line interface.  Unpack it and run the `cli` script.
- - `platform-android/build/outputs/apk`:
-   contains the Android application package.  Install it on your Android device.
-
-Note that in order to build the Android application, you will need to have the Android SDK installed and either have the environment variable `ANDROID_HOME` set to its location or a `gradle/local.properties` file with its location, eg. (for Homebrew users who installed the SDK using `brew install android-sdk`):
-
-    sdk.dir=/usr/local/opt/android-sdk
-
-
-### Native CLI
-
-Go into the `platform-independent/cli-c` directory and run `./build`.  The native command-line client will then be built.
-
-For detailed instructions, see [the native CLI instructions](platform-independent/c/README.md).
-
-
-## Support
-
-Feel free to contribute by forking the project, reporting issues or joining the discussion on:
-
- - [Gitter](https://gitter.im/lyndir/MasterPassword)
- - #masterpassword (on chat.freenode.net)
- - #masterpassword:lyndir.com (on Matrix)
- - masterpassword@lyndir.com
+Master Password export files are fully supported by Spectre.  Migration mechanism exist in Master Password which will trigger as soon as you install Spectre; for instance, as soon as you install Spectre on your iOS device, Master Password will show a pop-up which will copy your user over at a tap.

build.gradle

@@ -16,7 +16,7 @@ buildscript {
 
 allprojects {
     group = 'com.lyndir.masterpassword'
-    version = '2.7.10'
+    version = '2.7.12'
 }
 
 subprojects {
@@ -29,7 +29,7 @@ subprojects {
         maven { url 'https://maven.lyndir.com' }
     }
     dependencies {
-        spotbugsPlugins group: 'com.h3xstream.findsecbugs', name: 'findsecbugs-plugin', version: '1.9.0'
+        //spotbugsPlugins group: 'com.h3xstream.findsecbugs', name: 'findsecbugs-plugin', version: '1.11.0'
         //spotbugsPlugins group: 'com.mebigfatguy.sb-contrib', name: 'sb-contrib', version: '7.4.6'
     }
     spotbugs {

lib/bin/build_lib

@@ -8,8 +8,9 @@
 #     - initialize
 #         - needs
 #     - clean & exit (only if script was ran with "clean" argument)
+#     - check & exit (only if target has already been successfully built)
 #     - prepare
-#         - clean
+#         - create
 #         - config
 #     - target
 #         - prepare
@@ -23,12 +24,14 @@
 # For example:
 # target_prepare() { make -s distclean; }
 # target_configure() { _target_configure "$@" --enable-minimal; }
+#
 set -e
 PATH+=:/usr/local/bin
 
 # needs <binary> ...
 #
 # Utility for ensuring all tools needed by the script are installed prior to starting.
+#
 needs() { _needs "$@"; }
 _needs() {
     local failed=0
@@ -48,7 +51,8 @@ _needs() {
 
 # initialize <prefix> <platform>
 #
-# The build script invokes this once prior to all other actions if the user wants a clean slate.
+# The build script invokes this once prior to all other actions.
+#
 initialize() { _initialize "$@"; }
 _initialize() {
     initialize_needs "$@"
@@ -56,15 +60,23 @@ _initialize() {
 
 # initialize_needs <prefix> <platform>
 #
-# Check if all tools needed for the default implementations are available.
+# Check if all tools required to configure and build for the platform are available.
+#
+# By default, this will check for:
+# - Windows: MSBuild
+# - Other: `libtool` (for libtoolize), `automake` (for aclocal), `autoconf` (for autoreconf) and make
 #
-# By default, this will check for `libtool` (for libtoolize), `automake` (for aclocal), `autoconf` (for autoreconf) and make.
 initialize_needs() { _initialize_needs "$@"; }
 _initialize_needs() {
     if [[ $platform = windows ]]; then
         needs cmd
-        export VSINSTALLDIR="${VSINSTALLDIR:-$(cd "$(cygpath -F 0x002a)/Microsoft Visual Studio"/*/*/Common7/.. && pwd)}"
-        [[ -e "$VSINSTALLDIR/Common7/Tools/VsMSBuildCmd.bat" ]] || { echo >&2 "Missing: msbuild.  Please install 'Build Tools for Visual Studio'.  See https://visualstudio.microsoft.com/downloads/?q=build+tools"; return 1; }
+        for dir in "$VSINSTALLDIR" "$(cygpath -F 0x002a)/Microsoft Visual Studio"/*/*/Common7/..; do
+            dir=$( [[ $dir ]] && cd "$dir" && [[ -e "Common7/Tools/VsMSBuildCmd.bat" ]] && cygpath -w "$PWD" ) && \
+                export VSINSTALLDIR=$dir && echo "Using MSBuild: $VSINSTALLDIR" && return
+        done
+
+        echo >&2 "Missing: msbuild.  Please install 'Build Tools for Visual Studio'.  See https://visualstudio.microsoft.com/downloads/?q=build+tools"
+        return 1
     else
         needs libtool:libtoolize,glibtoolize automake autoconf make
     fi
@@ -74,13 +86,18 @@ _initialize_needs() {
 #
 # Fully clean up the library code, restoring it to a pristine state.
 #
-# By default, this will wipe the prefix, run `make distclean` and `git clean -fdx`.
+# By default, this will:
+# - Windows: `msbuild /t:Clean`, or
+# - Makefile: run `make distclean`, or
+# - GIT: `git clean -fdx`
+#
+# Finally, it will wipe the prefix.
+#
 clean() { _clean "$@"; }
 _clean() {
     if [[ $platform = windows ]]; then
-        printf '"%%VSINSTALLDIR%%\Common7\Tools\VsMSBuildCmd.bat" && msbuild /t:Clean' > .clean.bat
-        cmd //c .clean.bat
-        rm -f .clean.bat
+        PATH="$(cygpath "$VSINSTALLDIR")/Common7/Tools:$PATH" \
+            cmd /v /c 'VsMSBuildCmd && for %s in (*.sln) do msbuild /t:Clean %s'
     elif [[ -e Makefile ]] && make -s distclean; then :
     elif [[ -e .git ]] && git clean -fdx; then :
     fi
@@ -88,26 +105,26 @@ _clean() {
     rm -rf "$prefix"
 }
 
-# prepare <prefix> <platform> [ <arch> ... ]
+# prepare <prefix> <platform> [ <arch:host> ... ]
 #
-# Configure the library for building the <arch>s on this machine.
+# Initialize the prefix in anticipation for building the <arch>s on this machine.
 # The build script invokes this once prior to building each of its targets.
-# The <prefix> has been newly created.
 #
-# By default, this will run `autoreconf`.
 prepare() { _prepare "$@"; }
 _prepare() {
-    prepare_clean "$@"
+    prepare_create "$@"
     prepare_config "$@"
 }
 
-# prepare_clean <prefix> <platform> [ <arch> ... ]
+# prepare_create <prefix> <platform> [ <arch:host> ... ]
 #
 # Perform any necessary clean-up of the library code prior to building.
 #
 # By default, this will wipe the build configuration and re-create the prefix.
-prepare_clean() { _prepare_clean "$@"; }
-_prepare_clean() {
+# TODO: Should this differ from clean()?
+#
+prepare_create() { _prepare_create "$@"; }
+_prepare_create() {
     local prefix=$1 platform=$2; shift 2
 
     if [[ $platform = windows ]]; then :
@@ -119,11 +136,16 @@ _prepare_clean() {
     install -d "$prefix/out"
 }
 
-# prepare_config <prefix> <platform> [ <arch> ... ]
+# prepare_config <prefix> <platform> [ <arch:host> ... ]
 #
-# Configure the library for building the <arch>s on this machine.
+# Generate build solution for configuring a build on this machine.
+# The <prefix> has been newly created.
+#
+# TODO: cmake support?
+# By default, this will:
+# - Windows: do nothing
+# - Other: run `autoreconf`.
 #
-# By default, this will run `autoreconf`.
 prepare_config() { _prepare_config "$@"; }
 _prepare_config() {
     local prefix=$1 platform=$2; shift 2
@@ -141,11 +163,11 @@ _prepare_config() {
     touch "$prefix/out/.prepared"
 }
 
-# target <prefix> <platform> <arch>
+# target <prefix> <platform> <arch> <host>
 #
-# Build the library for the given <arch> and <platform> into the given <prefix>.
+# Build the library to the <arch> binary for the <host> architecture on <platform> into the given <prefix>.
 # The build script invokes this function when it's ready to build the library's code.
-# Generic platform-specific environment setup has been done.
+#
 target() { _target "$@"; }
 _target() {
     target_prepare "$@"
@@ -153,14 +175,71 @@ _target() {
     target_build "$@"
 }
 
-# target_prepare <prefix> <platform> <arch>
+# target_prepare <prefix> <platform> <arch> <host>
 #
-# Prepare the library configuration for building the target.
+# Any build-related work to be done in the prefix prior to building.
+#
+# By default, this will:
+# - Windows: do nothing
+# - macOS/iOS: Discover SDKROOT & build flags
+# - Android: Prepare an NDK toolchain & build flags
+# - Makefile: run `make clean`
 #
-# By default, this will run `make clean` if a Makefile is found.
 target_prepare() { _target_prepare "$@"; }
 _target_prepare() {
-    local prefix=$1 platform=$2 arch=$3; shift 3
+    local prefix=$1 platform=$2 arch=$3 host=$4; shift 3
+
+    case "$platform" in
+        'windows')
+        ;;
+
+        'macos')
+            SDKROOT="$(xcrun --show-sdk-path --sdk macosx)"
+            export PATH="$(xcrun --show-sdk-platform-path --sdk macosx)/usr/bin:$PATH"
+            export CPPFLAGS="-arch $host -flto -O2 -g -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $CPPFLAGS"
+            export LDFLAGS="-arch $host -flto -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $LDFLAGS"
+        ;;
+
+        'ios')
+            case "$arch" in
+                *'arm'*)
+                    SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)"
+                    export PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH"
+                    export CPPFLAGS="-arch $host -mthumb -fembed-bitcode -flto -O2 -g -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $CPPFLAGS"
+                    export LDFLAGS="-arch $host -mthumb -fembed-bitcode -flto -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
+                ;;
+                *)
+                    SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
+                    export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
+                    export CPPFLAGS="-arch $host -flto -O2 -g -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $CPPFLAGS"
+                    export LDFLAGS="-arch $host -flto -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
+                ;;
+            esac
+        ;;
+
+        'android')
+            [[ -x $ANDROID_NDK_HOME/build/ndk-build ]] || { echo >&2 "Android NDK not found.  Please set ANDROID_NDK_HOME."; return 1; }
+
+            SDKROOT="$prefix/$arch/ndk"
+            # Platform 21 is lowest that supports x86_64
+            "$ANDROID_NDK_HOME/build/tools/make-standalone-toolchain.sh" --force --install-dir="$SDKROOT" --platform='android-21' --arch="$arch"
+            export PATH="$SDKROOT/bin:$PATH"
+            export CPPFLAGS="-O2 -g $CPPFLAGS"
+            export LDFLAGS="-avoid-version $LDFLAGS"
+            export CC='clang'
+        ;;
+
+        *)
+            case "$arch" in
+                x86)
+                    export CPPFLAGS="-m32 $CPPFLAGS" LDFLAGS="-m32 $LDFLAGS"
+                ;;
+                x86_64)
+                    export CPPFLAGS="-m64 $CPPFLAGS" LDFLAGS="-m64 $LDFLAGS"
+                ;;
+            esac
+        ;;
+    esac
 
     if [[ $platform = windows ]]; then :
     else
@@ -168,66 +247,74 @@ _target_prepare() {
     fi
 }
 
-# target_configure <prefix> <platform> <arch> [ <args> ... ]
+# target_configure <prefix> <platform> <arch> <host> [ <args> ... ]
 #
-# Configure the library for building the target.
+# Configure the library for building the target. This generates the compiler configuration.
 #
-# By default, this will run `./configure --host=<host> --prefix=<prefix>/<arch> <args>`.
-# By default, some platform-specific arguments will be passed in as well as
+# By default, this will:
+# - Windows: do nothing
+# - Other: run `./configure --host=<host> --prefix=<prefix>/<arch> <args>`.
+#
+# Some platform-specific configure arguments will be passed in as well.
 # --enable-pic --disable-pie to ensure the resulting library can be linked again.
+#
 target_configure() { _target_configure "$@"; }
 _target_configure() {
-    local prefix=$1 platform=$2 arch=$3; shift 3
+    local prefix=$1 platform=$2 arch=$3 host=$4; shift 4
 
-    local host=$arch build=
-    [[ $arch = *arm* ]] && host=arm
+    local build=
     [[ -x config.guess ]] && build=$(./config.guess)
     [[ -x build-aux/config.guess ]] && build=$(build-aux/config.guess)
 
     case "$platform" in
         'windows')
             # doesn't use ./configure
-            return
+            return 0
         ;;
         'ios'|'macos')
             host+=-apple
-            set -- --enable-static --disable-shared 
+            set -- --enable-static --disable-shared "$@"
         ;;
         'android')
-            case "$arch" in
-                'arm')    host='arm' ;;
-                'arm64')  host='aarch64' ;;
-                'x86')    host='i686' ;;
-                'x86_64') host='x86_64' ;;
-            esac
             host=( "$SDKROOT/$host"*-android* ) host=${host##*/}
             set -- --disable-static --enable-shared --with-sysroot="$SDKROOT/sysroot" "$@"
         ;;
         *)
-            set -- --enable-static --disable-shared 
+            set -- --enable-static --disable-shared "$@"
         ;;
     esac
 
     ./configure ${build:+--build="$build"} ${host:+--host="$host"} --prefix="$prefix/$arch" --enable-pic --disable-pie "$@"
 }
 
-# target_build <prefix> <platform> <arch>
+# target_build <prefix> <platform> <arch> <host>
 #
-# Build the library code for the target.
+# Build the library code for the target. This runs the compiler per the previous configuration.
+#
+# By default, this will:
+# - Windows: run `msbuild /t:Rebuild /p:Configuration:Release;Platform=<host>`
+# - Other: run `make check install`.
 #
-# By default, this will run `make check install`.
 target_build() { _target_build "$@"; }
 _target_build() {
-    local prefix=$1 platform=$2 arch=$3; shift 3
+    local prefix=$1 platform=$2 arch=$3 host=$4; shift 4
 
     if [[ $platform = windows ]]; then
-        # I cannot for the life of me figure out how to pass this command directly into cmd.
-        printf '"%%VSINSTALLDIR%%\Common7\Tools\VsMSBuildCmd.bat" && msbuild /t:Rebuild /p:Configuration=Release;Platform=%s;OutDir=%s' "$arch" "$(cygpath -w "${prefix##$PWD/}/$arch/")" > .build.bat
-        cmd //c .build.bat
-        rm -f .build.bat
+        if [[ -e CMakeLists.txt ]]; then
+            ( projdir=$PWD; mkdir -p "$prefix/$arch/"; cd "$prefix/$arch/"
+            PATH="$(cygpath "$VSINSTALLDIR")/Common7/Tools:$(cygpath "$VSINSTALLDIR")/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin:$PATH" \
+                cmd /v /c "$(printf 'VsMSBuildCmd && cmake -A %s %s && for %%s in (*.sln) do msbuild /m /t:Rebuild /p:Configuration=Release;Platform=%s;OutDir=. %%s' \
+                "$host" "$(cygpath -w "$projdir")" "$host")" )
+        else
+	    PATH="$(cygpath "$VSINSTALLDIR")/Common7/Tools:$PATH" \
+		cmd /v /c "$(printf 'VsMSBuildCmd && for %%s in (*.sln) do msbuild /m /t:Rebuild /p:Configuration=Release;Platform=%s;OutDir=%s %%s' \
+		"$host" "$(cygpath -w "${prefix##$PWD/}/$arch/")")"
+	fi
     else
         local cores=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null ||:)
-        make -j"${cores:-3}" install
+        #make -j"${cores:-3}" check install # TODO: libjson-c breaks on parallel build for check and install
+        #make check install # TODO: libjson-c has a failing test atm
+        make install
     fi
 }
 
@@ -235,6 +322,7 @@ _target_build() {
 #
 # Prepare the final build product.
 # The build script invokes this once after a successful build of all targets.
+#
 finalize() { _finalize "$@"; }
 _finalize() {
     finalize_merge "$@"
@@ -246,6 +334,7 @@ _finalize() {
 # Merge all targets into a product the application can use, available at `<prefix>/out`.
 #
 # By default, this will copy the headers to `<prefix>/out/include`, install libraries into `<prefix>/out/lib` and mark the output product as successful.
+#
 finalize_merge() { _finalize_merge "$@"; }
 _finalize_merge() {
     local prefix=$1 platform=$2; shift 2
@@ -296,6 +385,7 @@ _finalize_merge() {
 # Clean up the library after a successful build (eg. housekeeping of temporary files).
 #
 # By default, this will run `make clean`.
+#
 finalize_clean() { _finalize_clean "$@"; }
 _finalize_clean() {
     if [[ $platform = windows ]]; then :
@@ -307,6 +397,7 @@ _finalize_clean() {
 # build <name> [<platform>]
 #
 # Build the library <name> (found at ../<name>) for platform <platform> (or "host" if unspecified).
+#
 build() { _build "$@"; }
 _build() {
     local name=$1 platform=${2:-host}
@@ -322,10 +413,10 @@ _build() {
     if (( ! ${#archs[@]} )); then
         case "$platform" in
             'macos') archs=( 'x86_64' ) ;;
-            'ios') archs=( 'i386' 'x86_64' 'armv7' 'armv7s' 'arm64' ) ;;
-            'android') archs=( 'arm' 'arm64' 'x86' 'x86_64' ) ;;
-            'windows') archs=( 'Win32' 'x64' ) ;;
-            *) archs=( 'i686' 'x86_64' ) ;;
+            'ios') archs=( 'x86:i386' 'x86_64' 'armv7' 'armv7s' 'arm64' ) ;;
+            'android') archs=( 'arm' 'arm64:aarch64' 'x86:i686' 'x86_64' ) ;;
+            'windows') archs=( 'x86:Win32' 'x86_64:x64' ) ;;
+            *) archs=( 'x86:i686' 'x86_64' ) ;;
         esac
     fi
 
@@ -348,60 +439,13 @@ _build() {
 
     # Repeat the build for each individual architecture.
     for arch in "${archs[@]}"; do (
+        local host=${arch#*:} arch=${arch%%:*}
+
         echo
-        echo " # $name ($platform: $arch) ..."
+        echo " # $name [$platform: $arch ($host)] ..."
 
-        # Set up a base environment for the platform.
-        case "$platform" in
-            'windows')
-            ;;
-            'macos')
-                SDKROOT="$(xcrun --show-sdk-path --sdk macosx)"
-                export PATH="$(xcrun --show-sdk-platform-path --sdk macosx)/usr/bin:$PATH"
-                export CPPFLAGS="-arch $arch -flto -O2 -g -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $CPPFLAGS"
-                export LDFLAGS="-arch $arch -flto -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $LDFLAGS"
-            ;;
-            'ios')
-                case "$arch" in
-                    *'arm'*)
-                        SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)"
-                        export PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH"
-                        export CPPFLAGS="-arch $arch -mthumb -fembed-bitcode -flto -O2 -g -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $CPPFLAGS"
-                        export LDFLAGS="-arch $arch -mthumb -fembed-bitcode -flto -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
-                    ;;
-                    *)
-                        SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
-                        export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
-                        export CPPFLAGS="-arch $arch -flto -O2 -g -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $CPPFLAGS"
-                        export LDFLAGS="-arch $arch -flto -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
-                    ;;
-                esac
-            ;;
-            'android')
-                [[ -x $ANDROID_NDK_HOME/build/ndk-build ]] || { echo >&2 "Android NDK not found.  Please set ANDROID_NDK_HOME."; return 1; }
-
-                SDKROOT="$prefix/$arch/ndk"
-                # Platform 21 is lowest that supports x86_64
-                "$ANDROID_NDK_HOME/build/tools/make-standalone-toolchain.sh" --force --install-dir="$SDKROOT" --platform='android-21' --arch="$arch"
-                export PATH="$SDKROOT/bin:$PATH"
-                export CPPFLAGS="-O2 -g $CPPFLAGS"
-                export LDFLAGS="-avoid-version $LDFLAGS"
-                export CC='clang'
-            ;;
-            *)
-                case "$arch" in
-                    i686)
-                        export CPPFLAGS="-m32 $CPPFLAGS" LDFLAGS="-m32 $LDFLAGS"
-                    ;;
-                    x86_64)
-                        export CPPFLAGS="-m64 $CPPFLAGS" LDFLAGS="-m64 $LDFLAGS"
-                    ;;
-                esac
-            ;;
-        esac
-
-        target "$prefix" "$platform" "$arch"
+        target "$prefix" "$platform" "$arch" "$host"
     ); done
 
-    finalize "$prefix" "$platform" "${archs[@]}"
+    finalize "$prefix" "$platform" "${archs[@]%%:*}"
 }

platform-darwin/External/Pearl

@@ -1 +1 @@
-Subproject commit 72de3d1b49b4a9c9cd86f865f7a1c3da18fbc582
+Subproject commit 452d2a72c4e897e3141106ba6ca8544834128c9e

platform-darwin/MasterPassword-JNI.xcodeproj/project.pbxproj

@@ -30,10 +30,18 @@
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
+		536DEA2BDA9F2F9583C53D8F /* Products */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		DA1554D220B3924000EA92C5 = {
 			isa = PBXGroup;
 			children = (
 				DA1554DD20B3928E00EA92C5 /* core */,
+				536DEA2BDA9F2F9583C53D8F /* Products */,
 			);
 			sourceTree = "<group>";
 		};
@@ -105,6 +113,7 @@
 				Base,
 			);
 			mainGroup = DA1554D220B3924000EA92C5;
+			productRefGroup = 536DEA2BDA9F2F9583C53D8F /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (

platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		13D62249DA5980D1FFC89971 /* Pods_MasterPassword_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4E180CA32C86ACDC960D8B1 /* Pods_MasterPassword_iOS.framework */; };
+		148C3B3327EF82FED5464ADA /* Pods_MasterPassword_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A4F020BDEF2099375EBF1E7 /* Pods_MasterPassword_iOS.framework */; };
 		93D390C1B93F9D3AE37DD0A5 /* MPAnswersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39C426E03358384018E85 /* MPAnswersViewController.m */; };
 		93D391ECBD9BD2C64115B5DD /* PearlSizedTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39156E806BB78E04F78B9 /* PearlSizedTextView.m */; };
 		93D3922A53E41A54832E90D9 /* PearlOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D390FADEB325D8D54A957D /* PearlOverlay.m */; };
@@ -49,7 +49,6 @@
 		93D39A5FF670957C0AF8298D /* MPSiteCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39DEA995041A13DC9CAF7 /* MPSiteCell.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 */; };
 		93D39B8F90F58A5D158DDBA3 /* MPSitesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3924EE15017F8A12CB436 /* MPSitesViewController.m */; };
@@ -175,7 +174,6 @@
 		DA67461018DE7F0C00DFE240 /* Exo2.0-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DA67460C18DE7F0C00DFE240 /* Exo2.0-Bold.otf */; };
 		DA69540617D975D900BF294E /* icon_gears.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37841711E29500CF925C /* icon_gears.png */; };
 		DA69540717D975D900BF294E /* icon_gears@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37851711E29500CF925C /* icon_gears@2x.png */; };
-		DA72BD7B19C1510C00E6ACFE /* UIView+FontScale.m in Sources */ = {isa = PBXBuildFile; fileRef = DACE2F6719BA6A2A0010F92E /* UIView+FontScale.m */; };
 		DA72E2302453B91700676D4F /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA72E22F2453B91700676D4F /* WebKit.framework */; };
 		DA73049D194E022700E72520 /* ui_spinner.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36511711E29400CF925C /* ui_spinner.png */; };
 		DA73049E194E022700E72520 /* ui_spinner@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36521711E29400CF925C /* ui_spinner@2x.png */; };
@@ -334,7 +332,6 @@
 		DABD3C1E1711E2DC00CF925C /* MPPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD3BEB1711E2DC00CF925C /* MPPreferencesViewController.m */; };
 		DABD3C1F1711E2DC00CF925C /* MPTypeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD3BED1711E2DC00CF925C /* MPTypeViewController.m */; };
 		DABD3C211711E2DC00CF925C /* MPiOSConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD3BF11711E2DC00CF925C /* MPiOSConfig.m */; };
-		DABD3C241711E2DC00CF925C /* MasterPassword.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = DABD3BF81711E2DC00CF925C /* MasterPassword.entitlements */; };
 		DABD3C251711E2DC00CF925C /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DABD3BF91711E2DC00CF925C /* Settings.bundle */; };
 		DABD3C261711E2DC00CF925C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DABD3BFA1711E2DC00CF925C /* InfoPlist.strings */; };
 		DABD3C271711E2DC00CF925C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD3BFC1711E2DC00CF925C /* main.m */; };
@@ -463,7 +460,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		5C616FA365D7A5C31689B2FF /* Pods-MasterPassword.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword.test.xcconfig"; path = "Target Support Files/Pods-MasterPassword/Pods-MasterPassword.test.xcconfig"; sourceTree = "<group>"; };
+		2D3D92F229CDF888708ECB65 /* Pods-MasterPassword-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-iOS.debug.xcconfig"; path = "Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS.debug.xcconfig"; sourceTree = "<group>"; };
+		7902D27548A859ED1D8F5B82 /* Pods-MasterPassword-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-iOS.release.xcconfig"; path = "Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS.release.xcconfig"; sourceTree = "<group>"; };
+		7A4F020BDEF2099375EBF1E7 /* Pods_MasterPassword_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MasterPassword_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		93D390519405B76CC6A57C4F /* MPCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCell.h; sourceTree = "<group>"; };
 		93D3908DF8EABBD952065DC0 /* UICollectionView+PearlReloadItems.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UICollectionView+PearlReloadItems.m"; sourceTree = "<group>"; };
 		93D390A3B351FEF1B9EDAB56 /* mpw-algorithm_v2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v2.c"; sourceTree = "<group>"; };
@@ -476,7 +475,6 @@
 		93D391943675426839501BB8 /* MPLogsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLogsViewController.h; sourceTree = "<group>"; };
 		93D391AA32F24290C424438E /* NSNotificationCenter+PearlEasyCleanup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+PearlEasyCleanup.h"; sourceTree = "<group>"; };
 		93D39246FC21C6E63E35D615 /* UICollectionView+PearlReloadItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UICollectionView+PearlReloadItems.h"; sourceTree = "<group>"; };
-		93D3924D6F77E6BF41AC32D3 /* MPRootSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPRootSegue.h; sourceTree = "<group>"; };
 		93D3924EE15017F8A12CB436 /* MPSitesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSitesViewController.m; sourceTree = "<group>"; };
 		93D392876BE5C011DE73B43F /* MPPopdownSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPopdownSegue.h; sourceTree = "<group>"; };
 		93D392C5A6572DB0EB5B82C8 /* mpw-types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-types.c"; sourceTree = "<group>"; };
@@ -505,7 +503,6 @@
 		93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+PearlFullDescription.h"; sourceTree = "<group>"; };
 		93D3990D850D76A94C6B7A4D /* mpw-algorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-algorithm.h"; sourceTree = "<group>"; };
 		93D3990E0CD1B5CF9FBB2C07 /* MPWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPWebViewController.m; sourceTree = "<group>"; };
-		93D399493FEDDE74DD1A0C15 /* MPRootSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPRootSegue.m; sourceTree = "<group>"; };
 		93D3995B1D4DCE5A30D882BA /* MPCoachmarkViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCoachmarkViewController.m; sourceTree = "<group>"; };
 		93D39975CE5AEC99E3F086C7 /* MPSiteCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSiteCell.h; sourceTree = "<group>"; };
 		93D3999693660C89A7465F4E /* MPCoachmarkViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCoachmarkViewController.h; sourceTree = "<group>"; };
@@ -551,7 +548,6 @@
 		93D39F9106F2CCFB94283188 /* NSError+PearlFullDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+PearlFullDescription.m"; sourceTree = "<group>"; };
 		93D39FBF8FCEB4C106272334 /* NSOrderedSetOrArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSOrderedSetOrArray.h; sourceTree = "<group>"; };
 		93D39FD9623E8D5571C0AEB3 /* MPAlgorithmV3.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAlgorithmV3.m; sourceTree = "<group>"; };
-		B4E180CA32C86ACDC960D8B1 /* Pods_MasterPassword_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MasterPassword_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		DA071BF1190187FE00179766 /* empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "empty@2x.png"; sourceTree = "<group>"; };
 		DA071BF2190187FE00179766 /* empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = empty.png; sourceTree = "<group>"; };
@@ -1588,10 +1584,6 @@
 		DAFE4A63150399FF003ABA8F /* UIScrollView+PearlFlashingIndicators.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+PearlFlashingIndicators.h"; sourceTree = "<group>"; };
 		DAFE4A63150399FF003ABA91 /* NSDateFormatter+RFC3339.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDateFormatter+RFC3339.m"; sourceTree = "<group>"; };
 		DAFE4A63150399FF003ABA93 /* NSDateFormatter+RFC3339.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDateFormatter+RFC3339.h"; sourceTree = "<group>"; };
-		DC2D4B0016EB0A535147BA13 /* Pods-MasterPassword.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword.release.xcconfig"; path = "Target Support Files/Pods-MasterPassword/Pods-MasterPassword.release.xcconfig"; sourceTree = "<group>"; };
-		E4F11DB2CE85A9CF2A0C79B2 /* Pods-MasterPassword-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-iOS.debug.xcconfig"; path = "Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS.debug.xcconfig"; sourceTree = "<group>"; };
-		FE662C1B92299C911450537C /* Pods-MasterPassword.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword.debug.xcconfig"; path = "Target Support Files/Pods-MasterPassword/Pods-MasterPassword.debug.xcconfig"; sourceTree = "<group>"; };
-		FFFCFF8FBD5549B1EFF8806D /* Pods-MasterPassword-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-iOS.release.xcconfig"; path = "Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1620,7 +1612,7 @@
 				DA5BFA4B147E415C00F98B1E /* Foundation.framework in Frameworks */,
 				DA5BFA4D147E415C00F98B1E /* CoreGraphics.framework in Frameworks */,
 				DA5BFA4F147E415C00F98B1E /* CoreData.framework in Frameworks */,
-				13D62249DA5980D1FFC89971 /* Pods_MasterPassword_iOS.framework in Frameworks */,
+				148C3B3327EF82FED5464ADA /* Pods_MasterPassword_iOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1645,11 +1637,8 @@
 		6B6983E746CC7BE4292982AE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				FE662C1B92299C911450537C /* Pods-MasterPassword.debug.xcconfig */,
-				DC2D4B0016EB0A535147BA13 /* Pods-MasterPassword.release.xcconfig */,
-				5C616FA365D7A5C31689B2FF /* Pods-MasterPassword.test.xcconfig */,
-				E4F11DB2CE85A9CF2A0C79B2 /* Pods-MasterPassword-iOS.debug.xcconfig */,
-				FFFCFF8FBD5549B1EFF8806D /* Pods-MasterPassword-iOS.release.xcconfig */,
+				2D3D92F229CDF888708ECB65 /* Pods-MasterPassword-iOS.debug.xcconfig */,
+				7902D27548A859ED1D8F5B82 /* Pods-MasterPassword-iOS.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -1809,7 +1798,7 @@
 				DABB981515100B4000B05417 /* SystemConfiguration.framework */,
 				93D394077F8FAB8167647187 /* Twitter.framework */,
 				DA5BFA48147E415C00F98B1E /* UIKit.framework */,
-				B4E180CA32C86ACDC960D8B1 /* Pods_MasterPassword_iOS.framework */,
+				7A4F020BDEF2099375EBF1E7 /* Pods_MasterPassword_iOS.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -2784,8 +2773,6 @@
 				93D39B050DD5F55E9794EFD4 /* MPPopdownSegue.m */,
 				DABD3BEA1711E2DC00CF925C /* MPPreferencesViewController.h */,
 				DABD3BEB1711E2DC00CF925C /* MPPreferencesViewController.m */,
-				93D3924D6F77E6BF41AC32D3 /* MPRootSegue.h */,
-				93D399493FEDDE74DD1A0C15 /* MPRootSegue.m */,
 				93D39730673227EFF6DEFF19 /* MPSetupViewController.h */,
 				93D39A28369954D147E239BA /* MPSetupViewController.m */,
 				93D39975CE5AEC99E3F086C7 /* MPSiteCell.h */,
@@ -3159,14 +3146,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-iOS" */;
 			buildPhases = (
-				B8D66904C16DDB94975E6ABD /* [CP] Check Pods Manifest.lock */,
+				50DCE14ACFF8F47D6AD8D108 /* [CP] Check Pods Manifest.lock */,
 				DA8D88E019DA412A00B189D0 /* Run Script: genassets */,
 				DA5BFA40147E415C00F98B1E /* Sources */,
 				DA5BFA41147E415C00F98B1E /* Frameworks */,
 				DA5BFA42147E415C00F98B1E /* Resources */,
 				DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */,
-				4A87858EE3659604089E2F9F /* [CP] Embed Pods Frameworks */,
-				DA3C4EB32439438B00A6C4A8 /* Upload Sentry dSYM */,
+				DA3C4EB32439438B00A6C4A8 /* Sentry dSYM Upload */,
+				944AD8F1A1196535AF939789 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -3452,7 +3439,6 @@
 				DA5E0E5E24589C9B0007FBA7 /* Icon-83@2x.png in Resources */,
 				DA854C8418D4CFBF00106317 /* avatar-add.png in Resources */,
 				DAA1764B19D8B82B0044227B /* login_name@2x.png in Resources */,
-				DABD3C241711E2DC00CF925C /* MasterPassword.entitlements in Resources */,
 				DABD3C251711E2DC00CF925C /* Settings.bundle in Resources */,
 				DABD3C261711E2DC00CF925C /* InfoPlist.strings in Resources */,
 				DA32D05119D3D107004F3F0E /* icon_meter.png in Resources */,
@@ -3484,24 +3470,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		4A87858EE3659604089E2F9F /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		B8D66904C16DDB94975E6ABD /* [CP] Check Pods Manifest.lock */ = {
+		50DCE14ACFF8F47D6AD8D108 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -3523,7 +3492,31 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DA3C4EB32439438B00A6C4A8 /* Upload Sentry dSYM */ = {
+		944AD8F1A1196535AF939789 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/JRSwizzle-iOS/JRSwizzle.framework",
+				"${BUILT_PRODUCTS_DIR}/KCOrderedAccessorFix-iOS/KCOrderedAccessorFix.framework",
+				"${BUILT_PRODUCTS_DIR}/Sentry-iOS/Sentry.framework",
+				"${BUILT_PRODUCTS_DIR}/UIColor-Utilities/UIColor_Utilities.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JRSwizzle.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KCOrderedAccessorFix.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/UIColor_Utilities.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		DA3C4EB32439438B00A6C4A8 /* Sentry dSYM Upload */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
 			files = (
@@ -3531,15 +3524,16 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
+				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
 			);
-			name = "Upload Sentry dSYM";
+			name = "Sentry dSYM Upload";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = "/bin/sh -e";
-			shellScript = "if hash sentry-cli 2>/dev/null; then\n    if ! ERROR=$(SENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-ios sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\" 2>&1 >/dev/null); then\n        echo >&2 \"warning: sentry-cli: $ERROR\"\n    fi\nelse\n    echo >&2 \"warning: sentry-cli not installed: try brew install getsentry/tools/sentry-cli\"\nfi\n";
+			shellScript = "if ! hash sentry-cli 2>/dev/null; then\n    echo >&2 \"error: sentry-cli not installed. Try brew install getsentry/tools/sentry-cli\"\n    exit 1\nfi\n\nSENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-ios sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */ = {
@@ -3642,7 +3636,6 @@
 				93D399D7E08A142776A74CB8 /* MPOverlayViewController.m in Sources */,
 				DA46021D23D5E30B00398FF4 /* MPSecrets.m in Sources */,
 				93D39A27F2506C6FEEF9C588 /* MPAlgorithmV2.m in Sources */,
-				93D39B429C67A62E29DC02DA /* MPRootSegue.m in Sources */,
 				93D392FD5E2052F7D7DB3774 /* NSString+MPMarkDown.m in Sources */,
 				93D395B715D15F2B56F2A2EE /* mpw-types.c in Sources */,
 				93D39943D01E70DAC3B0DF76 /* mpw-util.c in Sources */,
@@ -3688,7 +3681,6 @@
 				DAFE4A2E15039824003ABA7C /* PearlStrings.m in Sources */,
 				DAFE4A3015039824003ABA7C /* PearlStringUtils.m in Sources */,
 				DAFE4A3715039824003ABA7C /* PearlKeyChain.m in Sources */,
-				DA72BD7B19C1510C00E6ACFE /* UIView+FontScale.m in Sources */,
 				DA250A17195665A100AC23F1 /* UITableView+PearlReloadItems.m in Sources */,
 				DAFE4A4115039824003ABA7C /* PearlArrayTVC.m in Sources */,
 				DAFE4A4315039824003ABA7C /* PearlBoxView.m in Sources */,
@@ -3803,33 +3795,45 @@
 				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_INTEGER = YES;
 				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES;
 				CLANG_WARN_ASSIGN_ENUM = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ATOMIC_IMPLICIT_SEQ_CST = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES_ERROR;
+				CLANG_WARN_BOOL_CONVERSION = YES_ERROR;
+				CLANG_WARN_COMMA = YES_ERROR;
+				CLANG_WARN_CONSTANT_CONVERSION = YES_ERROR;
 				CLANG_WARN_CXX0X_EXTENSIONS = YES;
+				CLANG_WARN_DELETE_NON_VIRTUAL_DTOR = YES_ERROR;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES_ERROR;
+				CLANG_WARN_FLOAT_CONVERSION = YES_ERROR;
+				CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO;
 				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES_ERROR;
+				CLANG_WARN_MISSING_NOESCAPE = YES_ERROR;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_INTERFACE_IVARS = YES_ERROR;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES_ERROR;
+				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = NO;
 				CLANG_WARN_OBJC_RECEIVER_WEAK = NO;
 				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = NO;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_PRAGMA_PACK = YES_ERROR;
+				CLANG_WARN_PRIVATE_MODULE = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
+				CLANG_WARN_VEXING_PARSE = YES_ERROR;
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
@@ -3855,7 +3859,7 @@
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES_ERROR;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = YES;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
@@ -3870,6 +3874,7 @@
 				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
 				GCC_WARN_MISSING_PARENTHESES = YES;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+				GCC_WARN_SHADOW = NO;
 				GCC_WARN_SIGN_COMPARE = NO;
 				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -3877,6 +3882,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
+				GCC_WARN_UNUSED_PARAMETER = NO;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
@@ -3909,33 +3915,45 @@
 				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_INTEGER = YES;
 				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES;
 				CLANG_WARN_ASSIGN_ENUM = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ATOMIC_IMPLICIT_SEQ_CST = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES_ERROR;
+				CLANG_WARN_BOOL_CONVERSION = YES_ERROR;
+				CLANG_WARN_COMMA = YES_ERROR;
+				CLANG_WARN_CONSTANT_CONVERSION = YES_ERROR;
 				CLANG_WARN_CXX0X_EXTENSIONS = YES;
+				CLANG_WARN_DELETE_NON_VIRTUAL_DTOR = YES_ERROR;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES_ERROR;
+				CLANG_WARN_FLOAT_CONVERSION = YES_ERROR;
+				CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO;
 				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES_ERROR;
+				CLANG_WARN_MISSING_NOESCAPE = YES_ERROR;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_INTERFACE_IVARS = YES_ERROR;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES_ERROR;
+				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = NO;
 				CLANG_WARN_OBJC_RECEIVER_WEAK = NO;
 				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = NO;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_PRAGMA_PACK = YES_ERROR;
+				CLANG_WARN_PRIVATE_MODULE = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
+				CLANG_WARN_VEXING_PARSE = YES_ERROR;
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
@@ -3959,7 +3977,7 @@
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES_ERROR;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = YES;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
@@ -3974,6 +3992,7 @@
 				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
 				GCC_WARN_MISSING_PARENTHESES = YES;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+				GCC_WARN_SHADOW = NO;
 				GCC_WARN_SIGN_COMPARE = NO;
 				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -3981,6 +4000,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
+				GCC_WARN_UNUSED_PARAMETER = NO;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
@@ -4001,7 +4021,7 @@
 		};
 		DA5BFA6E147E415C00F98B1E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E4F11DB2CE85A9CF2A0C79B2 /* Pods-MasterPassword-iOS.debug.xcconfig */;
+			baseConfigurationReference = 2D3D92F229CDF888708ECB65 /* Pods-MasterPassword-iOS.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -4037,7 +4057,7 @@
 		};
 		DA5BFA6F147E415C00F98B1E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FFFCFF8FBD5549B1EFF8806D /* Pods-MasterPassword-iOS.release.xcconfig */;
+			baseConfigurationReference = 7902D27548A859ED1D8F5B82 /* Pods-MasterPassword-iOS.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_OBJC_ARC = YES;

platform-darwin/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS.xcscheme

@@ -73,6 +73,13 @@
          identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
          referenceType = "1">
       </LocationScenarioReference>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "TERM"
+            value = "color"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Debug"

platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		7352E972184B980C428B66A2 /* Pods_MasterPassword_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E9477508F419F29008C7553 /* Pods_MasterPassword_macOS.framework */; };
 		93D390C676DF52DA7E459F19 /* MPSitesWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D9D0061FF1159998F06 /* MPSitesWindow.m */; };
 		93D391E61DC23E128DA4446C /* NSView+Traversing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D393EE88DE554BCCBC1C2D /* NSView+Traversing.h */; };
 		93D393A1646430FAAC73E7FE /* MPMacApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39F83DD151985F2C7345A /* MPMacApplication.m */; };
@@ -18,6 +17,7 @@
 		93D398D1F5D8CD5A22AF6929 /* MPGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39934FD8D5BFABA46F41C /* MPGradientView.m */; };
 		93D39C5789EFA607CF788082 /* MPSiteModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39E73BF5CBF8E5B005CD3 /* MPSiteModel.m */; };
 		93D39F833DEC1C89B2F795AC /* MPSitesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39A57A7823DE98A0FF83C /* MPSitesWindowController.m */; };
+		C6D1011AA5C6C5391BFC9DC0 /* Pods_MasterPassword_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C2AEAB82916C4A50EE4A4DE /* Pods_MasterPassword_macOS.framework */; };
 		DA0933CC1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0933CB1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png */; };
 		DA0933D01747B91B00DE1CEF /* appstore.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0933CF1747B91B00DE1CEF /* appstore.png */; };
 		DA09745E1E99586600F0BFE8 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA09745D1E99586600F0BFE8 /* libxml2.tbd */; };
@@ -101,7 +101,6 @@
 		DA5E5D011724A667003798D8 /* MPKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CAE1724A667003798D8 /* MPKey.m */; };
 		DA5E5D031724A667003798D8 /* MPMacAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CB41724A667003798D8 /* MPMacAppDelegate.m */; };
 		DA5E5D041724A667003798D8 /* MPMacConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CB61724A667003798D8 /* MPMacConfig.m */; };
-		DA5E5D081724A667003798D8 /* MasterPassword.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CBF1724A667003798D8 /* MasterPassword.entitlements */; };
 		DA5E5D0A1724A667003798D8 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CC21724A667003798D8 /* InfoPlist.strings */; };
 		DA5E5D0B1724A667003798D8 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CC41724A667003798D8 /* MainMenu.xib */; };
 		DA5E5D0C1724A667003798D8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CC61724A667003798D8 /* main.m */; };
@@ -349,11 +348,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		04D86D0B84D29123756339FD /* Pods-MasterPassword.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword.debug.xcconfig"; path = "Target Support Files/Pods-MasterPassword/Pods-MasterPassword.debug.xcconfig"; sourceTree = "<group>"; };
-		1E9477508F419F29008C7553 /* Pods_MasterPassword_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MasterPassword_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		1E9ED9547411486CE0898611 /* Pods-MasterPassword-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-macOS.debug.xcconfig"; path = "Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS.debug.xcconfig"; sourceTree = "<group>"; };
-		28DD0F6129ECC496C8DFE6F8 /* Pods-MasterPassword-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-macOS.release.xcconfig"; path = "Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS.release.xcconfig"; sourceTree = "<group>"; };
-		7791961245EBC3023523FDCD /* Pods-MasterPassword.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword.release.xcconfig"; path = "Target Support Files/Pods-MasterPassword/Pods-MasterPassword.release.xcconfig"; sourceTree = "<group>"; };
+		2C2AEAB82916C4A50EE4A4DE /* Pods_MasterPassword_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MasterPassword_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		6F97B456DA90E7D2E95B64A5 /* Pods-MasterPassword-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-macOS.debug.xcconfig"; path = "Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS.debug.xcconfig"; sourceTree = "<group>"; };
 		93D39240B5143E01F0B75E96 /* MPSiteModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSiteModel.h; sourceTree = "<group>"; };
 		93D392870DF659AFC1870521 /* NSView+Traversing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSView+Traversing.m"; sourceTree = "<group>"; };
 		93D392A4F3DE0BD758B9B056 /* MPNoStateButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPNoStateButton.h; sourceTree = "<group>"; };
@@ -1120,6 +1116,7 @@
 		DAFE4A63150399FF003ABA87 /* NSObject+PearlKVO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+PearlKVO.h"; sourceTree = "<group>"; };
 		DAFE4A63150399FF003ABA91 /* NSDateFormatter+RFC3339.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDateFormatter+RFC3339.m"; sourceTree = "<group>"; };
 		DAFE4A63150399FF003ABA93 /* NSDateFormatter+RFC3339.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDateFormatter+RFC3339.h"; sourceTree = "<group>"; };
+		DF299A3DC20096A2D2942352 /* Pods-MasterPassword-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MasterPassword-macOS.release.xcconfig"; path = "Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1155,7 +1152,7 @@
 				DA16B345170661F2000A0EAB /* libPearl.a in Frameworks */,
 				DA16B344170661EE000A0EAB /* Cocoa.framework in Frameworks */,
 				DA72E2272444081200676D4F /* SystemConfiguration.framework in Frameworks */,
-				7352E972184B980C428B66A2 /* Pods_MasterPassword_macOS.framework in Frameworks */,
+				C6D1011AA5C6C5391BFC9DC0 /* Pods_MasterPassword_macOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1182,10 +1179,8 @@
 		0C357E29DE20E18311095EBF /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				04D86D0B84D29123756339FD /* Pods-MasterPassword.debug.xcconfig */,
-				7791961245EBC3023523FDCD /* Pods-MasterPassword.release.xcconfig */,
-				1E9ED9547411486CE0898611 /* Pods-MasterPassword-macOS.debug.xcconfig */,
-				28DD0F6129ECC496C8DFE6F8 /* Pods-MasterPassword-macOS.release.xcconfig */,
+				6F97B456DA90E7D2E95B64A5 /* Pods-MasterPassword-macOS.debug.xcconfig */,
+				DF299A3DC20096A2D2942352 /* Pods-MasterPassword-macOS.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -1262,7 +1257,7 @@
 				DAD9B5EF1762CAA4001835F9 /* ServiceManagement.framework */,
 				DA6701DD16406B7300B61001 /* Social.framework */,
 				DABB981515100B4000B05417 /* SystemConfiguration.framework */,
-				1E9477508F419F29008C7553 /* Pods_MasterPassword_macOS.framework */,
+				2C2AEAB82916C4A50EE4A4DE /* Pods_MasterPassword_macOS.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -2321,15 +2316,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-macOS" */;
 			buildPhases = (
-				0DC4F66C2499C40A68A07D58 /* [CP] Check Pods Manifest.lock */,
+				A4743CFBA7F5C60D2E440512 /* [CP] Check Pods Manifest.lock */,
 				DA4EF9CB19FD4B600032ECB5 /* Run Script: genassets */,
 				DA5BFA40147E415C00F98B1E /* Sources */,
 				DA5BFA41147E415C00F98B1E /* Frameworks */,
 				DA5BFA42147E415C00F98B1E /* Resources */,
 				DAD9B5EE1762CA3A001835F9 /* Copy LoginHelper */,
 				DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */,
-				43E5966C8C236E86824DDADE /* [CP] Embed Pods Frameworks */,
-				DA3C4EB2243941AE00A6C4A8 /* Upload Sentry dSYM */,
+				DA3C4EB2243941AE00A6C4A8 /* Sentry dSYM Upload */,
+				85C937E180CD7620A471A930 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2388,7 +2383,7 @@
 				CLASSPREFIX = MP;
 				LastSwiftUpdateCheck = 0720;
 				LastTestingUpgradeCheck = 0510;
-				LastUpgradeCheck = 1140;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = Lyndir;
 				TargetAttributes = {
 					DA1C7AA61F1A8F24009A3551 = {
@@ -2535,7 +2530,6 @@
 				DACA29671705DF81002C6C22 /* SourceCodePro-ExtraLight.otf in Resources */,
 				DACA29681705DF81002C6C22 /* SourceCodePro-Black.otf in Resources */,
 				DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */,
-				DA5E5D081724A667003798D8 /* MasterPassword.entitlements in Resources */,
 				DA5E5D0A1724A667003798D8 /* InfoPlist.strings in Resources */,
 				DA5E5D0B1724A667003798D8 /* MainMenu.xib in Resources */,
 				DA0933CC1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png in Resources */,
@@ -2546,7 +2540,29 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		0DC4F66C2499C40A68A07D58 /* [CP] Check Pods Manifest.lock */ = {
+		85C937E180CD7620A471A930 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/JRSwizzle-macOS/JRSwizzle.framework",
+				"${BUILT_PRODUCTS_DIR}/KCOrderedAccessorFix-macOS/KCOrderedAccessorFix.framework",
+				"${BUILT_PRODUCTS_DIR}/Sentry-macOS/Sentry.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JRSwizzle.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KCOrderedAccessorFix.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		A4743CFBA7F5C60D2E440512 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -2568,24 +2584,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		43E5966C8C236E86824DDADE /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		DA3C4EB2243941AE00A6C4A8 /* Upload Sentry dSYM */ = {
+		DA3C4EB2243941AE00A6C4A8 /* Sentry dSYM Upload */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
 			files = (
@@ -2593,15 +2592,16 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
+				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
 			);
-			name = "Upload Sentry dSYM";
+			name = "Sentry dSYM Upload";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = "/bin/sh -e";
-			shellScript = "if hash sentry-cli 2>/dev/null; then\n    if ! ERROR=$(SENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-macos sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\" 2>&1 >/dev/null); then\n        echo >&2 \"warning: sentry-cli: $ERROR\"\n    fi\nelse\n    echo >&2 \"warning: sentry-cli not installed: try brew install getsentry/tools/sentry-cli\"\nfi\n";
+			shellScript = "if ! hash sentry-cli 2>/dev/null; then\n    echo >&2 \"error: sentry-cli not installed. Try brew install getsentry/tools/sentry-cli\"\n    exit 1\nfi\n\nSENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-macos sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DA4EF9CB19FD4B600032ECB5 /* Run Script: genassets */ = {
@@ -3195,12 +3195,13 @@
 		};
 		DA5BFA6E147E415C00F98B1E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1E9ED9547411486CE0898611 /* Pods-MasterPassword-macOS.debug.xcconfig */;
+			baseConfigurationReference = 6F97B456DA90E7D2E95B64A5 /* Pods-MasterPassword-macOS.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = Source/Mac/MasterPassword.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				COMBINE_HIDPI_IMAGES = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
@@ -3234,12 +3235,13 @@
 		};
 		DA5BFA6F147E415C00F98B1E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 28DD0F6129ECC496C8DFE6F8 /* Pods-MasterPassword-macOS.release.xcconfig */;
+			baseConfigurationReference = DF299A3DC20096A2D2942352 /* Pods-MasterPassword-macOS.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = Source/Mac/MasterPassword.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				COMBINE_HIDPI_IMAGES = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";

platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/MasterPassword macOS.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
-   version = "1.3">
+   LastUpgradeVersion = "1200"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,15 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-            BuildableName = "Master Password.app"
-            BlueprintName = "MasterPassword-macOS"
-            ReferencedContainer = "container:MasterPassword-macOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <Testables>
       </Testables>
    </TestAction>
@@ -59,6 +50,17 @@
             ReferencedContainer = "container:MasterPassword-macOS.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "TERM"
+            value = "color"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Debug"

platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-bench.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
-   version = "1.3">
+   LastUpgradeVersion = "1200"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,15 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA1C7AC61F1A8FD8009A3551"
-            BuildableName = "mpw-bench"
-            BlueprintName = "mpw-bench"
-            ReferencedContainer = "container:MasterPassword-macOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <Testables>
       </Testables>
    </TestAction>
@@ -59,6 +50,17 @@
             ReferencedContainer = "container:MasterPassword-macOS.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "TERM"
+            value = "color"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-cli.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,15 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA1C7AA61F1A8F24009A3551"
-            BuildableName = "mpw-cli"
-            BlueprintName = "mpw-cli"
-            ReferencedContainer = "container:MasterPassword-macOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <Testables>
       </Testables>
    </TestAction>
@@ -81,6 +72,13 @@
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "TERM"
+            value = "color"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
       <LocationScenarioReference
          identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
          referenceType = "1">

platform-darwin/MasterPassword-macOS.xcodeproj/xcshareddata/xcschemes/mpw-test.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
-   version = "1.3">
+   LastUpgradeVersion = "1200"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,15 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA67743A1A474A03004F356A"
-            BuildableName = "mpw-test"
-            BlueprintName = "mpw-test"
-            ReferencedContainer = "container:MasterPassword-macOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <Testables>
       </Testables>
    </TestAction>
@@ -60,6 +51,17 @@
             ReferencedContainer = "container:MasterPassword-macOS.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "TERM"
+            value = "color"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Debug"

platform-darwin/Podfile

@@ -28,3 +28,14 @@ target 'MasterPassword-macOS' do
   pod 'KCOrderedAccessorFix'
   pod 'JRSwizzle'
 end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    if target.name == 'Countly-iOS' || target.name == 'Countly-macOS'
+      target.build_configurations.each do |config|
+        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)']
+        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'COUNTLY_EXCLUDE_IDFA=1'
+      end
+    end
+  end
+end

platform-darwin/Source/MPAlgorithmV0.m

@@ -88,7 +88,7 @@ static NSOperationQueue *_mpwQueue = nil;
 - (BOOL)tryMigrateUser:(MPUserEntity *)user inContext:(NSManagedObjectContext *)moc {
 
     NSError *error = nil;
-    NSFetchRequest *migrationRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPSiteEntity class] )];
+    NSFetchRequest *migrationRequest = [MPSiteEntity fetchRequest];
     migrationRequest.predicate = [NSPredicate predicateWithFormat:@"version_ < %d AND user == %@", self.version, user];
     NSArray *migrationSites = [moc executeFetchRequest:migrationRequest error:&error];
     if (!migrationSites) {
@@ -146,10 +146,10 @@ static NSOperationQueue *_mpwQueue = nil;
 
 - (NSString *)nameOfType:(MPResultType)type {
 
-    if (!type)
-        return nil;
-
     switch (type) {
+        case MPResultTypeNone:
+            return @"None";
+
         case MPResultTypeTemplateMaximum:
             return @"Maximum Security Password";
 
@@ -189,10 +189,10 @@ static NSOperationQueue *_mpwQueue = nil;
 
 - (NSString *)shortNameOfType:(MPResultType)type {
 
-    if (!type)
-        return nil;
-
     switch (type) {
+        case MPResultTypeNone:
+            return @"None";
+
         case MPResultTypeTemplateMaximum:
             return @"Maximum";
 
@@ -237,9 +237,6 @@ static NSOperationQueue *_mpwQueue = nil;
 
 - (Class)classOfType:(MPResultType)type {
 
-    if (!type)
-        Throw( @"No type given." );
-
     switch (type) {
         case MPResultTypeTemplateMaximum:
             return [MPGeneratedSiteEntity class];
@@ -271,6 +268,7 @@ static NSOperationQueue *_mpwQueue = nil;
         case MPResultTypeStatefulDevice:
             return [MPStoredSiteEntity class];
 
+        case MPResultTypeNone:
         case MPResultTypeDeriveKey:
             break;
     }
@@ -322,6 +320,7 @@ static NSOperationQueue *_mpwQueue = nil;
             return MPResultTypeStatefulDevice;
         case MPResultTypeStatefulDevice:
             return MPResultTypeTemplatePhrase;
+        case MPResultTypeNone:
         case MPResultTypeDeriveKey:
             break;
     }
@@ -531,8 +530,13 @@ static NSOperationQueue *_mpwQueue = nil;
             return;
         }
 
-        case MPResultTypeDeriveKey:
+        case MPResultTypeNone:
+        case MPResultTypeDeriveKey: {
+            PearlNotMainQueue( ^{
+                resultBlock( nil );
+            } );
             return;
+        }
     }
 
     Throw( @"Type not supported: %lu", (long)type );
@@ -621,7 +625,7 @@ static NSOperationQueue *_mpwQueue = nil;
 
 - (NSString *)exportLoginForSite:(MPSiteEntity *)site usingKey:(MPKey *)key {
 
-    if (!(site.type & MPSiteFeatureExportContent) || site.loginGenerated || ![site.loginName length])
+    if (site.loginGenerated || ![site.loginName length])
         return nil;
 
     __block NSData *state = nil;

platform-darwin/Source/MPAppDelegate_InApp.m

@@ -117,7 +117,7 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
             [self performPurchaseProductWithIdentifier:productIdentifier quantity:quantity];
         }]];
         [controller addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:controller animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
         return;
     }
 #endif
@@ -158,16 +158,16 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
 
 - (void)request:(SKRequest *)request didFailWithError:(NSError *)error {
 
-    MPError( error, @"StoreKit request (%@) failed.", request );
+    MPError( error, @"StoreKit request failed." );
 
 #if TARGET_OS_IPHONE
     PearlMainQueue( ^{
         UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Purchase Failed" message:
                         strf( @"%@\n\n%@", error.localizedDescription,
-                                @"Ensure you are online and try logging out and back into iTunes from your device's Settings." )
+                                @"Could not reach Apple's iTunes Store.  Make sure you're connected to the Internet and try again." )
                                                                      preferredStyle:UIAlertControllerStyleAlert];
         [controller addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:controller animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
     } );
 #endif
 }
@@ -222,6 +222,17 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
                 MPError( transaction.error, @"Transaction failed: %@.", transaction.payment.productIdentifier );
                 [queue finishTransaction:transaction];
 
+#if TARGET_OS_IPHONE
+                PearlMainQueue( ^{
+                    UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Purchase Failed" message:
+                                    strf( @"%@\n\n%@", transaction.error.localizedDescription,
+                                            @"Could not reach Apple's iTunes Store.  Make sure you're connected to the Internet and try again." )
+                                                                                 preferredStyle:UIAlertControllerStyleAlert];
+                    [controller addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:nil]];
+                    [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
+                } );
+#endif
+
                 SKProduct *product = self.products[transaction.payment.productIdentifier];
                 [Countly.sharedInstance recordEvent:@"purchase" segmentation:@{
                         @"id": product.productIdentifier,

platform-darwin/Source/MPAppDelegate_Key.m

@@ -201,6 +201,7 @@
     }
 
     @try {
+        [SentrySDK setUser:[[SentryUser alloc] initWithUserId:user.userID]];
         [Countly.sharedInstance userLoggedIn:user.userID];
 
         [Countly.sharedInstance recordEvent:@"login" segmentation:@{
@@ -248,18 +249,18 @@
                 masterPassword = PearlAwait( ^(void (^setResult)(id)) {
                     PearlMainQueue( ^{
                         UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Enter Old Master Password" message:
-                                        strf( @"Your old master password is required to migrate the stored password for %@", site.name )
+                                        strf( @"Your old master password is required to unlock the stored password for: <%@>", site.name )
                                                                                      preferredStyle:UIAlertControllerStyleAlert];
                         [controller addTextFieldWithConfigurationHandler:nil];
                         [controller addAction:[UIAlertAction actionWithTitle:@"Migrate" style:UIAlertActionStyleDefault handler:
                                 ^(UIAlertAction *_Nonnull action) {
                                     setResult( controller.textFields.firstObject.text );
                                 }]];
-                        [controller addAction:[UIAlertAction actionWithTitle:@"Don't Migrate" style:UIAlertActionStyleCancel handler:
+                        [controller addAction:[UIAlertAction actionWithTitle:@"Leave It" style:UIAlertActionStyleCancel handler:
                                 ^(UIAlertAction *_Nonnull action) {
                                     setResult( nil );
                                 }]];
-                        [self.navigationController presentViewController:controller animated:YES completion:nil];
+                        [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
                     } );
                 } );
 #endif

platform-darwin/Source/MPAppDelegate_Shared.h

@@ -20,7 +20,7 @@
 
 #if TARGET_OS_IPHONE
 
-@interface MPAppDelegate_Shared : PearlAppDelegate
+@interface MPAppDelegate_Shared : UIResponder<UIApplicationDelegate, PearlConfigDelegate>
 
 #else
 

platform-darwin/Source/MPAppDelegate_Shared.m

@@ -116,9 +116,8 @@ static MPAppDelegate_Shared *instance;
     if (self.activeUserOID == activeUserOID || [self.activeUserOID isEqual:activeUserOID])
         return;
 
-    if (self.key)
-        self.key = nil;
-
+    self.key = nil;
+    [SentrySDK setUser:nil];
     [Countly.sharedInstance userLoggedOut];
 
     self.activeUserOID = activeUserOID;

platform-darwin/Source/MPAppDelegate_Store.h

@@ -30,6 +30,7 @@
 - (id)managedObjectContextChanged:(void ( ^ )(NSDictionary<NSManagedObjectID *, NSString *> *affectedObjects))changedBlock;
 
 - (MPFixableResult)findAndFixInconsistenciesSaveInContext:(NSManagedObjectContext *)context;
+- (void)retryCorruptStore;
 - (void)deleteAndResetStore;
 
 /** @param completion The block to execute after adding the site, executed from the main thread with the new site in the main MOC. */

platform-darwin/Source/MPAppDelegate_Store.m

@@ -19,6 +19,8 @@
 #import "MPAppDelegate_Store.h"
 #import "mpw-marshal.h"
 #import "mpw-util.h"
+#import "MPAppDelegate_InApp.h"
+#import "MPSecrets.h"
 
 #if TARGET_OS_IPHONE
 #define STORE_OPTIONS NSPersistentStoreFileProtectionKey : NSFileProtectionComplete,
@@ -49,7 +51,8 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
 
 + (NSManagedObjectContext *)managedObjectContextForMainThreadIfReady {
 
-    NSAssert( [[NSThread currentThread] isMainThread], @"Can only access main MOC from the main thread." );
+    NSAssert( [[NSThread currentThread] isMainThread], @"Direct access to main MOC only allowed from the main thread." );
+
     NSManagedObjectContext *mainManagedObjectContext = [[self get] mainManagedObjectContextIfReady];
     if (!mainManagedObjectContext || ![[NSThread currentThread] isMainThread])
         return nil;
@@ -154,6 +157,39 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
 - (NSManagedObjectContext *)mainManagedObjectContextIfReady {
 
     [self loadStore];
+
+    if (!self.mainManagedObjectContext && self.privateManagedObjectContext.persistentStoreCoordinator) {
+        self.mainManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
+        self.mainManagedObjectContext.parentContext = self.privateManagedObjectContext;
+        if (@available( iOS 10.0, macOS 10.12, * ))
+            self.mainManagedObjectContext.automaticallyMergesChangesFromParent = YES;
+        else
+            // When privateManagedObjectContext is saved, import the changes into mainManagedObjectContext.
+            PearlAddNotificationObserverTo( self.mainManagedObjectContext, NSManagedObjectContextDidSaveNotification,
+                    self.privateManagedObjectContext, nil, ^(NSManagedObjectContext *mainContext, NSNotification *note) {
+                [mainContext performBlock:^{
+                    @try {
+                        [mainContext mergeChangesFromContextDidSaveNotification:note];
+                    }
+                    @catch (NSException *exception) {
+                        err( @"While merging changes:\n%@", [exception fullDescription] );
+                    }
+                }];
+            } );
+
+#if TARGET_OS_IPHONE
+        PearlAddNotificationObserver( UIApplicationWillResignActiveNotification, UIApp, [NSOperationQueue mainQueue],
+                    ^(MPAppDelegate_Shared *self, NSNotification *note) {
+                        [self.mainManagedObjectContext saveToStore];
+                    } );
+#else
+        PearlAddNotificationObserver( NSApplicationWillResignActiveNotification, NSApp, [NSOperationQueue mainQueue],
+                ^(MPAppDelegate_Shared *self, NSNotification *note) {
+                    [self.mainManagedObjectContext saveToStore];
+                } );
+#endif
+    }
+
     return self.mainManagedObjectContext;
 }
 
@@ -181,12 +217,12 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
     } );
 
     // Do nothing if already fully set up, otherwise (re-)load the store.
-    if (self.storeCoordinator && self.mainManagedObjectContext && self.privateManagedObjectContext)
+    if ([self.storeCoordinator.persistentStores count])
         return;
 
-    [self.storeQueue addOperationWithBlock:^{
+    NSOperation *storeOperation = [NSBlockOperation blockOperationWithBlock:^{
         // Do nothing if already fully set up, otherwise (re-)load the store.
-        if (self.storeCoordinator && self.mainManagedObjectContext && self.privateManagedObjectContext)
+        if ([self.storeCoordinator.persistentStores count])
             return;
 
         // Unregister any existing observers and contexts.
@@ -207,41 +243,15 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         // Check if migration is necessary.
         [self migrateStore];
 
-        // 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;
-        if (@available( iOS 10.0, macOS 10.12, * ))
-            self.mainManagedObjectContext.automaticallyMergesChangesFromParent = YES;
-        else
-            // When privateManagedObjectContext is saved, import the changes into mainManagedObjectContext.
-            PearlAddNotificationObserverTo( self.mainManagedObjectContext, NSManagedObjectContextDidSaveNotification,
-                    self.privateManagedObjectContext, nil, ^(NSManagedObjectContext *mainContext, NSNotification *note) {
-                [mainContext performBlock:^{
-                    @try {
-                        [mainContext mergeChangesFromContextDidSaveNotification:note];
-                    }
-                    @catch (NSException *exception) {
-                        err( @"While merging changes:\n%@", [exception fullDescription] );
-                    }
-                }];
-            } );
-
-
         // Create a new store coordinator.
-        NSError *error = nil;
         NSURL *localStoreURL = [self localStoreURL];
+        NSError *error = nil;
         if (![[NSFileManager defaultManager] createDirectoryAtURL:[localStoreURL URLByDeletingLastPathComponent]
                                       withIntermediateDirectories:YES attributes:nil error:&error]) {
             MPError( error, @"Couldn't create our application support directory." );
             return;
         }
-        if (![self.storeCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:[self localStoreURL]
+        if (![self.storeCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:localStoreURL
                                                        options:@{
                                                                NSMigratePersistentStoresAutomaticallyOption: @YES,
                                                                NSInferMappingModelAutomaticallyOption      : @YES,
@@ -254,17 +264,10 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         }
         self.storeCorrupted = @NO;
 
-#if TARGET_OS_IPHONE
-        PearlAddNotificationObserver( UIApplicationWillResignActiveNotification, UIApp, [NSOperationQueue mainQueue],
-                ^(MPAppDelegate_Shared *self, NSNotification *note) {
-                    [self.mainManagedObjectContext saveToStore];
-                } );
-#else
-        PearlAddNotificationObserver( NSApplicationWillResignActiveNotification, NSApp, [NSOperationQueue mainQueue],
-                ^(MPAppDelegate_Shared *self, NSNotification *note) {
-                    [self.mainManagedObjectContext saveToStore];
-                } );
-#endif
+        // Install managed object contexts and observers.
+        self.privateManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+        self.privateManagedObjectContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy;
+        self.privateManagedObjectContext.persistentStoreCoordinator = self.storeCoordinator;
 
         // Perform a data sanity check on the newly loaded store to find and fix any issues.
         if ([[MPConfig get].checkInconsistency boolValue])
@@ -272,6 +275,14 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                 [self findAndFixInconsistenciesSaveInContext:context];
             }];
     }];
+
+    [self.storeQueue addOperations:@[ storeOperation ] waitUntilFinished:YES];
+}
+
+- (void)retryCorruptStore {
+
+    self.storeCorrupted = @NO;
+    [self loadStore];
 }
 
 - (void)deleteAndResetStore {
@@ -607,7 +618,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
 
         // Find an existing user to update.
         NSError *error = nil;
-        NSFetchRequest *userFetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPUserEntity class] )];
+        NSFetchRequest *userFetchRequest = [MPUserEntity fetchRequest];
         userFetchRequest.predicate = [NSPredicate predicateWithFormat:@"name == %@", @(importUser->fullName)];
         NSArray *users = [context executeFetchRequest:userFetchRequest error:&error];
         if (!users)
@@ -645,7 +656,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
             MPMarshalledSite *importSite = &importUser->sites[s];
 
             // Find an existing site to update.
-            NSFetchRequest *siteFetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPSiteEntity class] )];
+            NSFetchRequest *siteFetchRequest = [MPSiteEntity fetchRequest];
             siteFetchRequest.predicate = [NSPredicate predicateWithFormat:@"name == %@ AND user == %@", @(importSite->siteName), user];
             NSArray *existingSites = [context executeFetchRequest:siteFetchRequest error:&error];
             if (!existingSites)
@@ -710,26 +721,39 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                        error:(__autoreleasing NSError **)error {
 
     MPMarshalledUser *exportUser = NULL;
-    MPMarshalledFile *exportFile = NULL;
+    MPMarshalledFile *exportFile = mpw_marshal_file( NULL, NULL, mpw_marshal_data_new() );
     @try {
         inf( @"Exporting sites, %@, for user: %@", revealPasswords? @"revealing passwords": @"omitting passwords", user.userID );
+        NSString *masterPassword = askExportPassword( user.name );
+        if (!masterPassword) {
+            inf( @"Export cancelled." );
+            return nil;
+        }
+
+        for (NSString *feature in @[ MPProductGenerateLogins, MPProductGenerateAnswers, MPProductOSIntegration, MPProductTouchID ])
+            if ([[MPAppDelegate_Shared get] isFeatureUnlocked:feature])
+                mpw_marshal_data_set_str( digest( strf( @"%@/%@", user.name, feature ) ).UTF8String, exportFile->data,
+                        "user", "_ext_mpw", feature.UTF8String, nil );
+
+        MPKey *key = [[MPKey alloc] initForFullName:user.name withMasterPassword:masterPassword];
         exportUser = mpw_marshal_user( user.name.UTF8String,
-                mpw_masterKeyProvider_str( askExportPassword( user.name ).UTF8String ), user.algorithm.version );
+                mpw_masterKeyProvider_str( masterPassword.UTF8String ), user.algorithm.version );
         exportUser->redacted = !revealPasswords;
         exportUser->avatar = (unsigned int)user.avatar;
         exportUser->keyID = mpw_strdup( [user.keyID encodeHex].UTF8String );
         exportUser->defaultType = user.defaultType;
         exportUser->lastUsed = (time_t)user.lastUsed.timeIntervalSince1970;
 
-        for (MPSiteEntity *site in user.sites) {
+        for (MPSiteEntity *site in [user.sites sortedArrayUsingDescriptors:@[
+                [NSSortDescriptor sortDescriptorWithKey:@"name" ascending:YES]
+        ]]) {
             MPCounterValue counter = MPCounterValueInitial;
             if ([site isKindOfClass:[MPGeneratedSiteEntity class]])
                 counter = ((MPGeneratedSiteEntity *)site).counter;
-            MPMarshalledSite *exportSite = mpw_marshal_site( exportUser,
-                    site.name.UTF8String, site.type, counter, site.algorithm.version );
-            exportSite->resultState = mpw_strdup( [site.algorithm exportPasswordForSite:site usingKey:self.key].UTF8String );
-            exportSite->loginState = mpw_strdup( [site.algorithm exportLoginForSite:site usingKey:self.key].UTF8String );
-            exportSite->loginType = site.loginGenerated? MPResultTypeTemplateName: MPResultTypeStatefulPersonal;
+            MPMarshalledSite *exportSite = mpw_marshal_site( exportUser, site.name.UTF8String, site.type, counter, site.algorithm.version );
+            exportSite->resultState = mpw_strdup( [site.algorithm exportPasswordForSite:site usingKey:key].UTF8String );
+            exportSite->loginState = mpw_strdup( [site.algorithm exportLoginForSite:site usingKey:key].UTF8String );
+            exportSite->loginType = site.loginGenerated || !exportSite->loginState? MPResultTypeTemplateName: MPResultTypeStatefulPersonal;
             exportSite->url = mpw_strdup( site.url.UTF8String );
             exportSite->uses = (unsigned int)site.uses;
             exportSite->lastUsed = (time_t)site.lastUsed.timeIntervalSince1970;

platform-darwin/Source/MPEntities.m

@@ -29,6 +29,8 @@
     if ([self hasChanges])
         [self performBlockAndWait:^{
             @try {
+                [self processPendingChanges];
+
                 NSError *error = nil;
                 if (!(success = [self save:&error]))
                     MPError( error, @"While saving." );

platform-darwin/Source/MPTypes.h

@@ -16,7 +16,9 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+MP_LIBS_BEGIN
 #import <Sentry/Sentry.h>
+MP_LIBS_END
 
 __BEGIN_DECLS
 extern NSString *const MPErrorDomain;
@@ -41,8 +43,9 @@ __END_DECLS
     \
     if (__error && [[MPConfig get].sendInfo boolValue]) { \
         SentryEvent *event = [[SentryEvent alloc] initWithLevel:kSentryLevelError]; \
-        event.message = strf(@"%@: %@", message_, [__error localizedDescription]); \
+        event.message = [[SentryMessage alloc] initWithFormatted:strf( message_ @": %@", ##__VA_ARGS__, [__error localizedDescription])]; \
         event.logger = @"MPError"; \
+        event.fingerprint = @[ message_, __error.domain, @(__error.code) ]; \
         [SentrySDK captureEvent:event]; \
     } \
     __error; \

platform-darwin/Source/Mac/Base.lproj/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.3"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -12,9 +12,6 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <menu title="AMainMenu" systemMenu="main" id="29">
-            <point key="canvasLocation" x="139" y="155"/>
-        </menu>
         <customObject id="494" customClass="MPMacAppDelegate">
             <connections>
                 <outlet property="createUserItem" destination="757" id="763"/>
@@ -202,6 +199,7 @@
                                 </attributedString>
                                 <modifierMask key="keyEquivalentModifierMask"/>
                             </menuItem>
+                            <menuItem isSeparatorItem="YES" id="lhE-aV-1P4"/>
                             <menuItem title="Diagnostics" id="GSN-f0-q7s">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
@@ -219,6 +217,23 @@
                                 </attributedString>
                                 <modifierMask key="keyEquivalentModifierMask"/>
                             </menuItem>
+                            <menuItem title="Copy Device Identifier" id="c2c-Vy-iqg">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="copyIdentifier:" target="494" id="dDF-fR-z6h"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Your anonymous device identifier allows support to find your diagnostic reports." enabled="NO" id="xMa-pq-Bqg">
+                                <attributedString key="attributedTitle">
+                                    <fragment content="Your anonymous device identifier allows support to find your diagnostic reports.">
+                                        <attributes>
+                                            <font key="NSFont" size="11" name="Helvetica"/>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" firstLineHeadIndent="8"/>
+                                        </attributes>
+                                    </fragment>
+                                </attributedString>
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
                         </items>
                     </menu>
                 </menuItem>
@@ -241,6 +256,9 @@
                     </connections>
                 </menuItem>
             </items>
+            <connections>
+                <outlet property="delegate" destination="494" id="Slu-zT-yO4"/>
+            </connections>
             <point key="canvasLocation" x="140" y="23"/>
         </menu>
     </objects>

platform-darwin/Source/Mac/MPMacAppDelegate.h

@@ -21,9 +21,9 @@
 #import "MPSitesWindowController.h"
 #import "MPInitialWindowController.h"
 
-@interface MPMacAppDelegate : MPAppDelegate_Shared<NSApplicationDelegate>
+@interface MPMacAppDelegate : MPAppDelegate_Shared<NSApplicationDelegate, NSMenuDelegate>
 
-@property(nonatomic, strong) NSStatusItem *statusView;
+@property(nonatomic, strong) NSStatusItem *statusItem;
 @property(nonatomic, strong) MPSitesWindowController *sitesWindowController;
 @property(nonatomic, strong) MPInitialWindowController *initialWindowController;
 @property(nonatomic, weak) IBOutlet NSMenuItem *lockItem;
@@ -42,6 +42,7 @@
 - (IBAction)showPasswordWindow:(id)sender;
 - (void)setLoginItemEnabled:(BOOL)enabled;
 - (IBAction)togglePreference:(id)sender;
+- (IBAction)copyIdentifier:(id)sender;
 - (IBAction)newUser:(NSMenuItem *)sender;
 - (IBAction)lock:(id)sender;
 - (IBAction)terminate:(id)sender;

platform-darwin/Source/Mac/MPMacAppDelegate.m

@@ -22,10 +22,12 @@
 #import "MPSecrets.h"
 #import "mpw-marshal.h"
 
+MP_LIBS_BEGIN
 #import <Carbon/Carbon.h>
 #import <ServiceManagement/ServiceManagement.h>
 #import <Sentry/Sentry.h>
 #import <Countly/Countly.h>
+MP_LIBS_END
 
 #define LOGIN_HELPER_BUNDLE_ID @"com.lyndir.lhunath.MasterPassword.Mac.LoginHelper"
 
@@ -68,10 +70,10 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
     @try {
         // Sentry
-        [SentrySDK initWithOptions:@{
+        [SentrySDK startWithOptions:@{
                 @"dsn"                      : NilToNSNull( decrypt( sentryDSN ) ),
 #ifdef DEBUG
-                @"debug"                    : @(YES),
+                @"debug"                    : @(NO),
                 @"environment"              : @"Development",
 #elif PUBLIC
                 @"debug"                    : @(NO),
@@ -80,7 +82,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
                 @"debug"                    : @(NO),
                 @"environment"              : @"Private",
 #endif
-                @"enabled"                  : [MPMacConfig get].sendInfo,
+                @"enabled"                  : @([[MPMacConfig get].sendInfo boolValue] || ![[MPMacConfig get].sendInfoDecided boolValue]),
                 @"enableAutoSessionTracking": @(YES),
         }];
         [[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) {
@@ -158,12 +160,10 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     }           forKeyPath:@"activeUser" options:0 context:nil];
 
     // Status item.
-    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 );
+    self.statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
+    self.statusItem.menu = self.statusMenu;
+    self.statusItem.button.image = [NSImage imageNamed:@"menu-icon"];
+    self.statusItem.button.image.template = YES;
 
     PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresWillChangeNotification, self.storeCoordinator, nil,
             ^(id self, NSNotification *note) {
@@ -435,6 +435,12 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     [self updateMenuItems];
 }
 
+- (IBAction)copyIdentifier:(id)sender {
+    [[NSPasteboard generalPasteboard] declareTypes:@[ NSStringPboardType ] owner:nil];
+    if (![[NSPasteboard generalPasteboard] setString:[PearlKeyChain deviceIdentifier] forType:NSPasteboardTypeString])
+        wrn( @"Couldn't copy device identifier to pasteboard." );
+}
+
 - (IBAction)newUser:(NSMenuItem *)sender {
 
     NSAlert *alert = [NSAlert new];
@@ -502,7 +508,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
 - (IBAction)showPopup:(id)sender {
 
-    [self.statusView popUpStatusItemMenu:self.statusView.menu];
+    [[self.statusItem button] performClick:sender];
 }
 
 - (IBAction)showPasswordWindow:(id)sender {
@@ -546,15 +552,6 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
         return;
     }
 
-    if (!self.key) {
-        NSAlert *alert = [NSAlert new];
-        alert.messageText = @"User Locked";
-        alert.informativeText = @"To export your sites, first unlock your user by opening Master Password.";
-        [alert runModal];
-        [self showPopup:nil];
-        return;
-    }
-
     NSDateFormatter *exportDateFormatter = [NSDateFormatter new];
     [exportDateFormatter setDateFormat:@"yyyy'-'MM'-'dd"];
 
@@ -579,43 +576,46 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     if ([savePanel runModal] == NSFileHandlingPanelCancelButton)
         return;
 
-    [self exportSitesRevealPasswords:revealPasswords
-                   askExportPassword:^NSString *(NSString *userName) {
-                       return PearlMainQueueAwait( ^id {
-                           NSAlert *alert = [NSAlert new];
-                           [alert addButtonWithTitle:@"Import"];
-                           [alert addButtonWithTitle:@"Cancel"];
-                           alert.messageText = strf( @"Master Password For\n%@", userName );
-                           alert.informativeText = @"Enter the current master password for this user.";
-                           alert.accessoryView = [[NSSecureTextField alloc] initWithFrame:NSMakeRect( 0, 0, 200, 22 )];
-                           [alert layout];
-                           if ([alert runModal] == NSAlertFirstButtonReturn)
-                               return ((NSTextField *)alert.accessoryView).stringValue;
-                           else
-                               return nil;
-                       } );
-                   } result:^(NSString *mpsites, NSError *error) {
-                if (!mpsites || error) {
-                    PearlMainQueue( ^{
-                        [[NSAlert alertWithError:MPError( error, @"Failed to export mpsites." )] runModal];
+    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+        NSError *error = nil;
+        NSString *exportedUser = [self exportSitesFor:[self activeUserInContext:context] revealPasswords:revealPasswords askExportPassword:
+                ^NSString *(NSString *userName) {
+                    return PearlMainQueueAwait( ^id {
+                        NSAlert *alert = [NSAlert new];
+                        [alert addButtonWithTitle:@"Export"];
+                        [alert addButtonWithTitle:@"Cancel"];
+                        alert.messageText = strf( @"Master Password For\n%@", userName );
+                        alert.informativeText = @"Enter the current master password for this user.";
+                        alert.accessoryView = [[NSSecureTextField alloc] initWithFrame:NSMakeRect( 0, 0, 200, 22 )];
+                        [alert layout];
+                        if ([alert runModal] == NSAlertFirstButtonReturn)
+                            return ((NSTextField *)alert.accessoryView).stringValue;
+                        else
+                            return nil;
                     } );
-                    return;
-                }
+                }                               error:&error];
 
-                NSError *coordinateError = nil;
-                [[[NSFileCoordinator alloc] initWithFilePresenter:nil]
-                        coordinateWritingItemAtURL:savePanel.URL options:0 error:&coordinateError byAccessor:^(NSURL *newURL) {
-                    NSError *writeError = nil;
-                    if (![mpsites writeToURL:newURL atomically:NO encoding:NSUTF8StringEncoding error:&writeError])
-                        PearlMainQueue( ^{
-                            [[NSAlert alertWithError:MPError( writeError, @"Could not write to the export file." )] runModal];
-                        } );
-                }];
-                if (coordinateError)
-                    PearlMainQueue( ^{
-                        [[NSAlert alertWithError:MPError( coordinateError, @"Could not gain access to the export file." )] runModal];
-                    } );
-            }];
+        if (error)
+            PearlMainQueue( ^{
+                [[NSAlert alertWithError:MPError( error, @"Failed to export mpsites." )] runModal];
+            } );
+        if (!exportedUser)
+            return;
+
+        NSError *coordinateError = nil;
+        [[[NSFileCoordinator alloc] initWithFilePresenter:nil]
+                coordinateWritingItemAtURL:savePanel.URL options:0 error:&coordinateError byAccessor:^(NSURL *newURL) {
+            NSError *writeError = nil;
+            if (![exportedUser writeToURL:newURL atomically:NO encoding:NSUTF8StringEncoding error:&writeError])
+                PearlMainQueue( ^{
+                    [[NSAlert alertWithError:MPError( writeError, @"Could not write to the export file." )] runModal];
+                } );
+        }];
+        if (coordinateError)
+            PearlMainQueue( ^{
+                [[NSAlert alertWithError:MPError( coordinateError, @"Could not gain access to the export file." )] runModal];
+            } );
+    }];
 }
 
 - (void)updateUsers {
@@ -652,7 +652,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     self.deleteUserItem.toolTip = mainActiveUser? nil: @"First select the user to delete.";
 
     NSError *error = nil;
-    NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPUserEntity class] )];
+    NSFetchRequest *fetchRequest = [MPUserEntity fetchRequest];
     fetchRequest.sortDescriptors = @[ [NSSortDescriptor sortDescriptorWithKey:@"lastUsed" ascending:NO] ];
     NSArray *users = [mainContext executeFetchRequest:fetchRequest error:&error];
     if (!users)
@@ -688,13 +688,6 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     [self updateMenuItems];
 }
 
-- (void)showMenu {
-
-    [self updateMenuItems];
-
-    [self.statusView popUpStatusItemMenu:self.statusView.menu];
-}
-
 - (void)updateMenuItems {
 
     MPUserEntity *activeUser = [self activeUserForMainThread];
@@ -749,6 +742,13 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     }
 }
 
+#pragma mark - NSMenuDelegate
+
+- (void)menuNeedsUpdate:(NSMenu *)menu {
+
+    [self updateMenuItems];
+}
+
 #pragma mark - PearlConfigDelegate
 
 - (void)didUpdateConfigForKey:(SEL)configKey fromValue:(id)oldValue {
@@ -769,13 +769,9 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
     // Send info
     NSArray *countlyFeatures = @[
-            CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating
+            CLYConsentSessions, CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating
     ];
-    if ([[MPConfig get].sendInfo boolValue] || ![[MPConfig get].sendInfoDecided boolValue])
-        [Countly.sharedInstance giveConsentForFeature:CLYConsentSessions];
-    else
-        [Countly.sharedInstance cancelConsentForFeature:CLYConsentSessions];
-    if ([[MPMacConfig get].sendInfo boolValue]) {
+    if ([[MPMacConfig get].sendInfo boolValue] || ![[MPMacConfig get].sendInfoDecided boolValue]) {
         if ([PearlLogger get].printLevel > PearlLogLevelInfo)
             [PearlLogger get].printLevel = PearlLogLevelInfo;
 

platform-darwin/Source/Mac/MPSiteModel.h

@@ -45,7 +45,7 @@
 @property(nonatomic, readonly) BOOL stored;
 @property(nonatomic, readonly) BOOL transient;
 
-- (instancetype)initWithEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups;
+- (instancetype)initWithEntity:(MPSiteEntity *)entity queryGroups:(NSArray *)queryGroups;
 - (instancetype)initWithName:(NSString *)siteName forUser:(MPUserEntity *)user;
 - (MPSiteEntity *)entityInContext:(NSManagedObjectContext *)moc;
 

platform-darwin/Source/Mac/MPSiteModel.m

@@ -31,12 +31,12 @@
 
 @implementation MPSiteModel
 
-- (instancetype)initWithEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups {
+- (instancetype)initWithEntity:(MPSiteEntity *)entity queryGroups:(NSArray *)queryGroups {
 
     if (!(self = [super init]))
         return nil;
 
-    [self setEntity:entity fuzzyGroups:fuzzyGroups];
+    [self setEntity:entity queryGroups:queryGroups];
     self.initialized = YES;
 
     return self;
@@ -53,23 +53,25 @@
     return self;
 }
 
-- (void)setEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups {
+- (void)setEntity:(MPSiteEntity *)entity queryGroups:(NSArray *)queryGroups {
 
     if ([self.entityOID isEqual:entity.permanentObjectID])
         return;
     self.entityOID = entity.permanentObjectID;
 
     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;
+    NSMutableAttributedString *attributedSiteName = [[NSMutableAttributedString alloc] initWithString:siteName?: @""];
+    if ([attributedSiteName length])
+        for (NSUInteger f = 0, s = 0; f < [queryGroups count]; ++f, ++s) {
+            s = [siteName rangeOfString:queryGroups[f] options:NSDiacriticInsensitiveSearch | NSCaseInsensitiveSearch
+                                  range:NSMakeRange( s, [siteName length] - s )].location;
+            if (s == NSNotFound)
+                break;
+
+            [attributedSiteName addAttribute:NSBackgroundColorAttributeName value:[NSColor alternateSelectedControlColor]
+                                       range:NSMakeRange( s, [queryGroups[f] length] )];
+        }
 
-        [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] )];
@@ -179,7 +181,8 @@
     if (algorithmVersion == self.algorithm.version)
         return;
     [self willChangeValueForKey:@"outdated"];
-    self.algorithm = MPAlgorithmForVersion( algorithmVersion )?: self.algorithm;
+    self.algorithm =
+            MPAlgorithmForVersion( MIN( MPAlgorithmVersionLast, MAX( MPAlgorithmVersionFirst, algorithmVersion ) ) )?: self.algorithm;
     [self didChangeValueForKey:@"outdated"];
 
     if (self.entityOID)
@@ -210,12 +213,12 @@
 
 - (BOOL)generated {
 
-    return self.type & MPResultTypeClassTemplate;
+    return (self.type & MPResultTypeClassTemplate) == MPResultTypeClassTemplate;
 }
 
 - (BOOL)stored {
 
-    return self.type & MPResultTypeClassStateful;
+    return (self.type & MPResultTypeClassStateful) == MPResultTypeClassStateful;
 }
 
 - (BOOL)transient {

platform-darwin/Source/Mac/MPSitesWindowController.m

@@ -18,6 +18,7 @@
 
 #import <QuartzCore/QuartzCore.h>
 #import <Countly/Countly.h>
+#import <UserNotifications/UserNotifications.h>
 #import "MPSitesWindowController.h"
 #import "MPMacAppDelegate.h"
 #import "MPAppDelegate_Store.h"
@@ -52,13 +53,10 @@
 
                 if (![[MPMacConfig get].sendInfoDecided boolValue]) {
                     NSAlert *alert = [NSAlert new];
-                    alert.messageText = @"Welcome to Master Password!";
-                    alert.informativeText = @"We want you to have a top-notch experience.\n"
-                                            @"Using diagnostics, we ensure the application keeps working as designed for you.\n"
-                                            @"\n"
-                                            @"We look out for application bugs, runtime issues, sudden crashes & usage counters.\n"
-                                            @"Needless to say, diagnostics are always scrubbed and personal details will never leave your device.";
-                    [alert addButtonWithTitle:@"Thanks!"];
+                    alert.messageText = @"Diagnostics";
+                    alert.informativeText = @"We look for bugs, sudden crashes, runtime issues & statistics.\n\n"
+                                            @"Diagnostics are scrubbed and personal details will never leave your device.";
+                    [alert addButtonWithTitle:@"Engage"];
                     [alert addButtonWithTitle:@"Disable"];
                     [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
                         [MPMacConfig get].sendInfo = @(returnCode != NSAlertSecondButtonReturn);
@@ -99,7 +97,16 @@
     self.siteTable.superview.superview.layer.mask = self.siteGradient;
 
     self.siteTable.controller = self;
-    prof_finish( @"ui" );
+    prof_rewind( @"ui" );
+
+    if (@available( macOS 10.14, * )) {
+        [[UNUserNotificationCenter currentNotificationCenter]
+                requestAuthorizationWithOptions:UNAuthorizationOptionAlert completionHandler:^(BOOL granted, NSError *error) {
+            if (!granted)
+                err( @"Couldn't obtain notification authorization: %@", error );
+        }];
+    }
+    prof_finish( @"notifications" );
 }
 
 - (void)dealloc {
@@ -550,13 +557,19 @@
     [self copyContent:self.shiftPressed? selectedSite.loginName: selectedSite.content];
     [NSApp hide:nil];
 
-    NSUserNotification *notification = [NSUserNotification new];
-    notification.title = @"Password Copied";
-    if (selectedSite.loginName.length)
-        notification.subtitle = strf( @"%@ at %@", selectedSite.loginName, selectedSite.name );
-    else
-        notification.subtitle = selectedSite.name;
-    [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+    if (@available( macOS 10.14, * )) {
+        UNMutableNotificationContent *notification = [UNMutableNotificationContent new];
+        notification.title = self.shiftPressed? @"Login Copied": @"Password Copied";
+        if (selectedSite.loginName.length)
+            notification.subtitle = strf( @"%@ at %@", selectedSite.loginName, selectedSite.name );
+        else
+            notification.subtitle = selectedSite.name;
+        [[UNUserNotificationCenter currentNotificationCenter] addNotificationRequest:
+                        [UNNotificationRequest requestWithIdentifier:selectedSite.name content:notification trigger:nil]
+                                                               withCompletionHandler:^(NSError *error) {
+                                                                   dbg( @"notification: %@, completed w/errror: %@", notification, error );
+                                                               }];
+    }
 }
 
 - (void)updateUser {
@@ -598,26 +611,24 @@
         return;
     }
 
-    static NSRegularExpression *fuzzyRE;
-    static dispatch_once_t once = 0;
-    dispatch_once( &once, ^{
-        fuzzyRE = [NSRegularExpression regularExpressionWithPattern:@"(.)" options:0 error:nil];
-    } );
-
     prof_new( @"updateSites" );
     NSString *queryString = self.siteField.stringValue;
-    NSString *queryPattern = [[queryString stringByReplacingMatchesOfExpression:fuzzyRE withTemplate:@"*$1"] stringByAppendingString:@"*"];
+    NSMutableArray *queryGroups = [NSMutableArray new];
+    NSMutableString *queryPattern = [NSMutableString new];
+    [queryString enumerateSubstringsInRange: NSMakeRange(0, [queryString length]) options: NSStringEnumerationByComposedCharacterSequences
+                                 usingBlock: ^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
+                                     if (substringRange.location < 20) {
+                                         [queryGroups addObject:substring];
+                                         [queryPattern appendString:@"*"];
+                                     }
+                                     [queryPattern appendString:substring];
+                                 }];
+    [queryPattern appendString:@"*"];
     prof_rewind( @"queryPattern" );
-    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]];
-                           }];
-    prof_rewind( @"fuzzyRE" );
     [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
         prof_rewind( @"moc" );
 
-        NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPSiteEntity class] )];
+        NSFetchRequest *fetchRequest = [MPSiteEntity fetchRequest];
         fetchRequest.sortDescriptors = @[ [[NSSortDescriptor alloc] initWithKey:@"lastUsed" ascending:NO] ];
         fetchRequest.predicate =
                 [NSPredicate predicateWithFormat:@"name LIKE[cd] %@ AND user == %@", queryPattern, [MPMacAppDelegate get].activeUserOID];
@@ -635,7 +646,7 @@
         BOOL exact = NO;
         NSMutableArray *newSites = [NSMutableArray arrayWithCapacity:[siteResults count]];
         for (MPSiteEntity *site in siteResults) {
-            [newSites addObject:[[MPSiteModel alloc] initWithEntity:site fuzzyGroups:fuzzyGroups]];
+            [newSites addObject:[[MPSiteModel alloc] initWithEntity:site queryGroups:queryGroups]];
             exact |= [site.name isEqualToString:queryString];
         }
         prof_rewind( @"newSites: %u, exact: %d", (uint)[siteResults count], exact );

platform-darwin/Source/Mac/MPSitesWindowController.xib

@@ -722,7 +722,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                                 <shadow key="shadow">
                                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                                 </shadow>
-                                                <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="73y-03-zHt"/>
+                                                <stepperCell key="cell" continuous="YES" alignment="left" maxValue="4294967295" doubleValue="1" valueWraps="YES" id="73y-03-zHt"/>
                                                 <connections>
                                                     <binding destination="mcS-ik-b0n" name="value" keyPath="selection.algorithmVersion" id="GyA-hK-6cD"/>
                                                 </connections>
@@ -776,7 +776,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                                 <shadow key="shadow">
                                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                                 </shadow>
-                                                <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="ikF-n4-xiI"/>
+                                                <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="4294967295" doubleValue="1" valueWraps="YES" id="ikF-n4-xiI"/>
                                                 <connections>
                                                     <binding destination="mcS-ik-b0n" name="value" keyPath="selection.counter" id="qmm-6z-boy"/>
                                                 </connections>

platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj

@@ -102,7 +102,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = MP;
-				LastUpgradeCheck = 1140;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Maarten Billemont";
 				TargetAttributes = {
 					DAD9B5C0176299B9001835F9 = {
@@ -185,6 +185,7 @@
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = NO;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
@@ -271,6 +272,7 @@
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = NO;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;

platform-darwin/Source/iOS/MPAvatarCell.m

@@ -58,22 +58,6 @@ const long MPAvatarAdd = 10000;
     self.avatarImageView.layer.masksToBounds = NO;
     self.avatarImageView.backgroundColor = [UIColor clearColor];
 
-    [self observeKeyPath:@"bounds" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) {
-        self.contentView.frame = self.bounds;
-    }];
-    [self observeKeyPath:@"selected" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) {
-        [self updateAnimated:self.superview != nil];
-    }];
-    [self observeKeyPath:@"highlighted" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) {
-        [self updateAnimated:self.superview != nil];
-    }];
-    PearlAddNotificationObserver( UIKeyboardWillShowNotification, nil, [NSOperationQueue mainQueue],
-            ^(MPAvatarCell *self, NSNotification *note) {
-                CGRect keyboardRect = [note.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
-                CGFloat keyboardHeight = CGRectGetHeight( self.window.screen.bounds ) - CGRectGetMinY( keyboardRect );
-                [self.keyboardHeightConstraint updateConstant:keyboardHeight];
-            } );
-
     CABasicAnimation *toShadowOpacityAnimation = [CABasicAnimation animationWithKeyPath:@"shadowOpacity"];
     toShadowOpacityAnimation.toValue = @0.2f;
     toShadowOpacityAnimation.duration = 0.5f;
@@ -91,6 +75,22 @@ const long MPAvatarAdd = 10000;
     self.targetedShadowAnimation.duration = MAXFLOAT;
     self.avatarImageView.layer.shadowColor = [UIColor whiteColor].CGColor;
     self.avatarImageView.layer.shadowOffset = CGSizeZero;
+
+    [self observeKeyPath:@"bounds" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) {
+        self.contentView.frame = self.bounds;
+    }];
+    [self observeKeyPath:@"selected" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) {
+        [self updateAnimated:self.superview != nil];
+    }];
+    [self observeKeyPath:@"highlighted" withBlock:^(id from, id to, NSKeyValueChange cause, MPAvatarCell *self) {
+        [self updateAnimated:self.superview != nil];
+    }];
+    PearlAddNotificationObserver( UIKeyboardWillShowNotification, nil, [NSOperationQueue mainQueue],
+            ^(MPAvatarCell *self, NSNotification *note) {
+                CGRect keyboardRect = [note.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+                CGFloat keyboardHeight = CGRectGetHeight( self.window.screen.bounds ) - CGRectGetMinY( keyboardRect );
+                [self.keyboardHeightConstraint updateConstant:keyboardHeight];
+            } );
 }
 
 - (void)prepareForReuse {

platform-darwin/Source/iOS/MPCombinedViewController.m

@@ -31,7 +31,6 @@
     [super viewDidLoad];
 
     self.mode = MPCombinedModeUserSelection;
-    [self performSegueWithIdentifier:@"users" sender:self];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -125,7 +124,7 @@
 
     switch (self.mode) {
         case MPCombinedModeUserSelection: {
-            self.usersVC.view.userInteractionEnabled = YES;
+            self.usersVC.userSelectionContainer.userInteractionEnabled = YES;
             [self.usersVC setActive:YES animated:animated];
             if (self.sitesVC) {
                 MPSitesSegue *segue = [[MPSitesSegue alloc] initWithIdentifier:@"passwords" source:self.sitesVC destination:self];
@@ -135,7 +134,7 @@
             break;
         }
         case MPCombinedModePasswordSelection: {
-            self.usersVC.view.userInteractionEnabled = NO;
+            self.usersVC.userSelectionContainer.userInteractionEnabled = NO;
             [self.usersVC setActive:NO animated:animated];
             [self performSegueWithIdentifier:@"passwords" sender:@{ @"animated": @(animated) }];
             break;

platform-darwin/Source/iOS/MPEmergencyViewController.h

@@ -30,8 +30,10 @@
 @property(weak, nonatomic) IBOutlet UIActivityIndicatorView *activity;
 @property(weak, nonatomic) IBOutlet UIButton *passwordButton;
 @property(weak, nonatomic) IBOutlet UIView *tipContainer;
+@property(weak, nonatomic) IBOutlet UIButton *deviceButton;
 
 - (IBAction)controlChanged:(UIControl *)control;
 - (IBAction)copyPassword:(UITapGestureRecognizer *)recognizer;
+- (IBAction)copyDevice:(id)sender;
 
 @end

platform-darwin/Source/iOS/MPEmergencyViewController.m

@@ -38,6 +38,8 @@
 
     self.view.backgroundColor = [UIColor clearColor];
     self.dialogView.layer.cornerRadius = 5;
+
+    [self.deviceButton setTitle:[PearlKeyChain deviceIdentifier] forState:UIControlStateNormal];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -112,6 +114,11 @@
     }];
 }
 
+- (IBAction)copyDevice:(id)sender {
+    [UIPasteboard generalPasteboard].string = [PearlKeyChain deviceIdentifier];
+    [PearlOverlay showTemporaryOverlayWithTitle:strl( @"Device Identifier Copied" ) dismissAfter:2];
+}
+
 #pragma mark - Private
 
 - (void)updateKey {

platform-darwin/Source/iOS/MPGuideViewController.m

@@ -17,7 +17,6 @@
 //==============================================================================
 
 #import "MPGuideViewController.h"
-#import "markdown_lib.h"
 #import "NSString+MPMarkDown.h"
 
 @interface MPGuideStep : NSObject

platform-darwin/Source/iOS/MPOverlayViewController.m

@@ -33,13 +33,6 @@
     self.dismissSegueByButton = [NSMutableDictionary dictionary];
 }
 
-- (void)viewDidLoad {
-
-    [super viewDidLoad];
-
-    [self performSegueWithIdentifier:@"root" sender:self];
-}
-
 - (UIViewController *)childViewControllerForStatusBarStyle {
 
     return [self.childViewControllers lastObject];

platform-darwin/Source/iOS/MPRootSegue.h

@@ -1,23 +0,0 @@
-//==============================================================================
-// This file is part of Master Password.
-// Copyright (c) 2011-2017, Maarten Billemont.
-//
-// Master Password is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Master Password is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You can find a copy of the GNU General Public License in the
-// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
-//==============================================================================
-
-#import <Foundation/Foundation.h>
-
-@interface MPRootSegue : UIStoryboardSegue
-
-@end

platform-darwin/Source/iOS/MPRootSegue.m

@@ -1,35 +0,0 @@
-//==============================================================================
-// This file is part of Master Password.
-// Copyright (c) 2011-2017, Maarten Billemont.
-//
-// Master Password is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Master Password is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You can find a copy of the GNU General Public License in the
-// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
-//==============================================================================
-
-#import "MPRootSegue.h"
-
-@implementation MPRootSegue
-
-- (void)perform {
-
-    UIViewController *sourceViewController = self.sourceViewController;
-    UIViewController *destinationViewController = self.destinationViewController;
-    [sourceViewController addChildViewController:destinationViewController];
-    destinationViewController.view.frame = sourceViewController.view.bounds;
-    destinationViewController.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    [sourceViewController.view addSubview:destinationViewController.view];
-    [destinationViewController didMoveToParentViewController:sourceViewController];
-    [sourceViewController setNeedsStatusBarAppearanceUpdate];
-}
-
-@end

platform-darwin/Source/iOS/MPSiteCell.h

@@ -27,7 +27,7 @@ typedef NS_ENUM ( NSUInteger, MPSiteCellMode ) {
 
 @interface MPSiteCell : MPCell<UIScrollViewDelegate, UITextFieldDelegate>
 
-@property(nonatomic) NSArray *fuzzyGroups;
+@property(nonatomic) NSArray *queryGroups;
 
 - (void)setSite:(MPSiteEntity *)site animated:(BOOL)animated;
 - (void)setTransientSite:(NSString *)siteName animated:(BOOL)animated;

platform-darwin/Source/iOS/MPSiteCell.m

@@ -135,7 +135,7 @@
     [super prepareForReuse];
 
     self.siteOID = nil;
-    self.fuzzyGroups = nil;
+    self.queryGroups = nil;
     self.transientSite = nil;
     self.mode = MPPasswordCellModePassword;
     [self updateAnimated:NO];
@@ -150,11 +150,11 @@
 
 #pragma mark - State
 
-- (void)setFuzzyGroups:(NSArray *)fuzzyGroups {
+- (void)setQueryGroups:(NSArray *)queryGroups {
 
-    if (self.fuzzyGroups == fuzzyGroups)
+    if (self.queryGroups == queryGroups)
         return;
-    _fuzzyGroups = fuzzyGroups;
+    _queryGroups = queryGroups;
 
     [self updateSiteName:[self siteInContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]]];
 }
@@ -263,6 +263,7 @@
 
     UIAlertController *controller = [UIAlertController alertControllerWithTitle:strf( @"Delete %@?", site.name ) message:nil
                                                                  preferredStyle:UIAlertControllerStyleActionSheet];
+    [controller.popoverPresentationController setSourceView:sender];
     [controller addAction:[UIAlertAction actionWithTitle:@"Delete Site" style:UIAlertActionStyleDestructive
                                                  handler:^(UIAlertAction *_Nonnull action) {
                                                      [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
@@ -284,6 +285,7 @@
     MPSiteEntity *mainSite = [self siteInContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]];
     UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Change Password Type" message:nil
                                                                  preferredStyle:UIAlertControllerStyleActionSheet];
+    [controller.popoverPresentationController setSourceView:sender];
     for (NSNumber *typeNumber in [mainSite.algorithm allTypes]) {
         MPResultType type = (MPResultType)[typeNumber unsignedIntegerValue];
         NSString *typeName = [mainSite.algorithm nameOfType:type];
@@ -425,7 +427,7 @@
         if (!site || ![site isKindOfClass:[MPGeneratedSiteEntity class]])
             return;
 
-        ((MPGeneratedSiteEntity *)site).counter = 1;
+        ((MPGeneratedSiteEntity *)site).counter = MPCounterValueInitial;
         [context saveToStore];
 
         [PearlOverlay showTemporaryOverlayWithTitle:@"Counter Reset" dismissAfter:2];
@@ -433,7 +435,7 @@
     }];
 }
 
-- (IBAction)doContent:(id)sender {
+- (IBAction)doContent:(UIButton *)sender {
 
     [UIView animateWithDuration:.2f animations:^{
         self.contentButton.selected = YES;
@@ -444,6 +446,7 @@
         UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Create Site" message:
                         strf( @"Remember site named:\n%@", self.transientSite )
                                                                      preferredStyle:UIAlertControllerStyleActionSheet];
+        [controller.popoverPresentationController setSourceView:sender];
         [controller addAction:[UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:
                 ^(UIAlertAction *_Nonnull action) {
                     [[MPiOSAppDelegate get]
@@ -534,13 +537,13 @@
 
     // UI
     //self.backgroundColor = mainSite.url? [UIColor greenColor]: [UIColor redColor];
-    self.upgradeButton.gone = !mainSite.requiresExplicitMigration && ![[MPiOSConfig get].allowDowngrade boolValue];
-    self.answersButton.gone = ![[MPiOSAppDelegate get] isFeatureUnlocked:MPProductGenerateAnswers];
+    self.upgradeButton.visible = mainSite.requiresExplicitMigration || [[MPiOSConfig get].allowDowngrade boolValue];
+    self.answersButton.visible = [[MPiOSAppDelegate get] isFeatureUnlocked:MPProductGenerateAnswers];
     BOOL settingsMode = self.mode == MPPasswordCellModeSettings;
     self.loginNameContainer.visible = settingsMode || mainSite.loginGenerated || [mainSite.loginName length];
     self.modeButton.visible = !self.transientSite;
     self.modeButton.alpha = settingsMode? 0.5f: 0.1f;
-    self.counterLabel.visible = self.counterButton.visible = mainSite.type & MPResultTypeClassTemplate;
+    self.counterLabel.visible = self.counterButton.visible = (mainSite.type & MPResultTypeClassTemplate) == MPResultTypeClassTemplate;
     self.modeButton.selected = settingsMode;
     self.strengthLabel.gone = !settingsMode;
     self.modeScrollView.scrollEnabled = !self.transientSite;
@@ -653,14 +656,14 @@
     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;
+        for (NSUInteger f = 0, s = 0; f < [self.queryGroups count]; ++f, ++s) {
+            s = [siteName rangeOfString:self.queryGroups[f] options:NSDiacriticInsensitiveSearch | NSCaseInsensitiveSearch
+                                  range:NSMakeRange( s, [siteName length] - s )].location;
             if (s == NSNotFound)
                 break;
 
             [attributedSiteName addAttribute:NSBackgroundColorAttributeName value:[UIColor redColor]
-                                       range:NSMakeRange( s, [self.fuzzyGroups[f] length] )];
+                                       range:NSMakeRange( s, [self.queryGroups[f] length] )];
         }
 
     if (self.transientSite)

platform-darwin/Source/iOS/MPSitesSegue.m

@@ -43,7 +43,7 @@
         UIView *sitesView = sitesVC.view;
         sitesView.frame = combinedVC.view.bounds;
         sitesView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-        [combinedVC.view insertSubview:sitesView belowSubview:combinedVC.usersVC.view];
+        [combinedVC.view insertSubview:sitesView belowSubview:combinedVC.usersVC.view.superview];
 
         [sitesVC setActive:YES animated:self.animated completion:^(BOOL finished) {
             if (!finished)

platform-darwin/Source/iOS/MPSitesViewController.h

@@ -30,8 +30,6 @@
 @property(nonatomic, strong) IBOutlet UIView *badNameTipContainer;
 @property(nonatomic, strong) IBOutlet UIView *popdownView;
 @property(nonatomic, strong) IBOutlet UIView *popdownContainer;
-@property(nonatomic, strong) IBOutlet UIView *voltoInstallAlert;
-@property(nonatomic, strong) IBOutlet UIView *voltoMigrateAlert;
 
 @property(assign, nonatomic) BOOL active;
 
@@ -39,6 +37,5 @@
 - (void)reloadSites;
 
 - (IBAction)dismissPopdown:(id)sender;
-- (IBAction)upgradeVolto:(UIButton *)sender;
 
 @end

platform-darwin/Source/iOS/MPSitesViewController.m

@@ -16,7 +16,9 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+MP_LIBS_BEGIN
 #import <StoreKit/StoreKit.h>
+MP_LIBS_END
 
 #import "MPSitesViewController.h"
 #import "MPiOSAppDelegate.h"
@@ -36,7 +38,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 @interface MPSitesViewController()<NSFetchedResultsControllerDelegate>
 
 @property(nonatomic, strong) NSFetchedResultsController *fetchedResultsController;
-@property(nonatomic, strong) NSArray *fuzzyGroups;
+@property(nonatomic, strong) NSArray *queryGroups;
 @property(nonatomic, strong) NSCharacterSet *siteNameAcceptableCharactersSet;
 @property(nonatomic, strong) NSMutableArray<NSMutableArray *> *dataSource;
 @property(nonatomic, weak) UIViewController *popdownVC;
@@ -72,7 +74,6 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 
     [self registerObservers];
     [self updateConfigKey:nil];
-    [self updateVoltoAlerts];
 
     static NSRegularExpression *bareHostRE = nil;
     static dispatch_once_t once = 0;
@@ -120,12 +121,14 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     PearlRemoveNotificationObservers();
 }
 
-- (void)viewWillLayoutSubviews {
+- (void)viewDidLayoutSubviews {
 
-    self.collectionView.contentInset = [self.collectionView occludedInsets];
-    self.collectionView.scrollIndicatorInsets = self.collectionView.contentInset;
+    [super viewDidLayoutSubviews];
 
-    [super viewWillLayoutSubviews];
+    if (@available( iOS 11, * )) {
+        self.collectionView.layoutMargins =
+                UIEdgeInsetsMake( [self.collectionView occludedInsets].top - self.view.safeAreaInsets.top, 0, 0, 0 );
+    }
 }
 
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
@@ -160,7 +163,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
 
     MPSiteCell *cell = [MPSiteCell dequeueFromCollectionView:collectionView indexPath:indexPath];
-    [cell setFuzzyGroups:self.fuzzyGroups];
+    [cell setQueryGroups:self.queryGroups];
     id item = self.dataSource[(NSUInteger)indexPath.section][(NSUInteger)indexPath.item];
     if ([item isKindOfClass:[MPSiteEntity class]])
         [cell setSite:item animated:NO];
@@ -170,6 +173,19 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     return cell;
 }
 
+#pragma mark - UICollectionViewDelegateFlowLayout
+
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout
+  sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
+
+    UICollectionViewFlowLayout *layout = (UICollectionViewFlowLayout *)collectionViewLayout;
+    CGFloat availableWidth = collectionView.bounds.size.width
+                             - collectionView.layoutMargins.left - collectionView.layoutMargins.right
+                             - layout.sectionInset.left - layout.sectionInset.right;
+    CGFloat cells = MAX( 1, (int)((availableWidth + layout.minimumInteritemSpacing) / (318 + layout.minimumInteritemSpacing)) );
+    return CGSizeMake( (availableWidth - layout.minimumInteritemSpacing * (cells - 1)) / cells, 100 );
+}
+
 #pragma mark - UIScrollDelegate
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
@@ -184,11 +200,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 - (void)controllerDidChangeContent:(NSFetchedResultsController *)controller {
 
     if (controller == self.fetchedResultsController)
-        PearlMainQueue( ^{
-            [self.collectionView updateDataSource:self.dataSource
-                                       toSections:[self createDataSource]
-                                      reloadItems:nil completion:nil];
-        } );
+        [self updateSites];
 }
 
 #pragma mark - UISearchBarDelegate
@@ -305,7 +317,6 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     PearlAddNotificationObserver( UIApplicationWillEnterForegroundNotification, nil, [NSOperationQueue mainQueue],
             ^(MPSitesViewController *self, NSNotification *note) {
                 [self viewWillAppear:YES];
-                [self updateVoltoAlerts];
             } );
     PearlAddNotificationObserver( MPSignedOutNotification, nil, nil,
             ^(MPSitesViewController *self, NSNotification *note) {
@@ -353,39 +364,42 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 - (void)reloadSites {
 
     [self.fetchedResultsController.managedObjectContext performBlock:^{
-        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"]
-                stringByAppendingString:@"*"];
-        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]];
-                               }];
-        self.fuzzyGroups = fuzzyGroups;
+        NSMutableArray *queryGroups = [NSMutableArray new];
+        NSMutableString *queryPattern = [NSMutableString new];
+        [queryString enumerateSubstringsInRange: NSMakeRange(0, [queryString length]) options: NSStringEnumerationByComposedCharacterSequences
+                              usingBlock: ^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
+            if (substringRange.location < 20) {
+                [queryGroups addObject:substring];
+                [queryPattern appendString:@"*"];
+            }
+                                  [queryPattern appendString:substring];
+                              }];
+        [queryPattern appendString:@"*"];
+        self.queryGroups = queryGroups;
 
         NSError *error = nil;
         self.fetchedResultsController.fetchRequest.predicate =
                 [NSPredicate predicateWithFormat:@"name LIKE[cd] %@ AND user == %@", queryPattern, [MPiOSAppDelegate get].activeUserOID];
-        if (![self.fetchedResultsController performFetch:&error])
+        if (![self.fetchedResultsController performFetch:&error] || error)
             MPError( error, @"Couldn't fetch sites." );
 
-        PearlMainQueue( ^{
-            [self.collectionView updateDataSource:self.dataSource
-                                       toSections:[self createDataSource]
-                                      reloadItems:@[ MPTransientPasswordItem ] completion:^(BOOL finished) {
-                        for (MPSiteCell *cell in self.collectionView.visibleCells)
-                            [cell setFuzzyGroups:self.fuzzyGroups];
-                    }];
-        } );
+        [self updateSites];
     }];
 }
 
+- (void)updateSites {
+
+    PearlMainQueue( ^{
+        [self.collectionView updateDataSource:self.dataSource
+                                   toSections:[self createDataSource]
+                                  reloadItems:@[ MPTransientPasswordItem ] completion:^(BOOL finished) {
+                    for (MPSiteCell *cell in self.collectionView.visibleCells)
+                        [cell setQueryGroups:self.queryGroups];
+                }];
+    } );
+}
+
 #pragma mark - Properties
 
 - (NSString *)query {
@@ -403,14 +417,20 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
 
     if (!_fetchedResultsController) {
         [MPiOSAppDelegate managedObjectContextForMainThreadPerformBlockAndWait:^(NSManagedObjectContext *mainContext) {
-            NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPSiteEntity class] )];
+            NSFetchRequest *fetchRequest = [MPSiteEntity fetchRequest];
             fetchRequest.sortDescriptors = @[
                     [[NSSortDescriptor alloc] initWithKey:NSStringFromSelector( @selector( lastUsed ) ) ascending:NO]
             ];
-            fetchRequest.fetchBatchSize = 10;
+            fetchRequest.predicate = [NSPredicate predicateWithFormat:@"user == %@", [MPiOSAppDelegate get].activeUserOID];
+
             (self.fetchedResultsController = [[NSFetchedResultsController alloc]
                     initWithFetchRequest:fetchRequest managedObjectContext:mainContext
                       sectionNameKeyPath:nil cacheName:nil]).delegate = self;
+
+            NSError *error = nil;
+            if (![self.fetchedResultsController performFetch:&error] || error)
+                MPError( error, @"Couldn't fetch sites." );
+            [self updateSites];
         }];
         [self registerObservers];
     }
@@ -444,24 +464,4 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
         self.popdownToTopConstraint.priority = UILayoutPriorityDefaultHigh;
 }
 
-- (IBAction)upgradeVolto:(UIButton *)sender {
-
-    [[MPiOSAppDelegate get] migrateFor:[MPiOSAppDelegate get].activeUserForMainThread];
-}
-
-#pragma mark - Private
-
-- (void)updateVoltoAlerts {
-
-    BOOL voltoInstalled = [UIApp canOpenURL:[[NSURL alloc] initWithString:@"volto:"]];
-    if (voltoInstalled) {
-        self.voltoInstallAlert.visible = NO;
-        self.voltoMigrateAlert.visible = YES;
-    }
-    else {
-        self.voltoInstallAlert.visible = [MPiOSAppDelegate get].voltoViewController != nil;
-        self.voltoMigrateAlert.visible = NO;
-    }
-}
-
 @end

platform-darwin/Source/iOS/MPStoreViewController.m

@@ -18,10 +18,13 @@
 
 #import "MPStoreViewController.h"
 #import "MPiOSAppDelegate.h"
-#import "UIColor+Expanded.h"
 #import "MPAppDelegate_InApp.h"
 #import "MPSitesViewController.h"
 
+MP_LIBS_BEGIN
+#import "UIColor+Expanded.h"
+MP_LIBS_END
+
 PearlEnum( MPDevelopmentFuelConsumption,
         MPDevelopmentFuelConsumptionQuarterly, MPDevelopmentFuelConsumptionMonthly, MPDevelopmentFuelWeekly );
 

platform-darwin/Source/iOS/MPUsersViewController.h

@@ -35,10 +35,14 @@
 @property(weak, nonatomic) IBOutlet UIButton *nextAvatarButton;
 @property(weak, nonatomic) IBOutlet UIButton *previousAvatarButton;
 @property(weak, nonatomic) IBOutlet NSLayoutConstraint *keyboardHeightConstraint;
+@property(weak, nonatomic) IBOutlet UIView *spectreInstallAlert;
+@property(weak, nonatomic) IBOutlet UIView *spectreMigrateAlert;
 
 @property(assign, nonatomic, readonly) BOOL active;
 
 - (void)setActive:(BOOL)active animated:(BOOL)animated;
 - (IBAction)changeAvatar:(UIButton *)sender;
+- (IBAction)upgradeSpectre:(UIButton *)sender;
+- (IBAction)dismissSpectre:(UIButton *)sender;
 
 @end

platform-darwin/Source/iOS/MPUsersViewController.m

@@ -48,7 +48,7 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
             MPActiveUserStateMinimized,
 };
 
-@interface MPUsersViewController()
+@interface MPUsersViewController()<NSFetchedResultsControllerDelegate>
 
 @property(nonatomic) MPActiveUserState activeUserState;
 @property(nonatomic, strong) NSArray *userIDs;
@@ -57,7 +57,7 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
 @property(nonatomic) NSUInteger marqueeTipTextIndex;
 @property(nonatomic, copy) NSString *masterPasswordChoice;
 @property(nonatomic, strong) NSOperationQueue *afterUpdates;
-@property(nonatomic, weak) id contextChangedObserver;
+@property(nonatomic, strong) NSFetchedResultsController *userResultsController;
 
 @end
 
@@ -91,6 +91,7 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
     [super viewWillAppear:animated];
 
     self.userSelectionContainer.visible = NO;
+    [self.storeLoadingActivity startAnimating];
 }
 
 - (void)viewDidAppear:(BOOL)animated {
@@ -99,6 +100,7 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
 
     [self registerObservers];
     [self reloadUsers];
+    [self updateSpectreAlerts];
 
     [self.marqueeTipTimer invalidate];
     self.marqueeTipTimer = [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector( firedMarqueeTimer: )
@@ -432,6 +434,7 @@ referenceSizeForFooterInSection:(NSInteger)section {
 
         NSManagedObjectID *userID = user.permanentObjectID;
         UIAlertController *controller = [UIAlertController alertControllerWithTitle:user.name message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        [controller.popoverPresentationController setSourceView:avatarCell];
         [controller addAction:[UIAlertAction actionWithTitle:@"Delete User" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
             UIAlertController *controller_ = [UIAlertController alertControllerWithTitle:@"Deleting User" message:
                     @"The user and its sites will be deleted."            preferredStyle:UIAlertControllerStyleAlert];
@@ -641,7 +644,6 @@ referenceSizeForFooterInSection:(NSInteger)section {
 
     [self removeKeyPathObservers];
     PearlRemoveNotificationObservers();
-    [[NSNotificationCenter defaultCenter] removeObserver:self.contextChangedObserver];
 }
 
 - (void)registerObservers {
@@ -659,6 +661,7 @@ referenceSizeForFooterInSection:(NSInteger)section {
     PearlAddNotificationObserver( UIApplicationWillEnterForegroundNotification, nil, [NSOperationQueue mainQueue],
             ^(MPUsersViewController *self, NSNotification *note) {
                 [self reloadUsers];
+                [self updateSpectreAlerts];
             } );
     PearlAddNotificationObserver( UIApplicationDidBecomeActiveNotification, nil, [NSOperationQueue mainQueue],
             ^(MPUsersViewController *self, NSNotification *note) {
@@ -673,24 +676,6 @@ referenceSizeForFooterInSection:(NSInteger)section {
                 [self.keyboardHeightConstraint updateConstant:keyboardHeight];
             } );
 
-    if ((self.contextChangedObserver
-            = [[MPiOSAppDelegate get] managedObjectContextChanged:^(NSDictionary<NSManagedObjectID *, NSString *> *affectedObjects) {
-                if ([[[affectedObjects allKeys] filteredArrayUsingPredicate:
-                        [NSPredicate predicateWithBlock:^BOOL(NSManagedObjectID *objectID, NSDictionary *bindings) {
-                            return [objectID.entity.name isEqualToString:NSStringFromClass( [MPUserEntity class] )];
-                        }]] count])
-                    [self reloadUsers];
-            }]))
-        [UIView animateWithDuration:0.3f animations:^{
-            self.avatarCollectionView.visible = YES;
-            [self.storeLoadingActivity stopAnimating];
-        }];
-    else
-        [UIView animateWithDuration:0.3f animations:^{
-            self.avatarCollectionView.visible = NO;
-            [self.storeLoadingActivity startAnimating];
-        }];
-
     PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresWillChangeNotification, [MPiOSAppDelegate get].storeCoordinator, nil,
             ^(MPUsersViewController *self, NSNotification *note) {
                 self.userIDs = nil;
@@ -702,32 +687,67 @@ referenceSizeForFooterInSection:(NSInteger)section {
                     [self reloadUsers];
                 } );
             } );
+
+    [UIView animateWithDuration:0.3f animations:^{
+        self.avatarCollectionView.visible = YES;
+        [self.storeLoadingActivity stopAnimating];
+    }];
 }
 
 - (void)reloadUsers {
 
     [self afterUpdatesMainQueue:^{
         if (![MPiOSAppDelegate managedObjectContextForMainThreadPerformBlockAndWait:^(NSManagedObjectContext *mainContext) {
-            NSError *error = nil;
-            NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPUserEntity class] )];
+            NSFetchRequest *fetchRequest = [MPUserEntity fetchRequest];
             fetchRequest.sortDescriptors = @[
                     [NSSortDescriptor sortDescriptorWithKey:NSStringFromSelector( @selector( lastUsed ) ) ascending:NO]
             ];
-            NSArray *users = [mainContext executeFetchRequest:fetchRequest error:&error];
-            if (!users) {
-                MPError( error, @"Failed to load users." );
-                self.userIDs = nil;
-            }
+            self.userResultsController = [[NSFetchedResultsController alloc]
+                                          initWithFetchRequest:fetchRequest managedObjectContext:mainContext
+                                          sectionNameKeyPath:nil cacheName:nil];
+            self.userResultsController.delegate = self;
 
-            NSMutableArray *userIDs = [NSMutableArray arrayWithCapacity:[users count]];
-            for (MPUserEntity *user in users)
-                [userIDs addObject:user.permanentObjectID];
-            self.userIDs = userIDs;
+            NSError *error = nil;
+            if (![self.userResultsController performFetch:&error])
+                MPError( error, @"Failed to load users." );
+
+            [self updateUsers];
         }])
             self.userIDs = nil;
     }];
 }
 
+- (void)updateUsers {
+
+    [self.userResultsController.managedObjectContext performBlock:^{
+        NSArray *users = self.userResultsController.fetchedObjects;
+        NSMutableArray *userIDs = [NSMutableArray arrayWithCapacity:[users count]];
+        for (MPUserEntity *user in users)
+            [userIDs addObject:user.permanentObjectID];
+        self.userIDs = userIDs;
+    }];
+}
+
+- (void)updateSpectreAlerts {
+
+    BOOL spectreInstalled = [UIApp canOpenURL:[[NSURL alloc] initWithString:@"spectre:"]];
+    if (spectreInstalled) {
+        self.spectreInstallAlert.visible = NO;
+        self.spectreMigrateAlert.visible = YES;
+    }
+    else {
+        self.spectreInstallAlert.visible = [MPiOSAppDelegate get].spectreViewController != nil;
+        self.spectreMigrateAlert.visible = NO;
+    }
+}
+
+#pragma mark - NSFetchedResultsControllerDelegate
+
+- (void)controllerDidChangeContent:(NSFetchedResultsController *)controller {
+
+    [self updateUsers];
+}
+
 #pragma mark - Properties
 
 - (void)setActive:(BOOL)active animated:(BOOL)animated {
@@ -902,4 +922,15 @@ referenceSizeForFooterInSection:(NSInteger)section {
         ++[self selectedAvatar].avatar;
 }
 
+- (IBAction)upgradeSpectre:(UIButton *)sender {
+
+    [[MPiOSAppDelegate get] migrateFor:[MPiOSAppDelegate get].activeUserForMainThread];
+}
+
+- (IBAction)dismissSpectre:(UIButton *)sender {
+
+    self.spectreInstallAlert.visible = NO;
+    self.spectreMigrateAlert.visible = NO;
+}
+
 @end

platform-darwin/Source/iOS/MPWebViewController.m

@@ -98,11 +98,12 @@ decisionHandler:(void ( ^ )(WKNavigationActionPolicy))decisionHandler {
 
 #pragma mark - Actions
 
-- (IBAction)action:(id)sender {
+- (IBAction)action:(UIBarButtonItem *)sender {
 
-    UIAlertController *controller = [UIAlertController new];
-    controller.title = self.webView.URL.host;
-    controller.message = self.webView.URL.absoluteString;
+    UIAlertController *controller = [UIAlertController alertControllerWithTitle:self.webView.URL.host
+                                                                        message:self.webView.URL.absoluteString
+                                                                 preferredStyle:UIAlertControllerStyleActionSheet];
+    [controller.popoverPresentationController setBarButtonItem:sender];
     [controller addAction:[UIAlertAction actionWithTitle:@"Safari" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
         [UIApp openURL:self.webView.URL];
     }]];

platform-darwin/Source/iOS/MPiOSAppDelegate.h

@@ -23,7 +23,8 @@
 
 @interface MPiOSAppDelegate : MPAppDelegate_Shared <SKStoreProductViewControllerDelegate>
 
-@property(nonatomic, strong) SKStoreProductViewController *voltoViewController;
+@property(nonatomic, strong) UIWindow *window;
+@property(nonatomic, strong) SKStoreProductViewController *spectreViewController;
 
 - (void)openURL:(NSURL *)url;
 

platform-darwin/Source/iOS/MPiOSAppDelegate.m

@@ -23,8 +23,10 @@
 #import "mpw-marshal.h"
 #import "MPSecrets.h"
 
+MP_LIBS_BEGIN
 #import <Sentry/Sentry.h>
 #import <Countly/Countly.h>
+MP_LIBS_END
 
 @interface CountlyPushNotifications
 @end
@@ -35,7 +37,7 @@
 @implementation CountlyPushNotifications(MPNotifications)
 
 - (void)openURL:(NSString *)URLString {
-    [[MPiOSAppDelegate get].navigationController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:URLString]];
+    [[MPiOSAppDelegate get].window.rootViewController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:URLString]];
 }
 
 @end
@@ -48,6 +50,8 @@
 
 @implementation MPiOSAppDelegate
 
+@synthesize window;
+
 + (void)initialize {
 
     [MPiOSConfig get];
@@ -56,22 +60,6 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
     @try {
-        // Sentry
-        [SentrySDK initWithOptions:@{
-                @"dsn"                      : NilToNSNull( decrypt( sentryDSN ) ),
-#ifdef DEBUG
-                @"debug"                    : @(YES),
-                @"environment"              : @"Development",
-#elif PUBLIC
-                @"debug"                    : @(NO),
-                @"environment"              : @"Public",
-#else
-                @"debug"                    : @(NO),
-                @"environment"              : @"Private",
-#endif
-                @"enabled"                  : [MPiOSConfig get].sendInfo,
-                @"enableAutoSessionTracking": @(YES),
-        }];
         [[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) {
             PearlLogLevel level = PearlLogLevelWarn;
             if ([[MPConfig get].sendInfo boolValue])
@@ -120,7 +108,7 @@
         countlyConfig.deviceID = [PearlKeyChain deviceIdentifier];
         countlyConfig.secretSalt = decrypt( countlySalt );
 #if DEBUG
-        countlyConfig.enableDebug = YES;
+        //countlyConfig.enableDebug = YES;
         countlyConfig.pushTestMode = CLYPushTestModeDevelopment;
 #elif ! PUBLIC
         countlyConfig.enableDebug = NO;
@@ -144,18 +132,14 @@
             [self updateConfigKey:note.object];
         } );
         PearlAddNotificationObserver( NSUserDefaultsDidChangeNotification, nil, nil, ^(id self, NSNotification *note) {
-            [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:nil];
+            PearlMainQueueOperation( ^{
+                [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:nil];
+            } );
         } );
     }
     @catch (id exception) {
         err( @"During Config Test: %@", exception );
     }
-    @try {
-        [super application:application didFinishLaunchingWithOptions:launchOptions];
-    }
-    @catch (id exception) {
-        err( @"During Pearl Application Launch: %@", exception );
-    }
     @try {
         inf( @"Started up with device identifier: %@", [PearlKeyChain deviceIdentifier] );
 
@@ -190,24 +174,23 @@
         [migrateVC loadProductWithParameters:@{
                 SKStoreProductParameterCampaignToken       : @"app-masterpassword.ios", /* Campaign:    From MasterPassword iOS */
                 SKStoreProductParameterProviderToken       : @153897, /*                   Provider:    Maarten Billemont */
-                SKStoreProductParameterITunesItemIdentifier: @510296984, /*                Application: MasterPassword iOS */
-                //SKStoreProductParameterITunesItemIdentifier: @1500430196, /*             Application: Volto iOS */
+//              SKStoreProductParameterITunesItemIdentifier: @510296984, /*                Application: MasterPassword iOS */
+                SKStoreProductParameterITunesItemIdentifier: @1526402806, /*               Application: Spectre iOS */
         }                                   completionBlock:^(BOOL result, NSError *error) {
             if (error)
-                err( @"Failed loading Volto product information: %@", error );
+                err( @"Failed loading Spectre product information: %@", error );
 
                 if (result) {
-                    self.voltoViewController = migrateVC;
-                    self.voltoViewController.delegate = self;
+                    self.spectreViewController = migrateVC;
+                    self.spectreViewController.delegate = self;
                 } else {
-                    self.voltoViewController = nil;
+                    self.spectreViewController = nil;
                 }
         }];
 
         PearlMainQueueOperation( ^{
-            [self.navigationController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:@"masterpassword://foo?bar=quux"]];
             if ([[MPiOSConfig get].showSetup boolValue])
-                [self.navigationController performSegueWithIdentifier:@"setup" sender:self];
+                [self.window.rootViewController performSegueWithIdentifier:@"setup" sender:self];
 
             [self consentFeatures];
         } );
@@ -245,7 +228,7 @@
                                                 (id)[error localizedDescription]?: error )
                                                                                 preferredStyle:UIAlertControllerStyleAlert];
                         [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleCancel handler:nil]];
-                        [self.navigationController presentViewController:alert animated:YES completion:nil];
+                        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
                     } );
                     return;
                 }
@@ -257,7 +240,7 @@
                                         @"Master Password couldn't understand the import file."
                                                                                 preferredStyle:UIAlertControllerStyleAlert];
                         [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleCancel handler:nil]];
-                        [self.navigationController presentViewController:alert animated:YES completion:nil];
+                        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
                     } );
                     return;
                 }
@@ -297,8 +280,7 @@
             [self consentFeatures];
         }]];
 
-        [(self.navigationController.presentedViewController?: (UIViewController *)self.navigationController)
-                presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     } );
 
     return YES;
@@ -343,8 +325,7 @@
                 [MPiOSConfig get].notificationsDecided = @(YES);
             }
         }]];
-        [(self.navigationController.presentedViewController?: (UIViewController *)self.navigationController)
-                presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     } );
 }
 
@@ -373,7 +354,7 @@
                 [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
                     setResult( nil );
                 }]];
-                [self.navigationController presentViewController:alert animated:YES completion:nil];
+                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
             } );
         } );
     } askUserPassword:^NSString *(NSString *userName) {
@@ -391,7 +372,7 @@
                 [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
                     setResult( nil );
                 }]];
-                [self.navigationController presentViewController:alert animated:YES completion:nil];
+                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
             } );
         } );
     }          result:^(NSError *error) {
@@ -402,7 +383,7 @@
                 UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Error" message:[error localizedDescription]
                                                                              preferredStyle:UIAlertControllerStyleAlert];
                 [controller addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleCancel handler:nil]];
-                [self.navigationController presentViewController:controller animated:YES completion:nil];
+                [self.window.rootViewController presentViewController:controller animated:YES completion:nil];
             }
         } );
     }];
@@ -412,15 +393,7 @@
 
     inf( @"Will foreground" );
 
-    [super applicationWillEnterForeground:application];
-
     [self.hangDetector start];
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application {
-
-    inf( @"Re-activated" );
-    [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:nil];
 
     PearlNotMainQueue( ^{
         NSString *importData = [UIPasteboard generalPasteboard].string;
@@ -436,20 +409,22 @@
                             [UIPasteboard generalPasteboard].string = @"";
                         }]];
                 [alert addAction:[UIAlertAction actionWithTitle:@"No" style:UIAlertActionStyleCancel handler:nil]];
-                [self.navigationController presentViewController:alert animated:YES completion:nil];
+                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
             } );
         }
         mpw_marshal_file_free( &importFile );
     } );
+}
 
-    [super applicationDidBecomeActive:application];
+- (void)applicationDidBecomeActive:(UIApplication *)application {
+
+    inf( @"Re-activated" );
+    [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:nil];
 }
 
 - (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
 
     inf( @"Received memory warning." );
-
-    [super applicationDidReceiveMemoryWarning:application];
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application {
@@ -462,8 +437,6 @@
     }
 
     [self.hangDetector stop];
-
-    [super applicationDidEnterBackground:application];
 }
 
 #pragma mark - Behavior
@@ -480,7 +453,7 @@
         else if ([url.host isEqualToString:@"show-url"]) {
             for (NSURLQueryItem *item in [NSURLComponents componentsWithString:[url absoluteString]].queryItems)
                 if ([item.name isEqualToString:@"url"]) {
-                    [[MPiOSAppDelegate get].navigationController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:item.value]];
+                    [self.window.rootViewController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:item.value]];
                     return;
                 }
         }
@@ -488,8 +461,7 @@
             for (NSURLQueryItem *item in [NSURLComponents componentsWithString:[url absoluteString]].queryItems)
                 if ([item.name isEqualToString:@"fullName"]) {
                     [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-                        NSFetchRequest
-                                *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPUserEntity class] )];
+                        NSFetchRequest *fetchRequest = [MPUserEntity fetchRequest];
                         fetchRequest.predicate = [NSPredicate predicateWithFormat:@"name == %@", item.value];
                         NSArray *users = [context executeFetchRequest:fetchRequest error:nil];
                         [self migrateFor:users.firstObject];
@@ -513,7 +485,7 @@
                         @"help@masterpassword.app"
                                                                 preferredStyle:UIAlertControllerStyleAlert];
         [alert addAction:[UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     }
     else if (logs) {
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Feedback" message:
@@ -527,7 +499,7 @@
         [alert addAction:[UIAlertAction actionWithTitle:@"No Logs" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
             [self openFeedbackWithLogs:NO forVC:viewController];
         }]];
-        [self.navigationController presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     }
     else
         [self openFeedbackWithLogs:NO forVC:viewController];
@@ -573,15 +545,16 @@
                             @"This may be due to corruption.  You can either reset Master Password and "
                             @"recreate your user, or E-Mail us your logs and leave your corrupt store as-is for now."
                                                                     preferredStyle:UIAlertControllerStyleAlert];
-            [alert addAction:[UIAlertAction actionWithTitle:@"E-Mail Logs" style:UIAlertActionStyleDefault
-                                                    handler:^(UIAlertAction *action) {
-                                                        [self openFeedbackWithLogs:YES forVC:nil];
-                                                    }]];
+            [alert addAction:[UIAlertAction actionWithTitle:@"Try Again" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+                [self retryCorruptStore];
+            }]];
+            [alert addAction:[UIAlertAction actionWithTitle:@"Send Logs" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+                [self openFeedbackWithLogs:YES forVC:nil];
+            }]];
             [alert addAction:[UIAlertAction actionWithTitle:@"Reset" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
                 [self deleteAndResetStore];
             }]];
-            [alert addAction:[UIAlertAction actionWithTitle:@"Ignore" style:UIAlertActionStyleCancel handler:nil]];
-            [self.navigationController presentViewController:alert animated:YES completion:nil];
+            [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
         } );
     } );
 }
@@ -598,7 +571,7 @@
                         @"Would you like to make all your passwords visible in the export file?\n\n"
                         @"A safe export will include all sites but make their passwords invisible.\n"
                         @"It is great as a backup and remains safe when fallen in the wrong hands."
-                                                                preferredStyle:UIAlertControllerStyleActionSheet];
+                                                                preferredStyle:UIAlertControllerStyleAlert];
         [sheet addAction:[UIAlertAction actionWithTitle:@"Safe Export" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
             [self showExportRevealPasswords:NO forVC:viewController];
         }]];
@@ -606,10 +579,10 @@
             [self showExportRevealPasswords:YES forVC:viewController];
         }]];
         [sheet addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:sheet animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:sheet animated:YES completion:nil];
     }]];
     [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
-    [self.navigationController presentViewController:alert animated:YES completion:nil];
+    [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
 }
 
 - (void)showExportRevealPasswords:(BOOL)revealPasswords forVC:(UIViewController *)viewController {
@@ -620,41 +593,46 @@
                         @"Close Master Password, go into Settings and add a Mail account."
                                                                 preferredStyle:UIAlertControllerStyleAlert];
         [alert addAction:[UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
         return;
     }
 
     [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
         NSError *error = nil;
-        NSString *exportedUser = [self exportSitesFor:[self activeUserInContext:context] revealPasswords:revealPasswords askExportPassword:^NSString *(NSString *userName) {
-            return PearlAwait( ^(void (^setResult)(id)) {
-                PearlMainQueue( ^{
-                    UIAlertController *alert = [UIAlertController alertControllerWithTitle:strf( @"Master Password For:\n%@", userName )
-                                                                                   message:@"Enter your master password to export the user."
-                                                                            preferredStyle:UIAlertControllerStyleAlert];
-                    [alert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
-                        textField.secureTextEntry = YES;
-                    }];
-                    [alert addAction:[UIAlertAction actionWithTitle:@"Export" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-                        setResult( alert.textFields.firstObject.text );
-                    }]];
-                    [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
-                        setResult( nil );
-                    }]];
-                    [self.navigationController presentViewController:alert animated:YES completion:nil];
-                } );
-            } );
-        } error:&error];
+        NSString *exportedUser = [self exportSitesFor:[self activeUserInContext:context] revealPasswords:revealPasswords askExportPassword:
+                ^NSString *(NSString *userName) {
+                    return PearlAwait( ^(void (^setResult)(id)) {
+                        PearlMainQueue( ^{
+                            UIAlertController *alert = [UIAlertController alertControllerWithTitle:strf(
+                                            @"Master Password For:\n%@", userName )
+                                                                                           message:@"Enter your master password to export the user."
+                                                                                    preferredStyle:UIAlertControllerStyleAlert];
+                            [alert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+                                textField.secureTextEntry = YES;
+                            }];
+                            [alert addAction:[UIAlertAction actionWithTitle:@"Export" style:UIAlertActionStyleDefault
+                                                                    handler:^(UIAlertAction *action) {
+                                                                        setResult( alert.textFields.firstObject.text );
+                                                                    }]];
+                            [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel
+                                                                    handler:^(UIAlertAction *action) {
+                                                                        setResult( nil );
+                                                                    }]];
+                            [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
+                        } );
+                    } );
+                }                               error:&error];
 
         PearlMainQueue( ^{
-            if (!exportedUser || error) {
+            if (error) {
                 MPError( error, @"Failed to export mpsites." );
                 UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Export Error" message:[error localizedDescription]
                                                                         preferredStyle:UIAlertControllerStyleAlert];
                 [alert addAction:[UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleCancel handler:nil]];
-                [self.navigationController presentViewController:alert animated:YES completion:nil];
-                return;
+                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
             }
+            if (!exportedUser)
+                return;
 
             NSDateFormatter *exportDateFormatter = [NSDateFormatter new];
             [exportDateFormatter setDateFormat:@"yyyy'-'MM'-'dd"];
@@ -662,7 +640,7 @@
                     [self activeUserForMainThread].name, [exportDateFormatter stringFromDate:[NSDate date]] );
 
             UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Export Destination" message:nil
-                                                                    preferredStyle:UIAlertControllerStyleActionSheet];
+                                                                    preferredStyle:UIAlertControllerStyleAlert];
             [alert addAction:[UIAlertAction actionWithTitle:@"Send As E-Mail" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
                 NSString *message;
                 if (revealPasswords)
@@ -707,14 +685,14 @@
                 }
             }]];
             [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleCancel handler:nil]];
-            [self.navigationController presentViewController:alert animated:YES completion:nil];
+            [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
         } );
     }];
 }
 
 - (void)migrateFor:(MPUserEntity *)user {
 
-    if ([UIApp canOpenURL:[[NSURL alloc] initWithString:@"volto:"]]) {
+    if ([UIApp canOpenURL:[[NSURL alloc] initWithString:@"spectre:"]]) {
         if (!user) {
             [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
                 NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPUserEntity class] )];
@@ -723,15 +701,15 @@
                     return;
 
                 UIAlertController *usersSheet = [UIAlertController alertControllerWithTitle:@"Migrate User"
-                                                                                    message:@"Choose a user to migrate out to Volto."
-                                                                             preferredStyle:UIAlertControllerStyleActionSheet];
+                                                                                    message:@"Choose a user to migrate out to Spectre."
+                                                                             preferredStyle:UIAlertControllerStyleAlert];
                 [usersSheet addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
                 for (MPUserEntity *user_ in users)
                     [usersSheet addAction:[UIAlertAction actionWithTitle:user_.name style:UIAlertActionStyleDefault handler:
                             ^(UIAlertAction *action) { [self migrateFor:user_]; }]];
 
                 PearlMainQueue( ^{
-                    [self.navigationController presentViewController:usersSheet animated:YES completion:nil];
+                    [self.window.rootViewController presentViewController:usersSheet animated:YES completion:nil];
                 } );
             }];
             return;
@@ -753,24 +731,25 @@
                                         ^(UIAlertAction *action) { setResult( alert.textFields.firstObject.text ); }]];
                                 [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:
                                         ^(UIAlertAction *action) { setResult( nil ); }]];
-                                [self.navigationController presentViewController:alert animated:YES completion:nil];
+                                [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
                             } );
                         } );
                     } error:&error];
 
             PearlMainQueue( ^{
-                if (!exportedUser || error) {
+                if (error) {
                     MPError( error, @"Failed to export user." );
                     UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Export Error"
                                                                                    message:[error localizedDescription]
                                                                             preferredStyle:UIAlertControllerStyleAlert];
                     [alert addAction:[UIAlertAction actionWithTitle:@"Okay" style:UIAlertActionStyleCancel handler:nil]];
-                    [self.navigationController presentViewController:alert animated:YES completion:nil];
-                    return;
+                    [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
                 }
+                if (!exportedUser)
+                    return;
 
                 NSURLComponents *components = [NSURLComponents new];
-                components.scheme = @"volto";
+                components.scheme = @"spectre";
                 components.path = @"import";
                 components.queryItems = @[ [[NSURLQueryItem alloc] initWithName:@"data" value:exportedUser] ];
                 [UIApp openURL:components.URL];
@@ -778,8 +757,8 @@
         }];
     }
 
-    else if (self.voltoViewController)
-        [self.navigationController presentViewController:self.voltoViewController animated:YES completion:nil];
+    else if (self.spectreViewController)
+        [self.window.rootViewController presentViewController:self.spectreViewController animated:YES completion:nil];
 }
 
 - (void)changeMasterPasswordFor:(MPUserEntity *)user saveInContext:(NSManagedObjectContext *)moc didResetBlock:(void ( ^ )(void))didReset {
@@ -790,7 +769,7 @@
                         @"Changing your master password will cause all your generated passwords to change!\n"
                         @"Changing the master password back to the old one will cause your passwords to revert as well."
                                                                 preferredStyle:UIAlertControllerStyleAlert];
-        [alert addAction:[UIAlertAction actionWithTitle:@"Abort" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+        [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
             [moc performBlockAndWait:^{
                 inf( @"Clearing keyID for user: %@.", user.userID );
                 user.keyID = nil;
@@ -803,7 +782,7 @@
                 didReset();
         }]];
         [alert addAction:[UIAlertAction actionWithTitle:@"Abort" style:UIAlertActionStyleCancel handler:nil]];
-        [self.navigationController presentViewController:alert animated:YES completion:nil];
+        [self.window.rootViewController presentViewController:alert animated:YES completion:nil];
     } );
 }
 
@@ -835,20 +814,32 @@
 
     // Send info
     NSArray *countlyFeatures = @[
-            CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating
+            CLYConsentSessions, CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating
     ];
-    if ([[MPConfig get].sendInfo boolValue] || ![[MPConfig get].sendInfoDecided boolValue])
-        [Countly.sharedInstance giveConsentForFeature:CLYConsentSessions];
-    else
-        [Countly.sharedInstance cancelConsentForFeature:CLYConsentSessions];
-    if ([[MPConfig get].sendInfo boolValue]) {
+    if ([[MPiOSConfig get].sendInfo boolValue] || ![[MPiOSConfig get].sendInfoDecided boolValue]) {
         if ([PearlLogger get].printLevel > PearlLogLevelInfo)
             [PearlLogger get].printLevel = PearlLogLevelInfo;
 
-        [SentrySDK.currentHub getClient].options.enabled = @YES;
+        // Sentry
+        if (!SentrySDK.isEnabled)
+            [SentrySDK startWithOptions:@{
+                    @"dsn"                      : NilToNSNull( decrypt( sentryDSN ) ),
+#ifdef DEBUG
+                    @"debug"                    : @(NO), //@(YES),
+                    @"environment"              : @"Development",
+#elif PUBLIC
+                    @"debug"                    : @(NO),
+                    @"environment"              : @"Public",
+#else
+                    @"debug"                    : @(NO),
+                    @"environment"              : @"Private",
+#endif
+                    @"enableAutoSessionTracking": @(YES),
+            }];
+
         [SentrySDK configureScope:^(SentryScope *scope) {
-            [scope setExtraValue:[MPConfig get].rememberLogin forKey:@"rememberLogin"];
-            [scope setExtraValue:[MPConfig get].sendInfo forKey:@"sendInfo"];
+            [scope setExtraValue:[MPiOSConfig get].rememberLogin forKey:@"rememberLogin"];
+            [scope setExtraValue:[MPiOSConfig get].sendInfo forKey:@"sendInfo"];
             [scope setExtraValue:[MPiOSConfig get].helpHidden forKey:@"helpHidden"];
             [scope setExtraValue:[MPiOSConfig get].showSetup forKey:@"showQuickStart"];
             [scope setExtraValue:[PearlConfig get].firstRun forKey:@"firstRun"];
@@ -865,13 +856,12 @@
 #else
             [scope setExtraValue:@(NO) forKey:@"reviewedVersion"];
 #endif
-
-            [Countly.sharedInstance giveConsentForFeatures:countlyFeatures];
         }];
+        [Countly.sharedInstance giveConsentForFeatures:countlyFeatures];
     }
     else {
         [Countly.sharedInstance cancelConsentForFeatures:countlyFeatures];
-        [SentrySDK.currentHub getClient].options.enabled = @NO;
+        [SentrySDK close];
     }
 }
 

platform-darwin/Source/iOS/MPiOSConfig.m

@@ -33,8 +33,8 @@
             NSStringFromSelector( @selector( siteInfoHidden ) )   : @YES,
             NSStringFromSelector( @selector( showSetup ) )        : @YES,
             NSStringFromSelector( @selector( appleID ) )          : @"510296984",
-            NSStringFromSelector( @selector( actionsTipShown ) )  : @(!self.firstRun),
-            NSStringFromSelector( @selector( typeTipShown ) )     : @(!self.firstRun),
+            NSStringFromSelector( @selector( actionsTipShown ) )  : @(![self.firstRun boolValue]),
+            NSStringFromSelector( @selector( typeTipShown ) )     : @(![self.firstRun boolValue]),
             NSStringFromSelector( @selector( loginNameTipShown ) ): @NO,
             NSStringFromSelector( @selector( traceMode ) )        : @NO,
             NSStringFromSelector( @selector( dictationSearch ) )  : @NO,

platform-darwin/Source/iOS/MasterPassword-Info.plist

@@ -60,7 +60,7 @@
 		<string>firefox</string>
 		<string>googlechrome</string>
 		<string>opera-http</string>
-		<string>volto</string>
+		<string>spectre</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>

platform-darwin/Source/iOS/Storyboard.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="Q1S-vU-GGO">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="Q1S-vU-GGO">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -69,7 +69,7 @@
                                         </collectionViewFlowLayout>
                                         <cells>
                                             <collectionViewCell opaque="NO" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MPAvatarCell" id="Zab-uQ-uk9" customClass="MPAvatarCell">
-                                                <rect key="frame" x="80" y="114.5" width="215" height="667"/>
+                                                <rect key="frame" x="80" y="115" width="215" height="667"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                                     <rect key="frame" x="0.0" y="0.0" width="215" height="667"/>
@@ -97,10 +97,10 @@
                                                             </constraints>
                                                         </imageView>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0Sa-Vg-EEI" userLabel="Name Backdrop">
-                                                            <rect key="frame" x="43.5" y="263" width="128.5" height="16"/>
+                                                            <rect key="frame" x="43.5" y="263" width="128" height="16"/>
                                                             <subviews>
                                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="1000" text="Maarten Billemont" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cLT-s0-4SQ" userLabel="Name Field">
-                                                                    <rect key="frame" x="5" y="0.0" width="118.5" height="16"/>
+                                                                    <rect key="frame" x="5" y="0.0" width="118" height="16"/>
                                                                     <fontDescription key="fontDescription" name="Exo2.0-ExtraBold" family="Exo 2.0" pointSize="13"/>
                                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -164,7 +164,7 @@
                                             <outlet property="delegate" destination="S8q-YF-Kt9" id="det-Eh-phM"/>
                                         </connections>
                                     </collectionView>
-                                    <button opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9u7-pu-Wtv" userLabel="Previous Avatar">
+                                    <button opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9u7-pu-Wtv" userLabel="Previous Avatar">
                                         <rect key="frame" x="0.0" y="439.5" width="44" height="53"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="44" id="Ay6-Jg-c3T"/>
@@ -177,7 +177,7 @@
                                             <action selector="changeAvatar:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="lNu-mK-3zD"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fUK-gJ-NRE" userLabel="Next Avatar">
+                                    <button opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fUK-gJ-NRE" userLabel="Next Avatar">
                                         <rect key="frame" x="370" y="439.5" width="44" height="53"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="44" id="oAm-YX-Fx5"/>
@@ -276,7 +276,7 @@
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XEP-O3-ayG" userLabel="Footer">
                                         <rect key="frame" x="0.0" y="824" width="414" height="72"/>
                                         <subviews>
-                                            <button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4md-Gp-SLG">
+                                            <button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4md-Gp-SLG">
                                                 <rect key="frame" x="20" y="48" width="374" height="24"/>
                                                 <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="10"/>
                                                 <state key="normal" title="Thanks, lhunath ➚">
@@ -288,14 +288,14 @@
                                                 </connections>
                                             </button>
                                             <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="069-Pu-yXe" userLabel="Thanks Tip">
-                                                <rect key="frame" x="91" y="0.0" width="232.5" height="60"/>
+                                                <rect key="frame" x="90.5" y="0.0" width="233" height="60"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="tip_basic_black.png" translatesAutoresizingMaskIntoConstraints="NO" id="Z8P-ZK-aS0">
-                                                        <rect key="frame" x="0.0" y="0.0" width="232.5" height="60"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="233" height="60"/>
                                                         <rect key="contentStretch" x="0.15000000000000002" y="0.0" width="0.69999999999999973" height="1"/>
                                                     </imageView>
                                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Why is Master Password free?" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="BLV-3x-Q0z">
-                                                        <rect key="frame" x="20" y="11.5" width="192.5" height="17"/>
+                                                        <rect key="frame" x="20" y="11.5" width="193" height="17"/>
                                                         <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
                                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -410,21 +410,112 @@
                                     <constraint firstItem="9u7-pu-Wtv" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" id="sez-BC-G3I"/>
                                 </constraints>
                             </view>
+                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tOT-TZ-yse" userLabel="Install Spectre Tip">
+                                <rect key="frame" x="0.0" y="740" width="414" height="156"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ded-Ii-gyf" userLabel="Migrate">
+                                        <rect key="frame" x="8" y="8" width="398" height="106"/>
+                                        <state key="normal" backgroundImage="tip_alert_black"/>
+                                        <connections>
+                                            <action selector="upgradeSpectre:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="Mmn-CK-C45"/>
+                                        </connections>
+                                    </button>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bqa-qH-Bia">
+                                        <rect key="frame" x="80" y="15" width="267" height="84"/>
+                                        <string key="text">The next generation of password security is now called «Spectre»:
+Tap to install the upgrade.
+
+This app is now out of maintenance.</string>
+                                        <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
+                                        <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tDY-IR-ak2" userLabel="Close">
+                                        <rect key="frame" x="347" y="20" width="47" height="31"/>
+                                        <buttonConfiguration key="configuration" style="plain" title="╳"/>
+                                        <connections>
+                                            <action selector="dismissSpectre:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="7a6-W3-NIK"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="ded-Ii-gyf" firstAttribute="leading" secondItem="tOT-TZ-yse" secondAttribute="leadingMargin" id="3fy-Qc-KlM"/>
+                                    <constraint firstItem="bqa-qH-Bia" firstAttribute="top" secondItem="ded-Ii-gyf" secondAttribute="top" constant="7" id="8Rd-qC-ttx"/>
+                                    <constraint firstItem="bqa-qH-Bia" firstAttribute="bottom" secondItem="ded-Ii-gyf" secondAttribute="bottom" constant="-15" id="VLO-QZ-6Jf"/>
+                                    <constraint firstItem="ded-Ii-gyf" firstAttribute="top" secondItem="tOT-TZ-yse" secondAttribute="topMargin" id="Y6k-Ep-Skv"/>
+                                    <constraint firstAttribute="trailingMargin" secondItem="ded-Ii-gyf" secondAttribute="trailing" id="d8e-pL-U3v"/>
+                                    <constraint firstAttribute="trailing" secondItem="tDY-IR-ak2" secondAttribute="trailing" constant="20" symbolic="YES" id="lb2-4g-zJV"/>
+                                    <constraint firstItem="bqa-qH-Bia" firstAttribute="leading" secondItem="ded-Ii-gyf" secondAttribute="leading" constant="72" id="nD7-ie-dHF"/>
+                                    <constraint firstItem="tDY-IR-ak2" firstAttribute="top" secondItem="tOT-TZ-yse" secondAttribute="top" constant="20" symbolic="YES" id="pDc-SL-x9W"/>
+                                    <constraint firstItem="tDY-IR-ak2" firstAttribute="leading" secondItem="bqa-qH-Bia" secondAttribute="trailing" id="suM-kx-xRY"/>
+                                    <constraint firstAttribute="bottomMargin" secondItem="ded-Ii-gyf" secondAttribute="bottom" id="xzD-vT-p1O"/>
+                                </constraints>
+                            </view>
+                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e7i-8u-nyd" userLabel="Migrate Spectre Tip">
+                                <rect key="frame" x="0.0" y="740" width="414" height="156"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4s3-Ex-jpT" userLabel="Migrate">
+                                        <rect key="frame" x="8" y="8" width="398" height="106"/>
+                                        <state key="normal" backgroundImage="tip_alert_black"/>
+                                        <connections>
+                                            <action selector="upgradeSpectre:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="059-Sa-0EF"/>
+                                        </connections>
+                                    </button>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bWt-lb-7xL">
+                                        <rect key="frame" x="80" y="15" width="267" height="84"/>
+                                        <string key="text">The next generation of password security is now called «Spectre»:
+Tap to copy your user into Spectre.
+
+This app is now out of maintenance.</string>
+                                        <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
+                                        <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3WO-6r-WEn" userLabel="Close">
+                                        <rect key="frame" x="347" y="20" width="47" height="31"/>
+                                        <buttonConfiguration key="configuration" style="plain" title="╳"/>
+                                        <connections>
+                                            <action selector="dismissSpectre:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="aEC-nX-WeV"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="3WO-6r-WEn" firstAttribute="leading" secondItem="bWt-lb-7xL" secondAttribute="trailing" id="49f-Eg-XMb"/>
+                                    <constraint firstItem="bWt-lb-7xL" firstAttribute="leading" secondItem="4s3-Ex-jpT" secondAttribute="leading" constant="72" id="4rw-uH-p06"/>
+                                    <constraint firstItem="3WO-6r-WEn" firstAttribute="top" secondItem="e7i-8u-nyd" secondAttribute="top" constant="20" id="50L-TI-WJ8"/>
+                                    <constraint firstItem="bWt-lb-7xL" firstAttribute="top" secondItem="4s3-Ex-jpT" secondAttribute="top" constant="7" id="AwO-Pj-Wnr"/>
+                                    <constraint firstAttribute="bottomMargin" secondItem="4s3-Ex-jpT" secondAttribute="bottom" id="LWF-xQ-l5k"/>
+                                    <constraint firstItem="4s3-Ex-jpT" firstAttribute="leading" secondItem="e7i-8u-nyd" secondAttribute="leadingMargin" id="OKe-0I-vdR"/>
+                                    <constraint firstItem="4s3-Ex-jpT" firstAttribute="top" secondItem="e7i-8u-nyd" secondAttribute="topMargin" id="TRy-eS-Ch4"/>
+                                    <constraint firstAttribute="trailing" secondItem="3WO-6r-WEn" secondAttribute="trailing" constant="20" id="aPO-KL-k9X"/>
+                                    <constraint firstItem="bWt-lb-7xL" firstAttribute="bottom" secondItem="4s3-Ex-jpT" secondAttribute="bottom" constant="-15" id="cYX-vL-MKX"/>
+                                    <constraint firstAttribute="trailingMargin" secondItem="4s3-Ex-jpT" secondAttribute="trailing" id="lRd-Hq-SH2"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" red="0.1215686275" green="0.12941176469999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="VGz-R0-vMD" firstAttribute="top" secondItem="X8H-vh-j7B" secondAttribute="bottom" id="8Ed-3Y-ll0"/>
                             <constraint firstAttribute="trailing" secondItem="X8H-vh-j7B" secondAttribute="trailing" id="8Gr-Dq-UpZ"/>
                             <constraint firstAttribute="bottom" secondItem="rWM-08-aab" secondAttribute="bottom" id="9Yx-cj-wHh"/>
+                            <constraint firstItem="tOT-TZ-yse" firstAttribute="leading" secondItem="DOr-Xu-P9q" secondAttribute="leading" id="CKQ-85-U4k"/>
+                            <constraint firstAttribute="bottom" secondItem="e7i-8u-nyd" secondAttribute="bottom" id="G00-FW-tqE"/>
                             <constraint firstItem="X8H-vh-j7B" firstAttribute="top" secondItem="9u7-pu-Wtv" secondAttribute="centerY" priority="500" constant="180" id="Gp5-h6-53S"/>
                             <constraint firstItem="rWM-08-aab" firstAttribute="leading" secondItem="DOr-Xu-P9q" secondAttribute="leading" id="Il8-kg-Dra"/>
                             <constraint firstItem="X8H-vh-j7B" firstAttribute="top" secondItem="fUK-gJ-NRE" secondAttribute="centerY" priority="500" constant="180" id="PgC-ZL-cQo"/>
                             <constraint firstAttribute="trailing" secondItem="rWM-08-aab" secondAttribute="trailing" id="UPP-1n-zIe"/>
                             <constraint firstItem="X8H-vh-j7B" firstAttribute="top" secondItem="qp1-nX-o4i" secondAttribute="bottom" constant="20" id="WdK-tA-njz"/>
+                            <constraint firstItem="e7i-8u-nyd" firstAttribute="leading" secondItem="DOr-Xu-P9q" secondAttribute="leading" id="au3-Bw-ioi"/>
                             <constraint firstItem="X8H-vh-j7B" firstAttribute="leading" secondItem="DOr-Xu-P9q" secondAttribute="leading" id="jbn-ko-MPq"/>
+                            <constraint firstAttribute="trailing" secondItem="e7i-8u-nyd" secondAttribute="trailing" id="l3l-d3-Y68"/>
                             <constraint firstItem="zCP-wo-gTl" firstAttribute="top" secondItem="zp4-4O-wZI" secondAttribute="bottom" id="nAS-Jf-o5m"/>
+                            <constraint firstAttribute="bottom" secondItem="tOT-TZ-yse" secondAttribute="bottom" id="oNx-xq-124"/>
+                            <constraint firstAttribute="trailing" secondItem="tOT-TZ-yse" secondAttribute="trailing" id="wI5-eh-S2b"/>
                             <constraint firstAttribute="top" secondItem="rWM-08-aab" secondAttribute="top" id="xBe-1Q-mz2"/>
                         </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="ignoreTouches" value="YES"/>
+                        </userDefinedRuntimeAttributes>
                     </view>
                     <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
                     <connections>
@@ -442,23 +533,16 @@
                         <outlet property="nextAvatarButton" destination="fUK-gJ-NRE" id="5qo-lK-rSa"/>
                         <outlet property="preferencesTipContainer" destination="0Um-Ot-hI6" id="Cv8-Bp-ZZs"/>
                         <outlet property="previousAvatarButton" destination="9u7-pu-Wtv" id="Hgv-lN-S1n"/>
-                        <outlet property="searchDisplayController" destination="h98-GT-FoS" id="VvS-JO-rqq"/>
+                        <outlet property="spectreInstallAlert" destination="tOT-TZ-yse" id="2hk-xb-psR"/>
+                        <outlet property="spectreMigrateAlert" destination="e7i-8u-nyd" id="6oI-L9-VgE"/>
                         <outlet property="storeLoadingActivity" destination="VDd-oM-ZOO" id="MJ7-2f-e8n"/>
                         <outlet property="thanksTipContainer" destination="069-Pu-yXe" id="wWf-2X-Ryw"/>
                         <outlet property="userSelectionContainer" destination="rWM-08-aab" id="Yme-hX-8P0"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8hZ-Tb-wZw" userLabel="First Responder" sceneMemberID="firstResponder"/>
-                <searchDisplayController id="h98-GT-FoS">
-                    <connections>
-                        <outlet property="delegate" destination="S8q-YF-Kt9" id="hyY-rf-2x2"/>
-                        <outlet property="searchContentsController" destination="S8q-YF-Kt9" id="2RA-rs-GhH"/>
-                        <outlet property="searchResultsDataSource" destination="S8q-YF-Kt9" id="Cdu-go-UBQ"/>
-                        <outlet property="searchResultsDelegate" destination="S8q-YF-Kt9" id="xxe-xE-sFM"/>
-                    </connections>
-                </searchDisplayController>
             </objects>
-            <point key="canvasLocation" x="2041" y="226"/>
+            <point key="canvasLocation" x="2040.5797101449277" y="225.66964285714283"/>
         </scene>
         <!--Web View Controller-->
         <scene sceneID="JQz-u7-oA7">
@@ -531,12 +615,23 @@
                     <view key="view" contentMode="scaleToFill" id="c4P-nn-PjR">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qca-aL-Un8">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                                <connections>
+                                    <segue destination="Ac5-na-hOV" kind="embed" identifier="root" id="x4h-Hl-KXD"/>
+                                </connections>
+                            </containerView>
+                        </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="qca-aL-Un8" firstAttribute="top" secondItem="c4P-nn-PjR" secondAttribute="top" id="7ix-Oo-ELN"/>
+                            <constraint firstAttribute="bottom" secondItem="qca-aL-Un8" secondAttribute="bottom" id="JRU-fk-cPG"/>
+                            <constraint firstItem="qca-aL-Un8" firstAttribute="leading" secondItem="c4P-nn-PjR" secondAttribute="leading" id="OAO-XC-DQ1"/>
+                            <constraint firstAttribute="trailing" secondItem="qca-aL-Un8" secondAttribute="trailing" id="R9n-bd-GVl"/>
+                        </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="V6W-ql-3TD"/>
-                    <connections>
-                        <segue destination="Ac5-na-hOV" kind="custom" identifier="root" customClass="MPRootSegue" id="UKS-gd-oD2"/>
-                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="fQY-fV-sIe" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -557,12 +652,25 @@
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" image="background.png" translatesAutoresizingMaskIntoConstraints="NO" id="Lkg-xn-bce" userLabel="Background">
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
+                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="91I-wN-JQb">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="ignoreTouches" value="YES"/>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <segue destination="S8q-YF-Kt9" kind="embed" identifier="users" id="GzD-Zv-DzW"/>
+                                </connections>
+                            </containerView>
                         </subviews>
                         <constraints>
+                            <constraint firstItem="91I-wN-JQb" firstAttribute="leading" secondItem="fkJ-D0-yue" secondAttribute="leading" id="E4w-Dw-Vip"/>
                             <constraint firstItem="Lkg-xn-bce" firstAttribute="top" secondItem="fkJ-D0-yue" secondAttribute="top" id="EIy-Cd-0vW"/>
+                            <constraint firstItem="91I-wN-JQb" firstAttribute="top" secondItem="fkJ-D0-yue" secondAttribute="top" id="EeB-9X-PEK"/>
                             <constraint firstAttribute="trailing" secondItem="Lkg-xn-bce" secondAttribute="trailing" id="ROW-fK-z92"/>
                             <constraint firstItem="Lkg-xn-bce" firstAttribute="leading" secondItem="fkJ-D0-yue" secondAttribute="leading" id="UH5-Kk-taJ"/>
+                            <constraint firstAttribute="bottom" secondItem="91I-wN-JQb" secondAttribute="bottom" id="mxv-9s-jxT"/>
                             <constraint firstAttribute="bottom" secondItem="Lkg-xn-bce" secondAttribute="bottom" id="txR-pf-v3l"/>
+                            <constraint firstAttribute="trailing" secondItem="91I-wN-JQb" secondAttribute="trailing" id="uef-ig-RRl"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="MPa-zX-Kaq"/>
@@ -570,7 +678,6 @@
                     <connections>
                         <segue destination="osn-5H-SWW" kind="custom" identifier="emergency" customClass="MPOverlaySegue" id="gtX-Cx-AA2"/>
                         <segue destination="nkY-z6-8jd" kind="custom" identifier="passwords" customClass="MPSitesSegue" id="Ozp-YT-Utx"/>
-                        <segue destination="S8q-YF-Kt9" kind="custom" identifier="users" customClass="MPRootSegue" id="StK-nr-nps"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="F33-Fe-Tb6" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -610,20 +717,20 @@
                             <tableViewSection id="FEv-Rb-jst">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="eth-Dc-JYn" userLabel="Show Help">
-                                        <rect key="frame" x="0.0" y="28" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="44.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eth-Dc-JYn" id="8m6-pP-lda">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="250"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="384.5" height="250"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Show Help" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x9b-Qa-Pza">
-                                                    <rect key="frame" x="20" y="20" width="343" height="20"/>
+                                                    <rect key="frame" x="20" y="20" width="344.5" height="20"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" text="Open the short step-by-step guide which explains how to use Master Password." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bKz-o1-gHv">
-                                                    <rect key="frame" x="20" y="48" width="343" height="182"/>
+                                                    <rect key="frame" x="20" y="48" width="344.5" height="182"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="12"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -642,20 +749,20 @@
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="R30-AU-bR6" userLabel="Sign Out">
-                                        <rect key="frame" x="0.0" y="278" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="294.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R30-AU-bR6" id="f6h-Ff-2Qc">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="250"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="384.5" height="250"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Sign Out" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nr5-ze-6PW">
-                                                    <rect key="frame" x="20" y="20" width="343" height="20"/>
+                                                    <rect key="frame" x="20" y="20" width="344.5" height="20"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" text="Log yourself out and return to the user selection screen." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0G1-cX-MT3">
-                                                    <rect key="frame" x="20" y="48" width="343" height="182"/>
+                                                    <rect key="frame" x="20" y="48" width="344.5" height="182"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="12"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -674,7 +781,7 @@
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="B8R-iE-Ffe" userLabel="Default Password Type">
-                                        <rect key="frame" x="0.0" y="528" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="544.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="B8R-iE-Ffe" id="8r5-Zc-TRj">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="250"/>
@@ -758,7 +865,7 @@
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="Sz1-JP-dw2" userLabel="Avatar">
-                                        <rect key="frame" x="0.0" y="778" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="794.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sz1-JP-dw2" id="R4X-LE-ir9">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="250"/>
@@ -784,7 +891,7 @@
                                                         <constraint firstAttribute="height" constant="110" id="zBf-EA-iDN"/>
                                                     </constraints>
                                                 </imageView>
-                                                <button opaque="NO" alpha="0.69999998807907104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DzC-Ts-gew" userLabel="Previous Avatar">
+                                                <button opaque="NO" alpha="0.69999998807907104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DzC-Ts-gew" userLabel="Previous Avatar">
                                                     <rect key="frame" x="20" y="148.5" width="44" height="53"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="1Wu-gS-flK"/>
@@ -798,7 +905,7 @@
                                                         <action selector="previousAvatar:" destination="JFc-sj-awD" eventType="touchUpInside" id="D92-6I-zFd"/>
                                                     </connections>
                                                 </button>
-                                                <button opaque="NO" alpha="0.69999998807907104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yAf-fc-SKl" userLabel="Next Avatar">
+                                                <button opaque="NO" alpha="0.69999998807907104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yAf-fc-SKl" userLabel="Next Avatar">
                                                     <rect key="frame" x="350" y="148.5" width="44" height="53"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="pEf-Vp-D7s"/>
@@ -833,25 +940,25 @@
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="fRZ-Uh-FR8" userLabel="Save Password">
-                                        <rect key="frame" x="0.0" y="1028" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="1044.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fRZ-Uh-FR8" id="qCQ-L5-teL">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="250"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jr5-mX-nw0">
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jr5-mX-nw0">
                                                     <rect key="frame" x="182.5" y="199" width="51" height="31"/>
                                                     <connections>
                                                         <action selector="valueChanged:" destination="JFc-sj-awD" eventType="valueChanged" id="KMj-5x-BcK"/>
                                                     </connections>
                                                 </switch>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Save Password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3fk-Io-xQI">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" ambiguous="YES" text="Save Password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3fk-Io-xQI">
                                                     <rect key="frame" x="20" y="20" width="374" height="20"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z1N-JR-4fr">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" ambiguous="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z1N-JR-4fr">
                                                     <rect key="frame" x="20" y="48" width="374" height="143"/>
                                                     <string key="text">This will store your master password in your device's keychain.  As a result, you'll be able to log in without entering your master password. This is somewhat less secure in the event of theft: anyone who figures out your device's PIN can get in.  You can compensate for the reduced security by setting a more secure passcode for your device (in Settings, go to: General-&gt;Passcode Lock, disable "Simple Passcode") or by purchasing and enabling support for TouchID.</string>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="12"/>
@@ -874,25 +981,25 @@
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="bKn-6f-TKE" userLabel="TouchID">
-                                        <rect key="frame" x="0.0" y="1278" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="1294.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bKn-6f-TKE" id="GBL-TP-VnH">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="250"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wOM-X3-jCG">
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wOM-X3-jCG">
                                                     <rect key="frame" x="182.5" y="199" width="51" height="31"/>
                                                     <connections>
                                                         <action selector="valueChanged:" destination="JFc-sj-awD" eventType="valueChanged" id="KmT-CO-GZh"/>
                                                     </connections>
                                                 </switch>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Biometrics" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6xf-vt-aXd">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" ambiguous="YES" text="Biometrics" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6xf-vt-aXd">
                                                     <rect key="frame" x="20" y="20" width="374" height="20"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="URR-yZ-QuC">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" ambiguous="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="URR-yZ-QuC">
                                                     <rect key="frame" x="20" y="48" width="374" height="143"/>
                                                     <string key="text">When enabled on a biometrics-enabled device, your fingerprint or face scan will be required to load your stored master password.
 Note that this feature requires you enable the Save Password option and have purchased Biometrics support from the in-app store.</string>
@@ -916,19 +1023,19 @@ Note that this feature requires you enable the Save Password option and have pur
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="9QG-lM-ymM" userLabel="Feedback">
-                                        <rect key="frame" x="0.0" y="1528" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="1544.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9QG-lM-ymM" id="hK8-XQ-lLz">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="250"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="396.5" height="250"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Feedback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5zr-Nr-zRb">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" ambiguous="YES" text="Feedback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5zr-Nr-zRb">
                                                     <rect key="frame" x="20" y="20" width="343" height="20"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" text="Contact me if you have a question, idea, praise or issue.  Try to be as detailed as possible." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8dg-Ew-Vy1">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" ambiguous="YES" text="Contact me if you have a question, idea, praise or issue.  Try to be as detailed as possible." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8dg-Ew-Vy1">
                                                     <rect key="frame" x="20" y="48" width="343" height="182"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="12"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -948,19 +1055,19 @@ Note that this feature requires you enable the Save Password option and have pur
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="UdB-BV-AHA" userLabel="Check Inconsistencies">
-                                        <rect key="frame" x="0.0" y="1778" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="1794.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UdB-BV-AHA" id="V2Y-nu-jhZ">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="250"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="396.5" height="250"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Check For Inconsistencies" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WXh-sg-l2h">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" ambiguous="YES" text="Check For Inconsistencies" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WXh-sg-l2h">
                                                     <rect key="frame" x="20" y="20" width="343" height="20"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" text="Perform a check to see if there are any inconsistencies in your site data that might cause issues." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gTs-JA-zmL">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" ambiguous="YES" text="Perform a check to see if there are any inconsistencies in your site data that might cause issues." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gTs-JA-zmL">
                                                     <rect key="frame" x="20" y="48" width="343" height="182"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="12"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -980,19 +1087,19 @@ Note that this feature requires you enable the Save Password option and have pur
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="IVT-Rs-nTu" userLabel="Export">
-                                        <rect key="frame" x="0.0" y="2028" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="2044.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="IVT-Rs-nTu" id="Q5J-2f-mmz">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="250"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="396.5" height="250"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Export" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KEh-y5-Obc">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" ambiguous="YES" text="Export" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KEh-y5-Obc">
                                                     <rect key="frame" x="20" y="20" width="343" height="20"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U77-XF-Bvb">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" ambiguous="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U77-XF-Bvb">
                                                     <rect key="frame" x="20" y="48" width="343" height="182"/>
                                                     <string key="text">An export saves all your sites and optionally their passwords to a file that you can store separately.  It can function as a back-up or a way to move all your sites to a new device.</string>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="12"/>
@@ -1013,19 +1120,19 @@ Note that this feature requires you enable the Save Password option and have pur
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" id="hmf-Wz-9l2" userLabel="Footer">
-                                        <rect key="frame" x="0.0" y="2278" width="414" height="250"/>
+                                        <rect key="frame" x="0.0" y="2294.5" width="414" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hmf-Wz-9l2" id="AL3-2q-tgO">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="250"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="999" verticalCompressionResistancePriority="1000" text="© 2011-2020, Maarten Billemont (lhunath)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sPw-mV-mFF">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="999" verticalCompressionResistancePriority="1000" ambiguous="YES" text="© 2011-2020, Maarten Billemont (lhunath)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sPw-mV-mFF">
                                                     <rect key="frame" x="20" y="4" width="374" height="106"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="11"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rl7-cr-FHf">
+                                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rl7-cr-FHf">
                                                     <rect key="frame" x="20" y="118" width="374" height="27"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="12"/>
                                                     <state key="normal" title="Home Page">
@@ -1035,7 +1142,7 @@ Note that this feature requires you enable the Save Password option and have pur
                                                         <action selector="homePageButton:" destination="JFc-sj-awD" eventType="touchUpInside" id="ptD-cv-NMr"/>
                                                     </connections>
                                                 </button>
-                                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="epW-Rm-9St">
+                                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="epW-Rm-9St">
                                                     <rect key="frame" x="20" y="153" width="374" height="27"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="12"/>
                                                     <state key="normal" title="Understanding Master Password's Security">
@@ -1045,7 +1152,7 @@ Note that this feature requires you enable the Save Password option and have pur
                                                         <action selector="securityButton:" destination="JFc-sj-awD" eventType="touchUpInside" id="Efv-cp-Xfh"/>
                                                     </connections>
                                                 </button>
-                                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LTN-ch-h8D">
+                                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LTN-ch-h8D">
                                                     <rect key="frame" x="20" y="188" width="374" height="27"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="12"/>
                                                     <state key="normal" title="Get the Master Password source code">
@@ -1055,7 +1162,7 @@ Note that this feature requires you enable the Save Password option and have pur
                                                         <action selector="sourceButton:" destination="JFc-sj-awD" eventType="touchUpInside" id="Y3O-di-CZo"/>
                                                     </connections>
                                                 </button>
-                                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Z60-lc-Nka">
+                                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Z60-lc-Nka">
                                                     <rect key="frame" x="20" y="223" width="374" height="27"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="12"/>
                                                     <state key="normal" title="Send Thanks">
@@ -1135,7 +1242,8 @@ Note that this feature requires you enable the Save Password option and have pur
                                     <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" keyboardDismissMode="interactive" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="aXw-tn-8Sj" userLabel="Password Collection">
                                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" sectionInsetReference="safeArea" id="Mv1-29-TWx">
+                                        <edgeInsets key="layoutMargins" top="100" left="0.0" bottom="0.0" right="0.0"/>
+                                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" sectionInsetReference="layoutMargins" id="Mv1-29-TWx">
                                             <size key="itemSize" width="355" height="100"/>
                                             <size key="headerReferenceSize" width="0.0" height="0.0"/>
                                             <size key="footerReferenceSize" width="0.0" height="0.0"/>
@@ -1143,7 +1251,7 @@ Note that this feature requires you enable the Save Password option and have pur
                                         </collectionViewFlowLayout>
                                         <cells>
                                             <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MPSiteCell" id="W2g-yv-V3V" customClass="MPSiteCell">
-                                                <rect key="frame" x="29.5" y="10" width="355" height="100"/>
+                                                <rect key="frame" x="29.5" y="110" width="355" height="100"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
                                                     <rect key="frame" x="0.0" y="0.0" width="355" height="100"/>
@@ -1579,9 +1687,9 @@ Note that this feature requires you enable the Save Password option and have pur
                                 </constraints>
                             </view>
                             <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cHF-cD-2Ge">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="144"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="139"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="CkH-CQ-k0G">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="144"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="139"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <navigationBar hidden="YES" opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="uuT-jm-2La" userLabel="Navigation" customClass="PearlUINavigationBar">
@@ -1601,14 +1709,14 @@ Note that this feature requires you enable the Save Password option and have pur
                                             </connections>
                                         </button>
                                         <searchBar contentMode="redraw" barStyle="black" searchBarStyle="minimal" placeholder="eg. apple.com" translatesAutoresizingMaskIntoConstraints="NO" id="aGs-1S-aC3">
-                                            <rect key="frame" x="0.0" y="88" width="414" height="56"/>
+                                            <rect key="frame" x="0.0" y="88" width="414" height="51"/>
                                             <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL"/>
                                             <connections>
                                                 <outlet property="delegate" destination="nkY-z6-8jd" id="ENG-q5-XwX"/>
                                             </connections>
                                         </searchBar>
                                         <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LEX-BK-PdS" userLabel="Bad Name Tip">
-                                            <rect key="frame" x="57" y="116" width="300.5" height="75.5"/>
+                                            <rect key="frame" x="57" y="113.5" width="300.5" height="75.5"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="tip_basic_black_top.png" translatesAutoresizingMaskIntoConstraints="NO" id="Rt5-v4-I0R">
                                                     <rect key="frame" x="0.0" y="0.0" width="300.5" height="75.5"/>
@@ -1657,70 +1765,6 @@ eg. apple.com, rmitchell@twitter.com</string>
                                 </view>
                                 <blurEffect style="regular"/>
                             </visualEffectView>
-                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ve-eR-1IW">
-                                <rect key="frame" x="0.0" y="740" width="414" height="156"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PWC-I5-RSl">
-                                        <rect key="frame" x="8" y="8" width="398" height="106"/>
-                                        <state key="normal" backgroundImage="tip_alert_black"/>
-                                        <connections>
-                                            <action selector="upgradeVolto:" destination="nkY-z6-8jd" eventType="touchUpInside" id="8KJ-vm-3D0"/>
-                                        </connections>
-                                    </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XgC-Ky-oVC">
-                                        <rect key="frame" x="80" y="15" width="315" height="84"/>
-                                        <string key="text">The next generation of password security is now called «Volto»:
-Tap to install the upgrade.
-
-This app is now out of maintenance.</string>
-                                        <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
-                                        <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="PWC-I5-RSl" firstAttribute="top" secondItem="3ve-eR-1IW" secondAttribute="topMargin" id="0gi-j6-mfg"/>
-                                    <constraint firstItem="XgC-Ky-oVC" firstAttribute="leading" secondItem="PWC-I5-RSl" secondAttribute="leading" constant="72" id="E88-An-rzp"/>
-                                    <constraint firstAttribute="bottomMargin" secondItem="PWC-I5-RSl" secondAttribute="bottom" id="FrN-5c-k1V"/>
-                                    <constraint firstItem="XgC-Ky-oVC" firstAttribute="trailing" secondItem="PWC-I5-RSl" secondAttribute="trailing" constant="-11" id="Scl-zE-fTg"/>
-                                    <constraint firstAttribute="trailingMargin" secondItem="PWC-I5-RSl" secondAttribute="trailing" id="gwp-DL-I06"/>
-                                    <constraint firstItem="XgC-Ky-oVC" firstAttribute="bottom" secondItem="PWC-I5-RSl" secondAttribute="bottom" constant="-15" id="hFa-k3-yr9"/>
-                                    <constraint firstItem="PWC-I5-RSl" firstAttribute="leading" secondItem="3ve-eR-1IW" secondAttribute="leadingMargin" id="jod-TY-7Iu"/>
-                                    <constraint firstItem="XgC-Ky-oVC" firstAttribute="top" secondItem="PWC-I5-RSl" secondAttribute="top" constant="7" id="yjZ-x1-6JY"/>
-                                </constraints>
-                            </view>
-                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="67c-5R-Foa">
-                                <rect key="frame" x="0.0" y="740" width="414" height="156"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZK-er-8ql">
-                                        <rect key="frame" x="8" y="8" width="398" height="106"/>
-                                        <state key="normal" backgroundImage="tip_alert_black"/>
-                                        <connections>
-                                            <action selector="upgradeVolto:" destination="nkY-z6-8jd" eventType="touchUpInside" id="P4a-tL-9yX"/>
-                                        </connections>
-                                    </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fLB-gA-32p">
-                                        <rect key="frame" x="80" y="15" width="315" height="84"/>
-                                        <string key="text">The next generation of password security is now called «Volto»:
-Tap to copy this user into Volto.
-
-This app is now out of maintenance.</string>
-                                        <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
-                                        <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstAttribute="trailingMargin" secondItem="EZK-er-8ql" secondAttribute="trailing" id="2v6-0n-EXu"/>
-                                    <constraint firstItem="fLB-gA-32p" firstAttribute="bottom" secondItem="EZK-er-8ql" secondAttribute="bottom" constant="-15" id="KET-Ct-225"/>
-                                    <constraint firstAttribute="bottomMargin" secondItem="EZK-er-8ql" secondAttribute="bottom" id="LqJ-v9-IDf"/>
-                                    <constraint firstItem="fLB-gA-32p" firstAttribute="trailing" secondItem="EZK-er-8ql" secondAttribute="trailing" constant="-11" id="ivM-cA-Fn9"/>
-                                    <constraint firstItem="fLB-gA-32p" firstAttribute="leading" secondItem="EZK-er-8ql" secondAttribute="leading" constant="72" id="iwL-1a-Tgo"/>
-                                    <constraint firstItem="fLB-gA-32p" firstAttribute="top" secondItem="EZK-er-8ql" secondAttribute="top" constant="7" id="mHI-WQ-tMx"/>
-                                    <constraint firstItem="EZK-er-8ql" firstAttribute="top" secondItem="67c-5R-Foa" secondAttribute="topMargin" id="xMX-Iy-gkw"/>
-                                    <constraint firstItem="EZK-er-8ql" firstAttribute="leading" secondItem="67c-5R-Foa" secondAttribute="leadingMargin" id="ycd-o8-QVl"/>
-                                </constraints>
-                            </view>
                             <view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XNM-XQ-rMe" userLabel="Popdown">
                                 <rect key="frame" x="0.0" y="-896" width="414" height="896"/>
                                 <subviews>
@@ -1764,13 +1808,8 @@ This app is now out of maintenance.</string>
                         </subviews>
                         <color key="backgroundColor" red="0.1215686275" green="0.12941176469999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="67c-5R-Foa" secondAttribute="trailing" id="0mY-Tq-ZT4"/>
                             <constraint firstItem="cHF-cD-2Ge" firstAttribute="top" secondItem="XNM-XQ-rMe" secondAttribute="bottom" id="6V9-tX-50t"/>
-                            <constraint firstAttribute="trailing" secondItem="3ve-eR-1IW" secondAttribute="trailing" id="7hd-C3-Akk"/>
-                            <constraint firstAttribute="bottom" secondItem="67c-5R-Foa" secondAttribute="bottom" id="8xp-Si-tWG"/>
                             <constraint firstAttribute="top" secondItem="XNM-XQ-rMe" secondAttribute="bottom" priority="750" id="BdD-Kc-eHl"/>
-                            <constraint firstItem="67c-5R-Foa" firstAttribute="leading" secondItem="tI8-OT-LrO" secondAttribute="leading" id="Ftn-Yi-mdI"/>
-                            <constraint firstAttribute="bottom" secondItem="3ve-eR-1IW" secondAttribute="bottom" id="GOa-ky-jfJ"/>
                             <constraint firstItem="uuT-jm-2La" firstAttribute="bottom" secondItem="S9X-2T-e1e" secondAttribute="bottom" priority="500" constant="44" id="HAi-jL-BdJ"/>
                             <constraint firstAttribute="trailing" secondItem="K2e-Gh-7hH" secondAttribute="trailing" id="Hnk-mU-GSd"/>
                             <constraint firstAttribute="top" secondItem="cHF-cD-2Ge" secondAttribute="bottom" priority="1" id="JO5-ph-0ce"/>
@@ -1782,7 +1821,6 @@ This app is now out of maintenance.</string>
                             <constraint firstItem="cHF-cD-2Ge" firstAttribute="leading" secondItem="tI8-OT-LrO" secondAttribute="leading" id="TJC-eP-DDE"/>
                             <constraint firstItem="uuT-jm-2La" firstAttribute="bottom" secondItem="VOY-zU-XQR" secondAttribute="bottom" id="U4C-1P-lIR"/>
                             <constraint firstItem="K2e-Gh-7hH" firstAttribute="height" secondItem="tI8-OT-LrO" secondAttribute="height" id="Xfe-XT-eOn"/>
-                            <constraint firstItem="3ve-eR-1IW" firstAttribute="leading" secondItem="tI8-OT-LrO" secondAttribute="leading" id="bKZ-qF-SL5"/>
                             <constraint firstAttribute="trailing" secondItem="XNM-XQ-rMe" secondAttribute="trailing" id="bgl-u9-shU"/>
                             <constraint firstItem="K2e-Gh-7hH" firstAttribute="top" secondItem="tI8-OT-LrO" secondAttribute="bottom" priority="1" id="dNt-uf-8BC"/>
                             <constraint firstItem="K2e-Gh-7hH" firstAttribute="top" secondItem="tI8-OT-LrO" secondAttribute="top" priority="500" id="vtB-e4-L8o"/>
@@ -1801,8 +1839,6 @@ This app is now out of maintenance.</string>
                         <outlet property="popdownView" destination="XNM-XQ-rMe" id="FaW-4m-Fff"/>
                         <outlet property="searchBar" destination="aGs-1S-aC3" id="rTp-DP-rIz"/>
                         <outlet property="sitesToBottomConstraint" destination="dNt-uf-8BC" id="Ta6-eL-z7w"/>
-                        <outlet property="voltoInstallAlert" destination="3ve-eR-1IW" id="Ah5-OX-XhQ"/>
-                        <outlet property="voltoMigrateAlert" destination="67c-5R-Foa" id="aTi-fu-opO"/>
                         <segue destination="z9O-w0-6oR" kind="modal" identifier="guide" id="Ql4-wf-T8u"/>
                         <segue destination="Foa-Er-RBr" kind="custom" identifier="message" customClass="MPOverlaySegue" id="Xne-Sm-HQt"/>
                     </connections>
@@ -1831,10 +1867,10 @@ This app is now out of maintenance.</string>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1lc-e7-Qme" userLabel="Emergency Generator">
-                                        <rect key="frame" x="20" y="240.5" width="374" height="415.5"/>
+                                        <rect key="frame" x="20" y="240" width="374" height="416"/>
                                         <subviews>
                                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Emergency Generator" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="4Lh-s0-Dbt">
-                                                <rect key="frame" x="20" y="20" width="334" height="21"/>
+                                                <rect key="frame" x="20" y="20" width="334" height="21.5"/>
                                                 <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -1842,7 +1878,7 @@ This app is now out of maintenance.</string>
                                                 <size key="shadowOffset" width="0.0" height="1"/>
                                             </label>
                                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Generate your password without logging in.  Great for if you're borrowing a friend's device or are having trouble logging in." lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="vHS-3A-Tae">
-                                                <rect key="frame" x="20" y="49" width="334" height="51.5"/>
+                                                <rect key="frame" x="20" y="49.5" width="334" height="51.5"/>
                                                 <fontDescription key="fontDescription" name="Exo2.0-Thin" family="Exo 2.0" pointSize="14"/>
                                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -1850,7 +1886,7 @@ This app is now out of maintenance.</string>
                                                 <size key="shadowOffset" width="0.0" height="1"/>
                                             </label>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your Name" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XAC-Da-lpf" userLabel="User Name">
-                                                <rect key="frame" x="20" y="108.5" width="334" height="34"/>
+                                                <rect key="frame" x="20" y="109" width="334" height="34"/>
                                                 <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" autocapitalizationType="words" keyboardAppearance="alert" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
                                                 <connections>
@@ -1859,7 +1895,7 @@ This app is now out of maintenance.</string>
                                                 </connections>
                                             </textField>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your Master Password" clearsOnBeginEditing="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="J46-0E-no3" userLabel="Master Password">
-                                                <rect key="frame" x="20" y="150.5" width="334" height="34"/>
+                                                <rect key="frame" x="20" y="151" width="334" height="34"/>
                                                 <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardAppearance="alert" returnKeyType="next" enablesReturnKeyAutomatically="YES" secureTextEntry="YES"/>
                                                 <connections>
@@ -1868,7 +1904,7 @@ This app is now out of maintenance.</string>
                                                 </connections>
                                             </textField>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Site Name" clearsOnBeginEditing="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="56H-xR-09J" userLabel="Site Name">
-                                                <rect key="frame" x="20" y="192.5" width="334" height="34"/>
+                                                <rect key="frame" x="20" y="193" width="334" height="34"/>
                                                 <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="URL" keyboardAppearance="alert" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
                                                 <connections>
@@ -1877,7 +1913,7 @@ This app is now out of maintenance.</string>
                                                 </connections>
                                             </textField>
                                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="1" translatesAutoresizingMaskIntoConstraints="NO" id="e4b-Iv-Pk9" userLabel="Type">
-                                                <rect key="frame" x="20" y="234.5" width="334" height="32"/>
+                                                <rect key="frame" x="20" y="235" width="334" height="32"/>
                                                 <segments>
                                                     <segment title="Max"/>
                                                     <segment title="Long"/>
@@ -1892,7 +1928,7 @@ This app is now out of maintenance.</string>
                                                 </connections>
                                             </segmentedControl>
                                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Counter" lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="cAo-K2-E23">
-                                                <rect key="frame" x="20" y="277.5" width="64" height="21.5"/>
+                                                <rect key="frame" x="20" y="278.5" width="64" height="21.5"/>
                                                 <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -1900,13 +1936,13 @@ This app is now out of maintenance.</string>
                                                 <size key="shadowOffset" width="0.0" height="1"/>
                                             </label>
                                             <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="ZPT-EI-yuv" userLabel="Counter">
-                                                <rect key="frame" x="260" y="273.5" width="94" height="32"/>
+                                                <rect key="frame" x="260" y="274" width="94" height="32"/>
                                                 <connections>
                                                     <action selector="controlChanged:" destination="osn-5H-SWW" eventType="valueChanged" id="eQA-3X-uc9"/>
                                                 </connections>
                                             </stepper>
                                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="3Cd-XH-Wau">
-                                                <rect key="frame" x="245" y="278.5" width="7" height="20"/>
+                                                <rect key="frame" x="245" y="279" width="7" height="20.5"/>
                                                 <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="17"/>
                                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1947,10 +1983,10 @@ This app is now out of maintenance.</string>
                                                 </state>
                                             </button>
                                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="4sN-hm-xio">
-                                                <rect key="frame" x="168.5" y="352" width="37" height="37"/>
+                                                <rect key="frame" x="168.5" y="352.5" width="37" height="37"/>
                                             </activityIndicatorView>
                                             <button opaque="NO" clipsSubviews="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="bHR-he-dnZ">
-                                                <rect key="frame" x="20" y="345.5" width="334" height="50"/>
+                                                <rect key="frame" x="20" y="346" width="334" height="50"/>
                                                 <gestureRecognizers/>
                                                 <fontDescription key="fontDescription" name="SourceCodePro-Black" family="Source Code Pro" pointSize="30"/>
                                                 <state key="normal" title="XapaNuwjFihn6$">
@@ -1962,7 +1998,7 @@ This app is now out of maintenance.</string>
                                                 </connections>
                                             </button>
                                             <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="beo-cJ-jIn" userLabel="View - Content Tip">
-                                                <rect key="frame" x="82" y="310.5" width="210" height="60"/>
+                                                <rect key="frame" x="82" y="311" width="210" height="60"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="tip_basic_black.png" translatesAutoresizingMaskIntoConstraints="NO" id="nyL-cO-aPa">
                                                         <rect key="frame" x="0.0" y="0.0" width="210" height="60"/>
@@ -2041,14 +2077,41 @@ This app is now out of maintenance.</string>
                                     <constraint firstItem="1lc-e7-Qme" firstAttribute="leading" secondItem="whU-l0-2bU" secondAttribute="leading" constant="20" id="ztv-2f-RAc"/>
                                 </constraints>
                             </scrollView>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="cbe-hc-9K5">
+                                <rect key="frame" x="20" y="820" width="374" height="42"/>
+                                <subviews>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Anonymous Device Identifier" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="VyZ-qP-VkG">
+                                        <rect key="frame" x="0.0" y="0.0" width="374" height="18"/>
+                                        <fontDescription key="fontDescription" name="Exo2.0-Thin" family="Exo 2.0" pointSize="14"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                        <color key="shadowColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <size key="shadowOffset" width="0.0" height="1"/>
+                                    </label>
+                                    <button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DVF-Im-H2I">
+                                        <rect key="frame" x="0.0" y="18" width="374" height="24"/>
+                                        <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="10"/>
+                                        <state key="normal" title="0000000000000000000000000000000000000000">
+                                            <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="copyDevice:" destination="osn-5H-SWW" eventType="touchUpInside" id="0dD-IS-Ktn"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                            </stackView>
                         </subviews>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="whU-l0-2bU" firstAttribute="height" secondItem="GiS-3g-cDj" secondAttribute="height" multiplier="1:2" id="4oQ-JI-wQv"/>
                             <constraint firstAttribute="width" secondItem="whU-l0-2bU" secondAttribute="width" id="AiQ-LE-3bh"/>
                             <constraint firstItem="IV3-lc-Fnf" firstAttribute="top" secondItem="gRG-Ys-94p" secondAttribute="bottom" id="IMb-wl-Eeb"/>
+                            <constraint firstItem="cbe-hc-9K5" firstAttribute="leading" secondItem="GiS-3g-cDj" secondAttribute="leadingMargin" id="KNZ-jb-npt"/>
                             <constraint firstAttribute="trailing" secondItem="gRG-Ys-94p" secondAttribute="trailing" id="Pb1-eY-0FG"/>
+                            <constraint firstItem="IV3-lc-Fnf" firstAttribute="top" secondItem="cbe-hc-9K5" secondAttribute="bottom" id="YWv-H4-Ij3"/>
                             <constraint firstItem="gRG-Ys-94p" firstAttribute="top" secondItem="GiS-3g-cDj" secondAttribute="top" id="oyk-Xr-zTZ"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="cbe-hc-9K5" secondAttribute="trailing" id="wss-B8-PT6"/>
                             <constraint firstItem="gRG-Ys-94p" firstAttribute="leading" secondItem="GiS-3g-cDj" secondAttribute="leading" id="zhC-jf-5dY"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
@@ -2063,6 +2126,7 @@ This app is now out of maintenance.</string>
                         <outlet property="containerView" destination="GiS-3g-cDj" id="01o-PU-SNZ"/>
                         <outlet property="counterLabel" destination="3Cd-XH-Wau" id="wv7-jZ-6tX"/>
                         <outlet property="counterStepper" destination="ZPT-EI-yuv" id="w5c-hO-T51"/>
+                        <outlet property="deviceButton" destination="DVF-Im-H2I" id="TMU-Vo-bDo"/>
                         <outlet property="dialogView" destination="1lc-e7-Qme" id="JYt-mv-XV2"/>
                         <outlet property="fullNameField" destination="XAC-Da-lpf" id="XCk-0H-IcI"/>
                         <outlet property="masterPasswordField" destination="J46-0E-no3" id="DfH-4n-cop"/>
@@ -2104,10 +2168,10 @@ This app is now out of maintenance.</string>
                                 </items>
                             </navigationBar>
                             <pageControl opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="8A2-ly-WTX">
-                                <rect key="frame" x="187.5" y="771" width="39" height="37"/>
+                                <rect key="frame" x="129.5" y="782" width="155.5" height="26"/>
                             </pageControl>
                             <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="i2y-lo-HXR">
-                                <rect key="frame" x="0.0" y="44" width="414" height="637"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="648"/>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="m8O-kY-22j">
                                     <size key="itemSize" width="320" height="458"/>
@@ -2117,7 +2181,7 @@ This app is now out of maintenance.</string>
                                 </collectionViewFlowLayout>
                                 <cells>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MPGuideStepCell" id="oGu-pJ-3bQ" customClass="MPGuideStepCell">
-                                        <rect key="frame" x="0.0" y="89.5" width="320" height="458"/>
+                                        <rect key="frame" x="0.0" y="95" width="320" height="458"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="458"/>
@@ -2146,13 +2210,13 @@ This app is now out of maintenance.</string>
                                 </connections>
                             </collectionView>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="To begin, tap the &quot;New User&quot; icon and add yourself as a user to the application." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ciw-56-nNy" userLabel="Caption">
-                                <rect key="frame" x="8" y="689" width="398" height="82"/>
+                                <rect key="frame" x="8" y="700" width="398" height="82"/>
                                 <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="13"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oop-Ff-gbz" userLabel="Caption Height Strut">
-                                <rect key="frame" x="8" y="689" width="1" height="82"/>
+                                <rect key="frame" x="8" y="700" width="1" height="82"/>
                                 <string key="text" base64-UTF8="YES">
 CgoKCgoKCgoKCgoKCg
 </string>
@@ -2568,7 +2632,7 @@ See </string>
                         <color key="separatorColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MPStoreProductCell" id="JVW-tG-xxe" userLabel="Product" customClass="MPStoreProductCell">
-                                <rect key="frame" x="0.0" y="28" width="414" height="380"/>
+                                <rect key="frame" x="0.0" y="44.5" width="414" height="380"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JVW-tG-xxe" id="CLQ-CW-NGn">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="380"/>
@@ -2636,7 +2700,7 @@ See </string>
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MPStoreFuelProductCell" id="le3-Q5-MSO" userLabel="Fuel" customClass="MPStoreFuelProductCell">
-                                <rect key="frame" x="0.0" y="408" width="414" height="380"/>
+                                <rect key="frame" x="0.0" y="424.5" width="414" height="380"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="le3-Q5-MSO" id="SzQ-Y5-XIF">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="380"/>
@@ -2731,7 +2795,7 @@ Invested: 3.7 work hours</string>
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MPStoreCellSpinner" rowHeight="170" id="LOh-72-Ifp" userLabel="Spinner">
-                                <rect key="frame" x="0.0" y="788" width="414" height="170"/>
+                                <rect key="frame" x="0.0" y="804.5" width="414" height="170"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LOh-72-Ifp" id="gjr-8l-JJ0">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="170"/>
@@ -2741,7 +2805,7 @@ Invested: 3.7 work hours</string>
                                             <rect key="frame" x="188.5" y="20" width="37" height="37"/>
                                         </activityIndicatorView>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="Loading products..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NPg-it-juF">
-                                            <rect key="frame" x="134.5" y="97" width="145.5" height="25"/>
+                                            <rect key="frame" x="134" y="97" width="146" height="25"/>
                                             <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="17"/>
                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -2758,19 +2822,19 @@ Invested: 3.7 work hours</string>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MPStoreCellFooter" rowHeight="100" id="jsY-TE-4y5" userLabel="Footer">
-                                <rect key="frame" x="0.0" y="958" width="414" height="100"/>
+                                <rect key="frame" x="0.0" y="974.5" width="414" height="100"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jsY-TE-4y5" id="guB-Eb-KpI">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="100"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999998807907104" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="749" verticalCompressionResistancePriority="751" text="© 2012-2014, Maarten Billemont (lhunath)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="26U-st-xNs">
+                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.69999998807907104" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="749" verticalCompressionResistancePriority="751" ambiguous="YES" text="© 2012-2014, Maarten Billemont (lhunath)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="26U-st-xNs">
                                             <rect key="frame" x="20" y="4" width="374" height="22"/>
                                             <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="11"/>
                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lQ1-b9-Xp4">
+                                        <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lQ1-b9-Xp4">
                                             <rect key="frame" x="20" y="34" width="374" height="27"/>
                                             <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="12"/>
                                             <state key="normal" title="Restore Previous Purchases">
@@ -2780,7 +2844,7 @@ Invested: 3.7 work hours</string>
                                                 <action selector="restorePurchases:" destination="pdl-xv-zjX" eventType="touchUpInside" id="Q8M-ud-OHL"/>
                                             </connections>
                                         </button>
-                                        <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eus-kQ-emn">
+                                        <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eus-kQ-emn">
                                             <rect key="frame" x="8" y="69" width="398" height="27"/>
                                             <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="12"/>
                                             <state key="normal" title="Send Thanks">
@@ -2844,7 +2908,7 @@ Invested: 3.7 work hours</string>
                                 <color key="separatorColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MPGlobalAnswersCell" rowHeight="133" id="DT2-Vb-uXj" userLabel="Global Answer" customClass="MPGlobalAnswersCell">
-                                        <rect key="frame" x="0.0" y="28" width="414" height="133"/>
+                                        <rect key="frame" x="0.0" y="44.5" width="414" height="133"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DT2-Vb-uXj" id="URA-cl-MJP">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="133"/>
@@ -2888,14 +2952,14 @@ Invested: 3.7 work hours</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MPSendAnswersCell" rowHeight="44" id="tvm-WZ-MDZ" userLabel="Send Answers" customClass="MPSendAnswersCell">
-                                        <rect key="frame" x="0.0" y="161" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="177.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tvm-WZ-MDZ" id="BTm-Lm-V9p">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="384.5" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Send the answer(s) to my email" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AAV-yg-dfK">
-                                                    <rect key="frame" x="8" y="8" width="367" height="28"/>
+                                                    <rect key="frame" x="8" y="8" width="368.5" height="28"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="12"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -2911,14 +2975,14 @@ Invested: 3.7 work hours</string>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MPMultipleAnswersCell" rowHeight="44" id="5MB-qb-oPk" userLabel="Multiple Answers" customClass="MPMultipleAnswersCell">
-                                        <rect key="frame" x="0.0" y="205" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="221.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5MB-qb-oPk" id="4wX-xO-9QU">
-                                            <rect key="frame" x="0.0" y="0.0" width="370" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="373.5" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="This site needs different answers for each question" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="een-0g-CMy">
-                                                    <rect key="frame" x="8" y="8" width="354" height="28"/>
+                                                    <rect key="frame" x="8" y="8" width="357.5" height="28"/>
                                                     <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="12"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -2934,7 +2998,7 @@ Invested: 3.7 work hours</string>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MPAnswersQuestionCell" rowHeight="130" id="iFm-3w-hOv" userLabel="Question" customClass="MPAnswersQuestionCell">
-                                        <rect key="frame" x="0.0" y="249" width="414" height="130"/>
+                                        <rect key="frame" x="0.0" y="265.5" width="414" height="130"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iFm-3w-hOv" id="X5d-5g-uJa">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="130"/>
@@ -3257,7 +3321,7 @@ Ut in geometria, prima si dederis, danda sunt omnia. Nonne igitur tibi videntur,
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="k2G-nL-x3l"/>
+        <segue reference="Ql4-wf-T8u"/>
         <segue reference="gtb-zE-u9H"/>
     </inferredMetricsTieBreakers>
     <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>

platform-independent/c/cli/distribute

@@ -14,9 +14,9 @@ echo "Cleaning .."
 git clean -ffdx .
 
 echo "Creating archive $mpwArchive .."
-echo "$version" > VERSION
-git show --show-signature --pretty=format:%H --quiet "$tag" > TAG
-{ git ls-files -z .; printf '%s\0' VERSION TAG; } | xargs -0 tar -Lcvzf "$mpwArchive"
+echo "$version" > cli/VERSION
+git show --show-signature --pretty=format:%H --quiet "$tag" > cli/TAG
+{ git ls-files -z .; printf '%s\0' cli/VERSION cli/TAG; } | xargs -0 tar -Lcvzf "$mpwArchive"
 
 echo "Creating archive signature $mpwArchive.sig .."
 gpg --detach-sign --local-user 5C2D1D61853F20F2FCDDCCB70EF21226F43EA6BC "$mpwArchive"

platform-independent/c/cli/mpw-cli-tests

@@ -28,7 +28,7 @@ mpw_expect() {
             json)   file=~/.mpw.d/"$user.mpjson" ;;
         esac
     fi
-    [[ $file ]] && (( ! keep )) && rm "$file"
+    [[ -e $file ]] && (( ! keep )) && rm "$file"
 
     printf '.'
     local result=$(./mpw -q "${args[@]}") err=$?
@@ -79,397 +79,429 @@ mpw_expect() {
         esac
     fi
 
-    [[ $file ]] && (( ! keep )) && rm "$file"
+    [[ -e $file ]] && (( ! keep )) && rm "$file"
 }
 
 
 #   mpw_tests.xml
 ##  V3
 printf "\nV%d, none: " 3
-mpw_expect 'CefoTiciJuba7@'       -Fnone \
-    -u 'test' -M 'test'                                                    'test'
-mpw_expect 'Tina0#NotaMahu'       -Fnone \
-    -u 'tesẗ' -M 'ẗest'                                                    'ẗesẗ'
-mpw_expect 'Tina0#NotaMahu'       -Fnone \
-    -u 'tesẗ' -M 'ẗest'                                      -C ''         'ẗesẗ'
-mpw_expect 'Tina0#NotaMahu'       -Fnone \
-    -u 'tesẗ' -M 'ẗest'                  -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Tina0#NotaMahu'       -Fnone \
-    -u 'tesẗ' -M 'ẗest'              -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Tina0#NotaMahu'       -Fnone \
-    -u 'tesẗ' -M 'ẗest'          -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Tina0#NotaMahu'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'KovxFipe5:Zatu'       -Fnone \
-    -u '⛄'                   -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'ModoLalhRapo6#'       -Fnone \
-    -u 'tesẗ' -M '⛄'                       -tlong   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'CudmTecuPune7:'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''         '⛄'
-mpw_expect 'yubfalago'            -Fnone \
-    -u 'tesẗ' -M 'ẗest'                  -p 'identification'               'ẗesẗ'
-mpw_expect 'yubfalago'            -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tname   -c1 -a3 -p 'identification' -C ''         'ẗesẗ'
-mpw_expect 'jip nodwoqude dizo'   -Fnone \
-    -u 'tesẗ' -M 'ẗest'                  -p 'recovery'                     'ẗesẗ'
-mpw_expect 'jip nodwoqude dizo'   -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a3 -p 'recovery'       -C ''         'ẗesẗ'
-mpw_expect 'dok sorkicoyu ruya' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a3 -p 'recovery'       -C 'quesẗion' 'ẗesẗ'
-mpw_expect 'j5TJ%G0WWwSMvYb)hr4)' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tmax    -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'TinRaz2?'             -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tmed    -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'jad0IQA3'             -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tbasic  -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Tin0'                 -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tshort  -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect '1710'                 -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tpin    -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'tinraziqu'            -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tname   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'tinr ziq taghuye zuj' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a3 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'HidiLonoFopt9&'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c4294967295 -a3 -p 'authentication'      'ẗesẗ'
+mpw_expect 'CefoTiciJuba7@'         -Fnone \
+    -u 'test' -M 'test'                                                        'test'
+mpw_expect 'Tina0#NotaMahu'         -Fnone \
+    -u 'tesẗ' -M 'ẗest'                                                        'ẗesẗ'
+mpw_expect 'Tina0#NotaMahu'         -Fnone \
+    -u 'tesẗ' -M 'ẗest'                                         -C ''          'ẗesẗ'
+mpw_expect 'Tina0#NotaMahu'         -Fnone \
+    -u 'tesẗ' -M 'ẗest'                     -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Tina0#NotaMahu'         -Fnone \
+    -u 'tesẗ' -M 'ẗest'               -a3   -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Tina0#NotaMahu'         -Fnone \
+    -u 'tesẗ' -M 'ẗest'             -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Tina0#NotaMahu'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'KovxFipe5:Zatu'         -Fnone \
+    -u '⛄'   -M 'ẗest' -tlong      -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'ModoLalhRapo6#'         -Fnone \
+    -u 'tesẗ' -M '⛄'   -tlong      -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'CudmTecuPune7:'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c1 -a3 -p 'authentication' -C ''          '⛄'
+mpw_expect 'yubfalago'              -Fnone \
+    -u 'tesẗ' -M 'ẗest'                    -p 'identification' -C ''          'ẗesẗ'
+mpw_expect 'yubfalago'              -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tname      -c1 -a3 -p 'identification' -C ''          'ẗesẗ'
+mpw_expect 'jip nodwoqude dizo'     -Fnone \
+    -u 'tesẗ' -M 'ẗest'                     -p 'recovery'       -C ''          'ẗesẗ'
+mpw_expect 'jip nodwoqude dizo'     -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a3 -p 'recovery'       -C ''          'ẗesẗ'
+mpw_expect 'dok sorkicoyu ruya'     -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a3 -p 'recovery'       -C 'quesẗion'  'ẗesẗ'
+mpw_expect 'j5TJ%G0WWwSMvYb)hr4)'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tmax       -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'TinRaz2?'               -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tmed       -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'jad0IQA3'               -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tbasic     -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Tin0'                   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tshort     -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect '1710'                   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tpin       -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'tinraziqu'              -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tname      -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'tinr ziq taghuye zuj'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a3 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'HidiLonoFopt9&'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c4294967295 -a3 -p 'authentication' -C '' 'ẗesẗ'
 
 ##  V2
 printf "\nV%d, none: " 2
-mpw_expect 'CefoTiciJuba7@'       -Fnone \
-    -u 'test' -M 'test' -tlong   -c1 -a2 -p 'authentication' -C ''         'test'
-mpw_expect "HuczFina3'Qatf"       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'SicrJuwaWaql0#'       -Fnone \
-    -u '⛄'                   -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'LokaJayp1@Faba'       -Fnone \
-    -u 'tesẗ' -M '⛄'                       -tlong   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'DoqaHulu8:Funh'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''         '⛄'
-mpw_expect 'yiyguxoxe'            -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tname   -c1 -a2 -p 'identification' -C ''         'ẗesẗ'
+mpw_expect 'CefoTiciJuba7@'         -Fnone \
+    -u 'test' -M 'test' -tlong      -c1 -a2 -p 'authentication' -C ''          'test'
+mpw_expect "HuczFina3'Qatf"         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'SicrJuwaWaql0#'         -Fnone \
+    -u '⛄'   -M 'ẗest' -tlong      -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'LokaJayp1@Faba'         -Fnone \
+    -u 'tesẗ' -M '⛄'   -tlong      -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'DoqaHulu8:Funh'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c1 -a2 -p 'authentication' -C ''          '⛄'
+mpw_expect 'yiyguxoxe'              -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tname      -c1 -a2 -p 'identification' -C ''          'ẗesẗ'
 mpw_expect 'vu yelyo bat kujavmu'   -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a2 -p 'recovery'       -C ''         'ẗesẗ'
-mpw_expect 'ka deqce xad vomacgi' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a2 -p 'recovery'       -C 'quesẗion' 'ẗesẗ'
-mpw_expect 'wRF$LmB@umWGLWeVlB0-' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tmax    -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'HucZuk0!'             -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tmed    -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'wb59VoB5'             -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tbasic  -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Huc9'                 -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tshort  -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect '2959'                 -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tpin    -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'huczukamo'            -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tname   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'huc finmokozi fota' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a2 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Mixa1~BulgNijo'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c4294967295 -a2 -p 'authentication'      'ẗesẗ'
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a2 -p 'recovery'       -C ''          'ẗesẗ'
+mpw_expect 'ka deqce xad vomacgi'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a2 -p 'recovery'       -C 'quesẗion'  'ẗesẗ'
+mpw_expect 'wRF$LmB@umWGLWeVlB0-'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tmax       -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'HucZuk0!'               -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tmed       -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'wb59VoB5'               -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tbasic     -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Huc9'                   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tshort     -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect '2959'                   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tpin       -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'huczukamo'              -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tname      -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'huc finmokozi fota'     -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a2 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Mixa1~BulgNijo'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c4294967295 -a2 -p 'authentication' -C '' 'ẗesẗ'
 
 ##  V1
 printf "\nV%d, none: " 1
-mpw_expect 'CefoTiciJuba7@'       -Fnone \
-    -u 'test' -M 'test' -tlong   -c1 -a1 -p 'authentication' -C ''         'test'
-mpw_expect 'SuxiHoteCuwe3/'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'CupaTixu8:Hetu'       -Fnone \
-    -u '⛄'                   -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'NaqmBanu9+Decs'       -Fnone \
-    -u 'tesẗ' -M '⛄'                       -tlong   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'XowaDokoGeyu2)'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''         '⛄'
-mpw_expect 'makmabivo'            -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tname   -c1 -a1 -p 'identification' -C ''         'ẗesẗ'
+mpw_expect 'CefoTiciJuba7@'         -Fnone \
+    -u 'test' -M 'test' -tlong      -c1 -a1 -p 'authentication' -C ''          'test'
+mpw_expect 'SuxiHoteCuwe3/'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'CupaTixu8:Hetu'         -Fnone \
+    -u '⛄'   -M 'ẗest' -tlong      -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'NaqmBanu9+Decs'         -Fnone \
+    -u 'tesẗ' -M '⛄'   -tlong      -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'XowaDokoGeyu2)'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c1 -a1 -p 'authentication' -C ''          '⛄'
+mpw_expect 'makmabivo'              -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tname      -c1 -a1 -p 'identification' -C ''          'ẗesẗ'
 mpw_expect 'je mutbo buf puhiywo'   -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a1 -p 'recovery'       -C ''         'ẗesẗ'
-mpw_expect 'ne hapfa dax qamayqo' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a1 -p 'recovery'       -C 'quesẗion' 'ẗesẗ'
-mpw_expect 'JlZo&eLhqgoxqtJ!NC5/' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tmax    -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'SuxHot2*'             -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tmed    -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Jly28Veh'             -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tbasic  -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Sux2'                 -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tshort  -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect '4922'                 -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tpin    -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'suxhotito'            -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tname   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'su hotte pav calewxo' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a1 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Luxn2#JapiXopa'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c4294967295 -a1 -p 'authentication'      'ẗesẗ'
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a1 -p 'recovery'       -C ''          'ẗesẗ'
+mpw_expect 'ne hapfa dax qamayqo'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a1 -p 'recovery'       -C 'quesẗion'  'ẗesẗ'
+mpw_expect 'JlZo&eLhqgoxqtJ!NC5/'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tmax       -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'SuxHot2*'               -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tmed       -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Jly28Veh'               -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tbasic     -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Sux2'                   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tshort     -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect '4922'                   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tpin       -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'suxhotito'              -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tname      -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'su hotte pav calewxo'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a1 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Luxn2#JapiXopa'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c4294967295 -a1 -p 'authentication' -C '' 'ẗesẗ'
 
 ##  V0
 printf "\nV%d, none: " 0
-mpw_expect 'GeqoBigiFubh2!'       -Fnone \
-    -u 'test' -M 'test' -tlong   -c1 -a0 -p 'authentication' -C ''         'test'
-mpw_expect 'WumiZobxGuhe8]'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'KuhaXimj8@Zebu'       -Fnone \
-    -u '⛄'                   -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'CajtFayv9_Pego'       -Fnone \
-    -u 'tesẗ' -M '⛄'                       -tlong   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'QohaPokgYevu2!'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''         '⛄'
-mpw_expect 'takxabico'            -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tname   -c1 -a0 -p 'identification' -C ''         'ẗesẗ'
+mpw_expect 'GeqoBigiFubh2!'         -Fnone \
+    -u 'test' -M 'test' -tlong      -c1 -a0 -p 'authentication' -C ''          'test'
+mpw_expect 'WumiZobxGuhe8]'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'KuhaXimj8@Zebu'         -Fnone \
+    -u '⛄'   -M 'ẗest' -tlong      -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'CajtFayv9_Pego'         -Fnone \
+    -u 'tesẗ' -M '⛄'   -tlong      -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'QohaPokgYevu2!'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c1 -a0 -p 'authentication' -C ''          '⛄'
+mpw_expect 'takxabico'              -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tname      -c1 -a0 -p 'identification' -C ''          'ẗesẗ'
 mpw_expect 'je tuxfo fut huzivlo'   -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a0 -p 'recovery'       -C ''         'ẗesẗ'
-mpw_expect 'ye zahqa lam jatavmo' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a0 -p 'recovery'       -C 'quesẗion' 'ẗesẗ'
-mpw_expect 'g4@)4SlA#)cJ#ib)vvH3' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tmax    -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Wum7_Xix'             -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tmed    -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'gAo78ARD'             -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tbasic  -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Wum7'                 -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tshort  -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect '9427'                 -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tpin    -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'wumdoxixo'            -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tname   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'wu doxbe hac kaselqo' -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tphrase -c1 -a0 -p 'authentication' -C ''         'ẗesẗ'
-mpw_expect 'Pumy7.JadjQoda'       -Fnone \
-    -u 'tesẗ' -M 'ẗest' -tlong   -c4294967295 -a0 -p 'authentication'      'ẗesẗ'
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a0 -p 'recovery'       -C ''          'ẗesẗ'
+mpw_expect 'ye zahqa lam jatavmo'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a0 -p 'recovery'       -C 'quesẗion'  'ẗesẗ'
+mpw_expect 'g4@)4SlA#)cJ#ib)vvH3'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tmax       -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Wum7_Xix'               -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tmed       -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'gAo78ARD'               -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tbasic     -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Wum7'                   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tshort     -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect '9427'                   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tpin       -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'wumdoxixo'              -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tname      -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'wu doxbe hac kaselqo'   -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tphrase    -c1 -a0 -p 'authentication' -C ''          'ẗesẗ'
+mpw_expect 'Pumy7.JadjQoda'         -Fnone \
+    -u 'tesẗ' -M 'ẗest' -tlong      -c4294967295 -a0 -p 'authentication' -C '' 'ẗesẗ'
 
 ##  V3
 printf "\nV%d, flat: " 3
-mpw_expect 'IfHuAUUpqpKZDZlNvz8$' -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tmax    -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.max'
-mpw_expect 'FamiJirk1)Zehc'       -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.long'
-mpw_expect 'NofhMusw8+Cebo'       -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.⛄'
-mpw_expect 'Necx1$LagaRizu'       -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c4294967295 -a3 -p 'authentication'      'ẗesẗ.c+a3pa'
-mpw_expect 'Poq2)Tey'             -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tmed    -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.med'
-mpw_expect 'Wr07Okx0'             -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tbasic  -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.basic'
-mpw_expect 'Bug9'                 -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tshort  -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.short'
-mpw_expect '3560'                 -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tpin    -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.pin'
-mpw_expect 'jupxiqepi'            -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tname   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.name'
-mpw_expect 'vuh buxtukewo puhe' -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tphrase -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.phrase'
-mpw_expect 'mophabiwe'            -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tname   -c1 -a3 -p 'identification' -C ''         'ẗesẗ.c1a3pi'
-mpw_expect 'mup wulbezaxa juca'   -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tphrase -c1 -a3 -p 'recovery'       -C ''         'ẗesẗ.c1a3pr'
+mpw_expect 'IfHuAUUpqpKZDZlNvz8$'   -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tmax    -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.max'
+mpw_expect 'FamiJirk1)Zehc'         -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.long'
+mpw_expect 'NofhMusw8+Cebo'         -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.⛄'
+mpw_expect 'Necx1$LagaRizu'         -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest'          -c4294967295 -a3 -p 'authentication' -C '' 'ẗesẗ.c+a3pa'
+mpw_expect 'Poq2)Tey'               -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tmed    -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.med'
+mpw_expect 'Wr07Okx0'               -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tbasic  -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.basic'
+mpw_expect 'Bug9'                   -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tshort  -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.short'
+mpw_expect '3560'                   -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tpin    -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.pin'
+mpw_expect 'jupxiqepi'              -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tname   -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.name'
+mpw_expect 'vuh buxtukewo puhe'     -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tphrase -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.phrase'
+mpw_expect 'Cq5$TfH#OHmPS9yREp7)'    -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tmax    -c1 -a3 -p 'identification' -C ''          'ẗesẗ.c1a3pi.max'
+mpw_expect 'mophabiwe'              -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest'          -c1 -a3 -p 'identification' -C ''          'ẗesẗ.c1a3pi'
+mpw_expect 'lA^ul!%9&TD%fj6icT1['   -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tmax    -c1 -a3 -p 'recovery'       -C ''          'ẗesẗ.c1a3pr.max'
+mpw_expect 'mup wulbezaxa juca'     -Fflat -R0 \
+    -u 'tesẗ.v3' -M 'ẗest'          -c1 -a3 -p 'recovery'       -C ''          'ẗesẗ.c1a3pr'
 mpw_expect 'molg rux kaczuvi ror'   -Fflat -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tphrase -c1 -a3 -p 'recovery'       -C 'quesẗion' 'ẗesẗ.c1a3pr.quesẗion'
+    -u 'tesẗ.v3' -M 'ẗest'          -c1 -a3 -p 'recovery'       -C 'quesẗion'  'ẗesẗ.c1a3pr.quesẗion'
 
 ##  V2
 printf "\nV%d, flat: " 2
-mpw_expect 'i7@0M*DdP4DgD#jJIzyL' -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tmax    -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.max'
-mpw_expect 'Lifw5]DablSuga'       -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.long'
-mpw_expect 'Leja5%RavoZapa'       -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.⛄'
-mpw_expect 'NejnGazo8?Seqo'       -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c4294967295 -a2 -p 'authentication'      'ẗesẗ.c+a2pa'
-mpw_expect 'XicSux2&'             -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tmed    -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.med'
-mpw_expect 'uEY50hcZ'             -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tbasic  -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.basic'
-mpw_expect 'Jif6'                 -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tshort  -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.short'
-mpw_expect '4001'                 -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tpin    -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.pin'
-mpw_expect 'rexmibace'            -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tname   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.name'
-mpw_expect 'cez fexlemozo yula' -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tphrase -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.phrase'
-mpw_expect 'camfibeye'            -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tname   -c1 -a2 -p 'identification' -C ''         'ẗesẗ.c1a2pi'
-mpw_expect 'ye vemcu keq xepewmi' -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tphrase -c1 -a2 -p 'recovery'       -C ''         'ẗesẗ.c1a2pr'
+mpw_expect 'i7@0M*DdP4DgD#jJIzyL'   -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tmax    -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.max'
+mpw_expect 'Lifw5]DablSuga'         -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.long'
+mpw_expect 'Leja5%RavoZapa'         -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.⛄'
+mpw_expect 'NejnGazo8?Seqo'         -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest'          -c4294967295 -a2 -p 'authentication' -C '' 'ẗesẗ.c+a2pa'
+mpw_expect 'XicSux2&'               -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tmed    -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.med'
+mpw_expect 'uEY50hcZ'               -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tbasic  -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.basic'
+mpw_expect 'Jif6'                   -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tshort  -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.short'
+mpw_expect '4001'                   -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tpin    -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.pin'
+mpw_expect 'rexmibace'              -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tname   -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.name'
+mpw_expect 'cez fexlemozo yula'     -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tphrase -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.phrase'
+mpw_expect 'T8+xi4NMd3HUGdV#GW*%'   -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tmax    -c1 -a2 -p 'identification' -C ''          'ẗesẗ.c1a2pi.max'
+mpw_expect 'camfibeye'              -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest'          -c1 -a2 -p 'identification' -C ''          'ẗesẗ.c1a2pi'
+mpw_expect 'YLcoWeBwyiBf2*irFq1.'   -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tmax    -c1 -a2 -p 'recovery'       -C ''          'ẗesẗ.c1a2pr.max'
+mpw_expect 'ye vemcu keq xepewmi'   -Fflat -R0 \
+    -u 'tesẗ.v2' -M 'ẗest'          -c1 -a2 -p 'recovery'       -C ''          'ẗesẗ.c1a2pr'
 mpw_expect 'yi qazne tid najuvme'   -Fflat -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tphrase -c1 -a2 -p 'recovery'       -C 'quesẗion' 'ẗesẗ.c1a2pr.quesẗion'
+    -u 'tesẗ.v2' -M 'ẗest'          -c1 -a2 -p 'recovery'       -C 'quesẗion'  'ẗesẗ.c1a2pr.quesẗion'
 
 ##  V1
 printf "\nV%d, flat: " 1
-mpw_expect 'a3~AiGkHk)Pgjbb)mk6H' -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tmax    -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.max'
-mpw_expect 'Lojz6?VotaJall'       -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.long'
-mpw_expect 'Yoqu7)NiziFito'       -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.⛄'
-mpw_expect 'Foha4[TojmXanc'       -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c4294967295 -a1 -p 'authentication'      'ẗesẗ.c+a1pa'
-mpw_expect 'Hiy3*Zag'             -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tmed    -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.med'
-mpw_expect 'UJR7HpG0'             -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tbasic  -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.basic'
-mpw_expect 'Cij7'                 -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tshort  -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.short'
-mpw_expect '0020'                 -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tpin    -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.pin'
-mpw_expect 'vadxovezu'            -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tname   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.name'
-mpw_expect 'sij jihloyenu kizi' -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tphrase -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.phrase'
-mpw_expect 'qipberize'            -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tname   -c1 -a1 -p 'identification' -C ''         'ẗesẗ.c1a1pi'
-mpw_expect 'sok torxibute reza' -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tphrase -c1 -a1 -p 'recovery'       -C ''         'ẗesẗ.c1a1pr'
+mpw_expect 'a3~AiGkHk)Pgjbb)mk6H'   -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tmax    -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.max'
+mpw_expect 'Lojz6?VotaJall'         -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.long'
+mpw_expect 'Yoqu7)NiziFito'         -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.⛄'
+mpw_expect 'Foha4[TojmXanc'         -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest'          -c4294967295 -a1 -p 'authentication' -C '' 'ẗesẗ.c+a1pa'
+mpw_expect 'Hiy3*Zag'               -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tmed    -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.med'
+mpw_expect 'UJR7HpG0'               -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tbasic  -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.basic'
+mpw_expect 'Cij7'                   -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tshort  -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.short'
+mpw_expect '0020'                   -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tpin    -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.pin'
+mpw_expect 'vadxovezu'              -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tname   -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.name'
+mpw_expect 'sij jihloyenu kizi'     -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tphrase -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.phrase'
+mpw_expect 'z2U9)(uQ78TXqtaus)8.'   -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tmax    -c1 -a1 -p 'identification' -C ''          'ẗesẗ.c1a1pi.max'
+mpw_expect 'qipberize'              -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest'          -c1 -a1 -p 'identification' -C ''          'ẗesẗ.c1a1pi'
+mpw_expect 'QMciaKyi1&I*g%tHz99,'   -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tmax    -c1 -a1 -p 'recovery'       -C ''          'ẗesẗ.c1a1pr.max'
+mpw_expect 'sok torxibute reza'     -Fflat -R0 \
+    -u 'tesẗ.v1' -M 'ẗest'          -c1 -a1 -p 'recovery'       -C ''          'ẗesẗ.c1a1pr'
 mpw_expect 'xacp qaw qutbece gan'   -Fflat -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tphrase -c1 -a1 -p 'recovery'       -C 'quesẗion' 'ẗesẗ.c1a1pr.quesẗion'
+    -u 'tesẗ.v1' -M 'ẗest'          -c1 -a1 -p 'recovery'       -C 'quesẗion'  'ẗesẗ.c1a1pr.quesẗion'
 
 ##  V0
 printf "\nV%d, flat: " 0
-mpw_expect 'b5@ww@Jmb4cAioRbivb)' -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tmax    -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.max'
-mpw_expect 'ZuceHazwLojz8!'       -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.long'
-mpw_expect 'Boxj2!YabePodp'       -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.⛄'
-mpw_expect 'PeblLuqc6]Cala'       -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c4294967295 -a0 -p 'authentication'      'ẗesẗ.c+a0pa'
-mpw_expect 'XelQac0@'             -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tmed    -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.med'
-mpw_expect 'qS07SRc8'             -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tbasic  -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.basic'
-mpw_expect 'Fih8'                 -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tshort  -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.short'
-mpw_expect '6121'                 -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tpin    -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.pin'
-mpw_expect 'rivfutipe'            -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tname   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.name'
-mpw_expect 'xir qebdohogo buno' -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tphrase -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.phrase'
-mpw_expect 'ragcoxudo'            -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tname   -c1 -a0 -p 'identification' -C ''         'ẗesẗ.c1a0pi'
-mpw_expect 'kokl hov lowmaya xaf' -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tphrase -c1 -a0 -p 'recovery'       -C ''         'ẗesẗ.c1a0pr'
-mpw_expect 'wi zanmu nug zuwidwe' -Fflat -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tphrase -c1 -a0 -p 'recovery'       -C 'quesẗion' 'ẗesẗ.c1a0pr.quesẗion'
+mpw_expect 'b5@ww@Jmb4cAioRbivb)'   -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tmax    -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.max'
+mpw_expect 'ZuceHazwLojz8!'         -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.long'
+mpw_expect 'Boxj2!YabePodp'         -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.⛄'
+mpw_expect 'PeblLuqc6]Cala'         -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest'          -c4294967295 -a0 -p 'authentication' -C '' 'ẗesẗ.c+a0pa'
+mpw_expect 'XelQac0@'               -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tmed    -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.med'
+mpw_expect 'qS07SRc8'               -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tbasic  -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.basic'
+mpw_expect 'Fih8'                   -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tshort  -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.short'
+mpw_expect '6121'                   -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tpin    -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.pin'
+mpw_expect 'rivfutipe'              -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tname   -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.name'
+mpw_expect 'xir qebdohogo buno'     -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tphrase -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.phrase'
+mpw_expect "RoAm3bJSvo@#loHSRA6\'"  -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tmax    -c1 -a0 -p 'identification' -C ''          'ẗesẗ.c1a0pi.max'
+mpw_expect 'ragcoxudo'              -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest'          -c1 -a0 -p 'identification' -C ''          'ẗesẗ.c1a0pi'
+mpw_expect 'm8]SiJHiAS@H@Rbw))34'   -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tmax    -c1 -a0 -p 'recovery'       -C ''          'ẗesẗ.c1a0pr.max'
+mpw_expect 'kokl hov lowmaya xaf'   -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest'          -c1 -a0 -p 'recovery'       -C ''          'ẗesẗ.c1a0pr'
+mpw_expect 'wi zanmu nug zuwidwe'   -Fflat -R0 \
+    -u 'tesẗ.v0' -M 'ẗest'          -c1 -a0 -p 'recovery'       -C 'quesẗion'  'ẗesẗ.c1a0pr.quesẗion'
 
 
 ##  V3
 printf "\nV%d, json: " 3
-mpw_expect 'IfHuAUUpqpKZDZlNvz8$' -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tmax    -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.max'
-mpw_expect 'FamiJirk1)Zehc'       -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.long'
-mpw_expect 'NofhMusw8+Cebo'       -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.⛄'
-mpw_expect 'Necx1$LagaRizu'       -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c4294967295 -a3 -p 'authentication'      'ẗesẗ.c+a3pa'
-mpw_expect 'Poq2)Tey'             -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tmed    -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.med'
-mpw_expect 'Wr07Okx0'             -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tbasic  -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.basic'
-mpw_expect 'Bug9'                 -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tshort  -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.short'
-mpw_expect '3560'                 -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tpin    -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.pin'
-mpw_expect 'jupxiqepi'            -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tname   -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.name'
-mpw_expect 'vuh buxtukewo puhe' -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tphrase -c1 -a3 -p 'authentication' -C ''         'ẗesẗ.c1a3pa.phrase'
-mpw_expect 'mophabiwe'            -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tname   -c1 -a3 -p 'identification' -C ''         'ẗesẗ.c1a3pi'
-mpw_expect 'mup wulbezaxa juca'   -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tphrase -c1 -a3 -p 'recovery'       -C ''         'ẗesẗ.c1a3pr'
+mpw_expect 'IfHuAUUpqpKZDZlNvz8$'   -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tmax    -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.max'
+mpw_expect 'FamiJirk1)Zehc'         -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.long'
+mpw_expect 'NofhMusw8+Cebo'         -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tlong   -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.⛄'
+mpw_expect 'Necx1$LagaRizu'         -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest'          -c4294967295 -a3 -p 'authentication' -C '' 'ẗesẗ.c+a3pa'
+mpw_expect 'Poq2)Tey'               -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tmed    -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.med'
+mpw_expect 'Wr07Okx0'               -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tbasic  -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.basic'
+mpw_expect 'Bug9'                   -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tshort  -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.short'
+mpw_expect '3560'                   -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tpin    -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.pin'
+mpw_expect 'jupxiqepi'              -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tname   -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.name'
+mpw_expect 'vuh buxtukewo puhe'     -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tphrase -c1 -a3 -p 'authentication' -C ''          'ẗesẗ.c1a3pa.phrase'
+mpw_expect 'Cq5$TfH#OHmPS9yREp7)'    -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tmax    -c1 -a3 -p 'identification' -C ''          'ẗesẗ.c1a3pi.max'
+mpw_expect 'mophabiwe'              -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest'          -c1 -a3 -p 'identification' -C ''          'ẗesẗ.c1a3pi'
+mpw_expect 'lA^ul!%9&TD%fj6icT1['   -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest' -tmax    -c1 -a3 -p 'recovery'       -C ''          'ẗesẗ.c1a3pr.max'
+mpw_expect 'mup wulbezaxa juca'     -Fjson -R0 \
+    -u 'tesẗ.v3' -M 'ẗest'          -c1 -a3 -p 'recovery'       -C ''          'ẗesẗ.c1a3pr'
 mpw_expect 'molg rux kaczuvi ror'   -Fjson -R0 \
-    -u 'tesẗ.v3' -M 'ẗest' -tphrase -c1 -a3 -p 'recovery'       -C 'quesẗion' 'ẗesẗ.c1a3pr.quesẗion'
+    -u 'tesẗ.v3' -M 'ẗest'          -c1 -a3 -p 'recovery'       -C 'quesẗion'  'ẗesẗ.c1a3pr.quesẗion'
 
 ##  V2
 printf "\nV%d, json: " 2
-mpw_expect 'i7@0M*DdP4DgD#jJIzyL' -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tmax    -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.max'
-mpw_expect 'Lifw5]DablSuga'       -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.long'
-mpw_expect 'Leja5%RavoZapa'       -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.⛄'
-mpw_expect 'NejnGazo8?Seqo'       -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c4294967295 -a2 -p 'authentication'      'ẗesẗ.c+a2pa'
-mpw_expect 'XicSux2&'             -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tmed    -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.med'
-mpw_expect 'uEY50hcZ'             -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tbasic  -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.basic'
-mpw_expect 'Jif6'                 -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tshort  -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.short'
-mpw_expect '4001'                 -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tpin    -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.pin'
-mpw_expect 'rexmibace'            -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tname   -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.name'
-mpw_expect 'cez fexlemozo yula' -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tphrase -c1 -a2 -p 'authentication' -C ''         'ẗesẗ.c1a2pa.phrase'
-mpw_expect 'camfibeye'            -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tname   -c1 -a2 -p 'identification' -C ''         'ẗesẗ.c1a2pi'
-mpw_expect 'ye vemcu keq xepewmi' -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tphrase -c1 -a2 -p 'recovery'       -C ''         'ẗesẗ.c1a2pr'
+mpw_expect 'i7@0M*DdP4DgD#jJIzyL'   -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tmax    -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.max'
+mpw_expect 'Lifw5]DablSuga'         -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.long'
+mpw_expect 'Leja5%RavoZapa'         -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tlong   -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.⛄'
+mpw_expect 'NejnGazo8?Seqo'         -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest'          -c4294967295 -a2 -p 'authentication' -C '' 'ẗesẗ.c+a2pa'
+mpw_expect 'XicSux2&'               -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tmed    -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.med'
+mpw_expect 'uEY50hcZ'               -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tbasic  -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.basic'
+mpw_expect 'Jif6'                   -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tshort  -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.short'
+mpw_expect '4001'                   -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tpin    -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.pin'
+mpw_expect 'rexmibace'              -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tname   -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.name'
+mpw_expect 'cez fexlemozo yula'     -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tphrase -c1 -a2 -p 'authentication' -C ''          'ẗesẗ.c1a2pa.phrase'
+mpw_expect 'T8+xi4NMd3HUGdV#GW*%'   -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tmax    -c1 -a2 -p 'identification' -C ''          'ẗesẗ.c1a2pi.max'
+mpw_expect 'camfibeye'              -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest'          -c1 -a2 -p 'identification' -C ''          'ẗesẗ.c1a2pi'
+mpw_expect 'YLcoWeBwyiBf2*irFq1.'   -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest' -tmax    -c1 -a2 -p 'recovery'       -C ''          'ẗesẗ.c1a2pr.max'
+mpw_expect 'ye vemcu keq xepewmi'   -Fjson -R0 \
+    -u 'tesẗ.v2' -M 'ẗest'          -c1 -a2 -p 'recovery'       -C ''          'ẗesẗ.c1a2pr'
 mpw_expect 'yi qazne tid najuvme'   -Fjson -R0 \
-    -u 'tesẗ.v2' -M 'ẗest' -tphrase -c1 -a2 -p 'recovery'       -C 'quesẗion' 'ẗesẗ.c1a2pr.quesẗion'
+    -u 'tesẗ.v2' -M 'ẗest'          -c1 -a2 -p 'recovery'       -C 'quesẗion'  'ẗesẗ.c1a2pr.quesẗion'
 
 ##  V1
 printf "\nV%d, json: " 1
-mpw_expect 'a3~AiGkHk)Pgjbb)mk6H' -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tmax    -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.max'
-mpw_expect 'Lojz6?VotaJall'       -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.long'
-mpw_expect 'Yoqu7)NiziFito'       -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.⛄'
-mpw_expect 'Foha4[TojmXanc'       -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c4294967295 -a1 -p 'authentication'      'ẗesẗ.c+a1pa'
-mpw_expect 'Hiy3*Zag'             -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tmed    -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.med'
-mpw_expect 'UJR7HpG0'             -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tbasic  -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.basic'
-mpw_expect 'Cij7'                 -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tshort  -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.short'
-mpw_expect '0020'                 -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tpin    -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.pin'
-mpw_expect 'vadxovezu'            -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tname   -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.name'
-mpw_expect 'sij jihloyenu kizi' -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tphrase -c1 -a1 -p 'authentication' -C ''         'ẗesẗ.c1a1pa.phrase'
-mpw_expect 'qipberize'            -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tname   -c1 -a1 -p 'identification' -C ''         'ẗesẗ.c1a1pi'
-mpw_expect 'sok torxibute reza' -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tphrase -c1 -a1 -p 'recovery'       -C ''         'ẗesẗ.c1a1pr'
+mpw_expect 'a3~AiGkHk)Pgjbb)mk6H'   -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tmax    -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.max'
+mpw_expect 'Lojz6?VotaJall'         -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.long'
+mpw_expect 'Yoqu7)NiziFito'         -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tlong   -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.⛄'
+mpw_expect 'Foha4[TojmXanc'         -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest'          -c4294967295 -a1 -p 'authentication' -C '' 'ẗesẗ.c+a1pa'
+mpw_expect 'Hiy3*Zag'               -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tmed    -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.med'
+mpw_expect 'UJR7HpG0'               -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tbasic  -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.basic'
+mpw_expect 'Cij7'                   -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tshort  -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.short'
+mpw_expect '0020'                   -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tpin    -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.pin'
+mpw_expect 'vadxovezu'              -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tname   -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.name'
+mpw_expect 'sij jihloyenu kizi'     -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tphrase -c1 -a1 -p 'authentication' -C ''          'ẗesẗ.c1a1pa.phrase'
+mpw_expect 'z2U9)(uQ78TXqtaus)8.'   -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tmax    -c1 -a1 -p 'identification' -C ''          'ẗesẗ.c1a1pi.max'
+mpw_expect 'qipberize'              -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest'          -c1 -a1 -p 'identification' -C ''          'ẗesẗ.c1a1pi'
+mpw_expect 'QMciaKyi1&I*g%tHz99,'   -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest' -tmax    -c1 -a1 -p 'recovery'       -C ''          'ẗesẗ.c1a1pr.max'
+mpw_expect 'sok torxibute reza'     -Fjson -R0 \
+    -u 'tesẗ.v1' -M 'ẗest'          -c1 -a1 -p 'recovery'       -C ''          'ẗesẗ.c1a1pr'
 mpw_expect 'xacp qaw qutbece gan'   -Fjson -R0 \
-    -u 'tesẗ.v1' -M 'ẗest' -tphrase -c1 -a1 -p 'recovery'       -C 'quesẗion' 'ẗesẗ.c1a1pr.quesẗion'
+    -u 'tesẗ.v1' -M 'ẗest'          -c1 -a1 -p 'recovery'       -C 'quesẗion'  'ẗesẗ.c1a1pr.quesẗion'
 
 ##  V0
 printf "\nV%d, json: " 0
-mpw_expect 'b5@ww@Jmb4cAioRbivb)' -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tmax    -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.max'
-mpw_expect 'ZuceHazwLojz8!'       -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.long'
-mpw_expect 'Boxj2!YabePodp'       -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.⛄'
-mpw_expect 'PeblLuqc6]Cala'       -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c4294967295 -a0 -p 'authentication'      'ẗesẗ.c+a0pa'
-mpw_expect 'XelQac0@'             -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tmed    -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.med'
-mpw_expect 'qS07SRc8'             -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tbasic  -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.basic'
-mpw_expect 'Fih8'                 -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tshort  -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.short'
-mpw_expect '6121'                 -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tpin    -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.pin'
-mpw_expect 'rivfutipe'            -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tname   -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.name'
-mpw_expect 'xir qebdohogo buno' -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tphrase -c1 -a0 -p 'authentication' -C ''         'ẗesẗ.c1a0pa.phrase'
-mpw_expect 'ragcoxudo'            -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tname   -c1 -a0 -p 'identification' -C ''         'ẗesẗ.c1a0pi'
-mpw_expect 'kokl hov lowmaya xaf' -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tphrase -c1 -a0 -p 'recovery'       -C ''         'ẗesẗ.c1a0pr'
-mpw_expect 'wi zanmu nug zuwidwe' -Fjson -R0 \
-    -u 'tesẗ.v0' -M 'ẗest' -tphrase -c1 -a0 -p 'recovery'       -C 'quesẗion' 'ẗesẗ.c1a0pr.quesẗion'
+mpw_expect 'b5@ww@Jmb4cAioRbivb)'   -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tmax    -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.max'
+mpw_expect 'ZuceHazwLojz8!'         -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.long'
+mpw_expect 'Boxj2!YabePodp'         -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tlong   -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.⛄'
+mpw_expect 'PeblLuqc6]Cala'         -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest'          -c4294967295 -a0 -p 'authentication' -C '' 'ẗesẗ.c+a0pa'
+mpw_expect 'XelQac0@'               -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tmed    -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.med'
+mpw_expect 'qS07SRc8'               -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tbasic  -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.basic'
+mpw_expect 'Fih8'                   -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tshort  -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.short'
+mpw_expect '6121'                   -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tpin    -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.pin'
+mpw_expect 'rivfutipe'              -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tname   -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.name'
+mpw_expect 'xir qebdohogo buno'     -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tphrase -c1 -a0 -p 'authentication' -C ''          'ẗesẗ.c1a0pa.phrase'
+mpw_expect "RoAm3bJSvo@#loHSRA6\'"  -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tmax    -c1 -a0 -p 'identification' -C ''          'ẗesẗ.c1a0pi.max'
+mpw_expect 'ragcoxudo'              -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest'          -c1 -a0 -p 'identification' -C ''          'ẗesẗ.c1a0pi'
+mpw_expect 'm8]SiJHiAS@H@Rbw))34'   -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest' -tmax    -c1 -a0 -p 'recovery'       -C ''          'ẗesẗ.c1a0pr.max'
+mpw_expect 'kokl hov lowmaya xaf'   -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest'          -c1 -a0 -p 'recovery'       -C ''          'ẗesẗ.c1a0pr'
+mpw_expect 'wi zanmu nug zuwidwe'   -Fjson -R0 \
+    -u 'tesẗ.v0' -M 'ẗest'          -c1 -a0 -p 'recovery'       -C 'quesẗion'  'ẗesẗ.c1a0pr.quesẗion'
 
 
 # Finish

platform-independent/c/core/build.gradle

@@ -74,7 +74,7 @@ library {
             link.linkerArgs = ['-lc', '-nodefaultlibs', '-flto']
         } else if (toolChain in VisualCpp) {
             // TODO: Should this be shared instead of static?
-            compile.compilerArgs = ['/TC', '/MT', '/Ox', '/DSODIUM_STATIC', '/DSODIUM_EXPORT=']
+            compile.compilerArgs = ['/TC', '/MT', '/Ox', '/DSODIUM_STATIC', '/DSODIUM_EXPORT=', '/std:c11']
         }
     }
 }

platform-independent/c/core/src/mpw-algorithm.c

@@ -122,7 +122,10 @@ const char *mpw_site_result(
         return NULL;
     }
 
-    if (resultType & MPResultTypeClassTemplate) {
+    if (resultType == MPResultTypeNone) {
+        return NULL;
+    }
+    else if (resultType & MPResultTypeClassTemplate) {
         switch (algorithmVersion) {
             case MPAlgorithmVersionV0:
                 return mpw_site_template_password_v0( masterKey, siteKey, resultType, resultParam );
@@ -203,6 +206,10 @@ const char *mpw_site_state(
         return NULL;
     }
 
+    if (resultType == MPResultTypeNone) {
+        return NULL;
+    }
+
     switch (algorithmVersion) {
         case MPAlgorithmVersionV0:
             return mpw_site_state_v0( masterKey, siteKey, resultType, resultParam );

platform-independent/c/core/src/mpw-algorithm_v0.c

@@ -166,6 +166,11 @@ const char *mpw_site_crypted_password_v0(
         err( "Missing encrypted state." );
         return NULL;
     }
+    if (strlen( cipherText ) % 4 != 0) {
+        wrn( "Malformed encrypted state, not base64." );
+        // This can happen if state was stored in a non-encrypted form, eg. login in old mpsites.
+        return mpw_strdup( cipherText );
+    }
 
     // Base64-decode
     uint8_t *cipherBuf = calloc( 1, mpw_base64_decode_max( cipherText ) );
@@ -184,8 +189,10 @@ const char *mpw_site_crypted_password_v0(
     mpw_free( &plainBytes, bufSize );
     if (!plainText)
         err( "AES decryption error: %s", strerror( errno ) );
+    else if (!mpw_utf8_strchars( plainText ))
+        wrn( "decrypted -> plainText: %zu bytes = illegal UTF-8 = %s", strlen( plainText ), mpw_hex( plainText, bufSize ) );
     else
-        trc( "decrypted -> plainText: %zu bytes = %s = %s", strlen( plainText ), plainText, mpw_hex( plainText, strlen( plainText ) ) );
+        trc( "decrypted -> plainText: %zu bytes = %s = %s", strlen( plainText ), plainText, mpw_hex( plainText, bufSize ) );
 
     return plainText;
 }

platform-independent/c/core/src/mpw-marshal.c

@@ -93,7 +93,7 @@ MPMarshalledUser *mpw_marshal_user(
             .fullName = mpw_strdup( fullName ),
             .identicon = MPIdenticonUnset,
             .keyID = NULL,
-            .defaultType = MPResultTypeDefault,
+            .defaultType = MPResultTypeDefaultResult,
             .lastUsed = 0,
 
             .sites_count = 0,
@@ -122,7 +122,7 @@ MPMarshalledSite *mpw_marshal_site(
             .resultType = resultType,
             .resultState = NULL,
 
-            .loginType = MPResultTypeTemplateName,
+            .loginType = MPResultTypeDefaultLogin,
             .loginState = NULL,
 
             .url = NULL,
@@ -250,7 +250,7 @@ void mpw_marshal_file_free(
 MPMarshalledData *mpw_marshal_data_new() {
 
     MPMarshalledData *data = malloc( sizeof( MPMarshalledData ) );
-    *data = (MPMarshalledData){};
+    *data = (MPMarshalledData){ 0 };
     mpw_marshal_data_set_null( data, NULL );
     data->is_null = false;
     return data;
@@ -864,7 +864,7 @@ static void mpw_marshal_read_flat(
     char *fullName = NULL, *keyID = NULL;
     MPAlgorithmVersion algorithm = MPAlgorithmVersionCurrent;
     MPIdenticon identicon = MPIdenticonUnset;
-    MPResultType defaultType = MPResultTypeDefault;
+    MPResultType defaultType = MPResultTypeDefaultResult;
     time_t exportDate = 0;
     bool headerStarted = false, headerEnded = false, importRedacted = false;
     for (const char *endOfLine, *positionInLine = in; (endOfLine = strstr( positionInLine, "\n" )); positionInLine = endOfLine + 1) {
@@ -980,7 +980,7 @@ static void mpw_marshal_read_flat(
                     str_counter = mpw_strdup( strtok( NULL, "" ) );
                     mpw_free_string( &typeAndVersionAndCounter );
                 }
-                siteLoginState = mpw_get_token( &positionInLine, endOfLine, "\t\n" ); // TODO: Needs to be encoded if redacted?
+                siteLoginState = mpw_get_token( &positionInLine, endOfLine, "\t\n" );
                 siteName = mpw_get_token( &positionInLine, endOfLine, "\t\n" );
                 siteResultState = mpw_get_token( &positionInLine, endOfLine, "\n" );
                 break;
@@ -1014,16 +1014,15 @@ static void mpw_marshal_read_flat(
                 mpw_marshal_error( file, MPMarshalErrorIllegal, "Invalid site last used: %s: %s", siteName, str_lastUsed );
                 continue;
             }
+            MPResultType siteLoginType = siteLoginState && strlen( siteLoginState )? MPResultTypeStatefulPersonal: MPResultTypeNone;
 
             char dateString[21];
             mpw_marshal_data_set_num( siteCounter, file->data, "sites", siteName, "counter", NULL );
             mpw_marshal_data_set_num( siteAlgorithm, file->data, "sites", siteName, "algorithm", NULL );
             mpw_marshal_data_set_num( siteType, file->data, "sites", siteName, "type", NULL );
-            mpw_marshal_data_set_str( siteResultState && strlen( siteResultState )? siteResultState: NULL, file->data, "sites", siteName,
-                    "password", NULL );
-            mpw_marshal_data_set_num( MPResultTypeDefault, file->data, "sites", siteName, "login_type", NULL );
-            mpw_marshal_data_set_str( siteLoginState && strlen( siteLoginState )? siteLoginState: NULL, file->data, "sites", siteName,
-                    "login_name", NULL );
+            mpw_marshal_data_set_str( siteResultState, file->data, "sites", siteName, "password", NULL );
+            mpw_marshal_data_set_num( siteLoginType, file->data, "sites", siteName, "login_type", NULL );
+            mpw_marshal_data_set_str( siteLoginState, file->data, "sites", siteName, "login_name", NULL );
             mpw_marshal_data_set_num( strtol( str_uses, NULL, 10 ), file->data, "sites", siteName, "uses", NULL );
             if (strftime( dateString, sizeof( dateString ), "%FT%TZ", gmtime( &siteLastUsed ) ))
                 mpw_marshal_data_set_str( dateString, file->data, "sites", siteName, "last_used", NULL );
@@ -1152,7 +1151,7 @@ MPMarshalledUser *mpw_marshal_auth(
     }
     MPIdenticon identicon = mpw_identicon_encoded( mpw_marshal_data_get_str( file->data, "user", "identicon", NULL ) );
     const char *keyID = mpw_marshal_data_get_str( file->data, "user", "key_id", NULL );
-    MPResultType defaultType = mpw_default_n( MPResultTypeDefault, mpw_marshal_data_get_num( file->data, "user", "default_type", NULL ) );
+    MPResultType defaultType = mpw_default_n( MPResultTypeDefaultResult, mpw_marshal_data_get_num( file->data, "user", "default_type", NULL ) );
     if (!mpw_type_short_name( defaultType )) {
         mpw_marshal_error( file, MPMarshalErrorIllegal, "Invalid user default type: %u", defaultType );
         return NULL;
@@ -1218,7 +1217,7 @@ MPMarshalledUser *mpw_marshal_auth(
             return NULL;
         }
         const char *siteResultState = mpw_marshal_data_get_str( siteData, "password", NULL );
-        MPResultType siteLoginType = mpw_default_n( MPResultTypeTemplateName, mpw_marshal_data_get_num( siteData, "login_type", NULL ) );
+        MPResultType siteLoginType = mpw_default_n( MPResultTypeDefaultLogin, mpw_marshal_data_get_num( siteData, "login_type", NULL ) );
         if (!mpw_type_short_name( siteLoginType )) {
             mpw_marshal_error( file, MPMarshalErrorIllegal, "Invalid site login type: %s: %u", siteName, siteLoginType );
             mpw_free( &masterKey, MPMasterKeySize );
@@ -1260,10 +1259,10 @@ MPMarshalledUser *mpw_marshal_auth(
                 return NULL;
             }
 
-            if (siteResultState && strlen( siteResultState ))
+            if (siteResultState && strlen( siteResultState ) && masterKey)
                 site->resultState = mpw_site_state( masterKey, site->siteName, site->counter,
                         MPKeyPurposeAuthentication, NULL, site->resultType, siteResultState, site->algorithm );
-            if (siteLoginState && strlen( siteLoginState ))
+            if (siteLoginState && strlen( siteLoginState ) && masterKey)
                 site->loginState = mpw_site_state( masterKey, site->siteName, MPCounterValueInitial,
                         MPKeyPurposeIdentification, NULL, site->loginType, siteLoginState, site->algorithm );
         }
@@ -1284,7 +1283,7 @@ MPMarshalledUser *mpw_marshal_auth(
 
             if (!user->redacted) {
                 // Clear Text
-                if (answerState && strlen( answerState ))
+                if (answerState && strlen( answerState ) && masterKey)
                     question->state = mpw_site_state( masterKey, site->siteName, MPCounterValueInitial,
                             MPKeyPurposeRecovery, question->keyword, question->type, answerState, site->algorithm );
             }

platform-independent/c/core/src/mpw-marshal.h

@@ -223,6 +223,7 @@ const char *mpw_marshal_write(
 MPMarshalledFile *mpw_marshal_read(
         MPMarshalledFile *file, const char *in);
 /** Authenticate as the user identified by the given marshalled file.
+ * @note This object stores a reference to the given key provider.
  * @return A user object (allocated), or NULL if the file format provides no marshalling or a format error occurred. */
 MPMarshalledUser *mpw_marshal_auth(
         MPMarshalledFile *file, const MPMasterKeyProvider masterKeyProvider);
@@ -230,19 +231,25 @@ MPMarshalledUser *mpw_marshal_auth(
 //// Creating.
 
 /** Create a new user object ready for marshalling.
+ * @note This object stores copies of the strings assigned to it and manages their deallocation internally.
  * @return A user object (allocated), or NULL if the fullName is missing or the marshalled user couldn't be allocated. */
 MPMarshalledUser *mpw_marshal_user(
         const char *fullName, const MPMasterKeyProvider masterKeyProvider, const MPAlgorithmVersion algorithmVersion);
 /** Create a new site attached to the given user object, ready for marshalling.
+ * @note This object stores copies of the strings assigned to it and manages their deallocation internally.
  * @return A site object (allocated), or NULL if the siteName is missing or the marshalled site couldn't be allocated. */
 MPMarshalledSite *mpw_marshal_site(
         MPMarshalledUser *user,
         const char *siteName, const MPResultType resultType, const MPCounterValue siteCounter, const MPAlgorithmVersion algorithmVersion);
 /** Create a new question attached to the given site object, ready for marshalling.
+ * @note This object stores copies of the strings assigned to it and manages their deallocation internally.
  * @return A question object (allocated), or NULL if the marshalled question couldn't be allocated. */
 MPMarshalledQuestion *mpw_marshal_question(
         MPMarshalledSite *site, const char *keyword);
 /** Create or update a marshal file descriptor.
+ * @param file If NULL, a new file will be allocated.  Otherwise, the given file will be updated and the updated file returned.
+ * @param info If NULL, the file's info will be left as-is, otherwise it will be replaced by the given one.  The file will manage the info's deallocation.
+ * @param data If NULL, the file's data will be left as-is, otherwise it will be replaced by the given one.  The file will manage the data's deallocation.
  * @return The given file or new (allocated) if file is NULL; or NULL if the user is missing or the file couldn't be allocated. */
 MPMarshalledFile *mpw_marshal_file(
         MPMarshalledFile *file, MPMarshalledInfo *info, MPMarshalledData *data);

platform-independent/c/core/src/mpw-types.c

@@ -38,6 +38,8 @@ const MPResultType mpw_type_named(const char *typeName) {
 
     // Find what password type is represented by the type letter.
     if (strlen( typeName ) == 1) {
+        if ('0' == typeName[0])
+            return MPResultTypeNone;
         if ('x' == typeName[0])
             return MPResultTypeTemplateMaximum;
         if ('l' == typeName[0])
@@ -63,6 +65,8 @@ const MPResultType mpw_type_named(const char *typeName) {
     }
 
     // Find what password type is represented by the type name.
+    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeNone ), typeName, strlen( typeName ) ) == OK)
+        return MPResultTypeNone;
     if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateMaximum ), typeName, strlen( typeName ) ) == OK)
         return MPResultTypeTemplateMaximum;
     if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateLong ), typeName, strlen( typeName ) ) == OK)
@@ -93,6 +97,8 @@ const MPResultType mpw_type_named(const char *typeName) {
 const char *mpw_type_abbreviation(const MPResultType resultType) {
 
     switch (resultType) {
+        case MPResultTypeNone:
+            return "no";
         case MPResultTypeTemplateMaximum:
             return "max";
         case MPResultTypeTemplateLong:
@@ -125,6 +131,8 @@ const char *mpw_type_abbreviation(const MPResultType resultType) {
 const char *mpw_type_short_name(const MPResultType resultType) {
 
     switch (resultType) {
+        case MPResultTypeNone:
+            return "none";
         case MPResultTypeTemplateMaximum:
             return "maximum";
         case MPResultTypeTemplateLong:
@@ -157,6 +165,8 @@ const char *mpw_type_short_name(const MPResultType resultType) {
 const char *mpw_type_long_name(const MPResultType resultType) {
 
     switch (resultType) {
+        case MPResultTypeNone:
+            return "None";
         case MPResultTypeTemplateMaximum:
             return "Maximum Security Password";
         case MPResultTypeTemplateLong:

platform-independent/c/core/src/mpw-types.h

@@ -80,6 +80,9 @@ typedef mpw_opts( uint16_t, MPSiteFeature ) {
 
 // bit 0-3 | MPResultTypeClass | MPSiteFeature
 typedef mpw_enum( uint32_t, MPResultType ) {
+    /** 0: Don't produce a result */
+            MPResultTypeNone = 0,
+
     /** 16: pg^VMAUBk5x3p%HP%i4= */
             MPResultTypeTemplateMaximum = 0x0 | MPResultTypeClassTemplate | 0x0,
     /** 17: BiroYena8:Kixa */
@@ -105,7 +108,8 @@ typedef mpw_enum( uint32_t, MPResultType ) {
     /** 4160: Derive a unique binary key. */
             MPResultTypeDeriveKey = 0x0 | MPResultTypeClassDerive | MPSiteFeatureAlternative,
 
-    MPResultTypeDefault = MPResultTypeTemplateLong,
+    MPResultTypeDefaultResult = MPResultTypeTemplateLong,
+    MPResultTypeDefaultLogin = MPResultTypeTemplateName,
 };
 
 typedef mpw_enum ( uint32_t, MPCounterValue ) {

platform-independent/c/core/src/mpw-util.c

@@ -22,7 +22,6 @@ MP_LIBS_BEGIN
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include <libgen.h>
 
 #if MPW_CPERCIVA
 #include <scrypt/crypto_scrypt.h>
@@ -607,6 +606,9 @@ const uint8_t *mpw_unhex(const char *hex, size_t *length) {
 
 size_t mpw_utf8_charlen(const char *utf8String) {
 
+    if (!utf8String)
+        return 0;
+
     // Legal UTF-8 byte sequences: <http://www.unicode.org/unicode/uni2errata/UTF-8_Corrigendum.html>
     unsigned char utf8Char = (unsigned char)*utf8String;
     if (utf8Char >= 0x00 && utf8Char <= 0x7F)
@@ -624,8 +626,9 @@ size_t mpw_utf8_charlen(const char *utf8String) {
 size_t mpw_utf8_strchars(const char *utf8String) {
 
     size_t strchars = 0, charlen;
-    for (char *remaining = (char *)utf8String; (charlen = mpw_utf8_charlen( remaining )); remaining += charlen)
-        ++strchars;
+    for (char *remaining = (char *)utf8String; remaining && *remaining; remaining += charlen, ++strchars)
+        if (!(charlen = mpw_utf8_charlen( remaining )))
+            return 0;
 
     return strchars;
 }

platform-independent/c/core/src/mpw-util.h

@@ -86,6 +86,21 @@ void mpw_log_ssink(LogLevel level, const char *file, int line, const char *funct
 
 //// Utilities
 
+#ifndef OK
+#define OK 0
+#endif
+#ifndef ERR
+#define ERR -1
+#endif
+
+#ifndef stringify
+#define stringify(s) #s
+#endif
+#ifndef stringify_def
+#define stringify_def(s) stringify(s)
+#endif
+
+#if !__STRICT_ANSI__ && __GNUC__ >= 3
 #ifndef min
 #define min(a, b) ({ \
     __typeof__ (a) _a = (a); \
@@ -98,21 +113,18 @@ void mpw_log_ssink(LogLevel level, const char *file, int line, const char *funct
     __typeof__ (b) _b = (b); \
     _a > _b ? _a : _b; })
 #endif
-#ifndef ERR
-#define ERR -1
+#define mpw_default(__default, __value) ({ __typeof__ (__value) _v = (__value); _v? _v: (__default); })
+#define mpw_default_n(__default, __num) ({ __typeof__ (__num) _n = (__num); !isnan( _n )? (__typeof__ (__default))_n: (__default); })
+#else
+#ifndef min
+#define min(a, b) ( (a) < (b) ? (a) : (b) )
 #endif
-#ifndef OK
-#define OK 0
+#ifndef max
+#define max(a, b) ( (a) > (b) ? (a) : (b) )
 #endif
-#ifndef stringify
-#define stringify(s) #s
+#define mpw_default(__default, __value) ( (__value)? (__value): (__default) )
+#define mpw_default_n(__default, __num) ( !isnan( (__num) )? (__num): (__default) )
 #endif
-#ifndef stringify_def
-#define stringify_def(s) stringify(s)
-#endif
-
-#define mpw_default(__default, __value) ({ __typeof__ (__value) _v = __value; _v? _v: __default; })
-#define mpw_default_n(__default, __num) ({ __typeof__ (__num) _n = (__num); !isnan( _n )? (__typeof__ (__default))_n: __default; })
 
 
 //// Buffers and memory.
@@ -256,9 +268,9 @@ bool mpw_id_buf_equals(MPKeyID id1, MPKeyID id2);
 
 //// String utilities.
 
-/** @return The byte length of the UTF-8 character at the start of the given string. */
+/** @return The byte length of the UTF-8 character at the start of the given string or 0 if it is NULL, empty or not a legal UTF-8 character. */
 size_t mpw_utf8_charlen(const char *utf8String);
-/** @return The amount of UTF-8 characters in the given string. */
+/** @return The amount of UTF-8 characters in the given string or 0 if it is NULL, empty, or contains bytes that are not legal in UTF-8. */
 size_t mpw_utf8_strchars(const char *utf8String);
 /** Drop-in for memdup(3).
  * @return A buffer (allocated, len) with len bytes copied from src or NULL if src is missing or the buffer could not be allocated. */

platform-independent/java/algorithm/build.gradle

@@ -15,7 +15,7 @@ configurations {
 
 dependencies {
     implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2'
-    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.0.0-beta4'
+    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.1'
 
     api group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.8'
     api group: 'org.jetbrains', name: 'annotations', version: '16.0.2'

platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java

@@ -151,7 +151,7 @@ public interface MPAlgorithm {
     /**
      * The algorithm iterations.
      */
-    enum Version implements  MPAlgorithm {
+    enum Version implements MPAlgorithm {
 
         /**
          * bugs:
@@ -346,7 +346,7 @@ public interface MPAlgorithm {
         @Nonnull
         @Override
         public Version version() {
-            return MPAlgorithm.Version.V0;
+            return this;
         }
 
         @Nonnull

platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java

@@ -20,7 +20,6 @@ package com.lyndir.masterpassword;
 
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.UnsignedInteger;
-import com.lyndir.lhunath.opal.system.CodeUtils;
 import com.lyndir.lhunath.opal.system.logging.Logger;
 import java.util.Arrays;
 import java.util.EnumMap;
@@ -56,6 +55,7 @@ public class MPMasterKey {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     protected void finalize()
             throws Throwable {
 

platform-independent/java/gui/build.gradle

@@ -12,7 +12,7 @@ dependencies {
     implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2'
     implementation group: 'com.yuvimasory', name: 'orange-extensions', version: '1.3.0'
     implementation group: 'com.github.tulskiy', name: 'jkeymaster', version: '1.2'
-    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.0.0-beta4'
+    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.1'
 
     compile project( ':masterpassword-model' )
 }

platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Components.java

@@ -212,7 +212,7 @@ public abstract class Components {
             @Override
             public String getString(final int where, final int len)
                     throws BadLocationException {
-                return "";
+                return new String( new char[this.length()] );
             }
         } ), null, 0 ) {
             {

platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java

@@ -459,7 +459,8 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L
             char[] masterPassword = masterPasswordField.getPassword();
             MPIdenticon identicon = ((masterPassword != null) && (masterPassword.length > 0))?
                     user.getAlgorithm().identicon( user.getFullName(), masterPassword ): null;
-            Arrays.fill( masterPassword, (char) 0 );
+            if (masterPassword != null)
+                Arrays.fill( masterPassword, (char) 0 );
 
             Res.ui( () -> {
                 if (identicon != null) {
@@ -900,6 +901,12 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L
         private void showSiteItem(@Nullable final MPQuery.Result<? extends MPSite<?>> item) {
             MPSite<?> site = (item != null)? item.getValue(): null;
             Res.ui( getSiteResult( site, showLogin ), result -> {
+                settingsButton.setEnabled( site != null );
+                questionsButton.setEnabled( site != null );
+                editButton.setEnabled( site != null );
+                keyButton.setEnabled( site != null );
+                deleteButton.setEnabled( site != null );
+
                 if (!showLogin && (site != null))
                     resultLabel.setText( (result != null)? strf( "Your password for %s:", site.getSiteName() ): " " );
                 else if (showLogin && (site != null))
@@ -911,11 +918,6 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L
                     resultField.setText( EACH_CHARACTER.matcher( result ).replaceAll( "•" ) );
                 else
                     resultField.setText( result );
-                settingsButton.setEnabled( result != null );
-                questionsButton.setEnabled( result != null );
-                editButton.setEnabled( result != null );
-                keyButton.setEnabled( result != null );
-                deleteButton.setEnabled( result != null );
             } );
         }
 

platform-independent/java/model/build.gradle

@@ -7,7 +7,7 @@ description = 'Master Password Site Model'
 dependencies {
     implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.8'
-    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.0.0-beta4'
+    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.1'
 
     api project( ':masterpassword-algorithm' )
     api group: 'joda-time', name: 'joda-time', version: '2.10'

platform-independent/java/tests/build.gradle

@@ -7,7 +7,7 @@ description = 'Master Password Test Suite'
 dependencies {
     implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2'
     implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
-    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.0.0-beta4'
+    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.1'
 
     implementation project( ':masterpassword-algorithm' )
     implementation project( ':masterpassword-model' )

platform-independent/scripts/timetocrack

@@ -1,6 +1,20 @@
 #!/usr/bin/env bash
 source bashlib
 calc() { python -c "import math; print $1"; }
+scale() {
+    local number=$1 precision=$2 definition unit weight; shift 2
+    for definition in "$@"; do
+        definition=$definition
+        weight=${definition#*:}
+        [[ ! $weight || $(calc "($number) > ($weight)") = True ]] || break
+
+        number=$(calc "(1.0 * $number) / (1.0 * ${weight:-1})") unit=${definition%:*}
+    done
+    printf "%'0.${precision}f %s" "$number" "$unit"
+}
+scaleTime()     { scale "$1" "${2:-2}" 'Seconds:' "Hours:3600" "Days:24" "Months:30" "Years:356/30" "K Years:1000" "M Years:1000" "B Years:1000" "T Years:1000"; }
+scaleEnergy()   { scale "$1" "${2:-2}" 'Wh:' 'kWh:1000' 'MWh:1000' 'GWh:1000' 'TWh:1000'; }
+scaleCost()     { scale "$1" "${2:-2}" '$US:' 'K$US:1000' 'M$US:1000' 'B$US:1000' 'T$US:1000'; }
 
 inf 'Calculate the maximum amount of time required to brute-force search for a password.'
 
@@ -17,44 +31,45 @@ x="$a$n!@#\$%^&*()"
 w="@words.txt"
 
 ## METRICS
+
 # Last update: 2016-09
-# GTX Titan X can generate about 402.7M HMAC-SHA-256 hashes per second (5301.7M SHA1).  (ref. https://hashcat.net/forum/thread-4314.html)
-# GTX Titan X can be bought for about 950$ used. (ref. amazon.com)
-#hardwareName='GTX Titan X (SHA1)'                  hardwareSpeed='5302M'
-#hardwareName='GTX Titan X (SHA1 @ 5k$)'            hardwareSpeed='5302M * 5k / 950'
-#hardwareName='GTX Titan X (SHA1 @ 20k$)'           hardwareSpeed='5302M * 20k / 950'
-#hardwareName='GTX Titan X (SHA1 @ 20M$)'           hardwareSpeed='5302M * 20M / 950'
-#hardwareName='GTX Titan X (SHA1 @ 5B$)'            hardwareSpeed='5302M * 5B / 950'
- hardwareName='GTX Titan X (HMAC-SHA-256 @ 950$)'   hardwareSpeed='403M'
-#hardwareName='GTX Titan X (HMAC-SHA-256 @ 5k$)'    hardwareSpeed='403M * 5k / 950'
-#hardwareName='GTX Titan X (HMAC-SHA-256 @ 20k$)'   hardwareSpeed='403M * 20k / 950'
-#hardwareName='GTX Titan X (HMAC-SHA-256 @ 20M$)'   hardwareSpeed='403M * 20M / 950'
-#hardwareName='GTX Titan X (HMAC-SHA-256 @ 5B$)'    hardwareSpeed='403M * 5B / 950'
+# GTX Titan X -- https://gist.github.com/epixoip/1f26f43e9036d9ce0eb8
+#hardwareName='GTX Titan X (SHA1)'          hardwareHPS='5302M'     hardwareCost='950'  hardwareWatt='250' # -mpl: 4.67 m
+#hardwareName='GTX Titan X (HMAC-SHA-256)'  hardwareHPS='2113M'     hardwareCost='950'  hardwareWatt='250' # -mpl: 0.99 y
+#hardwareName='GTX Titan X (bcrypt-10)'     hardwareHPS='14440/32'  hardwareCost='950'  hardwareWatt='250' # -mpl: 4.62 My
+# GTX 980 Ti -- https://gist.github.com/epixoip/d34245293ccecbfcc7c7
+#hardwareName='GTX 980 Ti (SHA1)'           hardwareHPS='5366M'     hardwareCost='450'  hardwareWatt='250' # -mpl: 4.61 m
+#hardwareName='GTX 980 Ti (SHA256)'         hardwareHPS='2032M'     hardwareCost='450'  hardwareWatt='250' # -mpl: 1.03 y
+#hardwareName='GTX 980 Ti (bcrypt-10)'      hardwareHPS='14521/32'  hardwareCost='450'  hardwareWatt='250' # -mpl: 4.60 My
+# GTX 1060 -- https://gist.github.com/derpasaurusz/817638385a35026383331b22e6f2d490
+#hardwareName='GTX 1060 (SHA1)'             hardwareHPS='4218M'     hardwareCost='400'  hardwareWatt='120' # -mpl: 5.87 m
+#hardwareName='GTX 1060 (SHA256)'           hardwareHPS='1632M'     hardwareCost='400'  hardwareWatt='120' # -mpl: 1.28 y
+#hardwareName='GTX 1060 (bcrypt-10)'        hardwareHPS='8046/32'   hardwareCost='400'  hardwareWatt='120' # -mpl: 8.30 My
+# GTX 1080 Ti -- https://gist.github.com/epixoip/ace60d09981be09544fdd35005051505
+#hardwareName='GTX 1080 Ti (SHA1)'          hardwareHPS='12696M'    hardwareCost='1200' hardwareWatt='250' # -mpl: 1.95 m
+#hardwareName='GTX 1080 Ti (SHA256)'        hardwareHPS='4967M'     hardwareCost='1200' hardwareWatt='250' # -mpl: 4.99 m
+#hardwareName='GTX 1080 Ti (bcrypt-10)'     hardwareHPS='23266/32'  hardwareCost='1200' hardwareWatt='250' # -mpl: 2.87 My
+ hardwareName='GTX 1080 Ti (mpw?)'          hardwareHPS='56*3'      hardwareCost='1200' hardwareWatt='250' # -mpl: 2.87 My
 
 # ASICs
- hardwareName='AntMiner L3+ (scrypt)'               hardwareSpeed='1M'
-#hardwareName='AntMiner L3+ (scrypt @ 5k$)'         hardwareSpeed='1M * 5k / 2500'
-#hardwareName='AntMiner L3+ (scrypt @ 20k$)'        hardwareSpeed='1M * 20k / 2500'
-#hardwareName='AntMiner L3+ (scrypt @ 20M$)'        hardwareSpeed='1M * 20M / 2500'
-#hardwareName='AntMiner L3+ (scrypt @ 5B$)'         hardwareSpeed='1M * 5B / 2500'
- hardwareName='AntMiner S9 (SHA256)'                hardwareSpeed='14T'
-#hardwareName='AntMiner S9 (SHA256 @ 5k$)'          hardwareSpeed='14T * 5k / 1288'
-#hardwareName='AntMiner S9 (SHA256 @ 20k$)'         hardwareSpeed='14T * 20k / 1288'
-#hardwareName='AntMiner S9 (SHA256 @ 20M$)'         hardwareSpeed='14T * 20M / 1288'
-#hardwareName='AntMiner S9 (SHA256 @ 5B$)'          hardwareSpeed='14T * 5B / 1288'
+#hardwareName='AntMiner L3+ (scrypt)'       hardwareHPS='1M'    hardwareCost='2500' hardwareWatt='800'
+#hardwareName='AntMiner S9 (SHA256)'        hardwareHPS='14T'   hardwareCost='1288' hardwareWatt='1400'
 
 # mpw-bench
-#hardwareName='2.3 GHz i7, 8GB (MPW)'               hardwareSpeed=7.46
+#hardwareName='2.3 GHz i7, 8GB (MPW)'       hardwareHPS=7.46
+
+costPerKWh='0.1' # ~0.1$/kWh
+hardwareQuantity=$(calc "5000000000 / ($hardwareCost)")
 
 second='1'
 secondsInHour='3600'
 secondsInDay='3600 * 24'
 secondsInMonth='3600 * 24 * 30'
 secondsInYear='3600 * 24 * 356'
-hardwareSpeed=${hardwareSpeed//k/000}
-hardwareSpeed=${hardwareSpeed//M/000000}
-hardwareSpeed=${hardwareSpeed//G/000000000}
-hardwareSpeed=${hardwareSpeed//T/000000000000}
+hardwareHPS=${hardwareHPS//k/000}
+hardwareHPS=${hardwareHPS//M/000000}
+hardwareHPS=${hardwareHPS//G/000000000}
+hardwareHPS=${hardwareHPS//T/000000000000}
 
 ## SEARCH SPACE
 hr
@@ -74,7 +89,7 @@ for _c in V C v c A a n o x w; do
 
     inf '%s: Class contains %d entities: %s' "$_c" "$cs" "$cc"
 done
-spaceString=${1:-$(ask -d "x ** 12" "Amount of space?")}
+spaceString=${1:-$(ask -d "x ** 12" "Size of the space?")}
 case "$spaceString" in
     -mp*) mpmode=${spaceString#-mp} mpmode=${mpmode:-long}
         case "$mpmode" in
@@ -82,9 +97,18 @@ case "$spaceString" in
             max|secure|x) spaceString='aonxxxxxxxxxxxxxxxxx+axxxxxxxxxxxxxxxxxon' ;;
             med|m) spaceString='CvcnoCvc+CvcCvcno' ;;
             basic|b) spaceString='aaanaaan+aannaaan+aaannaaa' ;;
+            *) ftl 'Unknown mode: %s' "$mpmode" || exit
         esac ;;
+    -pw*) password=${spaceString#-pw} spaceString=
+        while read -N1 pwchar; do
+            for _c in v c a n x; do
+                cc=${!_c}
+                [[ $cc = *$pwchar* ]] && spaceString+=$_c && break
+            done || spaceString+=" 256 "
+        done <<< "$password"
+        ;;
 esac
-space=$spaceString
+spaceSize=$spaceString
 for _c in V C v c A a n o x w; do
     cc=${!_c}
     if [[ $cc = @* ]]; then
@@ -94,35 +118,39 @@ for _c in V C v c A a n o x w; do
         cs=${#cc}
     fi
 
-    space=${space//$_c/ 0$cs }
+    spaceSize=${spaceSize//$_c/ 0$cs }
 done
 # Replace sequences of numbers by multiplication of those numbers.  Then, pretty-print.
-space=$(sed -e 's/\([[:digit:]]\)  *\([[:digit:]]\)/\1 * \2/g' -e 's/ 00*\([1-9]\)/ \1/g' <<< "$space")
-space=$(tr -s ' ' <<< "$space") space=${space# } space=${space% }
+spaceSize=$(sed -e 's/\([[:digit:]]\)  *\([[:digit:]]\)/\1 * \2/g' -e 's/ 00*\([1-9]\)/ \1/g' <<< "$spaceSize")
+spaceSize=$(tr -s ' ' <<< "$spaceSize") spaceSize=${spaceSize# } spaceSize=${spaceSize% }
 inf ''
-inf "Search space: %s = %s = %'.f possibilities to try (~%.1f bit)." "$spaceString" "$space" "$(calc "$space")" "$(bc -l <<< "l($(calc "$space")) / l(2)")"
+inf "Search space: %s = %s = %'.f possibilities to try (~%.1f bit)." "$spaceString" "$spaceSize" "$(calc "$spaceSize")" "$(bc -l <<< "l($(calc "$spaceSize")) / l(2)")"
 
 ## CLUSTER SIZE
 hr
 inf 'CLUSTER SIZE'
-inf "Simulating %s at a rate of about %'.1f attempts per second." "$hardwareName" "$(calc "$hardwareSpeed")"
-cluster=$(ask -d 1 "Amount of GPUs?")
+inf "Simulating %s at a rate of about %'.1f attempts per second." "$hardwareName" "$(calc "$hardwareHPS")"
+cluster=$(ask -d "$hardwareQuantity" "Amount of units?")
 
 
 ## CALCULATE
 hr
 inf 'TIMING'
-inf "Time to search the entire space using %d GPUs of type %s (rate=%'.1f/s)" "$cluster" "$hardwareName" "$(calc "$hardwareSpeed")"
+inf "Time to search the entire space using %dx %s units (unit rate=%'.1f H/s)" "$cluster" "$hardwareName" "$(calc "$hardwareHPS")"
+
+seconds=$(calc "(1.0 * $spaceSize) / (1.0 * $hardwareHPS * $cluster)")
+inf "Time to crack: %s (ie. %s Seconds)" "$(scale "$seconds" 2 'Seconds:' "Hours:3600" "Days:24" "Months:30" "Years:356/30")" "$seconds"
+
 timing() {
     local title=$1 unit=$2 precision=$3 seconds=$4
-    time=$(calc "1.0 * ($space) / ($hardwareSpeed * $cluster) / ($seconds)")
-    percent=$(calc "100.0 * ($hardwareSpeed * $cluster) * ($seconds) / ($space)")
+    time=$(calc "(1.0 * $spaceSize) / (1.0 * $hardwareHPS * $cluster) / ($seconds)")
+    percent=$(calc "(100.0 * $hardwareHPS * $cluster * $seconds) / (1.0 * $spaceSize)")
     amount=$(calc "$percent / 100.0")
-    if [[ $amount = 0.* ]]; then
-        inf "%10s to crack: %'0.${precision}f (search rate is %0.0f%% / %s)" \
+    if [[ $(calc "$percent < 100") = True ]]; then
+        inf "    - %10s: %'0.${precision}f (ie. %0.1f%% / %s)" \
             "$title" "$time" "$percent" "$unit"
     else
-        inf "%10s to crack: %'0.${precision}f (completes %0.1fx / %s)" \
+        inf "    - %10s: %'0.${precision}f (ie. %0.1fx / %s)" \
             "$title" "$time" "$amount" "$unit"
     fi
 }
@@ -131,3 +159,17 @@ timing Hours h 2 "$secondsInHour"
 timing Days d 3 "$secondsInDay"
 timing Months m 4 "$secondsInMonth"
 timing Years y 4 "$secondsInYear"
+
+hr
+inf 'COST'
+inf "Budget required to search the entire space using %dx %s units (unit cost=%s + %s / year => %s annum, %s / HPS)" \
+    "$cluster" "$hardwareName" "$(scaleCost "$hardwareCost")" "$(scaleCost "1.0 * $hardwareWatt * 356 * 24 * $costPerKWh / 1000")" "$(scaleCost "$hardwareCost + 1.0 * $hardwareWatt * 356 * 24 * $costPerKWh / 1000")" "$(scaleCost "$hardwareCost / (1.0 * $hardwareHPS)")"
+
+fixedCost=$(calc "(1.0 * $cluster * $hardwareCost)")
+energyCost=$(calc "(1.0 * $cluster * $hardwareWatt * $seconds) / 3600") # Wh
+totalCost=$(calc "1.0 * $fixedCost + ($energyCost * $costPerKWh) / 1000.0")
+inf "Time cost  : %s" "$(scaleTime "$seconds")"
+inf "Fixed costs: %s" "$(scaleCost "$fixedCost")"
+inf "Energy cost: %s" "$(scaleEnergy "$energyCost")"
+inf "Budget cost: %s" "$(scaleCost "$totalCost")"
+

public/site

@@ -1 +1 @@
-Subproject commit d7d7567c079dcf77343eceba5cc37ee5e1d123ad
+Subproject commit 1e7491e0d9f39ac6d49e4078cf445ca69e71020a