diff --git a/KeePassKit b/KeePassKit
index 709c8874..07349e3b 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 709c8874e411288f4563ac681c0de54390fc9ee1
+Subproject commit 07349e3bcbce3c3c16fcd3143d5c06efdedd40ce
diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 2b59c459..a74b28ac 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
 		4C01C245176500C40016D5D0 /* HNHLevelIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */; };
 		4C055E74179620BF00BD2BAB /* NSString+CommandString.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C055E73179620BF00BD2BAB /* NSString+CommandString.m */; };
 		4C10412C178CDD44001B5239 /* NSDate+Humanized.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C10412B178CDD44001B5239 /* NSDate+Humanized.m */; };
-		4C16BA6217879A3C002B42BD /* MPPasswordStringFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */; };
 		4C17D8E517A1C780006C8C1E /* MPDocumentWindowDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C17D8E417A1C780006C8C1E /* MPDocumentWindowDelegate.m */; };
 		4C1842AB179B027800E2F5BC /* KPKDeletedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842AA179B027800E2F5BC /* KPKDeletedNode.m */; };
 		4C1842AF179B211C00E2F5BC /* KPKXmlTreeReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842AE179B211C00E2F5BC /* KPKXmlTreeReader.m */; };
@@ -23,7 +22,6 @@
 		4C1842C0179B5BFD00E2F5BC /* NSData+CommonCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842BF179B5BFD00E2F5BC /* NSData+CommonCrypto.m */; };
 		4C1842C3179B69E700E2F5BC /* NSData+HashedData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842C2179B69E700E2F5BC /* NSData+HashedData.m */; };
 		4C1842C6179BF52100E2F5BC /* KPKLegacyHeaderReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842C5179BF52000E2F5BC /* KPKLegacyHeaderReader.m */; };
-		4C1842CA179C616700E2F5BC /* KPKTreeCryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842C9179C616700E2F5BC /* KPKTreeCryptor.m */; };
 		4C1842D0179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842CF179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m */; };
 		4C1842D3179C64F000E2F5BC /* KPKXmlTreeCryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842D2179C64EF00E2F5BC /* KPKXmlTreeCryptor.m */; };
 		4C18816C179E06920045C5B7 /* TrashBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C18816B179E06920045C5B7 /* TrashBar.xib */; };
@@ -211,6 +209,7 @@
 		4CA0B2FC15BCAF8600654E32 /* MPSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2FB15BCAF8600654E32 /* MPSettingsWindowController.m */; };
 		4CA0E3A7176FAF99004D18CB /* MPDocumentQueryService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0E3A6176FAF99004D18CB /* MPDocumentQueryService.m */; };
 		4CA2335A176DBFE100F0B6AC /* MPLockDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */; };
+		4CAC614317AD319200023F9E /* KPKTestXmlParsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAC614217AD319200023F9E /* KPKTestXmlParsing.m */; };
 		4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; };
 		4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745A15B887FD00104512 /* NSString+DDXML.m */; };
 		4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745D15B887FD00104512 /* DDXMLDocument.m */; };
@@ -257,6 +256,7 @@
 		4CE5B54B173AFBA700207B39 /* MPDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE5B549173AFBA700207B39 /* MPDocument.m */; };
 		4CE8246F16E2E93400573141 /* MPOverlayWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8246E16E2E93400573141 /* MPOverlayWindowController.m */; };
 		4CE8247516E2F2B900573141 /* MPOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8247416E2F2B900573141 /* MPOverlayView.m */; };
+		4CECB31717AC326D00EAFB0F /* KPKLegacyWritingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CECB31617AC326D00EAFB0F /* KPKLegacyWritingTest.m */; };
 		4CF1F0CA1786B37900CD920E /* NSData+Gzip.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF1F0C81786B37900CD920E /* NSData+Gzip.m */; };
 		4CF29BF417879D0000851B60 /* 26_FileSaveTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CF29BF317879D0000851B60 /* 26_FileSaveTemplate.pdf */; };
 		4CF62B86179385D700B660B6 /* KPKAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF62B85179385D700B660B6 /* KPKAttribute.m */; };
@@ -286,8 +286,8 @@
 		4C055E73179620BF00BD2BAB /* NSString+CommandString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+CommandString.m"; sourceTree = "<group>"; };
 		4C10412A178CDD44001B5239 /* NSDate+Humanized.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Humanized.h"; sourceTree = "<group>"; };
 		4C10412B178CDD44001B5239 /* NSDate+Humanized.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Humanized.m"; sourceTree = "<group>"; };
-		4C16BA6017879A3C002B42BD /* MPPasswordStringFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordStringFormatter.h; sourceTree = "<group>"; };
-		4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordStringFormatter.m; sourceTree = "<group>"; };
+		4C13904C17ADD1A300A62934 /* KPKTreeCrypting.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKTreeCrypting.h; sourceTree = "<group>"; };
+		4C13904D17ADD3BE00A62934 /* KPKTreeWriting.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKTreeWriting.h; sourceTree = "<group>"; };
 		4C17D8E317A1C780006C8C1E /* MPDocumentWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDocumentWindowDelegate.h; sourceTree = "<group>"; };
 		4C17D8E417A1C780006C8C1E /* MPDocumentWindowDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDocumentWindowDelegate.m; sourceTree = "<group>"; };
 		4C1842A9179B027700E2F5BC /* KPKDeletedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKDeletedNode.h; sourceTree = "<group>"; };
@@ -310,8 +310,6 @@
 		4C1842C4179BF51F00E2F5BC /* KPKLegacyHeaderReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKLegacyHeaderReader.h; sourceTree = "<group>"; };
 		4C1842C5179BF52000E2F5BC /* KPKLegacyHeaderReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKLegacyHeaderReader.m; sourceTree = "<group>"; };
 		4C1842C7179BF6A100E2F5BC /* KPKLegacyHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KPKLegacyHeader.h; path = Format/KPKLegacyHeader.h; sourceTree = "<group>"; };
-		4C1842C8179C616600E2F5BC /* KPKTreeCryptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTreeCryptor.h; sourceTree = "<group>"; };
-		4C1842C9179C616700E2F5BC /* KPKTreeCryptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTreeCryptor.m; sourceTree = "<group>"; };
 		4C1842CE179C64DC00E2F5BC /* KPKLegacyTreeCryptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKLegacyTreeCryptor.h; sourceTree = "<group>"; };
 		4C1842CF179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKLegacyTreeCryptor.m; sourceTree = "<group>"; };
 		4C1842D1179C64EF00E2F5BC /* KPKXmlTreeCryptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKXmlTreeCryptor.h; sourceTree = "<group>"; };
@@ -664,6 +662,8 @@
 		4CA23358176DBFE100F0B6AC /* MPLockDaemon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLockDaemon.h; sourceTree = "<group>"; };
 		4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLockDaemon.m; sourceTree = "<group>"; };
 		4CAAFDD51787AED60013FCF9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		4CAC614117AD319200023F9E /* KPKTestXmlParsing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTestXmlParsing.h; sourceTree = "<group>"; };
+		4CAC614217AD319200023F9E /* KPKTestXmlParsing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTestXmlParsing.m; sourceTree = "<group>"; };
 		4CAD745615B887FD00104512 /* DDXMLElementAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLElementAdditions.h; sourceTree = "<group>"; };
 		4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLElementAdditions.m; sourceTree = "<group>"; };
 		4CAD745915B887FD00104512 /* NSString+DDXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+DDXML.h"; sourceTree = "<group>"; };
@@ -751,6 +751,8 @@
 		4CE8246E16E2E93400573141 /* MPOverlayWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOverlayWindowController.m; sourceTree = "<group>"; };
 		4CE8247316E2F2B900573141 /* MPOverlayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOverlayView.h; sourceTree = "<group>"; };
 		4CE8247416E2F2B900573141 /* MPOverlayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOverlayView.m; sourceTree = "<group>"; };
+		4CECB31517AC326D00EAFB0F /* KPKLegacyWritingTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKLegacyWritingTest.h; sourceTree = "<group>"; };
+		4CECB31617AC326D00EAFB0F /* KPKLegacyWritingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKLegacyWritingTest.m; sourceTree = "<group>"; };
 		4CF1F0C81786B37900CD920E /* NSData+Gzip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Gzip.m"; sourceTree = "<group>"; };
 		4CF1F0C91786B37900CD920E /* NSData+Gzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Gzip.h"; sourceTree = "<group>"; };
 		4CF29BF317879D0000851B60 /* 26_FileSaveTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 26_FileSaveTemplate.pdf; sourceTree = "<group>"; };
@@ -1111,8 +1113,6 @@
 				4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */,
 				4CA23358176DBFE100F0B6AC /* MPLockDaemon.h */,
 				4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */,
-				4C16BA6017879A3C002B42BD /* MPPasswordStringFormatter.h */,
-				4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */,
 				4C4B7EF617A4B335000234C7 /* MPUniqueCharactersFormatter.h */,
 				4C4B7EF717A4B335000234C7 /* MPUniqueCharactersFormatter.m */,
 			);
@@ -1193,6 +1193,10 @@
 				4C79E80517A9400500AC6CD2 /* KPKTestNSCoding.m */,
 				4C79E80717A9485600AC6CD2 /* KPKTestNSCopying.h */,
 				4C79E80817A9485600AC6CD2 /* KPKTestNSCopying.m */,
+				4CECB31517AC326D00EAFB0F /* KPKLegacyWritingTest.h */,
+				4CECB31617AC326D00EAFB0F /* KPKLegacyWritingTest.m */,
+				4CAC614117AD319200023F9E /* KPKTestXmlParsing.h */,
+				4CAC614217AD319200023F9E /* KPKTestXmlParsing.m */,
 			);
 			path = MacPassTests;
 			sourceTree = "<group>";
@@ -1617,8 +1621,6 @@
 			children = (
 				4CDB5C401794AA4F0017667E /* KPKTree+Serializing.h */,
 				4CDB5C411794AA4F0017667E /* KPKTree+Serializing.m */,
-				4C1842C8179C616600E2F5BC /* KPKTreeCryptor.h */,
-				4C1842C9179C616700E2F5BC /* KPKTreeCryptor.m */,
 				4C1842BA179B434C00E2F5BC /* KPKXmlHeaderReader.h */,
 				4C1842BB179B434C00E2F5BC /* KPKXmlHeaderReader.m */,
 				4C79E80117A9187400AC6CD2 /* KPKXmlHeaderWriter.h */,
@@ -1637,9 +1639,11 @@
 				4C1842C5179BF52000E2F5BC /* KPKLegacyHeaderReader.m */,
 				4C1842CE179C64DC00E2F5BC /* KPKLegacyTreeCryptor.h */,
 				4C1842CF179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m */,
+				4C13904C17ADD1A300A62934 /* KPKTreeCrypting.h */,
 				4C1842D4179C6DE400E2F5BC /* KPKHeaderReading.h */,
 				4C1842D5179C6F1800E2F5BC /* KPKHeaderWriting.h */,
 				4CCEDE2F179F550D008402BE /* KPKTreeReading.h */,
+				4C13904D17ADD3BE00A62934 /* KPKTreeWriting.h */,
 				4CCEDE30179F5B6C008402BE /* KPKDataStreamReader.h */,
 				4CCEDE31179F5B6C008402BE /* KPKDataStreamReader.m */,
 				4C5FA86B17A5F26800C781C9 /* KPKDataStreamWriter.h */,
@@ -1884,6 +1888,8 @@
 				4CFC8743179DFD3E000DFC03 /* KPKXmlLoadingTest.m in Sources */,
 				4C79E80617A9400500AC6CD2 /* KPKTestNSCoding.m in Sources */,
 				4C79E80917A9485600AC6CD2 /* KPKTestNSCopying.m in Sources */,
+				4CECB31717AC326D00EAFB0F /* KPKLegacyWritingTest.m in Sources */,
+				4CAC614317AD319200023F9E /* KPKTestXmlParsing.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2033,7 +2039,6 @@
 				4C5FE9AE17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m in Sources */,
 				4CF1F0CA1786B37900CD920E /* NSData+Gzip.m in Sources */,
 				4C3666411787327E00B249F1 /* MPDocument+Attachments.m in Sources */,
-				4C16BA6217879A3C002B42BD /* MPPasswordStringFormatter.m in Sources */,
 				4CD6C5AE1789FDE6000891F6 /* HNHRoundedSecureTextField.m in Sources */,
 				4C10412C178CDD44001B5239 /* NSDate+Humanized.m in Sources */,
 				4CD3ABBA178F71B50073F5C5 /* KPKTree.m in Sources */,
@@ -2067,7 +2072,6 @@
 				4C1842C0179B5BFD00E2F5BC /* NSData+CommonCrypto.m in Sources */,
 				4C1842C3179B69E700E2F5BC /* NSData+HashedData.m in Sources */,
 				4C1842C6179BF52100E2F5BC /* KPKLegacyHeaderReader.m in Sources */,
-				4C1842CA179C616700E2F5BC /* KPKTreeCryptor.m in Sources */,
 				4C1842D0179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m in Sources */,
 				4C1842D3179C64F000E2F5BC /* KPKXmlTreeCryptor.m in Sources */,
 				4CFC873B179DEDF3000DFC03 /* KPKMetaData.m in Sources */,
diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index f47764af..20415c0b 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -107,7 +107,7 @@
 						<object class="NSImageCell" key="NSCell" id="152819686">
 							<int key="NSCellFlags">134217728</int>
 							<int key="NSCellFlags2">33554432</int>
-							<object class="NSCustomResource" key="NSContents">
+							<object class="NSCustomResource" key="NSContents" id="1066877891">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSActionTemplate</string>
 							</object>
@@ -126,8 +126,8 @@
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="NSButton" id="830540359">
 								<reference key="NSNextResponder" ref="381395509"/>
-								<int key="NSvFlags">-2147483380</int>
-								<string key="NSFrame">{{20, 2}, {59, 25}}</string>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{20, 2}, {238, 25}}</string>
 								<reference key="NSSuperview" ref="381395509"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView"/>
@@ -142,10 +142,7 @@
 									<reference key="NSControlView" ref="830540359"/>
 									<int key="NSButtonFlags">918306816</int>
 									<int key="NSButtonFlags2">163</int>
-									<object class="NSCustomResource" key="NSNormalImage">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">07_NotepadTemplate</string>
-									</object>
+									<reference key="NSNormalImage" ref="1066877891"/>
 									<string key="NSAlternateContents"/>
 									<string key="NSKeyEquivalent"/>
 									<int key="NSPeriodicDelay">400</int>
@@ -178,7 +175,7 @@
 									<string key="NSFrameSize">{278, 369}</string>
 									<reference key="NSSuperview" ref="45251842"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="381395509"/>
+									<reference key="NSNextKeyView"/>
 									<string key="NSReuseIdentifierKey">_NS:28</string>
 								</object>
 								<string key="NSLabel">Entry</string>
@@ -601,6 +598,22 @@
 						<int key="objectID">2930</int>
 						<reference key="object" ref="381395509"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="46370971">
+								<reference key="firstItem" ref="381395509"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="830540359"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="381395509"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="696932551">
 								<reference key="firstItem" ref="830540359"/>
 								<int key="firstAttribute">10</int>
@@ -870,6 +883,11 @@
 						<reference key="object" ref="696932551"/>
 						<reference key="parent" ref="381395509"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3115</int>
+						<reference key="object" ref="46370971"/>
+						<reference key="parent" ref="381395509"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -911,6 +929,7 @@
 					<reference ref="574545128"/>
 					<reference ref="618180937"/>
 					<reference ref="696932551"/>
+					<reference ref="46370971"/>
 				</array>
 				<boolean value="NO" key="2930.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="2930.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -954,12 +973,13 @@
 				<string key="3110.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="3115.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">3114</int>
+			<int key="maxID">3115</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1059,10 +1079,10 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="07_NotepadTemplate">{128, 128}</string>
-			<string key="NSActionTemplate">{15, 15}</string>
-		</dictionary>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">NSActionTemplate</string>
+			<string key="NS.object.0">{15, 15}</string>
+		</object>
 		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
 </archive>
diff --git a/MacPass/DatabaseSettingsWindow.xib b/MacPass/DatabaseSettingsWindow.xib
index 1394ed3f..4b385cc2 100644
--- a/MacPass/DatabaseSettingsWindow.xib
+++ b/MacPass/DatabaseSettingsWindow.xib
@@ -14,8 +14,10 @@
 			<string>IBNSLayoutConstraint</string>
 			<string>NSButton</string>
 			<string>NSButtonCell</string>
+			<string>NSColorWell</string>
 			<string>NSCustomObject</string>
 			<string>NSMenu</string>
+			<string>NSMenuItem</string>
 			<string>NSPathCell</string>
 			<string>NSPathControl</string>
 			<string>NSPopUpButton</string>
@@ -54,7 +56,7 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">7</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {546, 293}}</string>
+				<string key="NSWindowRect">{{196, 240}, {546, 365}}</string>
 				<int key="NSWTFlags">1618477056</int>
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -96,10 +98,10 @@
 						<object class="NSTabView" id="86072074">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">12</int>
-							<string key="NSFrame">{{13, 41}, {520, 246}}</string>
+							<string key="NSFrame">{{13, 41}, {520, 318}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="830804879"/>
+							<reference key="NSNextKeyView" ref="915152531"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<array class="NSMutableArray" key="NSTabViewItems">
 								<object class="NSTabViewItem" id="993610707">
@@ -111,7 +113,7 @@
 											<object class="NSTextField" id="686583152">
 												<reference key="NSNextResponder" ref="161117556"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{136, 148}, {280, 22}}</string>
+												<string key="NSFrame">{{136, 220}, {280, 22}}</string>
 												<reference key="NSSuperview" ref="161117556"/>
 												<reference key="NSNextKeyView" ref="808661180"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -148,7 +150,7 @@
 											<object class="NSTextField" id="808661180">
 												<reference key="NSNextResponder" ref="161117556"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{50, 121}, {81, 17}}</string>
+												<string key="NSFrame">{{50, 195}, {81, 17}}</string>
 												<reference key="NSSuperview" ref="161117556"/>
 												<reference key="NSNextKeyView" ref="781083309"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -181,7 +183,7 @@
 											<object class="NSTextField" id="322366428">
 												<reference key="NSNextResponder" ref="161117556"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{25, 151}, {106, 17}}</string>
+												<string key="NSFrame">{{25, 223}, {106, 17}}</string>
 												<reference key="NSSuperview" ref="161117556"/>
 												<reference key="NSNextKeyView" ref="686583152"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -209,7 +211,7 @@
 															<object class="NSTextView" id="949711542">
 																<reference key="NSNextResponder" ref="401924003"/>
 																<int key="NSvFlags">2322</int>
-																<string key="NSFrameSize">{278, 121}</string>
+																<string key="NSFrameSize">{278, 98}</string>
 																<reference key="NSSuperview" ref="401924003"/>
 																<reference key="NSNextKeyView" ref="670917793"/>
 																<string key="NSReuseIdentifierKey">_NS:13</string>
@@ -271,7 +273,7 @@
 																<nil key="NSDelegate"/>
 															</object>
 														</array>
-														<string key="NSFrame">{{1, 1}, {278, 121}}</string>
+														<string key="NSFrame">{{1, 1}, {278, 98}}</string>
 														<reference key="NSSuperview" ref="781083309"/>
 														<reference key="NSNextKeyView" ref="949711542"/>
 														<string key="NSReuseIdentifierKey">_NS:11</string>
@@ -301,9 +303,9 @@
 													<object class="NSScroller" id="670917793">
 														<reference key="NSNextResponder" ref="781083309"/>
 														<int key="NSvFlags">256</int>
-														<string key="NSFrame">{{263, 1}, {16, 121}}</string>
+														<string key="NSFrame">{{263, 1}, {16, 98}}</string>
 														<reference key="NSSuperview" ref="781083309"/>
-														<reference key="NSNextKeyView" ref="115846238"/>
+														<reference key="NSNextKeyView" ref="284869012"/>
 														<string key="NSReuseIdentifierKey">_NS:83</string>
 														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 														<reference key="NSTarget" ref="781083309"/>
@@ -325,7 +327,7 @@
 														<double key="NSPercent">0.94565218687057495</double>
 													</object>
 												</array>
-												<string key="NSFrame">{{136, 17}, {280, 123}}</string>
+												<string key="NSFrame">{{136, 112}, {280, 100}}</string>
 												<reference key="NSSuperview" ref="161117556"/>
 												<reference key="NSNextKeyView" ref="580592620"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -337,8 +339,131 @@
 												<double key="NSMaxMagnification">4</double>
 												<double key="NSMagnification">1</double>
 											</object>
+											<object class="NSPopUpButton" id="99546798">
+												<reference key="NSNextResponder" ref="161117556"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{134, 68}, {120, 26}}</string>
+												<reference key="NSSuperview" ref="161117556"/>
+												<reference key="NSNextKeyView" ref="182669958"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSPopUpButtonCell" key="NSCell" id="152651086">
+													<int key="NSCellFlags">-2076180416</int>
+													<int key="NSCellFlags2">2048</int>
+													<reference key="NSSupport" ref="481048132"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="99546798"/>
+													<int key="NSButtonFlags">109199360</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">400</int>
+													<int key="NSPeriodicInterval">75</int>
+													<nil key="NSMenuItem"/>
+													<bool key="NSMenuItemRespectAlignment">YES</bool>
+													<object class="NSMenu" key="NSMenu" id="852569525">
+														<string key="NSTitle">OtherViews</string>
+														<array class="NSMutableArray" key="NSMenuItems">
+															<object class="NSMenuItem" id="114675233">
+																<reference key="NSMenu" ref="852569525"/>
+																<string key="NSTitle">None</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<object class="NSCustomResource" key="NSOnImage" id="439468608">
+																	<string key="NSClassName">NSImage</string>
+																	<string key="NSResourceName">NSMenuCheckmark</string>
+																</object>
+																<object class="NSCustomResource" key="NSMixedImage" id="259791402">
+																	<string key="NSClassName">NSImage</string>
+																	<string key="NSResourceName">NSMenuMixedState</string>
+																</object>
+																<string key="NSAction">_popUpItemAction:</string>
+																<reference key="NSTarget" ref="152651086"/>
+															</object>
+															<object class="NSMenuItem" id="390490368">
+																<reference key="NSMenu" ref="852569525"/>
+																<string key="NSTitle">GZip</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="439468608"/>
+																<reference key="NSMixedImage" ref="259791402"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">1</int>
+																<reference key="NSTarget" ref="152651086"/>
+															</object>
+														</array>
+														<reference key="NSMenuFont" ref="481048132"/>
+													</object>
+													<int key="NSSelectedIndex">-1</int>
+													<int key="NSPreferredEdge">1</int>
+													<bool key="NSUsesItemFromMenu">YES</bool>
+													<bool key="NSAltersState">YES</bool>
+													<int key="NSArrowPosition">2</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="284869012">
+												<reference key="NSNextResponder" ref="161117556"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{39, 73}, {92, 17}}</string>
+												<reference key="NSSuperview" ref="161117556"/>
+												<reference key="NSNextKeyView" ref="99546798"/>
+												<string key="NSReuseIdentifierKey">_NS:1535</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="709214179">
+													<int key="NSCellFlags">68157504</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">Compression:</string>
+													<reference key="NSSupport" ref="481048132"/>
+													<string key="NSCellIdentifier">_NS:1535</string>
+													<reference key="NSControlView" ref="284869012"/>
+													<reference key="NSBackgroundColor" ref="537570538"/>
+													<reference key="NSTextColor" ref="873531869"/>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="182669958">
+												<reference key="NSNextResponder" ref="161117556"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{88, 31}, {43, 17}}</string>
+												<reference key="NSSuperview" ref="161117556"/>
+												<reference key="NSNextKeyView" ref="455278074"/>
+												<string key="NSReuseIdentifierKey">_NS:1535</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="347056661">
+													<int key="NSCellFlags">68157504</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">Color:</string>
+													<reference key="NSSupport" ref="481048132"/>
+													<string key="NSCellIdentifier">_NS:1535</string>
+													<reference key="NSControlView" ref="182669958"/>
+													<reference key="NSBackgroundColor" ref="537570538"/>
+													<reference key="NSTextColor" ref="873531869"/>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSColorWell" id="455278074">
+												<reference key="NSNextResponder" ref="161117556"/>
+												<int key="NSvFlags">268</int>
+												<set class="NSMutableSet" key="NSDragTypes">
+													<string>NSColor pasteboard type</string>
+												</set>
+												<string key="NSFrame">{{136, 28}, {44, 23}}</string>
+												<reference key="NSSuperview" ref="161117556"/>
+												<reference key="NSNextKeyView" ref="115846238"/>
+												<string key="NSReuseIdentifierKey">_NS:1116</string>
+												<bool key="NSEnabled">YES</bool>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<bool key="NSIsBordered">YES</bool>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">1</int>
+													<bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes>
+												</object>
+											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {500, 200}}</string>
+										<string key="NSFrame">{{10, 33}, {500, 272}}</string>
 										<reference key="NSNextKeyView" ref="322366428"/>
 										<string key="NSReuseIdentifierKey">_NS:11</string>
 									</object>
@@ -348,15 +473,14 @@
 								</object>
 								<object class="NSTabViewItem" id="961038136">
 									<object class="NSView" key="NSView" id="830804879">
-										<reference key="NSNextResponder" ref="86072074"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSTextField" id="156220187">
 												<reference key="NSNextResponder" ref="830804879"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{111, 140}, {68, 17}}</string>
+												<string key="NSFrame">{{111, 212}, {68, 17}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="2005807"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -379,9 +503,8 @@
 													<string>Apple URL pasteboard type</string>
 													<string>NSFilenamesPboardType</string>
 												</set>
-												<string key="NSFrame">{{181, 74}, {170, 26}}</string>
+												<string key="NSFrame">{{181, 146}, {170, 26}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="118397594"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -404,9 +527,8 @@
 											<object class="NSTextField" id="323392534">
 												<reference key="NSNextResponder" ref="830804879"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{128, 78}, {51, 17}}</string>
+												<string key="NSFrame">{{128, 150}, {51, 17}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="562503982"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -425,9 +547,8 @@
 											<object class="NSButton" id="484114537">
 												<reference key="NSNextResponder" ref="830804879"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{184, 51}, {164, 19}}</string>
+												<string key="NSFrame">{{184, 123}, {164, 19}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="115846238"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -454,9 +575,8 @@
 											<object class="NSButton" id="548323424">
 												<reference key="NSNextResponder" ref="830804879"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{356, 136}, {31, 25}}</string>
+												<string key="NSFrame">{{356, 208}, {31, 25}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="813042737"/>
 												<string key="NSReuseIdentifierKey">_NS:22</string>
 												<bool key="NSEnabled">YES</bool>
@@ -483,9 +603,8 @@
 											<object class="NSButton" id="118397594">
 												<reference key="NSNextResponder" ref="830804879"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{356, 75}, {31, 25}}</string>
+												<string key="NSFrame">{{356, 147}, {31, 25}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="484114537"/>
 												<string key="NSReuseIdentifierKey">_NS:22</string>
 												<bool key="NSEnabled">YES</bool>
@@ -512,9 +631,8 @@
 											<object class="NSSecureTextField" id="2005807">
 												<reference key="NSNextResponder" ref="830804879"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{184, 138}, {164, 22}}</string>
+												<string key="NSFrame">{{184, 210}, {164, 22}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="548323424"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -537,9 +655,8 @@
 											<object class="NSTextField" id="813042737">
 												<reference key="NSNextResponder" ref="830804879"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{127, 108}, {52, 17}}</string>
+												<string key="NSFrame">{{127, 180}, {52, 17}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="113779232"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -558,9 +675,8 @@
 											<object class="NSSecureTextField" id="113779232">
 												<reference key="NSNextResponder" ref="830804879"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{184, 106}, {164, 22}}</string>
+												<string key="NSFrame">{{184, 178}, {164, 22}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="323392534"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -583,9 +699,8 @@
 											<object class="NSTextField" id="682548872">
 												<reference key="NSNextResponder" ref="830804879"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{198, 168}, {137, 17}}</string>
+												<string key="NSFrame">{{198, 240}, {137, 17}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="156220187"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -609,9 +724,7 @@
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {500, 200}}</string>
-										<reference key="NSSuperview" ref="86072074"/>
-										<reference key="NSWindow"/>
+										<string key="NSFrame">{{10, 33}, {500, 272}}</string>
 										<reference key="NSNextKeyView" ref="682548872"/>
 									</object>
 									<string key="NSLabel">Password</string>
@@ -620,14 +733,15 @@
 								</object>
 								<object class="NSTabViewItem" id="557419307">
 									<object class="NSView" key="NSView" id="915152531">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="86072074"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSButton" id="651439240">
 												<reference key="NSNextResponder" ref="915152531"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{184, 156}, {98, 18}}</string>
+												<string key="NSFrame">{{184, 228}, {98, 18}}</string>
 												<reference key="NSSuperview" ref="915152531"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="678934738"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -657,8 +771,9 @@
 											<object class="NSButton" id="678934738">
 												<reference key="NSNextResponder" ref="915152531"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{184, 127}, {133, 18}}</string>
+												<string key="NSFrame">{{184, 199}, {133, 18}}</string>
 												<reference key="NSSuperview" ref="915152531"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="265721585"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -683,8 +798,9 @@
 											<object class="NSButton" id="265721585">
 												<reference key="NSNextResponder" ref="915152531"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{184, 98}, {130, 18}}</string>
+												<string key="NSFrame">{{184, 170}, {130, 18}}</string>
 												<reference key="NSSuperview" ref="915152531"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="796440373"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -709,8 +825,9 @@
 											<object class="NSButton" id="796440373">
 												<reference key="NSNextResponder" ref="915152531"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{184, 69}, {95, 18}}</string>
+												<string key="NSFrame">{{184, 141}, {95, 18}}</string>
 												<reference key="NSSuperview" ref="915152531"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="642974286"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -735,8 +852,9 @@
 											<object class="NSButton" id="642974286">
 												<reference key="NSNextResponder" ref="915152531"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{184, 40}, {107, 18}}</string>
+												<string key="NSFrame">{{184, 112}, {107, 18}}</string>
 												<reference key="NSSuperview" ref="915152531"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="115846238"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -759,7 +877,9 @@
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {500, 200}}</string>
+										<string key="NSFrame">{{10, 33}, {500, 272}}</string>
+										<reference key="NSSuperview" ref="86072074"/>
+										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="651439240"/>
 									</object>
 									<string key="NSLabel">Protection</string>
@@ -774,7 +894,7 @@
 											<object class="NSButton" id="802671964">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{70, 159}, {307, 18}}</string>
+												<string key="NSFrame">{{70, 231}, {307, 18}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="928085070"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -800,7 +920,7 @@
 											<object class="NSButton" id="23176483">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{70, 60}, {138, 18}}</string>
+												<string key="NSFrame">{{70, 132}, {138, 18}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="515943809"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -826,7 +946,7 @@
 											<object class="NSButton" id="929442684">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{112, 37}, {187, 18}}</string>
+												<string key="NSFrame">{{112, 109}, {187, 18}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="115846238"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -852,7 +972,7 @@
 											<object class="NSTextField" id="928085070">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{111, 136}, {98, 17}}</string>
+												<string key="NSFrame">{{111, 208}, {98, 17}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="841263489"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -872,7 +992,7 @@
 											<object class="NSTextField" id="841263489">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{214, 134}, {96, 22}}</string>
+												<string key="NSFrame">{{214, 206}, {96, 22}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="272306362"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -893,7 +1013,7 @@
 											<object class="NSStepper" id="272306362">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{315, 131}, {19, 27}}</string>
+												<string key="NSFrame">{{315, 203}, {19, 27}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="475342969"/>
 												<string key="NSReuseIdentifierKey">_NS:1099</string>
@@ -912,7 +1032,7 @@
 											<object class="NSPopUpButton" id="515943809">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{212, 56}, {220, 26}}</string>
+												<string key="NSFrame">{{212, 128}, {220, 26}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="929442684"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -948,7 +1068,7 @@
 											<object class="NSTextField" id="475342969">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{121, 103}, {88, 17}}</string>
+												<string key="NSFrame">{{121, 175}, {88, 17}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="952577051"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -968,7 +1088,7 @@
 											<object class="NSTextField" id="952577051">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{214, 101}, {96, 22}}</string>
+												<string key="NSFrame">{{214, 173}, {96, 22}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="854447279"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -989,7 +1109,7 @@
 											<object class="NSStepper" id="854447279">
 												<reference key="NSNextResponder" ref="627437575"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{315, 98}, {19, 27}}</string>
+												<string key="NSFrame">{{315, 170}, {19, 27}}</string>
 												<reference key="NSSuperview" ref="627437575"/>
 												<reference key="NSNextKeyView" ref="23176483"/>
 												<string key="NSReuseIdentifierKey">_NS:1099</string>
@@ -1006,7 +1126,7 @@
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {500, 200}}</string>
+										<string key="NSFrame">{{10, 33}, {500, 272}}</string>
 										<reference key="NSNextKeyView" ref="802671964"/>
 									</object>
 									<string key="NSLabel">Advanced</string>
@@ -1021,7 +1141,7 @@
 											<object class="NSTextField" id="823681835">
 												<reference key="NSNextResponder" ref="777708215"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{97, 114}, {121, 17}}</string>
+												<string key="NSFrame">{{97, 186}, {121, 17}}</string>
 												<reference key="NSSuperview" ref="777708215"/>
 												<reference key="NSNextKeyView" ref="551388189"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -1041,7 +1161,7 @@
 											<object class="NSTextField" id="551388189">
 												<reference key="NSNextResponder" ref="777708215"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{223, 111}, {178, 22}}</string>
+												<string key="NSFrame">{{223, 183}, {178, 22}}</string>
 												<reference key="NSSuperview" ref="777708215"/>
 												<reference key="NSNextKeyView" ref="412708114"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -1062,7 +1182,7 @@
 											<object class="NSPopUpButton" id="849532305">
 												<reference key="NSNextResponder" ref="777708215"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{220, 79}, {184, 26}}</string>
+												<string key="NSFrame">{{220, 151}, {184, 26}}</string>
 												<reference key="NSSuperview" ref="777708215"/>
 												<reference key="NSNextKeyView" ref="115846238"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -1097,7 +1217,7 @@
 											<object class="NSTextField" id="412708114">
 												<reference key="NSNextResponder" ref="777708215"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{107, 84}, {110, 17}}</string>
+												<string key="NSFrame">{{107, 156}, {110, 17}}</string>
 												<reference key="NSSuperview" ref="777708215"/>
 												<reference key="NSNextKeyView" ref="849532305"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -1115,7 +1235,7 @@
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {500, 200}}</string>
+										<string key="NSFrame">{{10, 33}, {500, 272}}</string>
 										<reference key="NSNextKeyView" ref="823681835"/>
 									</object>
 									<string key="NSLabel">Templates</string>
@@ -1123,13 +1243,13 @@
 									<reference key="NSTabView" ref="86072074"/>
 								</object>
 							</array>
-							<reference key="NSSelectedTabViewItem" ref="961038136"/>
+							<reference key="NSSelectedTabViewItem" ref="557419307"/>
 							<reference key="NSFont" ref="481048132"/>
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 							<array class="NSMutableArray" key="NSSubviews">
-								<reference ref="830804879"/>
+								<reference ref="915152531"/>
 							</array>
 						</object>
 						<object class="NSButton" id="115846238">
@@ -1158,12 +1278,12 @@
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 					</array>
-					<string key="NSFrameSize">{546, 293}</string>
+					<string key="NSFrameSize">{546, 365}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="86072074"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -1585,7 +1705,151 @@
 						<int key="objectID">361</int>
 						<reference key="object" ref="161117556"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="499962694">
+							<object class="IBNSLayoutConstraint" id="787105694">
+								<reference key="firstItem" ref="455278074"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="182669958"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="326608431">
+								<reference key="firstItem" ref="161117556"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="455278074"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">28</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="454799807">
+								<reference key="firstItem" ref="455278074"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="99546798"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1000103332">
+								<reference key="firstItem" ref="455278074"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="99546798"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="244408773">
+								<reference key="firstItem" ref="161117556"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="182669958"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">31</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="953746118">
+								<reference key="firstItem" ref="182669958"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="455278074"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="735835534">
+								<reference key="firstItem" ref="99546798"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="284869012"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="658316010">
+								<reference key="firstItem" ref="99546798"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="781083309"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="753806010">
+								<reference key="firstItem" ref="284869012"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="99546798"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1021655575">
 								<reference key="firstItem" ref="161117556"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
@@ -1593,15 +1857,47 @@
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">17</double>
+									<double key="value">112</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="161117556"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="103394274">
+							<object class="IBNSLayoutConstraint" id="76747035">
+								<reference key="firstItem" ref="781083309"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="808661180"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="139760315">
+								<reference key="firstItem" ref="781083309"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="808661180"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="161117556"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="792719726">
 								<reference key="firstItem" ref="781083309"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -1613,8 +1909,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="161117556"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="641252819">
@@ -1633,21 +1929,21 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="787105694">
-								<reference key="firstItem" ref="781083309"/>
-								<int key="firstAttribute">5</int>
+							<object class="IBNSLayoutConstraint" id="667167820">
+								<reference key="firstItem" ref="686583152"/>
+								<int key="firstAttribute">10</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="808661180"/>
-								<int key="secondAttribute">6</int>
+								<reference key="secondItem" ref="322366428"/>
+								<int key="secondAttribute">10</int>
 								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="161117556"/>
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
+								<int key="contentType">2</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="189639033">
 								<reference key="firstItem" ref="686583152"/>
@@ -1697,22 +1993,6 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="221935849">
-								<reference key="firstItem" ref="808661180"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="322366428"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">13</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="161117556"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="920068060">
 								<reference key="firstItem" ref="322366428"/>
 								<int key="firstAttribute">5</int>
@@ -1729,26 +2009,14 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="3566854">
-								<reference key="firstItem" ref="322366428"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="686583152"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="161117556"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">2</int>
-							</object>
 							<reference ref="686583152"/>
 							<reference ref="322366428"/>
-							<reference ref="808661180"/>
 							<reference ref="781083309"/>
+							<reference ref="808661180"/>
+							<reference ref="99546798"/>
+							<reference ref="284869012"/>
+							<reference ref="455278074"/>
+							<reference ref="182669958"/>
 						</array>
 						<reference key="parent" ref="993610707"/>
 					</object>
@@ -1828,15 +2096,15 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="715421645">
-								<reference key="firstItem" ref="627437575"/>
-								<int key="firstAttribute">4</int>
+							<object class="IBNSLayoutConstraint" id="870144116">
+								<reference key="firstItem" ref="515943809"/>
+								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="515943809"/>
-								<int key="secondAttribute">4</int>
+								<reference key="secondItem" ref="627437575"/>
+								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">59</double>
+									<double key="value">120</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="627437575"/>
@@ -1956,7 +2224,7 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="233873188">
+							<object class="IBNSLayoutConstraint" id="164871307">
 								<reference key="firstItem" ref="627437575"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
@@ -1964,7 +2232,7 @@
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">39</double>
+									<double key="value">111</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="627437575"/>
@@ -2189,21 +2457,21 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="449989753">
+							<object class="IBNSLayoutConstraint" id="130522504">
 								<reference key="firstItem" ref="265721585"/>
-								<int key="firstAttribute">10</int>
+								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="915152531"/>
-								<int key="secondAttribute">10</int>
+								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">-7</double>
+									<double key="value">86</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="915152531"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="984890343">
 								<reference key="firstItem" ref="265721585"/>
@@ -2348,11 +2616,6 @@
 						<reference key="object" ref="3470984"/>
 						<reference key="parent" ref="322366428"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">435</int>
-						<reference key="object" ref="3566854"/>
-						<reference key="parent" ref="161117556"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">457</int>
 						<reference key="object" ref="203823370"/>
@@ -3064,11 +3327,6 @@
 						<array class="NSMutableArray" key="children"/>
 						<reference key="parent" ref="272342426"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">710</int>
-						<reference key="object" ref="395189341"/>
-						<reference key="parent" ref="161117556"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">665</int>
 						<reference key="object" ref="781083309"/>
@@ -3084,11 +3342,6 @@
 						<reference key="object" ref="641252819"/>
 						<reference key="parent" ref="161117556"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">672</int>
-						<reference key="object" ref="787105694"/>
-						<reference key="parent" ref="161117556"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">668</int>
 						<reference key="object" ref="670917793"/>
@@ -3137,21 +3390,6 @@
 						<reference key="object" ref="631142839"/>
 						<reference key="parent" ref="515943809"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">853</int>
-						<reference key="object" ref="103394274"/>
-						<reference key="parent" ref="161117556"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">854</int>
-						<reference key="object" ref="221935849"/>
-						<reference key="parent" ref="161117556"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">867</int>
-						<reference key="object" ref="499962694"/>
-						<reference key="parent" ref="161117556"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">956</int>
 						<reference key="object" ref="115846238"/>
@@ -3310,21 +3548,11 @@
 						<reference key="object" ref="529755700"/>
 						<reference key="parent" ref="627437575"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1114</int>
-						<reference key="object" ref="715421645"/>
-						<reference key="parent" ref="627437575"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1115</int>
 						<reference key="object" ref="99532800"/>
 						<reference key="parent" ref="627437575"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1116</int>
-						<reference key="object" ref="233873188"/>
-						<reference key="parent" ref="627437575"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1120</int>
 						<reference key="object" ref="813042737"/>
@@ -3874,11 +4102,6 @@
 						<reference key="object" ref="926657725"/>
 						<reference key="parent" ref="915152531"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1375</int>
-						<reference key="object" ref="449989753"/>
-						<reference key="parent" ref="915152531"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1376</int>
 						<reference key="object" ref="936517179"/>
@@ -3889,6 +4112,206 @@
 						<reference key="object" ref="105236918"/>
 						<reference key="parent" ref="915152531"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">710</int>
+						<reference key="object" ref="395189341"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1387</int>
+						<reference key="object" ref="667167820"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1388</int>
+						<reference key="object" ref="792719726"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1391</int>
+						<reference key="object" ref="139760315"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1393</int>
+						<reference key="object" ref="76747035"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1394</int>
+						<reference key="object" ref="99546798"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="152651086"/>
+							<object class="IBNSLayoutConstraint" id="872812455">
+								<reference key="firstItem" ref="99546798"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">115</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="99546798"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1395</int>
+						<reference key="object" ref="152651086"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="852569525"/>
+						</array>
+						<reference key="parent" ref="99546798"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1396</int>
+						<reference key="object" ref="852569525"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="114675233"/>
+							<reference ref="390490368"/>
+						</array>
+						<reference key="parent" ref="152651086"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1397</int>
+						<reference key="object" ref="114675233"/>
+						<reference key="parent" ref="852569525"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1398</int>
+						<reference key="object" ref="390490368"/>
+						<reference key="parent" ref="852569525"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1401</int>
+						<reference key="object" ref="658316010"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1404</int>
+						<reference key="object" ref="284869012"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="709214179"/>
+						</array>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1405</int>
+						<reference key="object" ref="709214179"/>
+						<reference key="parent" ref="284869012"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1408</int>
+						<reference key="object" ref="735835534"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1409</int>
+						<reference key="object" ref="872812455"/>
+						<reference key="parent" ref="99546798"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1410</int>
+						<reference key="object" ref="870144116"/>
+						<reference key="parent" ref="627437575"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1412</int>
+						<reference key="object" ref="130522504"/>
+						<reference key="parent" ref="915152531"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1421</int>
+						<reference key="object" ref="1021655575"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1433</int>
+						<reference key="object" ref="753806010"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1434</int>
+						<reference key="object" ref="182669958"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="347056661"/>
+						</array>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1435</int>
+						<reference key="object" ref="347056661"/>
+						<reference key="parent" ref="182669958"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1439</int>
+						<reference key="object" ref="455278074"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="111634873">
+								<reference key="firstItem" ref="455278074"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">44</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="455278074"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1441</int>
+						<reference key="object" ref="111634873"/>
+						<reference key="parent" ref="455278074"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1447</int>
+						<reference key="object" ref="1000103332"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1448</int>
+						<reference key="object" ref="454799807"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1449</int>
+						<reference key="object" ref="326608431"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1450</int>
+						<reference key="object" ref="953746118"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1451</int>
+						<reference key="object" ref="244408773"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1452</int>
+						<reference key="object" ref="787105694"/>
+						<reference key="parent" ref="161117556"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1411</int>
+						<reference key="object" ref="164871307"/>
+						<reference key="parent" ref="627437575"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -3924,9 +4347,7 @@
 				<string key="1078.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1096.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1113.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1114.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1115.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1116.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="1120.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="1120.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1121.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4024,9 +4445,47 @@
 				<string key="1344.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1387.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1391.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1393.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="1394.IBNSViewMetadataConstraints">
+					<reference ref="872812455"/>
+				</array>
+				<boolean value="NO" key="1394.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="1394.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1395.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1398.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1401.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="1404.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="1404.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1405.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1408.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1409.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1410.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1411.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1412.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1433.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="1434.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="1434.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="1439.IBNSViewMetadataConstraints">
+					<reference ref="111634873"/>
+				</array>
+				<boolean value="NO" key="1439.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="1439.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1448.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1449.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="189.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="190.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4059,16 +4518,25 @@
 				<string key="357.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="361.IBNSViewMetadataConstraints">
-					<reference ref="3566854"/>
 					<reference ref="920068060"/>
-					<reference ref="221935849"/>
 					<reference ref="203823370"/>
 					<reference ref="395189341"/>
 					<reference ref="189639033"/>
-					<reference ref="787105694"/>
+					<reference ref="667167820"/>
 					<reference ref="641252819"/>
-					<reference ref="103394274"/>
-					<reference ref="499962694"/>
+					<reference ref="792719726"/>
+					<reference ref="139760315"/>
+					<reference ref="76747035"/>
+					<reference ref="1021655575"/>
+					<reference ref="753806010"/>
+					<reference ref="658316010"/>
+					<reference ref="735835534"/>
+					<reference ref="953746118"/>
+					<reference ref="244408773"/>
+					<reference ref="1000103332"/>
+					<reference ref="454799807"/>
+					<reference ref="326608431"/>
+					<reference ref="787105694"/>
 				</array>
 				<string key="361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4082,7 +4550,7 @@
 					<reference ref="529755700"/>
 					<reference ref="231152968"/>
 					<reference ref="995495772"/>
-					<reference ref="233873188"/>
+					<reference ref="164871307"/>
 					<reference ref="1034264222"/>
 					<reference ref="736782921"/>
 					<reference ref="431509413"/>
@@ -4090,7 +4558,7 @@
 					<reference ref="1034060709"/>
 					<reference ref="272402705"/>
 					<reference ref="214527064"/>
-					<reference ref="715421645"/>
+					<reference ref="870144116"/>
 					<reference ref="447041330"/>
 					<reference ref="21627283"/>
 					<reference ref="1260617"/>
@@ -4104,7 +4572,7 @@
 					<reference ref="926657725"/>
 					<reference ref="936517179"/>
 					<reference ref="984890343"/>
-					<reference ref="449989753"/>
+					<reference ref="130522504"/>
 					<reference ref="564506748"/>
 					<reference ref="966197008"/>
 					<reference ref="517644297"/>
@@ -4113,7 +4581,6 @@
 				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="390.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="462.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="463.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -4205,7 +4672,6 @@
 				<string key="666.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="667.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="668.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="672.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="673.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="678.IBNSViewMetadataConstraints">
 					<reference ref="631142839"/>
@@ -4219,9 +4685,6 @@
 				<string key="731.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="732.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="844.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="853.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="854.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="867.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="956.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="956.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="957.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4235,7 +4698,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">1377</int>
+			<int key="maxID">1453</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4287,7 +4750,7 @@
 						<string key="cancelButton">NSButton</string>
 						<string key="databaseDescriptionTextView">NSTextView</string>
 						<string key="databaseNameTextField">NSTextField</string>
-						<string key="defaultUsernameTextField">HNHRoundendTextField</string>
+						<string key="defaultUsernameTextField">HNHRoundedTextField</string>
 						<string key="emptyRecycleBinOnQuitCheckButton">NSButton</string>
 						<string key="enableRecycleBinCheckButton">NSButton</string>
 						<string key="errorTextField">NSTextField</string>
@@ -4320,7 +4783,7 @@
 						</object>
 						<object class="IBToOneOutletInfo" key="defaultUsernameTextField">
 							<string key="name">defaultUsernameTextField</string>
-							<string key="candidateClassName">HNHRoundendTextField</string>
+							<string key="candidateClassName">HNHRoundedTextField</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="emptyRecycleBinOnQuitCheckButton">
 							<string key="name">emptyRecycleBinOnQuitCheckButton</string>
@@ -4400,6 +4863,24 @@
 						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">orderFrontSharingServicePicker:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">orderFrontSharingServicePicker:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">orderFrontSharingServicePicker:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSTextView.h</string>
+					</object>
+				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
@@ -4407,6 +4888,8 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
 			<string key="NSQuickLookTemplate">{21, 16}</string>
 			<string key="NSStopProgressTemplate">{11, 11}</string>
 			<string key="NSSwitch">{15, 15}</string>
diff --git a/MacPass/GroupInspectorView.xib b/MacPass/GroupInspectorView.xib
index f259696a..255725fe 100644
--- a/MacPass/GroupInspectorView.xib
+++ b/MacPass/GroupInspectorView.xib
@@ -524,7 +524,7 @@
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1004379867">
-							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags">-2075131840</int>
 							<int key="NSCellFlags2">272631104</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="851874085"/>
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index e0934753..04d5c1bf 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -38,10 +38,6 @@
 
 #import "DDXMLNode.h"
 
-#import "KPKPassword.h"
-#import "KPKTreeCryptor.h"
-#import "KPKTree.h"
-
 NSString *const MPDocumentDidAddGroupNotification         = @"com.hicknhack.macpass.MPDocumentDidAddGroupNotification";
 NSString *const MPDocumentDidAddEntryNotification         = @"com.hicknhack.macpass.MPDocumentDidAddEntryNotification";
 NSString *const MPDocumentDidRevertNotifiation            = @"com.hicknhack.macpass.MPDocumentDidRevertNotifiation";
@@ -196,11 +192,7 @@ typedef NS_ENUM(NSUInteger, MPAlertType) {
 #pragma mark Lock/Unlock/Decrypt
 
 - (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL {
-  //  KPKPassword *pwd = [[KPKPassword alloc] initWithPassword:password key:nil];
-  //
-  //  KPKTreeCryptor *cryptor = [KPKTreeCryptor treeCryptorWithData:_fileData password:pwd];
-  //  KPKTree *tree = [cryptor decryptTree:NULL];
-  
+
   self.key = keyFileURL;
   self.password = [password length] > 0 ? password : nil;
   @try {
diff --git a/MacPass/MPPasswordCreatorViewController.h b/MacPass/MPPasswordCreatorViewController.h
index adfa3db6..a8576c98 100644
--- a/MacPass/MPPasswordCreatorViewController.h
+++ b/MacPass/MPPasswordCreatorViewController.h
@@ -8,7 +8,7 @@
 
 #import "MPViewController.h"
 
-@interface MPPasswordCreatorViewController : MPViewController
+@interface MPPasswordCreatorViewController : MPViewController <NSTextFieldDelegate>
 
 @property (copy, readonly) NSString *generatedPassword;
 
diff --git a/MacPass/MPPasswordCreatorViewController.m b/MacPass/MPPasswordCreatorViewController.m
index 83f752df..eefab323 100644
--- a/MacPass/MPPasswordCreatorViewController.m
+++ b/MacPass/MPPasswordCreatorViewController.m
@@ -52,9 +52,10 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
 @property (weak) IBOutlet NSTextField *entropyTextField;
 @property (weak) IBOutlet NSLevelIndicator *entropyIndicator;
 
-@property (assign, nonatomic) BOOL useCustomString;
-@property (assign, nonatomic) NSUInteger passwordLength;
-@property (assign, nonatomic) CGFloat entropy;
+@property (nonatomic, copy) NSString *customString;
+@property (nonatomic, assign) BOOL useCustomString;
+@property (nonatomic, assign) NSUInteger passwordLength;
+@property (nonatomic, assign) CGFloat entropy;
 
 - (IBAction)_generatePassword:(id)sender;
 - (IBAction)_toggleCharacters:(id)sender;
@@ -72,6 +73,7 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
     _passwordLength = 12;
     _characterFlags = MPPasswordCharactersAll;
     _useCustomString = NO;
+    _customString = @"";
     _entropy = 0.0;
   }
   return self;
@@ -93,8 +95,10 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
   
   [self.entropyIndicator bind:NSValueBinding toObject:self withKeyPath:@"entropy" options:nil];
   [self.entropyTextField bind:NSValueBinding toObject:self withKeyPath:@"entropy" options:nil];
-    
+
+  [self.customCharactersTextField setDelegate:self];
   [_customButton bind:NSValueBinding toObject:self withKeyPath:@"useCustomString" options:nil];
+
   [_numbersButton setTag:MPPasswordCharactersNumbers];
   [_upperCaseButton setTag:MPPasswordCharactersUpperCase];
   [_lowerCaseButton setTag:MPPasswordCharactersLowerCase];
@@ -104,6 +108,9 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
   [self _generatePassword:nil];
 }
 
+#pragma mark -
+#pragma mark Actions
+
 - (IBAction)_generatePassword:(id)sender { 
   if(_useCustomString) {
     if([[_customCharactersTextField stringValue] length] > 0) {
@@ -137,6 +144,9 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
   
 }
 
+#pragma mark -
+#pragma mark Custom Setter
+
 - (void)setPassword:(NSString *)password {
   if(![_password isEqualToString:password]) {
     _password = [password copy];
@@ -159,6 +169,18 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
   }
 }
 
+#pragma mark -
+#pragma mark NSTextFieldDelegate
+
+- (void)controlTextDidChange:(NSNotification *)obj {
+  if([obj object] == self.customCharactersTextField) {
+    [self _generatePassword:nil];
+  }
+}
+
+#pragma mark -
+#pragma mark Helper
+
 - (void)_resetCharacters {
   if(_useCustomString) {
     [_customButton setState:NSOnState];
diff --git a/MacPass/MPPasswordStringFormatter.h b/MacPass/MPPasswordStringFormatter.h
deleted file mode 100644
index 5cb8425a..00000000
--- a/MacPass/MPPasswordStringFormatter.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  MPPasswordStringFormatter.h
-//  MacPass
-//
-//  Created by Michael Starke on 06.07.13.
-//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface MPPasswordStringFormatter : NSFormatter
-
-@end
diff --git a/MacPass/MPPasswordStringFormatter.m b/MacPass/MPPasswordStringFormatter.m
deleted file mode 100644
index 758958ac..00000000
--- a/MacPass/MPPasswordStringFormatter.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  MPPasswordStringFormatter.m
-//  MacPass
-//
-//  Created by Michael Starke on 06.07.13.
-//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
-//
-
-#import "MPPasswordStringFormatter.h"
-
-@implementation MPPasswordStringFormatter
-
-@end
diff --git a/MacPass/MPUniqueCharactersFormatter.m b/MacPass/MPUniqueCharactersFormatter.m
index 770fc3d4..99e12e68 100644
--- a/MacPass/MPUniqueCharactersFormatter.m
+++ b/MacPass/MPUniqueCharactersFormatter.m
@@ -27,9 +27,16 @@
               originalString:(NSString *)origString
        originalSelectedRange:(NSRange)origSelRange
             errorDescription:(NSString **)error {
-  return YES;
+  NSInteger newLenght = [*partialStringPtr length];
+  NSInteger oldLenght = [origString length];
+  if( oldLenght == 0 || (newLenght < oldLenght)) {
+    return YES;
+  }
+  
+  NSCharacterSet *newCharacterSet = [NSCharacterSet characterSetWithCharactersInString:*partialStringPtr];
+  NSCharacterSet *oldCharacterSet = [NSCharacterSet characterSetWithCharactersInString:origString];
+
+  return ![oldCharacterSet isSupersetOfSet:newCharacterSet];
 }
 
-
-
 @end
diff --git a/MacPass/NSString+MPPasswordCreation.m b/MacPass/NSString+MPPasswordCreation.m
index 8b5cb925..f6a161de 100644
--- a/MacPass/NSString+MPPasswordCreation.m
+++ b/MacPass/NSString+MPPasswordCreation.m
@@ -73,12 +73,11 @@ static NSString *allowedCharactersString(MPPasswordCharacterFlags flags) {
 }
 
 - (CGFloat)entropyWhithPossibleCharacterSet:(MPPasswordCharacterFlags)allowedCharacters orCustomCharacters:(NSString *)customCharacters {
-  if(nil != customCharacters) {
-    return 0; // We need a sophisticated parser here!
+  CGFloat alphabetCount = [customCharacters length];
+  if(nil == customCharacters) {
+    NSString *stringSet = allowedCharactersString(allowedCharacters);
+    alphabetCount = [stringSet length];
   }
-
-  NSString *stringSet = allowedCharactersString(allowedCharacters);
-  CGFloat alphabetCount = [stringSet length];
   CGFloat passwordLegnth = [self length];
   return passwordLegnth * ( log10(alphabetCount) / log10(2) );
 }
diff --git a/MacPass/PasswordCreatorView.xib b/MacPass/PasswordCreatorView.xib
index 418dbac3..ea551c0d 100644
--- a/MacPass/PasswordCreatorView.xib
+++ b/MacPass/PasswordCreatorView.xib
@@ -303,8 +303,8 @@
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTextFieldCell" key="NSCell" id="358808223">
-											<int key="NSCellFlags">-1804599231</int>
-											<int key="NSCellFlags2">272630784</int>
+											<int key="NSCellFlags">-1805647807</int>
+											<int key="NSCellFlags2">272631872</int>
 											<string key="NSContents"/>
 											<reference key="NSSupport" ref="510117885"/>
 											<string key="NSCellIdentifier">_NS:9</string>
@@ -576,7 +576,7 @@
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="932376285">
 							<int key="NSCellFlags">-2074083263</int>
-							<int key="NSCellFlags2">272631808</int>
+							<int key="NSCellFlags2">272632384</int>
 							<string key="NSContents"/>
 							<object class="NSFont" key="NSSupport">
 								<string key="NSName">Menlo-Regular</string>
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 2e72c31c..9fdee21f 100644
Binary files a/MacPass/en.lproj/Localizable.strings and b/MacPass/en.lproj/Localizable.strings differ
diff --git a/MacPassTests/KPKLegacyLoadingTest.m b/MacPassTests/KPKLegacyLoadingTest.m
index a627e836..f14d095e 100644
--- a/MacPassTests/KPKLegacyLoadingTest.m
+++ b/MacPassTests/KPKLegacyLoadingTest.m
@@ -7,8 +7,9 @@
 //
 
 #import "KPKLegacyLoadingTest.h"
-#import "KPKTreeCryptor.h"
+#import "KPKTree+Serializing.h"
 #import "KPKPassword.h"
+#import "KPKErrors.h"
 
 @implementation KPKLegacyLoadingTest
 
@@ -24,10 +25,19 @@
   _password = nil;
 }
 
-- (void)testLoading {
-  KPKTreeCryptor *cryptor = [KPKTreeCryptor treeCryptorWithData:_data password:_password];
-  KPKTree *tree = [cryptor decryptTree:NULL];
+- (void)testValidFile {
+  KPKTree *tree = [[KPKTree alloc] initWithData:_data password:_password error:NULL];
   STAssertNotNil(tree, @"Loading should result in a tree object");
 }
 
+- (void)testInvalidFile {
+  NSError *error;
+  uint8 bytes[] = {0x00,0x11,0x22,0x33,0x44};
+  NSData *data = [NSData dataWithBytes:bytes length:5];
+  KPKTree *tree = [[KPKTree alloc] initWithData:data password:nil error:&error];
+  STAssertNil(tree, @"Tree should be nil with invalid data");
+  STAssertNotNil(error, @"Error object should have been created");
+  STAssertTrue(KPKErrorUnknownFileFormat == [error code], @"Error should be Unknown file format");
+}
+
 @end
diff --git a/MacPassTests/KPKLegacyWritingTest.h b/MacPassTests/KPKLegacyWritingTest.h
new file mode 100644
index 00000000..82a0d4d5
--- /dev/null
+++ b/MacPassTests/KPKLegacyWritingTest.h
@@ -0,0 +1,17 @@
+//
+//  KPKLegacyWritingTest.h
+//  MacPass
+//
+//  Created by Michael Starke on 02.08.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+@class KPKPassword;
+
+@interface KPKLegacyWritingTest : SenTestCase {
+  NSData *_data;
+  KPKPassword *_password;
+}
+
+@end
diff --git a/MacPassTests/KPKLegacyWritingTest.m b/MacPassTests/KPKLegacyWritingTest.m
new file mode 100644
index 00000000..d8380fe3
--- /dev/null
+++ b/MacPassTests/KPKLegacyWritingTest.m
@@ -0,0 +1,36 @@
+//
+//  KPKLegacyWritingTest.m
+//  MacPass
+//
+//  Created by Michael Starke on 02.08.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "KPKLegacyWritingTest.h"
+
+
+#import "KPKPassword.h"
+#import "KPKTree+Serializing.h"
+
+@implementation KPKLegacyWritingTest
+
+- (void)setUp {
+  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdb"];
+  _data = [NSData dataWithContentsOfURL:url];
+  _password = [[KPKPassword alloc] initWithPassword:@"1234" key:nil];
+}
+
+- (void)tearDown {
+  _data = nil;
+  _password = nil;
+}
+
+- (void)testWriting {
+  NSError *error = nil;
+  KPKTree *tree = [[KPKTree alloc] initWithData:_data password:_password error:&error];
+  NSData *data = [tree encryptWithPassword:_password forVersion:KPKVersion1 error:&error];
+}
+
+
+@end
diff --git a/MacPassTests/KPKTestXmlParsing.h b/MacPassTests/KPKTestXmlParsing.h
new file mode 100644
index 00000000..7f1c96a9
--- /dev/null
+++ b/MacPassTests/KPKTestXmlParsing.h
@@ -0,0 +1,13 @@
+//
+//  KPKTestXmlParsing.h
+//  MacPass
+//
+//  Created by Michael Starke on 03.08.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface KPKTestXmlParsing : SenTestCase
+
+@end
diff --git a/MacPassTests/KPKTestXmlParsing.m b/MacPassTests/KPKTestXmlParsing.m
new file mode 100644
index 00000000..36c97f72
--- /dev/null
+++ b/MacPassTests/KPKTestXmlParsing.m
@@ -0,0 +1,47 @@
+//
+//  KPKTestXmlParsing.m
+//  MacPass
+//
+//  Created by Michael Starke on 03.08.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "KPKTestXmlParsing.h"
+#import "KPKXmlTreeReader.h"
+#import "KPKErrors.h"
+
+#import "DDXMLDocument.h"
+
+@implementation KPKTestXmlParsing
+
+- (void)testEmptyXmlFile {
+  DDXMLDocument *document = [[DDXMLDocument alloc] initWithXMLString:@"" options:0 error:NULL];
+  KPKXmlTreeReader *reader = [[KPKXmlTreeReader alloc] initWithData:[document XMLData] headerReader:nil];
+  NSError *error;
+  KPKTree *tree = [reader tree:&error];
+  STAssertNil(tree, @"No Tree form emptry data");
+  STAssertNotNil(error, @"Error Object should be provided");
+  STAssertTrue([error code] == KPKErrorNoData, @"Error Code should be No Data");
+}
+
+- (void)testNoNodeXmlFile {
+  DDXMLDocument *document = [[DDXMLDocument alloc] initWithXMLString:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?><root></root>" options:0 error:NULL];
+  KPKXmlTreeReader *reader = [[KPKXmlTreeReader alloc] initWithData:[document XMLData] headerReader:nil];
+  NSError *error;
+  KPKTree *tree = [reader tree:&error];
+  STAssertNil(tree, @"No Tree form emptry data");
+  STAssertNotNil(error, @"Error Object should be provided");
+  STAssertTrue([error code] == KPKErrorXMLKeePassFileElementMissing, @"Error Code should be KeePassFile root missing");
+}
+
+- (void)testNoRoodXmlFil {
+  DDXMLDocument *document = [[DDXMLDocument alloc] initWithXMLString:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?><KeePassFile><Root></Root></KeePassFile>" options:0 error:NULL];
+  KPKXmlTreeReader *reader = [[KPKXmlTreeReader alloc] initWithData:[document XMLData] headerReader:nil];
+  NSError *error;
+  KPKTree *tree = [reader tree:&error];
+  STAssertNil(tree, @"No Tree form emptry data");
+  STAssertNotNil(error, @"Error Object should be provided");
+  STAssertTrue([error code] == KPKErrorXMLRootElementMissing, @"Error Code should be KeePassFile root missing");
+}
+
+@end
diff --git a/MacPassTests/KPKXmlLoadingTest.m b/MacPassTests/KPKXmlLoadingTest.m
index 8945f58e..0bebcc6c 100644
--- a/MacPassTests/KPKXmlLoadingTest.m
+++ b/MacPassTests/KPKXmlLoadingTest.m
@@ -7,10 +7,9 @@
 //
 
 #import "KPKXmlLoadingTest.h"
-#import "KPKTreeCryptor.h"
 #import "KPKPassword.h"
 
-#import "KPKTree.h"
+#import "KPKTree+Serializing.h"
 #import "KPKEntry.h"
 #import "KPKGroup.h"
 
@@ -29,12 +28,12 @@
 }
 
 - (void)testLoading {
-  KPKTreeCryptor *cryptor = [KPKTreeCryptor treeCryptorWithData:_data password:_password];
-  KPKTree *tree = [cryptor decryptTree:NULL];
-  //STAssertNotNil(tree, @"Loading should result in a tree object");
+  NSError *error;
+  KPKTree *tree = [[KPKTree alloc] initWithData:_data password:_password error:&error];
+  STAssertNotNil(tree, @"Loading should result in a tree object");
 
-  //STAssertTrue([tree.root.groups count] == 0, @"Tree contains just root group");
-  //STAssertTrue([tree.root.entries count] == 1, @"Tree has only one entry");
+  STAssertTrue([tree.root.groups count] == 0, @"Tree contains just root group");
+  STAssertTrue([tree.root.entries count] == 1, @"Tree has only one entry");
 
   KPKEntry *entry = [tree.root.entries lastObject];
   NSMutableData *data = [[NSMutableData alloc] init];