diff --git a/Cartfile b/Cartfile
index 9f58c604..94656ccd 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
 github "sparkle-project/Sparkle" ~> 1.13.1
-github "mstarke/KeePassKit" "aee63e69f36d0a3d08763632a1472d312374f9a0"
+github "mstarke/KeePassKit" "d66c888b299358481da2ba2672ec7c644cce56ec"
 github "mstarke/HNHUi" ~> 1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index a9012e78..5db8a76d 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "mstarke/HNHUi" "1.1"
-github "mstarke/KeePassKit" "bf47781a618fc514288315995a966b5f630f6918"
+github "mstarke/KeePassKit" "d66c888b299358481da2ba2672ec7c644cce56ec"
 github "sparkle-project/Sparkle" "1.14.0"
diff --git a/MacPass/AutotypeBuilderView.xib b/MacPass/AutotypeBuilderView.xib
new file mode 100644
index 00000000..d7c83700
--- /dev/null
+++ b/MacPass/AutotypeBuilderView.xib
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="MPAutotypeBuilderViewController">
+            <connections>
+                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView misplaced="YES" id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="405" height="298"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <tokenField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Kvn-IG-DGI">
+                    <rect key="frame" x="20" y="-76" width="443" height="354"/>
+                    <tokenFieldCell key="cell" selectable="YES" editable="YES" alignment="left" allowsEditingTextAttributes="YES" id="GSA-a9-99Q">
+                        <font key="font" metaFont="cellTitle"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </tokenFieldCell>
+                </tokenField>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="Kvn-IG-DGI" secondAttribute="bottom" constant="20" id="YKC-lP-F5T"/>
+                <constraint firstItem="Kvn-IG-DGI" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="bJu-XA-mqO"/>
+                <constraint firstItem="Kvn-IG-DGI" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="22" id="p3m-hr-McG"/>
+                <constraint firstAttribute="trailing" secondItem="Kvn-IG-DGI" secondAttribute="trailing" constant="20" id="wNY-D6-iuK"/>
+            </constraints>
+            <point key="canvasLocation" x="324.5" y="487"/>
+        </customView>
+    </objects>
+</document>
diff --git a/MacPass/MPAutotypeBuilderViewController.h b/MacPass/MPAutotypeBuilderViewController.h
new file mode 100644
index 00000000..bfe11c71
--- /dev/null
+++ b/MacPass/MPAutotypeBuilderViewController.h
@@ -0,0 +1,13 @@
+//
+//  MPAutotypeBuilderViewController.h
+//  MacPass
+//
+//  Created by Michael Starke on 01/09/16.
+//  Copyright © 2016 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface MPAutotypeBuilderViewController : NSViewController
+
+@end
diff --git a/MacPass/MPAutotypeBuilderViewController.m b/MacPass/MPAutotypeBuilderViewController.m
new file mode 100644
index 00000000..8d0c6fde
--- /dev/null
+++ b/MacPass/MPAutotypeBuilderViewController.m
@@ -0,0 +1,22 @@
+//
+//  MPAutotypeBuilderViewController.m
+//  MacPass
+//
+//  Created by Michael Starke on 01/09/16.
+//  Copyright © 2016 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPAutotypeBuilderViewController.h"
+
+@interface MPAutotypeBuilderViewController ()
+
+@end
+
+@implementation MPAutotypeBuilderViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do view setup here.
+}
+
+@end