diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index 101972506..0728af490 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -50,7 +50,6 @@
 		840F7C2521BDA4B40057E851 /* AppNotifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45CD1ED8C308000A8B52 /* AppNotifications.swift */; };
 		840F7C2621BDA4B40057E851 /* TimelineKeyboardDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 844B5B5A1FEA00FB00C7C76A /* TimelineKeyboardDelegate.swift */; };
 		840F7C2821BDA4B40057E851 /* Browser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45DC1ED8C54B000A8B52 /* Browser.swift */; };
-		840F7C2921BDA4B40057E851 /* KeyboardDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45E21ED8C681000A8B52 /* KeyboardDelegateProtocol.swift */; };
 		840F7C2B21BDA4B40057E851 /* OPMLExporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8444C8F11FED81840051386C /* OPMLExporter.swift */; };
 		840F7C2C21BDA4B40057E851 /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A975D1ED9EB72007D329B /* MainWindowController.swift */; };
 		840F7C2E21BDA4B40057E851 /* UnreadFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F2D5391FC2308B00998D64 /* UnreadFeed.swift */; };
@@ -201,7 +200,6 @@
 		842AE5C42241F39C004A742C /* AdvancedPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5C22241F39C004A742C /* AdvancedPreferencesViewController.swift */; };
 		842E45CE1ED8C308000A8B52 /* AppNotifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45CD1ED8C308000A8B52 /* AppNotifications.swift */; };
 		842E45DD1ED8C54B000A8B52 /* Browser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45DC1ED8C54B000A8B52 /* Browser.swift */; };
-		842E45E31ED8C681000A8B52 /* KeyboardDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45E21ED8C681000A8B52 /* KeyboardDelegateProtocol.swift */; };
 		8440C8AD2129F9F5002353D1 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841D4D682106B3E100DD04E6 /* ArticlesDatabase.framework */; };
 		8440C8AE2129F9F5002353D1 /* ArticlesDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 841D4D682106B3E100DD04E6 /* ArticlesDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		84411E711FE5FBFA004B527F /* SmallIconProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84411E701FE5FBFA004B527F /* SmallIconProvider.swift */; };
@@ -768,7 +766,6 @@
 		842AE5C22241F39C004A742C /* AdvancedPreferencesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvancedPreferencesViewController.swift; sourceTree = "<group>"; };
 		842E45CD1ED8C308000A8B52 /* AppNotifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppNotifications.swift; path = NetNewsWire/AppNotifications.swift; sourceTree = "<group>"; };
 		842E45DC1ED8C54B000A8B52 /* Browser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Browser.swift; path = NetNewsWire/Browser.swift; sourceTree = "<group>"; };
-		842E45E21ED8C681000A8B52 /* KeyboardDelegateProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardDelegateProtocol.swift; sourceTree = "<group>"; };
 		842E5ED12206B1010012DBE1 /* DatabaseWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseWindowController.swift; sourceTree = "<group>"; };
 		842E5ED42206B1190012DBE1 /* DatabaseWindow.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = DatabaseWindow.storyboard; sourceTree = "<group>"; };
 		843A3B5520311E7700BF76EC /* FeedListOutlineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListOutlineView.swift; sourceTree = "<group>"; };
@@ -1141,7 +1138,6 @@
 			isa = PBXGroup;
 			children = (
 				849A97B01ED9FA69007D329B /* MainWindow.storyboard */,
-				842E45E21ED8C681000A8B52 /* KeyboardDelegateProtocol.swift */,
 				849A975D1ED9EB72007D329B /* MainWindowController.swift */,
 				519B8D322143397200FA689C /* SharingServiceDelegate.swift */,
 				849EE72020391F560082A1EA /* SharingServicePickerDelegate.swift */,
@@ -2372,7 +2368,6 @@
 				840F7C2621BDA4B40057E851 /* TimelineKeyboardDelegate.swift in Sources */,
 				84216D0422128B9D0049B9B9 /* DetailWebViewController.swift in Sources */,
 				840F7C2821BDA4B40057E851 /* Browser.swift in Sources */,
-				840F7C2921BDA4B40057E851 /* KeyboardDelegateProtocol.swift in Sources */,
 				840F7C2B21BDA4B40057E851 /* OPMLExporter.swift in Sources */,
 				842AE5C42241F39C004A742C /* AdvancedPreferencesViewController.swift in Sources */,
 				840F7C2C21BDA4B40057E851 /* MainWindowController.swift in Sources */,
@@ -2500,7 +2495,6 @@
 				842E45CE1ED8C308000A8B52 /* AppNotifications.swift in Sources */,
 				844B5B5B1FEA00FB00C7C76A /* TimelineKeyboardDelegate.swift in Sources */,
 				842E45DD1ED8C54B000A8B52 /* Browser.swift in Sources */,
-				842E45E31ED8C681000A8B52 /* KeyboardDelegateProtocol.swift in Sources */,
 				84216D0322128B9D0049B9B9 /* DetailWebViewController.swift in Sources */,
 				8444C8F21FED81840051386C /* OPMLExporter.swift in Sources */,
 				849A975E1ED9EB72007D329B /* MainWindowController.swift in Sources */,
diff --git a/NetNewsWire/MainWindow/Detail/DetailWebView.swift b/NetNewsWire/MainWindow/Detail/DetailWebView.swift
index b31e7307f..03c8109a6 100644
--- a/NetNewsWire/MainWindow/Detail/DetailWebView.swift
+++ b/NetNewsWire/MainWindow/Detail/DetailWebView.swift
@@ -8,6 +8,7 @@
 
 import AppKit
 import WebKit
+import RSCore
 
 final class DetailWebView: WKWebView {
 
diff --git a/NetNewsWire/MainWindow/KeyboardDelegateProtocol.swift b/NetNewsWire/MainWindow/KeyboardDelegateProtocol.swift
deleted file mode 100644
index 9c7c084b6..000000000
--- a/NetNewsWire/MainWindow/KeyboardDelegateProtocol.swift
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  KeyboardDelegateProtocol.swift
-//  NetNewsWire
-//
-//  Created by Brent Simmons on 10/11/16.
-//  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
-//
-
-import AppKit
-
-let keypadEnter: unichar = 3
-
-@objc protocol KeyboardDelegate: class {
-	
-	// Return true if handled.
-	func keydown(_: NSEvent, in view: NSView) -> Bool
-}
diff --git a/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift b/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift
index bc2f4451f..9d83b3778 100644
--- a/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift
+++ b/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift
@@ -7,6 +7,7 @@
 //
 
 import AppKit
+import RSCore
 
 class TimelineTableView: NSTableView {
 	
diff --git a/submodules/RSCore b/submodules/RSCore
index 8d6edc4ce..38cf40b7e 160000
--- a/submodules/RSCore
+++ b/submodules/RSCore
@@ -1 +1 @@
-Subproject commit 8d6edc4cec4e0900582b2b4ffbbe25eb9ed2eeff
+Subproject commit 38cf40b7ead95e6c3f3371b643748bd9f6687d8a