From cefcc14d4d6ae123eed11fa4e645a7d7b8dc97c4 Mon Sep 17 00:00:00 2001
From: kspearrin <kyle.spearrin@gmail.com>
Date: Wed, 19 Sep 2018 23:08:39 -0400
Subject: [PATCH] update autofill files

---
 .../CredentialProviderViewController.cs       |  39 ++
 ...edentialProviderViewController.designer.cs |  18 +
 src/iOS.Autofill/Entitlements.plist           |   2 +
 src/iOS.Autofill/Info.plist                   |   5 +-
 src/iOS.Autofill/MainInterface.storyboard     | 418 +++++++++---------
 src/iOS.Autofill/iOS.Autofill.csproj          |  22 +-
 .../LoadingViewController.designer.cs         |  40 +-
 7 files changed, 300 insertions(+), 244 deletions(-)
 create mode 100644 src/iOS.Autofill/CredentialProviderViewController.cs
 create mode 100644 src/iOS.Autofill/CredentialProviderViewController.designer.cs

diff --git a/src/iOS.Autofill/CredentialProviderViewController.cs b/src/iOS.Autofill/CredentialProviderViewController.cs
new file mode 100644
index 000000000..4c39e930e
--- /dev/null
+++ b/src/iOS.Autofill/CredentialProviderViewController.cs
@@ -0,0 +1,39 @@
+using AuthenticationServices;
+using Foundation;
+using System;
+using UIKit;
+
+namespace Bit.iOS.Autofill
+{
+    public partial class CredentialProviderViewController : ASCredentialProviderViewController
+    {
+        public CredentialProviderViewController (IntPtr handle) : base (handle)
+        {
+        }
+
+        public override void ViewDidLoad()
+        {
+            base.ViewDidLoad();
+        }
+
+        public override void PrepareCredentialList(ASCredentialServiceIdentifier[] serviceIdentifiers)
+        {
+            base.PrepareCredentialList(serviceIdentifiers);
+        }
+
+        public override void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
+        {
+            base.ProvideCredentialWithoutUserInteraction(credentialIdentity);
+        }
+
+        public override void PrepareInterfaceToProvideCredential(ASPasswordCredentialIdentity credentialIdentity)
+        {
+            base.PrepareInterfaceToProvideCredential(credentialIdentity);
+        }
+
+        public override void PrepareInterfaceForExtensionConfiguration()
+        {
+            base.PrepareInterfaceForExtensionConfiguration();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/iOS.Autofill/CredentialProviderViewController.designer.cs b/src/iOS.Autofill/CredentialProviderViewController.designer.cs
new file mode 100644
index 000000000..8da460501
--- /dev/null
+++ b/src/iOS.Autofill/CredentialProviderViewController.designer.cs
@@ -0,0 +1,18 @@
+// WARNING
+//
+// This file has been generated automatically by Visual Studio from the outlets and
+// actions declared in your storyboard file.
+// Manual changes to this file will not be maintained.
+//
+using Foundation;
+using System;
+using System.CodeDom.Compiler;
+using UIKit;
+
+namespace Bit.iOS.Autofill
+{
+    [Register ("CredentialProviderViewController")]
+    partial class CredentialProviderViewController
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/iOS.Autofill/Entitlements.plist b/src/iOS.Autofill/Entitlements.plist
index b20900dcc..ef9236c02 100644
--- a/src/iOS.Autofill/Entitlements.plist
+++ b/src/iOS.Autofill/Entitlements.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.authentication-services.autofill-credential-provider</key>
+	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.com.8bit.bitwarden</string>
diff --git a/src/iOS.Autofill/Info.plist b/src/iOS.Autofill/Info.plist
index f45126ecb..26f9ddaa9 100644
--- a/src/iOS.Autofill/Info.plist
+++ b/src/iOS.Autofill/Info.plist
@@ -18,13 +18,10 @@
 	<string>37</string>
 	<key>NSExtension</key>
 	<dict>
-		<key>NSExtensionAttributes</key>
-		<dict>
-		</dict>
 		<key>NSExtensionMainStoryboard</key>
 		<string>MainInterface</string>
 		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.ui-services</string>
+		<string>com.apple.authentication-services-credential-provider-ui</string>
 	</dict>
 	<key>UIDeviceFamily</key>
 	<array>
diff --git a/src/iOS.Autofill/MainInterface.storyboard b/src/iOS.Autofill/MainInterface.storyboard
index f107fe8ef..577e70fde 100644
--- a/src/iOS.Autofill/MainInterface.storyboard
+++ b/src/iOS.Autofill/MainInterface.storyboard
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="64">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Logins-->
-        <!--Splash View Controller-->
+        <!--Loading View Controller-->
         <scene sceneID="42">
             <objects>
-                <viewController id="43" customClass="LoadingViewController" sceneMemberID="viewController">
+                <viewController id="43" customClass="CredentialProviderViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="40"/>
                         <viewControllerLayoutGuide type="bottom" id="41"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="44">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="1713" translatesAutoresizingMaskIntoConstraints="NO" image="logo.png">
-                                <rect key="frame" x="159" y="248" width="282" height="44"/>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="1713">
+                                <rect key="frame" x="66" y="316" width="282" height="44"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint id="1763" firstItem="1713" firstAttribute="centerY" secondItem="44" secondAttribute="centerY" constant="-30"/>
-                            <constraint id="1764" firstItem="1713" firstAttribute="centerX" secondItem="44" secondAttribute="centerX"/>
+                            <constraint firstItem="1713" firstAttribute="centerY" secondItem="44" secondAttribute="centerY" constant="-30" id="1763"/>
+                            <constraint firstItem="1713" firstAttribute="centerX" secondItem="44" secondAttribute="centerX" id="1764"/>
                         </constraints>
                     </view>
                     <connections>
                         <segue destination="oCZ-GQ-aOK" kind="show" identifier="loginListSegue" id="1679"/>
-                        <segue id="8446" destination="6512" kind="presentation" identifier="lockFingerprintSegue"/>
-                        <segue id="8924" destination="6815" kind="presentation" identifier="lockPinSegue"/>
-                        <segue id="9874" destination="6855" kind="presentation" identifier="lockPasswordSegue"/>
-                        <segue id="10498" destination="1845" kind="presentation" identifier="newLoginSegue" modalPresentationStyle="fullScreen" modalTransitionStyle="coverVertical"/>
-                        <segue id="11089" destination="10580" kind="presentation" modalTransitionStyle="coverVertical" identifier="setupSegue"/>
+                        <segue destination="6512" kind="presentation" identifier="lockFingerprintSegue" id="8446"/>
+                        <segue destination="6815" kind="presentation" identifier="lockPinSegue" id="8924"/>
+                        <segue destination="6855" kind="presentation" identifier="lockPasswordSegue" id="9874"/>
+                        <segue destination="1845" kind="presentation" identifier="newLoginSegue" modalPresentationStyle="fullScreen" modalTransitionStyle="coverVertical" id="10498"/>
+                        <segue destination="10580" kind="presentation" identifier="setupSegue" modalTransitionStyle="coverVertical" id="11089"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="45" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -44,8 +44,8 @@
         <scene sceneID="63">
             <objects>
                 <navigationController definesPresentationContext="YES" id="64" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="67" translucent="NO" hidden="YES">
-                        <rect key="frame" x="0.0" y="20" width="600" height="44"/>
+                    <navigationBar key="navigationBar" hidden="YES" contentMode="scaleToFill" translucent="NO" id="67">
+                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     </navigationBar>
                     <connections>
@@ -61,99 +61,102 @@
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="oCZ-GQ-aOK" sceneMemberID="viewController">
                     <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="8A5-AR-QHS" translucent="NO">
-                        <rect key="frame" x="0.0" y="20" width="600" height="44"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="8A5-AR-QHS">
+                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <color key="tintColor" red="0.0" green="0.52549019607843139" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
-                            <color key="textColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </textAttributes>
-                        <color key="barTintColor" colorSpace="calibratedRGB" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1"/>
-                        <color key="tintColor" colorSpace="calibratedRGB" red="0" green="0.52549019607843139" blue="1" alpha="1"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
-                        <segue id="4562" destination="2304" kind="relationship" relationship="rootViewController"/>
+                        <segue destination="2304" kind="relationship" relationship="rootViewController" id="4562"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Kkn-u3-rq1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="399" y="561"/>
         </scene>
+        <!--Navigation Controller-->
         <scene sceneID="1844">
             <objects>
                 <navigationController definesPresentationContext="YES" id="1845" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="1848" translucent="NO">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="1848">
+                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                        <rect key="frame" x="0.0" y="20" width="600" height="44"/>
+                        <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
-                            <color key="textColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </textAttributes>
-                        <color key="barTintColor" colorSpace="calibratedRGB" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1"/>
                     </navigationBar>
                     <connections>
-                        <segue id="2253" destination="2087" kind="relationship" relationship="rootViewController"/>
+                        <segue destination="2087" kind="relationship" relationship="rootViewController" id="2253"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="1849" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="1932" y="-270"/>
         </scene>
+        <!--Add Login-->
         <scene sceneID="2086">
             <objects>
-                <tableViewController id="2087" sceneMemberID="viewController" customClass="LoginAddViewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="50" sectionHeaderHeight="22" sectionFooterHeight="22" id="2088" opaque="NO" allowsSelection="NO">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                <tableViewController id="2087" customClass="LoginAddViewController" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" allowsSelection="NO" rowHeight="50" sectionHeaderHeight="22" sectionFooterHeight="22" id="2088">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="sectionIndexBackgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <sections/>
                         <connections>
                             <outlet property="dataSource" destination="2087" id="2089"/>
                             <outlet property="delegate" destination="2087" id="2090"/>
                         </connections>
-                        <sections/>
-                        <color key="sectionIndexBackgroundColor" colorSpace="calibratedWhite" white="0" alpha="0"/>
                     </tableView>
-                    <navigationItem title="Add Login" id="2252" key="navigationItem">
-                        <barButtonItem title="Cancel" id="3747" translatesAutoresizingMaskIntoConstraints="NO" key="leftBarButtonItem">
-                            <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                    <navigationItem key="navigationItem" title="Add Login" id="2252">
+                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="3747">
+                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <connections>
                                 <action selector="CancelBarButton_Activated:" destination="2087" id="3751"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem title="Save" id="3748" translatesAutoresizingMaskIntoConstraints="NO" key="rightBarButtonItem">
-                            <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                        <barButtonItem key="rightBarButtonItem" title="Save" id="3748">
+                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <connections>
                                 <action selector="SaveBarButton_Activated:" destination="2087" id="3752"/>
                             </connections>
                         </barButtonItem>
                     </navigationItem>
                     <connections>
-                        <outlet property="SaveBarButton" destination="3748" id="name-outlet-3748"/>
                         <outlet property="CancelBarButton" destination="3747" id="name-outlet-3747"/>
-                        <segue id="4805" destination="4574" kind="show" identifier="passwordGeneratorSegue"/>
                         <outlet property="NavItem" destination="2252" id="name-outlet-2252"/>
+                        <outlet property="SaveBarButton" destination="3748" id="name-outlet-3748"/>
+                        <segue destination="4574" kind="show" identifier="passwordGeneratorSegue" id="4805"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2093" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="2632" y="-276"/>
         </scene>
+        <!--Logins-->
         <scene sceneID="2303">
             <objects>
-                <tableViewController id="2304" sceneMemberID="viewController" customClass="LoginListViewController">
+                <tableViewController id="2304" customClass="LoginListViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="2305">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="3761" rowHeight="44" style="IBUITableViewCellStyleSubtitle" textLabel="3763" detailTextLabel="3764">
-                                <rect key="frame" x="0.0" y="22" width="600" height="44"/>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="3763" detailTextLabel="3764" rowHeight="44" style="IBUITableViewCellStyleSubtitle" id="3761">
+                                <rect key="frame" x="0.0" y="22" width="414" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3761" id="3762">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3763">
-                                            <rect key="frame" x="20" y="4" width="35.5" height="21.5"/>
+                                            <rect key="frame" x="20" y="4" width="35" height="21.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -175,44 +178,45 @@
                             <outlet property="delegate" destination="2304" id="2307"/>
                         </connections>
                     </tableView>
-                    <connections>
-                        <segue id="3731" destination="1845" kind="presentation" identifier="loginAddSegue" modalPresentationStyle="fullScreen" modalTransitionStyle="coverVertical"/>
-                        <outlet property="AddBarButton" destination="3736" id="name-outlet-3736"/>
-                        <outlet property="CancelBarButton" destination="3735" id="name-outlet-3735"/>
-                        <outlet property="NavItem" destination="3734" id="name-outlet-3734"/>
-                    </connections>
                     <toolbarItems/>
-                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
-                    <navigationItem title="Logins" id="3734" translatesAutoresizingMaskIntoConstraints="NO" key="navigationItem">
-                        <barButtonItem title="Cancel" id="3735" translatesAutoresizingMaskIntoConstraints="NO" key="leftBarButtonItem">
-                            <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                    <navigationItem key="navigationItem" title="Logins" id="3734">
+                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="3735">
+                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <connections>
                                 <action selector="CancelBarButton_Activated:" destination="2304" id="3750"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem id="3736" translatesAutoresizingMaskIntoConstraints="NO" key="rightBarButtonItem" systemItem="add">
-                            <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                        <barButtonItem key="rightBarButtonItem" systemItem="add" id="3736">
+                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <connections>
                                 <action selector="AddBarButton_Activated:" destination="2304" id="3749"/>
                             </connections>
                         </barButtonItem>
                     </navigationItem>
+                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
+                    <connections>
+                        <outlet property="AddBarButton" destination="3736" id="name-outlet-3736"/>
+                        <outlet property="CancelBarButton" destination="3735" id="name-outlet-3735"/>
+                        <outlet property="NavItem" destination="3734" id="name-outlet-3734"/>
+                        <segue destination="1845" kind="presentation" identifier="loginAddSegue" modalPresentationStyle="fullScreen" modalTransitionStyle="coverVertical" id="3731"/>
+                    </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2310" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="1157" y="566"/>
         </scene>
+        <!--Navigation Controller-->
         <scene sceneID="4573">
             <objects>
                 <navigationController definesPresentationContext="YES" id="4574" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="4577" translucent="NO">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="4577">
+                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                        <rect key="frame" x="0.0" y="20" width="600" height="44"/>
-                        <color key="barTintColor" colorSpace="calibratedRGB" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1"/>
+                        <color key="tintColor" red="0.0" green="0.52549019607843139" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
-                            <color key="textColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </textAttributes>
-                        <color key="tintColor" colorSpace="calibratedRGB" red="0" green="0.52549019607843139" blue="1" alpha="1"/>
                     </navigationBar>
                     <connections>
                         <segue destination="4576" kind="relationship" relationship="rootViewController" id="4575"/>
@@ -222,96 +226,99 @@
             </objects>
             <point key="canvasLocation" x="3369" y="-276"/>
         </scene>
+        <!--Generate Password-->
         <scene sceneID="4579">
             <objects>
-                <viewController id="4576" sceneMemberID="viewController" customClass="PasswordGeneratorViewController">
+                <viewController id="4576" customClass="PasswordGeneratorViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="4571"/>
                         <viewControllerLayoutGuide type="bottom" id="4572"/>
                     </layoutGuides>
-                    <navigationItem key="navigationItem" id="4580" title="Generate Password">
-                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="4807">
-                            <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
-                            <connections>
-                                <action selector="CancelBarButton_Activated:" destination="4576" id="4887"/>
-                            </connections>
-                        </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" title="Select" id="4808">
-                            <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
-                            <connections>
-                                <action selector="SelectBarButton_Activated:" destination="4576" id="4810"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
-                    <connections>
-                        <outlet property="CancelBarButton" destination="4807" id="name-outlet-4807"/>
-                        <outlet property="SelectBarButton" destination="4808" id="name-outlet-4808"/>
-                        <outlet property="BaseView" destination="4930" id="name-outlet-4930"/>
-                        <outlet property="OptionsContainer" destination="4933" id="name-outlet-4933"/>
-                        <outlet property="PasswordLabel" destination="4940" id="name-outlet-4940"/>
-                        <outlet property="NavItem" destination="4580" id="name-outlet-4580"/>
-                    </connections>
-                    <view contentMode="scaleToFill" id="4930" key="view">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                    <view key="view" contentMode="scaleToFill" id="4930">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <containerView contentMode="scaleToFill" id="4933" translatesAutoresizingMaskIntoConstraints="NO">
-                                <rect key="frame" x="0.0" y="154.5" width="600" height="445.5"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                            <containerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4933">
+                                <rect key="frame" x="0.0" y="160.5" width="414" height="575.5"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
-                                    <segue id="6480" destination="4912" kind="embed"/>
+                                    <segue destination="4912" kind="embed" id="6480"/>
                                 </connections>
                             </containerView>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Label" lineBreakMode="tailTruncation" minimumFontSize="10" id="4940" translatesAutoresizingMaskIntoConstraints="NO" textAlignment="center">
-                                <rect key="frame" x="15" y="99" width="570" height="20.5"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Label" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="4940">
+                                <rect key="frame" x="15" y="105" width="384" height="20.5"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
                         <constraints>
-                            <constraint id="6484" firstItem="4930" firstAttribute="trailing" secondItem="4933" secondAttribute="trailing"/>
-                            <constraint id="6485" firstItem="4933" firstAttribute="top" secondItem="4940" secondAttribute="bottom" constant="35"/>
-                            <constraint id="6486" firstItem="4933" firstAttribute="leading" secondItem="4930" secondAttribute="leading"/>
-                            <constraint id="6487" firstItem="4940" firstAttribute="leading" secondItem="4930" secondAttribute="leading" constant="15"/>
-                            <constraint id="6488" firstItem="4940" firstAttribute="top" secondItem="4571" secondAttribute="bottom" constant="35"/>
-                            <constraint id="6489" firstItem="4930" firstAttribute="trailing" secondItem="4940" secondAttribute="trailing" constant="15"/>
-                            <constraint id="6490" firstItem="4572" firstAttribute="top" secondItem="4933" secondAttribute="bottom"/>
+                            <constraint firstAttribute="trailing" secondItem="4933" secondAttribute="trailing" id="6484"/>
+                            <constraint firstItem="4933" firstAttribute="top" secondItem="4940" secondAttribute="bottom" constant="35" id="6485"/>
+                            <constraint firstItem="4933" firstAttribute="leading" secondItem="4930" secondAttribute="leading" id="6486"/>
+                            <constraint firstItem="4940" firstAttribute="leading" secondItem="4930" secondAttribute="leading" constant="15" id="6487"/>
+                            <constraint firstItem="4940" firstAttribute="top" secondItem="4571" secondAttribute="bottom" constant="35" id="6488"/>
+                            <constraint firstAttribute="trailing" secondItem="4940" secondAttribute="trailing" constant="15" id="6489"/>
+                            <constraint firstItem="4572" firstAttribute="top" secondItem="4933" secondAttribute="bottom" id="6490"/>
                         </constraints>
                     </view>
+                    <navigationItem key="navigationItem" title="Generate Password" id="4580">
+                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="4807">
+                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <connections>
+                                <action selector="CancelBarButton_Activated:" destination="4576" id="4887"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" title="Select" id="4808">
+                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <connections>
+                                <action selector="SelectBarButton_Activated:" destination="4576" id="4810"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="BaseView" destination="4930" id="name-outlet-4930"/>
+                        <outlet property="CancelBarButton" destination="4807" id="name-outlet-4807"/>
+                        <outlet property="NavItem" destination="4580" id="name-outlet-4580"/>
+                        <outlet property="OptionsContainer" destination="4933" id="name-outlet-4933"/>
+                        <outlet property="PasswordLabel" destination="4940" id="name-outlet-4940"/>
+                        <outlet property="SelectBarButton" destination="4808" id="name-outlet-4808"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4582" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="4045" y="-272"/>
         </scene>
+        <!--Table View Controller-->
         <scene sceneID="4911">
             <objects>
                 <tableViewController id="4912" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="4913">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="445.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="575.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <connections>
                             <outlet property="dataSource" destination="4912" id="4914"/>
                             <outlet property="delegate" destination="4912" id="4915"/>
                         </connections>
                     </tableView>
-                    <connections/>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4918" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="4708" y="-194"/>
         </scene>
+        <!--Navigation Controller-->
         <scene sceneID="6511">
             <objects>
                 <navigationController definesPresentationContext="YES" id="6512" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="6515" translucent="NO">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="6515">
+                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                        <rect key="frame" x="0.0" y="20" width="600" height="44"/>
-                        <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
-                        <color key="barTintColor" colorSpace="calibratedRGB" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1"/>
+                        <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
-                            <color key="textColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </textAttributes>
                     </navigationBar>
                     <connections>
@@ -322,115 +329,117 @@
             </objects>
             <point key="canvasLocation" x="296" y="1394"/>
         </scene>
+        <!--Verify Fingerprint-->
         <scene sceneID="6517">
             <objects>
-                <viewController id="6514" sceneMemberID="viewController" customClass="LockFingerprintViewController">
+                <viewController id="6514" customClass="LockFingerprintViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="6509"/>
                         <viewControllerLayoutGuide type="bottom" id="6510"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="6519">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="6777" translatesAutoresizingMaskIntoConstraints="NO">
-                                <rect key="frame" x="30" y="519" width="540" height="41"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6777">
+                                <rect key="frame" x="30" y="655" width="354" height="41"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <state key="normal" title="Use Fingerprint To Unlock">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
                                 <inset key="contentEdgeInsets" minX="0.0" minY="10" maxX="0.0" maxY="10"/>
+                                <state key="normal" title="Use Fingerprint To Unlock">
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="11144" translatesAutoresizingMaskIntoConstraints="NO" misplaced="YES">
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="11144">
                                 <rect key="frame" x="254.5" y="234" width="91" height="92"/>
-                                <color key="tintColor" colorSpace="calibratedRGB" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1"/>
+                                <color key="tintColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <state key="normal" image="fingerprint.png">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    <color key="titleColor" colorSpace="calibratedRGB" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1"/>
+                                    <color key="titleColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" 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="FingerprintButton_TouchUpInside:" destination="6514" id="11149" eventType="touchUpInside"/>
+                                    <action selector="FingerprintButton_TouchUpInside:" destination="6514" eventType="touchUpInside" id="11149"/>
                                 </connections>
                             </button>
                         </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint id="6783" firstItem="6519" firstAttribute="trailing" secondItem="6777" secondAttribute="trailing" constant="30"/>
-                            <constraint id="6784" firstItem="6777" firstAttribute="leading" secondItem="6519" secondAttribute="leading" constant="30"/>
-                            <constraint id="6785" firstItem="6510" firstAttribute="top" secondItem="6777" secondAttribute="bottom" constant="40"/>
-                            <constraint id="6786" firstItem="6777" firstAttribute="centerX" secondItem="6519" secondAttribute="centerX"/>
-                            <constraint id="11147" firstItem="6519" firstAttribute="centerY" secondItem="11144" secondAttribute="centerY" constant="60"/>
-                            <constraint id="11148" firstItem="11144" firstAttribute="centerX" secondItem="6519" secondAttribute="centerX"/>
+                            <constraint firstAttribute="trailing" secondItem="6777" secondAttribute="trailing" constant="30" id="6783"/>
+                            <constraint firstItem="6777" firstAttribute="leading" secondItem="6519" secondAttribute="leading" constant="30" id="6784"/>
+                            <constraint firstItem="6510" firstAttribute="top" secondItem="6777" secondAttribute="bottom" constant="40" id="6785"/>
+                            <constraint firstItem="6777" firstAttribute="centerX" secondItem="6519" secondAttribute="centerX" id="6786"/>
+                            <constraint firstAttribute="centerY" secondItem="11144" secondAttribute="centerY" constant="60" id="11147"/>
+                            <constraint firstItem="11144" firstAttribute="centerX" secondItem="6519" secondAttribute="centerX" id="11148"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Verify Fingerprint" id="6518">
-                        <barButtonItem key="leftBarButtonItem" id="6800" title="Cancel">
+                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="6800">
                             <connections>
                                 <action selector="CancelButton_Activated:" destination="6514" id="7293"/>
                             </connections>
                         </barButtonItem>
                     </navigationItem>
                     <connections>
-                        <outlet property="UseButton" destination="6777" id="name-outlet-6777"/>
                         <outlet property="CancelButton" destination="6800" id="name-outlet-6800"/>
                         <outlet property="FingerprintButton" destination="11144" id="name-outlet-11144"/>
                         <outlet property="NavItem" destination="6518" id="name-outlet-6518"/>
+                        <outlet property="UseButton" destination="6777" id="name-outlet-6777"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6520" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="983" y="1390"/>
         </scene>
+        <!--Verify PIN-->
         <scene sceneID="6801">
             <objects>
-                <viewController id="6802" sceneMemberID="viewController" customClass="LockPinViewController">
+                <viewController id="6802" customClass="LockPinViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="6812"/>
                         <viewControllerLayoutGuide type="bottom" id="6810"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="6805">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="- - - -" lineBreakMode="tailTruncation" minimumFontSize="10" id="7373" translatesAutoresizingMaskIntoConstraints="NO" textAlignment="center" misplaced="YES">
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="- - - -" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="7373">
                                 <rect key="frame" x="30" y="104" width="540" height="17"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="40"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" id="7350" translatesAutoresizingMaskIntoConstraints="NO" textAlignment="center" misplaced="YES">
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7350">
                                 <rect key="frame" x="30" y="79" width="540" height="77"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
-                                <color key="backgroundColor" colorSpace="calibratedWhite" white="0" alpha="0"/>
-                                <color key="tintColor" colorSpace="calibratedWhite" white="0" alpha="0"/>
-                                <color key="textColor" colorSpace="calibratedWhite" white="0" alpha="0"/>
                             </textField>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Enter your PIN Code." lineBreakMode="tailTruncation" minimumFontSize="10" id="10516" translatesAutoresizingMaskIntoConstraints="NO" textAlignment="center">
-                                <rect key="frame" x="30" y="179" width="540" height="20.5"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Enter your PIN Code." textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="10516">
+                                <rect key="frame" x="30" y="192" width="354" height="20.5"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" colorSpace="calibratedWhite" white="0.333333333333333" alpha="1"/>
+                                <color key="textColor" red="0.3333333432674408" green="0.3333333432674408" blue="0.3333333432674408" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint id="7351" firstItem="7350" firstAttribute="leading" secondItem="6805" secondAttribute="leading" constant="30"/>
-                            <constraint id="7352" firstItem="6805" firstAttribute="trailing" secondItem="7350" secondAttribute="trailing" constant="30"/>
-                            <constraint id="7353" firstItem="7350" firstAttribute="top" secondItem="6812" secondAttribute="bottom" constant="15"/>
-                            <constraint id="7374" firstItem="7373" firstAttribute="leading" secondItem="6805" secondAttribute="leading" constant="30"/>
-                            <constraint id="7375" firstItem="6805" firstAttribute="trailing" secondItem="7373" secondAttribute="trailing" constant="30"/>
-                            <constraint id="7376" firstItem="7373" firstAttribute="top" secondItem="6812" secondAttribute="bottom" constant="40"/>
-                            <constraint id="7394" firstItem="7350" firstAttribute="height" secondItem="7373" secondAttribute="height" constant="60"/>
-                            <constraint id="10517" firstItem="10516" firstAttribute="leading" secondItem="6805" secondAttribute="leading" constant="30"/>
-                            <constraint id="10518" firstItem="6805" firstAttribute="trailing" secondItem="10516" secondAttribute="trailing" constant="30"/>
-                            <constraint id="10519" firstItem="10516" firstAttribute="top" secondItem="7350" secondAttribute="bottom"/>
+                            <constraint firstItem="7350" firstAttribute="leading" secondItem="6805" secondAttribute="leading" constant="30" id="7351"/>
+                            <constraint firstAttribute="trailing" secondItem="7350" secondAttribute="trailing" constant="30" id="7352"/>
+                            <constraint firstItem="7350" firstAttribute="top" secondItem="6812" secondAttribute="bottom" constant="15" id="7353"/>
+                            <constraint firstItem="7373" firstAttribute="leading" secondItem="6805" secondAttribute="leading" constant="30" id="7374"/>
+                            <constraint firstAttribute="trailing" secondItem="7373" secondAttribute="trailing" constant="30" id="7375"/>
+                            <constraint firstItem="7373" firstAttribute="top" secondItem="6812" secondAttribute="bottom" constant="40" id="7376"/>
+                            <constraint firstItem="7350" firstAttribute="height" secondItem="7373" secondAttribute="height" constant="60" id="7394"/>
+                            <constraint firstItem="10516" firstAttribute="leading" secondItem="6805" secondAttribute="leading" constant="30" id="10517"/>
+                            <constraint firstAttribute="trailing" secondItem="10516" secondAttribute="trailing" constant="30" id="10518"/>
+                            <constraint firstItem="10516" firstAttribute="top" secondItem="7350" secondAttribute="bottom" id="10519"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Verify PIN" id="6803">
-                        <barButtonItem key="leftBarButtonItem" id="6804" title="Cancel">
+                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="6804">
                             <connections>
                                 <action selector="CancelButton_Activated:" destination="6802" id="7313"/>
                             </connections>
@@ -438,27 +447,28 @@
                     </navigationItem>
                     <connections>
                         <outlet property="CancelButton" destination="6804" id="name-outlet-6804"/>
-                        <outlet property="PinTextField" destination="7350" id="name-outlet-7350"/>
-                        <outlet property="PinLabel" destination="7373" id="name-outlet-7373"/>
                         <outlet property="InstructionLabel" destination="10516" id="name-outlet-10516"/>
                         <outlet property="NavItem" destination="6803" id="name-outlet-6803"/>
+                        <outlet property="PinLabel" destination="7373" id="name-outlet-7373"/>
+                        <outlet property="PinTextField" destination="7350" id="name-outlet-7350"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6813" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="975" y="2083"/>
         </scene>
+        <!--Navigation Controller-->
         <scene sceneID="6814">
             <objects>
                 <navigationController definesPresentationContext="YES" id="6815" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="6817" translucent="NO">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="6817">
+                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                        <rect key="frame" x="0.0" y="20" width="600" height="44"/>
-                        <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                        <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
-                            <color key="textColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </textAttributes>
-                        <color key="barTintColor" colorSpace="calibratedRGB" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1"/>
                     </navigationBar>
                     <connections>
                         <segue destination="6802" kind="relationship" relationship="rootViewController" id="6816"/>
@@ -468,39 +478,41 @@
             </objects>
             <point key="canvasLocation" x="306" y="2083"/>
         </scene>
+        <!--Navigation Controller-->
         <scene sceneID="6854">
             <objects>
                 <navigationController definesPresentationContext="YES" id="6855" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="6857" translucent="NO">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="6857">
+                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                        <rect key="frame" x="0.0" y="20" width="600" height="44"/>
-                        <color key="barTintColor" colorSpace="calibratedRGB" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1"/>
+                        <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
-                            <color key="textColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </textAttributes>
-                        <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
                     </navigationBar>
                     <connections>
-                        <segue id="8266" destination="7413" kind="relationship" relationship="rootViewController"/>
+                        <segue destination="7413" kind="relationship" relationship="rootViewController" id="8266"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6858" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="306" y="2759"/>
         </scene>
+        <!--Verify Master Password-->
         <scene sceneID="7412">
             <objects>
-                <tableViewController id="7413" sceneMemberID="viewController" customClass="LockPasswordViewController">
+                <tableViewController id="7413" customClass="LockPasswordViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="7414">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <connections>
                             <outlet property="dataSource" destination="7413" id="7415"/>
                             <outlet property="delegate" destination="7413" id="7416"/>
                         </connections>
                     </tableView>
-                    <navigationItem title="Verify Master Password" id="8265" key="navigationItem">
+                    <navigationItem key="navigationItem" title="Verify Master Password" id="8265">
                         <barButtonItem key="leftBarButtonItem" title="Cancel" id="8268">
                             <connections>
                                 <action selector="CancelButton_Activated:" destination="7413" id="8287"/>
@@ -513,55 +525,56 @@
                         </barButtonItem>
                     </navigationItem>
                     <connections>
-                        <outlet property="SubmitButton" destination="8269" id="name-outlet-8269"/>
                         <outlet property="CancelButton" destination="8268" id="name-outlet-8268"/>
                         <outlet property="MainTableView" destination="7414" id="name-outlet-7414"/>
                         <outlet property="NavItem" destination="8265" id="name-outlet-8265"/>
+                        <outlet property="SubmitButton" destination="8269" id="name-outlet-8269"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="7419" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="977" y="2775"/>
         </scene>
+        <!--Setup View Controller-->
         <scene sceneID="10573">
             <objects>
-                <viewController id="10570" sceneMemberID="viewController" customClass="SetupViewController">
+                <viewController id="10570" customClass="SetupViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="10565"/>
                         <viewControllerLayoutGuide type="bottom" id="10566"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="10575">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Extension Activated!" lineBreakMode="tailTruncation" minimumFontSize="10" id="11092" translatesAutoresizingMaskIntoConstraints="NO" textAlignment="center">
-                                <rect key="frame" x="15" y="94" width="570" height="20.5"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Extension Activated!" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="11092">
+                                <rect key="frame" x="15" y="100" width="384" height="20.5"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" lineBreakMode="wordWrap" minimumFontSize="10" id="11093" translatesAutoresizingMaskIntoConstraints="NO" numberOfLines="0" textAlignment="center" misplaced="YES">
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="11093">
                                 <rect key="frame" x="15" y="134.5" width="570" height="41"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="11094" translatesAutoresizingMaskIntoConstraints="NO" image="ext-icon.png" misplaced="YES">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="ext-icon.png" translatesAutoresizingMaskIntoConstraints="NO" id="11094">
                                 <rect key="frame" x="255" y="205.5" width="90" height="90"/>
                             </imageView>
                         </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint id="11114" firstItem="11092" firstAttribute="leading" secondItem="10575" secondAttribute="leading" constant="15"/>
-                            <constraint id="11115" firstItem="10575" firstAttribute="trailing" secondItem="11092" secondAttribute="trailing" constant="15"/>
-                            <constraint id="11116" firstItem="11092" firstAttribute="top" secondItem="10565" secondAttribute="bottom" constant="30"/>
-                            <constraint id="11119" firstItem="11093" firstAttribute="leading" secondItem="10575" secondAttribute="leading" constant="15"/>
-                            <constraint id="11120" firstItem="10575" firstAttribute="trailing" secondItem="11093" secondAttribute="trailing" constant="15"/>
-                            <constraint id="11121" firstItem="11093" firstAttribute="top" secondItem="11092" secondAttribute="bottom" constant="20"/>
-                            <constraint id="11122" firstItem="11094" firstAttribute="centerX" secondItem="10575" secondAttribute="centerX"/>
-                            <constraint id="11123" firstItem="11094" firstAttribute="top" secondItem="11093" secondAttribute="bottom" constant="30"/>
+                            <constraint firstItem="11092" firstAttribute="leading" secondItem="10575" secondAttribute="leading" constant="15" id="11114"/>
+                            <constraint firstAttribute="trailing" secondItem="11092" secondAttribute="trailing" constant="15" id="11115"/>
+                            <constraint firstItem="11092" firstAttribute="top" secondItem="10565" secondAttribute="bottom" constant="30" id="11116"/>
+                            <constraint firstItem="11093" firstAttribute="leading" secondItem="10575" secondAttribute="leading" constant="15" id="11119"/>
+                            <constraint firstAttribute="trailing" secondItem="11093" secondAttribute="trailing" constant="15" id="11120"/>
+                            <constraint firstItem="11093" firstAttribute="top" secondItem="11092" secondAttribute="bottom" constant="20" id="11121"/>
+                            <constraint firstItem="11094" firstAttribute="centerX" secondItem="10575" secondAttribute="centerX" id="11122"/>
+                            <constraint firstItem="11094" firstAttribute="top" secondItem="11093" secondAttribute="bottom" constant="30" id="11123"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="10574">
@@ -583,22 +596,23 @@
             </objects>
             <point key="canvasLocation" x="1129" y="-264"/>
         </scene>
+        <!--Navigation Controller-->
         <scene sceneID="10579">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="10580" sceneMemberID="viewController">
                     <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="10583" translucent="NO">
-                        <rect key="frame" x="0.0" y="20" width="600" height="44"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="10583">
+                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
-                            <color key="textColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </textAttributes>
-                        <color key="barTintColor" colorSpace="calibratedRGB" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1"/>
-                        <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
-                        <segue id="10939" destination="10570" kind="relationship" relationship="rootViewController"/>
+                        <segue destination="10570" kind="relationship" relationship="rootViewController" id="10939"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="10584" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -607,9 +621,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="logo.png" width="282" height="44"/>
-        <image name="Icon.png" width="40" height="40"/>
-        <image name="ext-icon.png" width="90" height="90"/>
         <image name="fingerprint.png" width="91" height="92"/>
+        <image name="logo.png" width="282" height="44"/>
     </resources>
 </document>
\ No newline at end of file
diff --git a/src/iOS.Autofill/iOS.Autofill.csproj b/src/iOS.Autofill/iOS.Autofill.csproj
index 900a73b69..b410d235c 100644
--- a/src/iOS.Autofill/iOS.Autofill.csproj
+++ b/src/iOS.Autofill/iOS.Autofill.csproj
@@ -26,13 +26,11 @@
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchSdkVersion>9.3</MtouchSdkVersion>
+    <MtouchSdkVersion>12.0</MtouchSdkVersion>
     <MtouchProfiling>False</MtouchProfiling>
     <MtouchFastDev>False</MtouchFastDev>
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchFloat32>False</MtouchFloat32>
     <MtouchEnableBitcode>False</MtouchEnableBitcode>
@@ -57,8 +55,6 @@
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
     <MtouchEnableBitcode>False</MtouchEnableBitcode>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchTlsProvider>Default</MtouchTlsProvider>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
@@ -88,8 +84,6 @@
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
     <MtouchEnableBitcode>False</MtouchEnableBitcode>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchFloat32>False</MtouchFloat32>
     <DeviceSpecificBuild>False</DeviceSpecificBuild>
@@ -116,8 +110,6 @@
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
     <MtouchEnableBitcode>False</MtouchEnableBitcode>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchFloat32>False</MtouchFloat32>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
@@ -142,8 +134,6 @@
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
     <MtouchEnableBitcode>False</MtouchEnableBitcode>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchFloat32>False</MtouchFloat32>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
@@ -167,8 +157,6 @@
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
     <MtouchEnableBitcode>False</MtouchEnableBitcode>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchFloat32>False</MtouchFloat32>
     <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
@@ -186,8 +174,6 @@
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
     <MtouchEnableBitcode>False</MtouchEnableBitcode>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchTlsProvider>Default</MtouchTlsProvider>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
@@ -206,8 +192,6 @@
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
     <MtouchEnableBitcode>False</MtouchEnableBitcode>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchTlsProvider>Default</MtouchTlsProvider>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
@@ -226,6 +210,10 @@
     <None Include="Entitlements.plist" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <InterfaceDefinition Include="MainInterface.storyboard" />
+    <Compile Include="CredentialProviderViewController.cs" />
+    <Compile Include="CredentialProviderViewController.designer.cs">
+      <DependentUpon>CredentialProviderViewController.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/iOS.Extension/LoadingViewController.designer.cs b/src/iOS.Extension/LoadingViewController.designer.cs
index 0cd9c2cd2..5d55235f4 100644
--- a/src/iOS.Extension/LoadingViewController.designer.cs
+++ b/src/iOS.Extension/LoadingViewController.designer.cs
@@ -1,21 +1,21 @@
-// WARNING
-//
-// This file has been generated automatically by Xamarin Studio from the outlets and
-// actions declared in your storyboard file.
-// Manual changes to this file will not be maintained.
-//
-using Foundation;
-using System;
-using System.CodeDom.Compiler;
-using UIKit;
-
-namespace Bit.iOS.Extension
-{
-    [Register ("LoadingViewController")]
-    partial class LoadingViewController
-    {
-        void ReleaseDesignerOutlets ()
-        {
-        }
-    }
+// WARNING
+//
+// This file has been generated automatically by Visual Studio from the outlets and
+// actions declared in your storyboard file.
+// Manual changes to this file will not be maintained.
+//
+using Foundation;
+using System;
+using System.CodeDom.Compiler;
+using UIKit;
+
+namespace Bit.iOS.Extension
+{
+    [Register ("LoadingViewController")]
+    partial class LoadingViewController
+    {
+        void ReleaseDesignerOutlets ()
+        {
+        }
+    }
 }
\ No newline at end of file