diff --git a/Cartfile b/Cartfile
index fae0c2e0..7c7f9ce0 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
 github "sparkle-project/Sparkle" ~> 1.17.0
-github "mstarke/KeePassKit" "19073179a3f4d0dad79d4ac67e39f3dec4f2f6fe"
+github "mstarke/KeePassKit" "5f8377c760eeab1b366ac590dd7a7a65821e61dd"
 github "mstarke/HNHUi" ~> 1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 2b949443..90613cb4 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "mstarke/HNHUi" "1.1"
-github "mstarke/KeePassKit" "19073179a3f4d0dad79d4ac67e39f3dec4f2f6fe"
+github "mstarke/KeePassKit" "5f8377c760eeab1b366ac590dd7a7a65821e61dd"
 github "sparkle-project/Sparkle" "1.17.0"
diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib
index 67570ee9..215df408 100644
--- a/MacPass/EntryView.xib
+++ b/MacPass/EntryView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12120"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -48,7 +48,7 @@
                                                 <rect key="frame" x="1" y="1" width="104" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="270">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="270">
                                                         <rect key="frame" x="1" y="0.0" width="102" height="17"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="271">
                                                             <font key="font" metaFont="system"/>
@@ -82,7 +82,7 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="ImageCell" id="297">
-                                                <rect key="frame" x="109" y="1" width="145" height="17"/>
+                                                <rect key="frame" x="109" y="1" width="144" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <imageView translatesAutoresizingMaskIntoConstraints="NO" id="298">
@@ -93,8 +93,8 @@
                                                         </constraints>
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSActionTemplate" id="301"/>
                                                     </imageView>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="299">
-                                                        <rect key="frame" x="26" y="0.0" width="118" height="17"/>
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="299">
+                                                        <rect key="frame" x="26" y="0.0" width="117" height="17"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="300">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -134,7 +134,7 @@
                                                 <rect key="frame" x="256" y="1" width="118" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="429" customClass="NSSecureTextField">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="429" customClass="NSSecureTextField">
                                                         <rect key="frame" x="1" y="0.0" width="116" height="17"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="430">
                                                             <font key="font" metaFont="system"/>
@@ -171,7 +171,7 @@
                                                 <rect key="frame" x="378" y="1" width="113" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="422">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="422">
                                                         <rect key="frame" x="1" y="0.0" width="111" height="17"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="423">
                                                             <font key="font" metaFont="system"/>
@@ -208,7 +208,7 @@
                                                 <rect key="frame" x="494" y="1" width="199" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="617">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="617">
                                                         <rect key="frame" x="1" y="0.0" width="197" height="17"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="618">
                                                             <font key="font" metaFont="system"/>
diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index b3f1c6d1..8b509ce3 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -439,7 +439,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
     return; // We are displaying the entries already
   }
   if(contentView.subviews.count == 1) {
-    [contentView.subviews[0] removeFromSuperviewWithoutNeedingDisplay];
+    [contentView.subviews.firstObject removeFromSuperviewWithoutNeedingDisplay];
   }
   [contentView addSubview:self.splitView];
   NSView *outlineView = self.outlineViewController.view;
@@ -565,8 +565,8 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
 #pragma mark UI Helper
 
 - (BOOL)_isInspectorVisible {
-  NSView *inspectorView = [self.inspectorViewController view];
-  return (nil != [inspectorView superview]);
+  NSView *inspectorView = self.inspectorViewController.view;
+  return (nil != inspectorView.superview);
 }
 
 @end
diff --git a/MacPass/MPPluginDataViewController.m b/MacPass/MPPluginDataViewController.m
index 161b3cc7..1e2ebb4d 100644
--- a/MacPass/MPPluginDataViewController.m
+++ b/MacPass/MPPluginDataViewController.m
@@ -53,7 +53,7 @@
   NSInteger tag = ((NSButton *)sender).tag;
   if(tag >= 0 && tag < [self.pluginDataController.arrangedObjects count]) {
     id keyValueStore = ((NSArray *)self.pluginDataController.arrangedObjects)[tag];
-    [self.representedNode removeCustomDataValueForKey:[keyValueStore key]];
+    [self.representedNode removeCustomDataForKey:[keyValueStore key]];
   }
 }
 
diff --git a/MacPass/MPTableView.m b/MacPass/MPTableView.m
index 7f8f98d1..1a899d19 100644
--- a/MacPass/MPTableView.m
+++ b/MacPass/MPTableView.m
@@ -37,7 +37,7 @@
    We need to clear the outer areas
    as calling super will not do that for us
    */
-  [[self backgroundColor] set];
+  [self.backgroundColor set];
   NSRectFill(clipRect);
   [super drawBackgroundInClipRect:clipRect];
 }