diff --git a/Appcasts/netnewswire-beta.xml b/Appcasts/netnewswire-beta.xml
index 691906ae5..69141b8f0 100755
--- a/Appcasts/netnewswire-beta.xml
+++ b/Appcasts/netnewswire-beta.xml
@@ -6,6 +6,22 @@
         <description>Most recent NetNewsWire changes with links to updates.</description>
         <language>en</language>
 
+<item>
+          <title>NetNewsWire 5.0a4</title>
+            <description><![CDATA[
+               <p>Sidebar: fixed a bug where a drag-and-drop that triggers an error could make the app unresponsive.</p>
+            	<p>Timeline: fixed sorting when two items have the same publication date. Added additional criteria so the sort is stable and predictable.</p>
+            	<p>Timeline: small avatars (16 x 16 favicons, for  instance) are now centered on a gray background. Looks a bit better.</p>
+            	<p>Added How to Support NetNewsWire help menu item.</p>
+	           <p>AppleScript: read/unread and starred status are now read/write via scripts.</p>
+						<p>Updated to the latest Sparkle — the thing that does these in-app version upgrades — which has better support Dark Mode. Also, it might fix a bug where Check for Updates… is sometimes not available when it should be. (Maybe.)</p>
+							<p><b>Status note:</b> At this point we have no known bugs to fix before 5.0 beta. No crashing bugs. All that remains is documentation. So, please keep looking for bugs! :)</p>
+							]]></description>
+            <pubDate>Sat, 15 Jun 2019 19:000:00 -0700</pubDate>
+            <enclosure url="https://ranchero.com/downloads/NetNewsWire5.0a4.zip" sparkle:version="2237" sparkle:shortVersionString="5.0a4" length="5147527" type="application/zip" />
+            <sparkle:minimumSystemVersion>10.14.4</sparkle:minimumSystemVersion>
+        </item>
+
 <item>
           <title>NetNewsWire 5.0a3</title>
             <description><![CDATA[
diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift
index 64a897a00..36066fdf1 100644
--- a/Frameworks/Account/Account.swift
+++ b/Frameworks/Account/Account.swift
@@ -33,6 +33,7 @@ public enum AccountType: Int {
 	case feedbin = 17
 	case feedWrangler = 18
 	case newsBlur = 19
+	case readerAPI = 20
 	// TODO: more
 }
 
@@ -125,6 +126,17 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 		}
 	}
 	
+	public var endpointURL: URL? {
+		get {
+			return metadata.endpointURL
+		}
+		set {
+			if newValue != metadata.endpointURL {
+				metadata.endpointURL = newValue
+			}
+		}
+	}
+	
 	private var fetchingAllUnreadCounts = false
 	var isUnreadCountsInitialized = false
 
@@ -172,8 +184,12 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
         }
     }
     
-	public var usesTags: Bool {
-		return delegate.usesTags
+	public var isTagBasedSystem: Bool {
+		return delegate.isTagBasedSystem
+	}
+	
+	public var isOPMLImportSupported: Bool {
+		return delegate.isOPMLImportSupported
 	}
 	
 	var refreshInProgress = false {
@@ -194,8 +210,8 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 		return delegate.refreshProgress
 	}
 	
-	var supportsSubFolders: Bool {
-		return delegate.supportsSubFolders
+	var isSubfoldersSupported: Bool {
+		return delegate.isSubfoldersSupported
 	}
 	
 	init?(dataFolder: String, type: AccountType, accountID: String, transport: Transport? = nil) {
@@ -205,6 +221,8 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 			self.delegate = LocalAccountDelegate()
 		case .feedbin:
 			self.delegate = FeedbinAccountDelegate(dataFolder: dataFolder, transport: transport)
+		case .readerAPI:
+			self.delegate = ReaderAPIAccountDelegate(dataFolder: dataFolder, transport: transport)
 		default:
 			fatalError("Only Local and Feedbin accounts are supported")
 		}
@@ -232,6 +250,8 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 			defaultName = "FeedWrangler"
 		case .newsBlur:
 			defaultName = "NewsBlur"
+		case .readerAPI:
+			defaultName = "Reader API"
 		}
 
 		NotificationCenter.default.addObserver(self, selector: #selector(downloadProgressDidChange(_:)), name: .DownloadProgressDidChange, object: nil)
@@ -263,8 +283,10 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 		switch credentials {
 		case .basic(let username, _):
 			self.username = username
-		default:
-			return
+		case .readerAPIBasicLogin(let username, _):
+			self.username = username
+		case .readerAPIAuthLogin(let username, _):
+			self.username = username
 		}
 		
 		try CredentialsManager.storeCredentials(credentials, server: server)
@@ -288,12 +310,29 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 		self.username = nil
 	}
 	
-	public static func validateCredentials(transport: Transport = URLSession.webserviceTransport(), type: AccountType, credentials: Credentials, completion: @escaping (Result<Bool, Error>) -> Void) {
+	public func retrieveReaderAPIAuthCredentials() throws -> Credentials? {
+		guard let username = self.username, let server = delegate.server else {
+			return nil
+		}
+		return try CredentialsManager.retrieveReaderAPIAuthCredentials(server: server, username: username)
+	}
+	
+	public func removeReaderAPIAuthCredentials() throws {
+		guard let username = self.username, let server = delegate.server else {
+			return
+		}
+		try CredentialsManager.removeReaderAPIAuthCredentials(server: server, username: username)
+		self.username = nil
+	}
+	
+	public static func validateCredentials(transport: Transport = URLSession.webserviceTransport(), type: AccountType, credentials: Credentials, endpoint: URL? = nil, completion: @escaping (Result<Credentials?, Error>) -> Void) {
 		switch type {
 		case .onMyMac:
 			LocalAccountDelegate.validateCredentials(transport: transport, credentials: credentials, completion: completion)
 		case .feedbin:
 			FeedbinAccountDelegate.validateCredentials(transport: transport, credentials: credentials, completion: completion)
+		case .readerAPI:
+			ReaderAPIAccountDelegate.validateCredentials(transport: transport, credentials: credentials, endpoint: endpoint, completion: completion)
 		default:
 			break
 		}
@@ -313,7 +352,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 	
 	public func importOPML(_ opmlFile: URL, completion: @escaping (Result<Void, Error>) -> Void) {
 		
-		guard !delegate.opmlImportInProgress else {
+		guard !delegate.isOPMLImportInProgress else {
 			completion(.failure(AccountError.opmlImportInProgress))
 			return
 		}
diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj
index 4e8d20f58..3a6f1fd8b 100644
--- a/Frameworks/Account/Account.xcodeproj/project.pbxproj
+++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj
@@ -35,6 +35,13 @@
 		51E490362288C37100C791F0 /* FeedbinDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E490352288C37100C791F0 /* FeedbinDate.swift */; };
 		51E59599228C77BC00FCC42B /* FeedbinUnreadEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E59598228C77BC00FCC42B /* FeedbinUnreadEntry.swift */; };
 		51E5959B228C781500FCC42B /* FeedbinStarredEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E5959A228C781500FCC42B /* FeedbinStarredEntry.swift */; };
+		552032F8229D5D5A009559E0 /* ReaderAPIEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552032ED229D5D5A009559E0 /* ReaderAPIEntry.swift */; };
+		552032F9229D5D5A009559E0 /* ReaderAPISubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552032EE229D5D5A009559E0 /* ReaderAPISubscription.swift */; };
+		552032FB229D5D5A009559E0 /* ReaderAPITag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552032F0229D5D5A009559E0 /* ReaderAPITag.swift */; };
+		552032FC229D5D5A009559E0 /* ReaderAPIUnreadEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552032F1229D5D5A009559E0 /* ReaderAPIUnreadEntry.swift */; };
+		552032FD229D5D5A009559E0 /* ReaderAPITagging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552032F2229D5D5A009559E0 /* ReaderAPITagging.swift */; };
+		552032FE229D5D5A009559E0 /* ReaderAPIAccountDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552032F3229D5D5A009559E0 /* ReaderAPIAccountDelegate.swift */; };
+		55203300229D5D5A009559E0 /* ReaderAPICaller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552032F5229D5D5A009559E0 /* ReaderAPICaller.swift */; };
 		841973FE1F6DD1BC006346C4 /* RSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841973EF1F6DD19E006346C4 /* RSCore.framework */; };
 		841973FF1F6DD1C5006346C4 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841973FA1F6DD1AC006346C4 /* RSParser.framework */; };
 		841974011F6DD1EC006346C4 /* Folder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841974001F6DD1EC006346C4 /* Folder.swift */; };
@@ -136,6 +143,13 @@
 		51E490352288C37100C791F0 /* FeedbinDate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinDate.swift; sourceTree = "<group>"; };
 		51E59598228C77BC00FCC42B /* FeedbinUnreadEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinUnreadEntry.swift; sourceTree = "<group>"; };
 		51E5959A228C781500FCC42B /* FeedbinStarredEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinStarredEntry.swift; sourceTree = "<group>"; };
+		552032ED229D5D5A009559E0 /* ReaderAPIEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderAPIEntry.swift; sourceTree = "<group>"; };
+		552032EE229D5D5A009559E0 /* ReaderAPISubscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderAPISubscription.swift; sourceTree = "<group>"; };
+		552032F0229D5D5A009559E0 /* ReaderAPITag.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderAPITag.swift; sourceTree = "<group>"; };
+		552032F1229D5D5A009559E0 /* ReaderAPIUnreadEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderAPIUnreadEntry.swift; sourceTree = "<group>"; };
+		552032F2229D5D5A009559E0 /* ReaderAPITagging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderAPITagging.swift; sourceTree = "<group>"; };
+		552032F3229D5D5A009559E0 /* ReaderAPIAccountDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderAPIAccountDelegate.swift; sourceTree = "<group>"; };
+		552032F5229D5D5A009559E0 /* ReaderAPICaller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderAPICaller.swift; sourceTree = "<group>"; };
 		841973E81F6DD19E006346C4 /* RSCore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSCore.xcodeproj; path = ../RSCore/RSCore.xcodeproj; sourceTree = "<group>"; };
 		841973F41F6DD1AC006346C4 /* RSParser.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSParser.xcodeproj; path = ../RSParser/RSParser.xcodeproj; sourceTree = "<group>"; };
 		841974001F6DD1EC006346C4 /* Folder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Folder.swift; sourceTree = "<group>"; };
@@ -222,6 +236,20 @@
 			path = JSON;
 			sourceTree = "<group>";
 		};
+		552032EA229D5D5A009559E0 /* ReaderAPI */ = {
+			isa = PBXGroup;
+			children = (
+				552032ED229D5D5A009559E0 /* ReaderAPIEntry.swift */,
+				552032EE229D5D5A009559E0 /* ReaderAPISubscription.swift */,
+				552032F0229D5D5A009559E0 /* ReaderAPITag.swift */,
+				552032F1229D5D5A009559E0 /* ReaderAPIUnreadEntry.swift */,
+				552032F2229D5D5A009559E0 /* ReaderAPITagging.swift */,
+				552032F3229D5D5A009559E0 /* ReaderAPIAccountDelegate.swift */,
+				552032F5229D5D5A009559E0 /* ReaderAPICaller.swift */,
+			);
+			path = ReaderAPI;
+			sourceTree = "<group>";
+		};
 		841973E91F6DD19E006346C4 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -302,6 +330,7 @@
 				5165D71F22835E9800D9D53D /* FeedFinder */,
 				8419742B1F6DDE84006346C4 /* LocalAccount */,
 				84245C7D1FDDD2580074AFBB /* Feedbin */,
+				552032EA229D5D5A009559E0 /* ReaderAPI */,
 				848935031F62484F00CEBD24 /* AccountTests */,
 				848934F71F62484F00CEBD24 /* Products */,
 				8469F80F1F6DC3C10084783E /* Frameworks */,
@@ -515,11 +544,13 @@
 			buildActionMask = 2147483647;
 			files = (
 				84C8B3F41F89DE430053CCA6 /* DataExtensions.swift in Sources */,
+				552032F9229D5D5A009559E0 /* ReaderAPISubscription.swift in Sources */,
 				84C3654A1F899F3B001EC85C /* CombinedRefreshProgress.swift in Sources */,
 				8469F81C1F6DD15E0084783E /* Account.swift in Sources */,
 				5144EA4E227B829A00D19003 /* FeedbinAccountDelegate.swift in Sources */,
 				51E5959B228C781500FCC42B /* FeedbinStarredEntry.swift in Sources */,
 				846E77451F6EF9B900A165E2 /* Container.swift in Sources */,
+				552032FD229D5D5A009559E0 /* ReaderAPITagging.swift in Sources */,
 				84F73CF1202788D90000BCEF /* ArticleFetcher.swift in Sources */,
 				841974251F6DDCE4006346C4 /* AccountDelegate.swift in Sources */,
 				5165D73122837F3400D9D53D /* InitialFeedDownloader.swift in Sources */,
@@ -533,10 +564,15 @@
 				84B99C9F1FAE8D3200ECDEDB /* ContainerPath.swift in Sources */,
 				5133231122810EB200C30F19 /* FeedbinIcon.swift in Sources */,
 				846E77501F6EF9C400A165E2 /* LocalAccountRefresher.swift in Sources */,
+				55203300229D5D5A009559E0 /* ReaderAPICaller.swift in Sources */,
 				51E3EB41229AF61B00645299 /* AccountError.swift in Sources */,
 				51E59599228C77BC00FCC42B /* FeedbinUnreadEntry.swift in Sources */,
+				552032F8229D5D5A009559E0 /* ReaderAPIEntry.swift in Sources */,
+				552032FB229D5D5A009559E0 /* ReaderAPITag.swift in Sources */,
 				5165D72822835F7800D9D53D /* FeedFinder.swift in Sources */,
 				51D58755227F53BE00900287 /* FeedbinTag.swift in Sources */,
+				552032FE229D5D5A009559E0 /* ReaderAPIAccountDelegate.swift in Sources */,
+				552032FC229D5D5A009559E0 /* ReaderAPIUnreadEntry.swift in Sources */,
 				84D09623217418DC00D77525 /* FeedbinTagging.swift in Sources */,
 				84CAD7161FDF2E22000F0755 /* FeedbinEntry.swift in Sources */,
 				5165D72A22835F7D00D9D53D /* HTMLFeedFinder.swift in Sources */,
diff --git a/Frameworks/Account/AccountDelegate.swift b/Frameworks/Account/AccountDelegate.swift
index 56005273a..cc657f770 100644
--- a/Frameworks/Account/AccountDelegate.swift
+++ b/Frameworks/Account/AccountDelegate.swift
@@ -13,9 +13,10 @@ import RSWeb
 protocol AccountDelegate {
 
 	// Local account does not; some synced accounts might.
-	var supportsSubFolders: Bool { get }
-	var usesTags: Bool { get }
-	var opmlImportInProgress: Bool { get }
+	var isSubfoldersSupported: Bool { get }
+	var isTagBasedSystem: Bool { get }
+	var isOPMLImportSupported: Bool { get }
+	var isOPMLImportInProgress: Bool { get }
 	
 	var server: String? { get }
 	var credentials: Credentials? { get set }
@@ -47,6 +48,6 @@ protocol AccountDelegate {
 	// Called at the end of account’s init method.
 	func accountDidInitialize(_ account: Account)
 
-	static func validateCredentials(transport: Transport, credentials: Credentials, completion: @escaping (Result<Bool, Error>) -> Void)
+	static func validateCredentials(transport: Transport, credentials: Credentials, endpoint: URL?, completion: @escaping (Result<Credentials?, Error>) -> Void)
 	
 }
diff --git a/Frameworks/Account/AccountManager.swift b/Frameworks/Account/AccountManager.swift
index f707ff6c1..6d07cdaf4 100644
--- a/Frameworks/Account/AccountManager.swift
+++ b/Frameworks/Account/AccountManager.swift
@@ -172,7 +172,7 @@ public final class AccountManager: UnreadCountProvider {
 			}
 		}
 
-		group.notify(queue: DispatchQueue.main) {
+		group.notify(queue: DispatchQueue.global(qos: .background)) {
 			completion?()
 		}
 	}
diff --git a/Frameworks/Account/AccountMetadata.swift b/Frameworks/Account/AccountMetadata.swift
index 3229a4689..a741bfb12 100644
--- a/Frameworks/Account/AccountMetadata.swift
+++ b/Frameworks/Account/AccountMetadata.swift
@@ -21,6 +21,7 @@ final class AccountMetadata: Codable {
 		case username
 		case conditionalGetInfo
 		case lastArticleFetch
+		case endpointURL
 	}
 
 	var name: String? {
@@ -62,6 +63,14 @@ final class AccountMetadata: Codable {
 			}
 		}
 	}
+	
+	var endpointURL: URL? {
+		didSet {
+			if endpointURL != oldValue {
+				valueDidChange(.endpointURL)
+			}
+		}
+	}
 
 	weak var delegate: AccountMetadataDelegate?
 	
diff --git a/Frameworks/Account/Feedbin/FeedbinAPICaller.swift b/Frameworks/Account/Feedbin/FeedbinAPICaller.swift
index 27282de5b..a8d9757d1 100644
--- a/Frameworks/Account/Feedbin/FeedbinAPICaller.swift
+++ b/Frameworks/Account/Feedbin/FeedbinAPICaller.swift
@@ -42,7 +42,7 @@ final class FeedbinAPICaller: NSObject {
 		self.transport = transport
 	}
 	
-	func validateCredentials(completion: @escaping (Result<Bool, Error>) -> Void) {
+	func validateCredentials(completion: @escaping (Result<Credentials?, Error>) -> Void) {
 		
 		let callURL = feedbinBaseURL.appendingPathComponent("authentication.json")
 		let request = URLRequest(url: callURL, credentials: credentials)
@@ -50,12 +50,12 @@ final class FeedbinAPICaller: NSObject {
 		transport.send(request: request) { result in
 			switch result {
 			case .success:
-				completion(.success(true))
+				completion(.success(self.credentials))
 			case .failure(let error):
 				switch error {
 				case TransportError.httpError(let status):
 					if status == 401 {
-						completion(.success(false))
+						completion(.success(self.credentials))
 					} else {
 						completion(.failure(error))
 					}
diff --git a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
index 8cc07456b..05d3c0d0c 100644
--- a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
+++ b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
@@ -6,12 +6,6 @@
 //  Copyright © 2019 Ranchero Software, LLC. All rights reserved.
 //
 
-#if os(macOS)
-import AppKit
-#else
-import UIKit
-import RSCore
-#endif
 import Articles
 import RSCore
 import RSParser
@@ -30,10 +24,11 @@ final class FeedbinAccountDelegate: AccountDelegate {
 	private let caller: FeedbinAPICaller
 	private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Feedbin")
 
-	let supportsSubFolders = false
-	let usesTags = true
+	let isSubfoldersSupported = false
+	let isTagBasedSystem = true
+	let isOPMLImportSupported = true
 	let server: String? = "api.feedbin.com"
-	var opmlImportInProgress = false
+	var isOPMLImportInProgress = false
 	
 	var credentials: Credentials? {
 		didSet {
@@ -207,7 +202,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
 		}
 		
 		os_log(.debug, log: log, "Begin importing OPML...")
-		opmlImportInProgress = true
+		isOPMLImportInProgress = true
 		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		
 		caller.importOPML(opmlData: opmlData) { result in
@@ -216,7 +211,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
 				if importResult.complete {
 					os_log(.debug, log: self.log, "Import OPML done.")
 					self.refreshProgress.completeTask()
-					self.opmlImportInProgress = false
+					self.isOPMLImportInProgress = false
 					DispatchQueue.main.async {
 						completion(.success(()))
 					}
@@ -226,7 +221,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
 			case .failure(let error):
 				os_log(.debug, log: self.log, "Import OPML failed.")
 				self.refreshProgress.completeTask()
-				self.opmlImportInProgress = false
+				self.isOPMLImportInProgress = false
 				DispatchQueue.main.async {
 					let wrappedError = AccountError.wrappedError(error: error, account: account)
 					completion(.failure(wrappedError))
@@ -251,7 +246,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 			return
 		}
 		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		caller.renameTag(oldName: folder.name ?? "", newName: name) { result in
+			self.refreshProgress.completeTask()
 			switch result {
 			case .success:
 				DispatchQueue.main.async {
@@ -285,7 +282,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 				
 				if let feedTaggingID = feed.folderRelationship?[folder.name ?? ""] {
 					group.enter()
+					refreshProgress.addToNumberOfTasksAndRemaining(1)
 					caller.deleteTagging(taggingID: feedTaggingID) { result in
+						self.refreshProgress.completeTask()
 						group.leave()
 						switch result {
 						case .success:
@@ -302,7 +301,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 				
 				if let subscriptionID = feed.subscriptionID {
 					group.enter()
+					refreshProgress.addToNumberOfTasksAndRemaining(1)
 					caller.deleteSubscription(subscriptionID: subscriptionID) { result in
+						self.refreshProgress.completeTask()
 						group.leave()
 						switch result {
 						case .success:
@@ -329,7 +330,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 	
 	func createFeed(for account: Account, url: String, name: String?, container: Container, completion: @escaping (Result<Feed, Error>) -> Void) {
 		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		caller.createSubscription(url: url) { result in
+			self.refreshProgress.completeTask()
 			switch result {
 			case .success(let subResult):
 				switch subResult {
@@ -365,7 +368,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 			return
 		}
 		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		caller.renameSubscription(subscriptionID: subscriptionID, newName: name) { result in
+			self.refreshProgress.completeTask()
 			switch result {
 			case .success:
 				DispatchQueue.main.async {
@@ -408,7 +413,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 	func addFeed(for account: Account, with feed: Feed, to container: Container, completion: @escaping (Result<Void, Error>) -> Void) {
 		
 		if let folder = container as? Folder, let feedID = Int(feed.feedID) {
+			refreshProgress.addToNumberOfTasksAndRemaining(1)
 			caller.createTagging(feedID: feedID, name: folder.name ?? "") { result in
+				self.refreshProgress.completeTask()
 				switch result {
 				case .success(let taggingID):
 					DispatchQueue.main.async {
@@ -507,7 +514,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
 		accountMetadata = account.metadata
 	}
 	
-	static func validateCredentials(transport: Transport, credentials: Credentials, completion: @escaping (Result<Bool, Error>) -> Void) {
+	static func validateCredentials(transport: Transport, credentials: Credentials, endpoint: URL? = nil, completion: @escaping (Result<Credentials?, Error>) -> Void) {
 		
 		let caller = FeedbinAPICaller(transport: transport)
 		caller.credentials = credentials
@@ -557,7 +564,7 @@ private extension FeedbinAccountDelegate {
 							os_log(.debug, log: self.log, "Checking status of OPML import successfully completed.")
 							timer.invalidate()
 							self.refreshProgress.completeTask()
-							self.opmlImportInProgress = false
+							self.isOPMLImportInProgress = false
 							DispatchQueue.main.async {
 								completion(.success(()))
 							}
@@ -566,7 +573,7 @@ private extension FeedbinAccountDelegate {
 						os_log(.debug, log: self.log, "Import OPML check failed.")
 						timer.invalidate()
 						self.refreshProgress.completeTask()
-						self.opmlImportInProgress = false
+						self.isOPMLImportInProgress = false
 						DispatchQueue.main.async {
 							completion(.failure(error))
 						}
@@ -935,9 +942,13 @@ private extension FeedbinAccountDelegate {
 	}
 
 	func initialFeedDownload( account: Account, feed: Feed, completion: @escaping (Result<Feed, Error>) -> Void) {
-		
+
+		// refreshArticles is being reused and will clear one of the tasks for us
+		refreshProgress.addToNumberOfTasksAndRemaining(4)
+
 		// Download the initial articles
 		self.caller.retrieveEntries(feedID: feed.feedID) { result in
+			self.refreshProgress.completeTask()
 			
 			switch result {
 			case .success(let (entries, page)):
@@ -945,7 +956,9 @@ private extension FeedbinAccountDelegate {
 				self.processEntries(account: account, entries: entries) {
 					self.refreshArticles(account, page: page) {
 						self.refreshArticleStatus(for: account) {
+							self.refreshProgress.completeTask()
 							self.refreshMissingArticles(account) {
+								self.refreshProgress.completeTask()
 								DispatchQueue.main.async {
 									completion(.success(feed))
 								}
@@ -1191,7 +1204,9 @@ private extension FeedbinAccountDelegate {
 	func deleteTagging(for account: Account, with feed: Feed, from container: Container?, completion: @escaping (Result<Void, Error>) -> Void) {
 		
 		if let folder = container as? Folder, let feedTaggingID = feed.folderRelationship?[folder.name ?? ""] {
+			refreshProgress.addToNumberOfTasksAndRemaining(1)
 			caller.deleteTagging(taggingID: feedTaggingID) { result in
+				self.refreshProgress.completeTask()
 				switch result {
 				case .success:
 					DispatchQueue.main.async {
@@ -1224,7 +1239,9 @@ private extension FeedbinAccountDelegate {
 			return
 		}
 		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		caller.deleteSubscription(subscriptionID: subscriptionID) { result in
+			self.refreshProgress.completeTask()
 			switch result {
 			case .success:
 				DispatchQueue.main.async {
diff --git a/Frameworks/Account/LocalAccount/LocalAccountDelegate.swift b/Frameworks/Account/LocalAccount/LocalAccountDelegate.swift
index aef678300..b051f1f9b 100644
--- a/Frameworks/Account/LocalAccount/LocalAccountDelegate.swift
+++ b/Frameworks/Account/LocalAccount/LocalAccountDelegate.swift
@@ -18,9 +18,10 @@ public enum LocalAccountDelegateError: String, Error {
 
 final class LocalAccountDelegate: AccountDelegate {
 	
-	let supportsSubFolders = false
-	let usesTags = false
-	let opmlImportInProgress = false
+	let isSubfoldersSupported = false
+	let isTagBasedSystem = false
+	let isOPMLImportSupported = true
+	let isOPMLImportInProgress = false
 	
 	let server: String? = nil
 	var credentials: Credentials?
@@ -92,19 +93,23 @@ final class LocalAccountDelegate: AccountDelegate {
 			completion(.failure(LocalAccountDelegateError.invalidParameter))
 			return
 		}
-	
+		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		FeedFinder.find(url: url) { result in
 			
 			switch result {
 			case .success(let feedSpecifiers):
 				
+
 				guard let bestFeedSpecifier = FeedSpecifier.bestFeed(in: feedSpecifiers),
 					let url = URL(string: bestFeedSpecifier.urlString) else {
+						self.refreshProgress.completeTask()
 						completion(.failure(AccountError.createErrorNotFound))
 						return
 				}
 				
 				if account.hasFeed(withURL: bestFeedSpecifier.urlString) {
+					self.refreshProgress.completeTask()
 					completion(.failure(AccountError.createErrorAlreadySubscribed))
 					return
 				}
@@ -113,6 +118,8 @@ final class LocalAccountDelegate: AccountDelegate {
 				
 				InitialFeedDownloader.download(url) { parsedFeed in
 					
+					self.refreshProgress.completeTask()
+
 					if let parsedFeed = parsedFeed {
 						account.update(feed, with: parsedFeed, {})
 					}
@@ -125,6 +132,7 @@ final class LocalAccountDelegate: AccountDelegate {
 				}
 				
 			case .failure:
+				self.refreshProgress.completeTask()
 				completion(.failure(AccountError.createErrorNotFound))
 			}
 			
@@ -188,8 +196,8 @@ final class LocalAccountDelegate: AccountDelegate {
 	func accountDidInitialize(_ account: Account) {
 	}
 
-	static func validateCredentials(transport: Transport, credentials: Credentials, completion: (Result<Bool, Error>) -> Void) {
-		return completion(.success(false))
+	static func validateCredentials(transport: Transport, credentials: Credentials, endpoint: URL? = nil, completion: (Result<Credentials?, Error>) -> Void) {
+		return completion(.success(nil))
 	}
 	
 }
diff --git a/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift b/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
new file mode 100644
index 000000000..6e80bd3db
--- /dev/null
+++ b/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
@@ -0,0 +1,1079 @@
+//
+//  ReaderAPIAccountDelegate.swift
+//  Account
+//
+//  Created by Jeremy Beker on 5/28/19.
+//  Copyright © 2019 Ranchero Software, LLC. All rights reserved.
+//
+
+import Articles
+import RSCore
+import RSParser
+import RSWeb
+import SyncDatabase
+import os.log
+
+public enum ReaderAPIAccountDelegateError: String, Error {
+	case invalidParameter = "There was an invalid parameter passed."
+	case invalidResponse = "There was an invalid response from the server."
+}
+
+final class ReaderAPIAccountDelegate: AccountDelegate {
+
+	private let database: SyncDatabase
+	
+	private let caller: ReaderAPICaller
+	private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "ReaderAPI")
+
+	let isSubfoldersSupported = false
+	let isTagBasedSystem = true
+
+	var server: String? {
+		get {
+			return caller.server
+		}
+	}
+	
+	let isOPMLImportSupported = false
+	var isOPMLImportInProgress = false
+	
+	var credentials: Credentials? {
+		didSet {
+			caller.credentials = credentials
+		}
+	}
+	
+	weak var accountMetadata: AccountMetadata? {
+		didSet {
+			caller.accountMetadata = accountMetadata
+		}
+	}
+
+	init(dataFolder: String, transport: Transport?) {
+		
+		let databaseFilePath = (dataFolder as NSString).appendingPathComponent("Sync.sqlite3")
+		database = SyncDatabase(databaseFilePath: databaseFilePath)
+		
+		if transport != nil {
+			
+			caller = ReaderAPICaller(transport: transport!)
+			
+		} else {
+			
+			let sessionConfiguration = URLSessionConfiguration.default
+			sessionConfiguration.requestCachePolicy = .reloadIgnoringLocalCacheData
+			sessionConfiguration.timeoutIntervalForRequest = 60.0
+			sessionConfiguration.httpShouldSetCookies = false
+			sessionConfiguration.httpCookieAcceptPolicy = .never
+			sessionConfiguration.httpMaximumConnectionsPerHost = 1
+			sessionConfiguration.httpCookieStorage = nil
+			sessionConfiguration.urlCache = nil
+			
+			if let userAgentHeaders = UserAgent.headers() {
+				sessionConfiguration.httpAdditionalHeaders = userAgentHeaders
+			}
+			
+			caller = ReaderAPICaller(transport: URLSession(configuration: sessionConfiguration))
+			
+		}
+		
+	}
+	
+	var refreshProgress = DownloadProgress(numberOfTasks: 0)
+	
+	func refreshAll(for account: Account, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		refreshProgress.addToNumberOfTasksAndRemaining(6)
+		
+		refreshAccount(account) { result in
+			switch result {
+			case .success():
+				self.refreshArticles(account) {
+					self.refreshArticleStatus(for: account) {
+						self.refreshMissingArticles(account) {
+							self.refreshProgress.clear()
+							DispatchQueue.main.async {
+								completion(.success(()))
+							}
+						}
+					}
+				}
+
+			case .failure(let error):
+				DispatchQueue.main.async {
+					self.refreshProgress.clear()
+					let wrappedError = AccountError.wrappedError(error: error, account: account)
+					completion(.failure(wrappedError))
+				}
+			}
+			
+		}
+		
+	}
+
+	func sendArticleStatus(for account: Account, completion: @escaping (() -> Void)) {
+
+		os_log(.debug, log: log, "Sending article statuses...")
+		
+		let syncStatuses = database.selectForProcessing()
+		let createUnreadStatuses = syncStatuses.filter { $0.key == ArticleStatus.Key.read && $0.flag == false }
+		let deleteUnreadStatuses = syncStatuses.filter { $0.key == ArticleStatus.Key.read && $0.flag == true }
+		let createStarredStatuses = syncStatuses.filter { $0.key == ArticleStatus.Key.starred && $0.flag == true }
+		let deleteStarredStatuses = syncStatuses.filter { $0.key == ArticleStatus.Key.starred && $0.flag == false }
+
+		let group = DispatchGroup()
+		
+		group.enter()
+		sendArticleStatuses(createUnreadStatuses, apiCall: caller.createUnreadEntries) {
+			group.leave()
+		}
+		
+		group.enter()
+		sendArticleStatuses(deleteUnreadStatuses, apiCall: caller.deleteUnreadEntries) {
+			group.leave()
+		}
+		
+		group.enter()
+		sendArticleStatuses(createStarredStatuses, apiCall: caller.createStarredEntries) {
+			group.leave()
+		}
+		
+		group.enter()
+		sendArticleStatuses(deleteStarredStatuses, apiCall: caller.deleteStarredEntries) {
+			group.leave()
+		}
+		
+		group.notify(queue: DispatchQueue.main) {
+			os_log(.debug, log: self.log, "Done sending article statuses.")
+			completion()
+		}
+		
+	}
+	
+	func refreshArticleStatus(for account: Account, completion: @escaping (() -> Void)) {
+		
+		os_log(.debug, log: log, "Refreshing article statuses...")
+		
+		let group = DispatchGroup()
+		
+		group.enter()
+		caller.retrieveUnreadEntries() { result in
+			switch result {
+			case .success(let articleIDs):
+				self.syncArticleReadState(account: account, articleIDs: articleIDs)
+				group.leave()
+			case .failure(let error):
+				os_log(.info, log: self.log, "Retrieving unread entries failed: %@.", error.localizedDescription)
+				group.leave()
+			}
+			
+		}
+		
+		group.enter()
+		caller.retrieveStarredEntries() { result in
+			switch result {
+			case .success(let articleIDs):
+				self.syncArticleStarredState(account: account, articleIDs: articleIDs)
+				group.leave()
+			case .failure(let error):
+				os_log(.info, log: self.log, "Retrieving starred entries failed: %@.", error.localizedDescription)
+				group.leave()
+			}
+
+		}
+		
+		group.notify(queue: DispatchQueue.main) {
+			os_log(.debug, log: self.log, "Done refreshing article statuses.")
+			completion()
+		}
+		
+	}
+	
+	func importOPML(for account:Account, opmlFile: URL, completion: @escaping (Result<Void, Error>) -> Void) {
+	}
+	
+	func addFolder(for account: Account, name: String, completion: @escaping (Result<Folder, Error>) -> Void) {
+		if let folder = account.ensureFolder(with: name) {
+			completion(.success(folder))
+		} else {
+			completion(.failure(FeedbinAccountDelegateError.invalidParameter))
+		}
+	}
+	
+	func renameFolder(for account: Account, with folder: Folder, to name: String, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		caller.renameTag(oldName: folder.name ?? "", newName: name) { result in
+			switch result {
+			case .success:
+				DispatchQueue.main.async {
+					folder.name = name
+					completion(.success(()))
+				}
+			case .failure(let error):
+				DispatchQueue.main.async {
+					let wrappedError = AccountError.wrappedError(error: error, account: account)
+					completion(.failure(wrappedError))
+				}
+			}
+		}
+		
+	}
+
+	func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
+		let group = DispatchGroup()
+		
+		for feed in folder.topLevelFeeds {
+			group.enter()
+			removeFeed(for: account, with: feed, from: folder) { result in
+				group.leave()
+				switch result {
+				case .success:
+					break
+				case .failure(let error):
+					os_log(.error, log: self.log, "Remove feed error: %@.", error.localizedDescription)
+				}
+			}
+		}
+		
+		group.notify(queue: DispatchQueue.main) {
+			self.caller.deleteTag(name: folder.name!) { (result) in
+				switch result {
+				case .success:
+					account.removeFolder(folder)
+					completion(.success(()))
+				case .failure(let error):
+					os_log(.error, log: self.log, "Remove feed error: %@.", error.localizedDescription)
+				}
+				
+			}
+			
+		}
+		
+	}
+	
+	func createFeed(for account: Account, url: String, name: String?, container: Container, completion: @escaping (Result<Feed, Error>) -> Void) {
+		
+		caller.createSubscription(url: url) { result in
+			switch result {
+			case .success(let subResult):
+				switch subResult {
+				case .created(let subscription):
+					self.createFeed(account: account, subscription: subscription, name: name, container: container, completion: completion)
+				case .alreadySubscribed:
+					DispatchQueue.main.async {
+						completion(.failure(AccountError.createErrorAlreadySubscribed))
+					}
+				case .notFound:
+					DispatchQueue.main.async {
+						completion(.failure(AccountError.createErrorNotFound))
+					}
+				}
+			case .failure(let error):
+				DispatchQueue.main.async {
+					let wrappedError = AccountError.wrappedError(error: error, account: account)
+					completion(.failure(wrappedError))
+				}
+			}
+			
+		}
+		
+	}
+	
+	func renameFeed(for account: Account, with feed: Feed, to name: String, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		// This error should never happen
+		guard let subscriptionID = feed.subscriptionID else {
+			completion(.failure(FeedbinAccountDelegateError.invalidParameter))
+			return
+		}
+		
+		caller.renameSubscription(subscriptionID: subscriptionID, newName: name) { result in
+			switch result {
+			case .success:
+				DispatchQueue.main.async {
+					feed.editedName = name
+					completion(.success(()))
+				}
+			case .failure(let error):
+				DispatchQueue.main.async {
+					let wrappedError = AccountError.wrappedError(error: error, account: account)
+					completion(.failure(wrappedError))
+				}
+			}
+		}
+		
+	}
+	
+	func removeFeed(for account: Account, with feed: Feed, from container: Container?, completion: @escaping (Result<Void, Error>) -> Void) {
+		if feed.folderRelationship?.count ?? 0 > 1 {
+			deleteTagging(for: account, with: feed, from: container, completion: completion)
+		} else {
+			account.clearFeedMetadata(feed)
+			deleteSubscription(for: account, with: feed, from: container, completion: completion)
+		}
+	}
+	
+	func moveFeed(for account: Account, with feed: Feed, from: Container, to: Container, completion: @escaping (Result<Void, Error>) -> Void) {
+		if from is Account {
+			addFeed(for: account, with: feed, to: to, completion: completion)
+		} else {
+			deleteTagging(for: account, with: feed, from: from) { result in
+				switch result {
+				case .success:
+					self.addFeed(for: account, with: feed, to: to, completion: completion)
+				case .failure(let error):
+					completion(.failure(error))
+				}
+			}
+		}
+	}
+	
+	func addFeed(for account: Account, with feed: Feed, to container: Container, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		if let folder = container as? Folder, let feedName = feed.subscriptionID {
+			caller.createTagging(subscriptionID: feedName, tagName: folder.name ?? "") { result in
+				switch result {
+				case .success:
+					DispatchQueue.main.async {
+						self.saveFolderRelationship(for: feed, withFolderName: folder.name ?? "", id: feed.subscriptionID!)
+						account.removeFeed(feed)
+						folder.addFeed(feed)
+						completion(.success(()))
+					}
+				case .failure(let error):
+					DispatchQueue.main.async {
+						let wrappedError = AccountError.wrappedError(error: error, account: account)
+						completion(.failure(wrappedError))
+					}
+				}
+			}
+		} else {
+			DispatchQueue.main.async {
+				if let account = container as? Account {
+					account.addFeedIfNotInAnyFolder(feed)
+				}
+				completion(.success(()))
+			}
+		}
+		
+	}
+	
+	func restoreFeed(for account: Account, feed: Feed, container: Container, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		createFeed(for: account, url: feed.url, name: feed.editedName, container: container) { result in
+			switch result {
+			case .success:
+				completion(.success(()))
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+		
+	}
+	
+	func restoreFolder(for account: Account, folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		account.addFolder(folder)
+		let group = DispatchGroup()
+		
+		for feed in folder.topLevelFeeds {
+			
+			group.enter()
+			addFeed(for: account, with: feed, to: folder) { result in
+				if account.topLevelFeeds.contains(feed) {
+					account.removeFeed(feed)
+				}
+				group.leave()
+			}
+			
+		}
+		
+		group.notify(queue: DispatchQueue.main) {
+			completion(.success(()))
+		}
+		
+	}
+	
+	func markArticles(for account: Account, articles: Set<Article>, statusKey: ArticleStatus.Key, flag: Bool) -> Set<Article>? {
+		
+		let syncStatuses = articles.map { article in
+			return SyncStatus(articleID: article.articleID, key: statusKey, flag: flag)
+		}
+		database.insertStatuses(syncStatuses)
+		
+		if database.selectPendingCount() > 100 {
+			sendArticleStatus(for: account) {}
+		}
+		
+		return account.update(articles, statusKey: statusKey, flag: flag)
+		
+	}
+	
+	func accountDidInitialize(_ account: Account) {
+		accountMetadata = account.metadata
+		credentials = try? account.retrieveReaderAPIAuthCredentials()
+	}
+	
+	static func validateCredentials(transport: Transport, credentials: Credentials, endpoint: URL?, completion: @escaping (Result<Credentials?, Error>) -> Void) {
+		guard let endpoint = endpoint else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		let caller = ReaderAPICaller(transport: transport)
+		caller.credentials = credentials
+		caller.validateCredentials(endpoint: endpoint) { result in
+			DispatchQueue.main.async {
+				completion(result)
+			}
+		}
+		
+	}
+	
+}
+
+// MARK: Private
+
+private extension ReaderAPIAccountDelegate {
+	
+	func refreshAccount(_ account: Account, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		caller.retrieveTags { result in
+			switch result {
+			case .success(let tags):
+				BatchUpdate.shared.perform {
+					self.syncFolders(account, tags)
+				}
+				self.refreshProgress.completeTask()
+				self.refreshFeeds(account, completion: completion)
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+		
+	}
+	
+	func syncFolders(_ account: Account, _ tags: [ReaderAPITag]?) {
+		
+		guard let tags = tags else { return }
+
+		os_log(.debug, log: log, "Syncing folders with %ld tags.", tags.count)
+
+		let tagNames = tags.filter { $0.type == "folder" }.map { $0.tagID.replacingOccurrences(of: "user/-/label/", with: "") }
+
+		// Delete any folders not at Reader
+		if let folders = account.folders {
+			folders.forEach { folder in
+				if !tagNames.contains(folder.name ?? "") {
+					DispatchQueue.main.sync {
+						for feed in folder.topLevelFeeds {
+							account.addFeed(feed)
+							clearFolderRelationship(for: feed, withFolderName: folder.name ?? "")
+						}
+						account.removeFolder(folder)
+					}
+				}
+			}
+		}
+		
+		let folderNames: [String] =  {
+			if let folders = account.folders {
+				return folders.map { $0.name ?? "" }
+			} else {
+				return [String]()
+			}
+		}()
+
+		// Make any folders Reader has, but we don't
+		tagNames.forEach { tagName in
+			if !folderNames.contains(tagName) {
+				DispatchQueue.main.sync {
+					_ = account.ensureFolder(with: tagName)
+				}
+			}
+		}
+		
+	}
+	
+	func refreshFeeds(_ account: Account, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		caller.retrieveSubscriptions { result in
+			switch result {
+			case .success(let subscriptions):
+				
+				self.refreshProgress.completeTask()
+
+				BatchUpdate.shared.perform {
+					self.syncFeeds(account, subscriptions)
+					self.syncTaggings(account, subscriptions)
+				}
+
+				self.refreshProgress.completeTask()
+				completion(.success(()))
+		
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+			
+		}
+		
+	}
+
+	func syncFeeds(_ account: Account, _ subscriptions: [ReaderAPISubscription]?) {
+		
+		guard let subscriptions = subscriptions else { return }
+		
+		os_log(.debug, log: log, "Syncing feeds with %ld subscriptions.", subscriptions.count)
+		
+		let subFeedIds = subscriptions.map { String($0.feedID) }
+		
+		// Remove any feeds that are no longer in the subscriptions
+		if let folders = account.folders {
+			for folder in folders {
+				for feed in folder.topLevelFeeds {
+					if !subFeedIds.contains(feed.feedID) {
+						DispatchQueue.main.sync {
+							folder.removeFeed(feed)
+						}
+					}
+				}
+			}
+		}
+		
+		for feed in account.topLevelFeeds {
+			if !subFeedIds.contains(feed.feedID) {
+				DispatchQueue.main.sync {
+					account.removeFeed(feed)
+				}
+			}
+		}
+		
+		// Add any feeds we don't have and update any we do
+		subscriptions.forEach { subscription in
+			
+			let subFeedId = String(subscription.feedID)
+			
+			DispatchQueue.main.sync {
+				if let feed = account.idToFeedDictionary[subFeedId] {
+					feed.name = subscription.name
+					feed.homePageURL = subscription.homePageURL
+				} else {
+					let feed = account.createFeed(with: subscription.name, url: subscription.url, feedID: subFeedId, homePageURL: subscription.homePageURL)
+					feed.iconURL = subscription.iconURL
+					feed.subscriptionID = String(subscription.feedID)
+					account.addFeed(feed)
+				}
+			}
+			
+		}
+		
+	}
+
+	func syncTaggings(_ account: Account, _ subscriptions: [ReaderAPISubscription]?) {
+		
+		guard let subscriptions = subscriptions else { return }
+
+		os_log(.debug, log: log, "Syncing taggings with %ld subscriptions.", subscriptions.count)
+		
+		// Set up some structures to make syncing easier
+		let folderDict: [String: Folder] = {
+			if let folders = account.folders {
+				return Dictionary(uniqueKeysWithValues: folders.map { ($0.name ?? "", $0) } )
+			} else {
+				return [String: Folder]()
+			}
+		}()
+
+		let taggingsDict = subscriptions.reduce([String: [ReaderAPISubscription]]()) { (dict, subscription) in
+			var taggedFeeds = dict
+			
+			// For each category that this feed belongs to, add the feed to that name in the dict
+			subscription.categories.forEach({ (category) in
+				let categoryName = category.categoryLabel.replacingOccurrences(of: "user/-/label/", with: "")
+				
+				if var taggedFeed = taggedFeeds[categoryName] {
+					taggedFeed.append(subscription)
+					taggedFeeds[categoryName] = taggedFeed
+				} else {
+					taggedFeeds[categoryName] = [subscription]
+				}
+			})
+			
+			return taggedFeeds
+		}
+
+		// Sync the folders
+		for (folderName, groupedTaggings) in taggingsDict {
+			
+			guard let folder = folderDict[folderName] else { return }
+			
+			let taggingFeedIDs = groupedTaggings.map { String($0.feedID) }
+			
+			// Move any feeds not in the folder to the account
+			for feed in folder.topLevelFeeds {
+				if !taggingFeedIDs.contains(feed.feedID) {
+					DispatchQueue.main.sync {
+						folder.removeFeed(feed)
+						clearFolderRelationship(for: feed, withFolderName: folder.name ?? "")
+						account.addFeed(feed)
+					}
+				}
+			}
+			
+			// Add any feeds not in the folder
+			let folderFeedIds = folder.topLevelFeeds.map { $0.feedID }
+			
+			for subscription in groupedTaggings {
+				let taggingFeedID = String(subscription.feedID)
+				if !folderFeedIds.contains(taggingFeedID) {
+					let idDictionary = account.idToFeedDictionary
+					guard let feed = idDictionary[taggingFeedID] else {
+						continue
+					}
+					DispatchQueue.main.sync {
+						saveFolderRelationship(for: feed, withFolderName: folderName, id: String(subscription.feedID))
+						folder.addFeed(feed)
+					}
+				}
+			}
+			
+		}
+		
+		let taggedFeedIDs = Set(subscriptions.map { String($0.feedID) })
+		
+		// Remove all feeds from the account container that have a tag
+		DispatchQueue.main.sync {
+			for feed in account.topLevelFeeds {
+				if taggedFeedIDs.contains(feed.feedID) {
+					account.removeFeed(feed)
+				}
+			}
+		}
+
+	}
+	
+	func sendArticleStatuses(_ statuses: [SyncStatus],
+							 apiCall: ([Int], @escaping (Result<Void, Error>) -> Void) -> Void,
+							 completion: @escaping (() -> Void)) {
+		
+		guard !statuses.isEmpty else {
+			completion()
+			return
+		}
+		
+		let group = DispatchGroup()
+		
+		let articleIDs = statuses.compactMap { Int($0.articleID) }
+		let articleIDGroups = articleIDs.chunked(into: 1000)
+		for articleIDGroup in articleIDGroups {
+			
+			group.enter()
+			apiCall(articleIDGroup) { result in
+				switch result {
+				case .success:
+					self.database.deleteSelectedForProcessing(articleIDGroup.map { String($0) } )
+					group.leave()
+				case .failure(let error):
+					os_log(.error, log: self.log, "Article status sync call failed: %@.", error.localizedDescription)
+					self.database.resetSelectedForProcessing(articleIDGroup.map { String($0) } )
+					group.leave()
+				}
+			}
+			
+		}
+		
+		group.notify(queue: DispatchQueue.main) {
+			completion()
+		}
+		
+	}
+	
+	
+	
+	func clearFolderRelationship(for feed: Feed, withFolderName folderName: String) {
+		if var folderRelationship = feed.folderRelationship {
+			folderRelationship[folderName] = nil
+			feed.folderRelationship = folderRelationship
+		}
+	}
+	
+	func saveFolderRelationship(for feed: Feed, withFolderName folderName: String, id: String) {
+		if var folderRelationship = feed.folderRelationship {
+			folderRelationship[folderName] = id
+			feed.folderRelationship = folderRelationship
+		} else {
+			feed.folderRelationship = [folderName: id]
+		}
+	}
+
+	func decideBestFeedChoice(account: Account, url: String, name: String?, container: Container, choices: [ReaderAPISubscriptionChoice], completion: @escaping (Result<Feed, Error>) -> Void) {
+		
+		let feedSpecifiers: [FeedSpecifier] = choices.map { choice in
+			let source = url == choice.url ? FeedSpecifier.Source.UserEntered : FeedSpecifier.Source.HTMLLink
+			let specifier = FeedSpecifier(title: choice.name, urlString: choice.url, source: source)
+			return specifier
+		}
+
+		if let bestSpecifier = FeedSpecifier.bestFeed(in: Set(feedSpecifiers)) {
+			if let bestSubscription = choices.filter({ bestSpecifier.urlString == $0.url }).first {
+				createFeed(for: account, url: bestSubscription.url, name: name, container: container, completion: completion)
+			} else {
+				DispatchQueue.main.async {
+					completion(.failure(ReaderAPIAccountDelegateError.invalidParameter))
+				}
+			}
+		} else {
+			DispatchQueue.main.async {
+				completion(.failure(ReaderAPIAccountDelegateError.invalidParameter))
+			}
+		}
+		
+	}
+	
+	func createFeed( account: Account, subscription sub: ReaderAPISubscription, name: String?, container: Container, completion: @escaping (Result<Feed, Error>) -> Void) {
+		
+		DispatchQueue.main.async {
+			
+			let feed = account.createFeed(with: sub.name, url: sub.url, feedID: String(sub.feedID), homePageURL: sub.homePageURL)
+			feed.subscriptionID = String(sub.feedID)
+			
+			account.addFeed(feed, to: container) { result in
+				switch result {
+				case .success:
+					if let name = name {
+						account.renameFeed(feed, to: name) { result in
+							switch result {
+							case .success:
+								self.initialFeedDownload(account: account, feed: feed, completion: completion)
+							case .failure(let error):
+								completion(.failure(error))
+							}
+						}
+					} else {
+						self.initialFeedDownload(account: account, feed: feed, completion: completion)
+					}
+				case .failure(let error):
+					completion(.failure(error))
+				}
+			}
+			
+		}
+		
+	}
+
+	func initialFeedDownload( account: Account, feed: Feed, completion: @escaping (Result<Feed, Error>) -> Void) {
+		
+		// Download the initial articles
+		self.caller.retrieveEntries(feedID: feed.feedID) { result in
+			
+			switch result {
+			case .success(let (entries, page)):
+				
+				self.processEntries(account: account, entries: entries) {
+					self.refreshArticles(account, page: page) {
+						self.refreshArticleStatus(for: account) {
+							self.refreshMissingArticles(account) {
+								DispatchQueue.main.async {
+									completion(.success(feed))
+								}
+							}
+						}
+					}
+				}
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+			
+		}
+ 
+	}
+	
+	func refreshArticles(_ account: Account, completion: @escaping (() -> Void)) {
+
+		os_log(.debug, log: log, "Refreshing articles...")
+		
+		caller.retrieveEntries() { result in
+			
+			switch result {
+			case .success(let (entries, page, lastPageNumber)):
+				
+				if let last = lastPageNumber {
+					self.refreshProgress.addToNumberOfTasksAndRemaining(last - 1)
+				}
+				
+				self.processEntries(account: account, entries: entries) {
+					
+					self.refreshProgress.completeTask()
+					self.refreshArticles(account, page: page) {
+						os_log(.debug, log: self.log, "Done refreshing articles.")
+						completion()
+					}
+					
+				}
+
+			case .failure(let error):
+				os_log(.error, log: self.log, "Refresh articles failed: %@.", error.localizedDescription)
+				completion()
+			}
+			
+		}
+		
+	}
+	
+	func refreshMissingArticles(_ account: Account, completion: @escaping (() -> Void)) {
+		
+		os_log(.debug, log: log, "Refreshing missing articles...")
+		let articleIDs = Array(account.fetchArticleIDsForStatusesWithoutArticles())
+		
+		let group = DispatchGroup()
+		
+		let chunkedArticleIDs = articleIDs.chunked(into: 100)
+		
+		for chunk in chunkedArticleIDs {
+			
+			group.enter()
+			caller.retrieveEntries(articleIDs: chunk) { result in
+				
+				switch result {
+				case .success(let entries):
+				
+					self.processEntries(account: account, entries: entries) {
+						group.leave()
+					}
+					
+				case .failure(let error):
+					os_log(.error, log: self.log, "Refresh missing articles failed: %@.", error.localizedDescription)
+					group.leave()
+				}
+				
+			}
+
+		}
+
+		group.notify(queue: DispatchQueue.main) {
+			self.refreshProgress.completeTask()
+			os_log(.debug, log: self.log, "Done refreshing missing articles.")
+			completion()
+		}
+		
+	}
+
+	func refreshArticles(_ account: Account, page: String?, completion: @escaping (() -> Void)) {
+		
+		guard let page = page else {
+			completion()
+			return
+		}
+		
+		caller.retrieveEntries(page: page) { result in
+			
+			switch result {
+			case .success(let (entries, nextPage)):
+				
+				self.processEntries(account: account, entries: entries) {
+					self.refreshProgress.completeTask()
+					self.refreshArticles(account, page: nextPage, completion: completion)
+				}
+				
+			case .failure(let error):
+				os_log(.error, log: self.log, "Refresh articles for additional pages failed: %@.", error.localizedDescription)
+				completion()
+			}
+			
+		}
+		
+	}
+	
+	func processEntries(account: Account, entries: [ReaderAPIEntry]?, completion: @escaping (() -> Void)) {
+		
+		let parsedItems = mapEntriesToParsedItems(account: account, entries: entries)
+		let parsedMap = Dictionary(grouping: parsedItems, by: { item in item.feedURL } )
+		
+		let group = DispatchGroup()
+		
+		for (feedID, mapItems) in parsedMap {
+			
+			group.enter()
+			
+			if let feed = account.idToFeedDictionary[feedID] {
+				DispatchQueue.main.async {
+					account.update(feed, parsedItems: Set(mapItems), defaultRead: true) {
+						group.leave()
+					}
+				}
+			} else {
+				group.leave()
+			}
+			
+		}
+		
+		group.notify(queue: DispatchQueue.main) {
+			completion()
+		}
+
+	}
+	
+	func mapEntriesToParsedItems(account: Account, entries: [ReaderAPIEntry]?) -> Set<ParsedItem> {
+		
+		guard let entries = entries else {
+			return Set<ParsedItem>()
+		}
+		
+		let parsedItems: [ParsedItem] = entries.map { entry in
+			// let authors = Set([ParsedAuthor(name: entry.authorName, url: entry.jsonFeed?.jsonFeedAuthor?.url, avatarURL: entry.jsonFeed?.jsonFeedAuthor?.avatarURL, emailAddress: nil)])
+			// let feed = account.idToFeedDictionary[entry.origin.streamId!]! // TODO clean this up
+			
+			return ParsedItem(syncServiceID: entry.uniqueID(), uniqueID: entry.uniqueID(), feedURL: entry.origin.streamId!, url: nil, externalURL: entry.alternates.first?.url, title: entry.title, contentHTML: entry.summary.content, contentText: nil, summary: entry.summary.content, imageURL: nil, bannerImageURL: nil, datePublished: entry.parseDatePublished(), dateModified: nil, authors: nil, tags: nil, attachments: nil)
+		}
+		
+		return Set(parsedItems)
+		
+	}
+	
+	func syncArticleReadState(account: Account, articleIDs: [Int]?) {
+		
+		guard let articleIDs = articleIDs else {
+			return
+		}
+
+		let unreadArticleIDs = Set(articleIDs.map { String($0) } )
+		let currentUnreadArticleIDs = account.fetchUnreadArticleIDs()
+		
+		// Mark articles as unread
+		let deltaUnreadArticleIDs = unreadArticleIDs.subtracting(currentUnreadArticleIDs)
+		let markUnreadArticles = account.fetchArticles(forArticleIDs: deltaUnreadArticleIDs)
+		DispatchQueue.main.async {
+			_ = account.update(markUnreadArticles, statusKey: .read, flag: false)
+		}
+	
+		// Save any unread statuses for articles we haven't yet received
+		let markUnreadArticleIDs = Set(markUnreadArticles.map { $0.articleID })
+		let missingUnreadArticleIDs = deltaUnreadArticleIDs.subtracting(markUnreadArticleIDs)
+		if !missingUnreadArticleIDs.isEmpty {
+			DispatchQueue.main.async {
+				account.ensureStatuses(missingUnreadArticleIDs, .read, false)
+			}
+		}
+		
+		// Mark articles as read
+		let deltaReadArticleIDs = currentUnreadArticleIDs.subtracting(unreadArticleIDs)
+		let markReadArticles = account.fetchArticles(forArticleIDs: deltaReadArticleIDs)
+		DispatchQueue.main.async {
+			_ = account.update(markReadArticles, statusKey: .read, flag: true)
+		}
+	
+		// Save any read statuses for articles we haven't yet received
+		let markReadArticleIDs = Set(markReadArticles.map { $0.articleID })
+		let missingReadArticleIDs = deltaReadArticleIDs.subtracting(markReadArticleIDs)
+		if !missingReadArticleIDs.isEmpty {
+			DispatchQueue.main.async {
+				account.ensureStatuses(missingReadArticleIDs, .read, true)
+			}
+		}
+	
+	}
+	
+	func syncArticleStarredState(account: Account, articleIDs: [Int]?) {
+		
+		guard let articleIDs = articleIDs else {
+			return
+		}
+
+		let starredArticleIDs = Set(articleIDs.map { String($0) } )
+		let currentStarredArticleIDs = account.fetchStarredArticleIDs()
+		
+		// Mark articles as starred
+		let deltaStarredArticleIDs = starredArticleIDs.subtracting(currentStarredArticleIDs)
+		let markStarredArticles = account.fetchArticles(forArticleIDs: deltaStarredArticleIDs)
+		DispatchQueue.main.async {
+			_ = account.update(markStarredArticles, statusKey: .starred, flag: true)
+		}
+		
+		// Save any starred statuses for articles we haven't yet received
+		let markStarredArticleIDs = Set(markStarredArticles.map { $0.articleID })
+		let missingStarredArticleIDs = deltaStarredArticleIDs.subtracting(markStarredArticleIDs)
+		if !missingStarredArticleIDs.isEmpty {
+			DispatchQueue.main.async {
+				account.ensureStatuses(missingStarredArticleIDs, .starred, true)
+			}
+		}
+		
+		// Mark articles as unstarred
+		let deltaUnstarredArticleIDs = currentStarredArticleIDs.subtracting(starredArticleIDs)
+		let markUnstarredArticles = account.fetchArticles(forArticleIDs: deltaUnstarredArticleIDs)
+		DispatchQueue.main.async {
+			_ = account.update(markUnstarredArticles, statusKey: .starred, flag: false)
+		}
+		
+		// Save any unstarred statuses for articles we haven't yet received
+		let markUnstarredArticleIDs = Set(markUnstarredArticles.map { $0.articleID })
+		let missingUnstarredArticleIDs = deltaUnstarredArticleIDs.subtracting(markUnstarredArticleIDs)
+		if !missingUnstarredArticleIDs.isEmpty {
+			DispatchQueue.main.async {
+				account.ensureStatuses(missingUnstarredArticleIDs, .starred, false)
+			}
+		}
+		
+	}
+
+	func deleteTagging(for account: Account, with feed: Feed, from container: Container?, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		if let folder = container as? Folder, let feedName = feed.subscriptionID {
+			caller.deleteTagging(subscriptionID: feedName, tagName: folder.name ?? "") { result in
+				switch result {
+				case .success:
+					DispatchQueue.main.async {
+						self.clearFolderRelationship(for: feed, withFolderName: folder.name ?? "")
+						folder.removeFeed(feed)
+						account.addFeedIfNotInAnyFolder(feed)
+						completion(.success(()))
+					}
+				case .failure(let error):
+					DispatchQueue.main.async {
+						let wrappedError = AccountError.wrappedError(error: error, account: account)
+						completion(.failure(wrappedError))
+					}
+				}
+			}
+		} else {
+			if let account = container as? Account {
+				account.removeFeed(feed)
+			}
+			completion(.success(()))
+		}
+		
+	}
+
+	func deleteSubscription(for account: Account, with feed: Feed, from container: Container?, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		// This error should never happen
+		guard let subscriptionID = feed.subscriptionID else {
+			completion(.failure(FeedbinAccountDelegateError.invalidParameter))
+			return
+		}
+		
+		caller.deleteSubscription(subscriptionID: subscriptionID) { result in
+			switch result {
+			case .success:
+				DispatchQueue.main.async {
+					account.removeFeed(feed)
+					if let folders = account.folders {
+						for folder in folders {
+							folder.removeFeed(feed)
+						}
+					}
+					completion(.success(()))
+				}
+			case .failure(let error):
+				DispatchQueue.main.async {
+					let wrappedError = AccountError.wrappedError(error: error, account: account)
+					completion(.failure(wrappedError))
+				}
+			}
+		}
+		
+	}
+	
+}
diff --git a/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift b/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift
new file mode 100644
index 000000000..b2491a0a0
--- /dev/null
+++ b/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift
@@ -0,0 +1,947 @@
+//
+//  ReaderAPICaller.swift
+//  Account
+//
+//  Created by Jeremy Beker on 5/28/19.
+//  Copyright © 2019 Ranchero Software, LLC. All rights reserved.
+//
+
+import Foundation
+import RSWeb
+
+enum CreateReaderAPISubscriptionResult {
+	case created(ReaderAPISubscription)
+	case alreadySubscribed
+	case notFound
+}
+
+final class ReaderAPICaller: NSObject {
+	
+	struct ConditionalGetKeys {
+		static let subscriptions = "subscriptions"
+		static let tags = "tags"
+		static let taggings = "taggings"
+		static let icons = "icons"
+		static let unreadEntries = "unreadEntries"
+		static let starredEntries = "starredEntries"
+	}
+	
+	enum ReaderState: String {
+		case read = "user/-/state/com.google/read"
+		case starred = "user/-/state/com.google/starred"
+	}
+	
+	enum ReaderStreams: String {
+		case readingList = "user/-/state/com.google/reading-list"
+	}
+	
+	enum ReaderAPIEndpoints: String {
+		case login = "/accounts/ClientLogin"
+		case token = "/reader/api/0/token"
+		case disableTag = "/reader/api/0/disable-tag"
+		case renameTag = "/reader/api/0/rename-tag"
+		case tagList = "/reader/api/0/tag/list"
+		case subscriptionList = "/reader/api/0/subscription/list"
+		case subscriptionEdit = "/reader/api/0/subscription/edit"
+		case subscriptionAdd = "/reader/api/0/subscription/quickadd"
+		case contents = "/reader/api/0/stream/items/contents"
+		case itemIds = "/reader/api/0/stream/items/ids"
+		case editTag = "/reader/api/0/edit-tag"
+	}
+	
+	private var transport: Transport!
+	
+	var credentials: Credentials?
+	private var accessToken: String?
+	
+	weak var accountMetadata: AccountMetadata?
+
+	var server: String? {
+		get {
+			return APIBaseURL?.host
+		}
+	}
+	
+	private var APIBaseURL: URL? {
+		get {
+			guard let accountMetadata = accountMetadata else {
+				return nil
+			}
+	
+			return accountMetadata.endpointURL
+		}
+	}
+	
+	
+	init(transport: Transport) {
+		super.init()
+		self.transport = transport
+	}
+	
+	func validateCredentials(endpoint: URL, completion: @escaping (Result<Credentials?, Error>) -> Void) {
+		guard let credentials = credentials else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		guard case .readerAPIBasicLogin(let username, _) = credentials else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		let request = URLRequest(url: endpoint.appendingPathComponent(ReaderAPIEndpoints.login.rawValue), credentials: credentials)
+
+		transport.send(request: request) { result in
+			switch result {
+			case .success(let (_, data)):
+				guard let resultData = data else {
+					completion(.failure(TransportError.noData))
+					break
+				}
+				
+				// Convert the return data to UTF8 and then parse out the Auth token
+				guard let rawData = String(data: resultData, encoding: .utf8) else {
+					completion(.failure(TransportError.noData))
+					break
+				}
+				
+				var authData: [String: String] = [:]
+				rawData.split(separator: "\n").forEach({ (line: Substring) in
+					let items = line.split(separator: "=").map{String($0)}
+					authData[items[0]] = items[1]
+				})
+				
+				guard let authString = authData["Auth"] else {
+					completion(.failure(CredentialsError.incompleteCredentials))
+					break
+				}
+				
+				// Save Auth Token for later use
+				self.credentials = .readerAPIAuthLogin(username: username, apiKey: authString)
+				
+				completion(.success(self.credentials))
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+		
+	}
+	
+	func requestAuthorizationToken(endpoint: URL, completion: @escaping (Result<String, Error>) -> Void) {
+		// If we have a token already, use it
+		if let accessToken = accessToken {
+			completion(.success(accessToken))
+			return
+		}
+		
+		// Otherwise request one.
+		guard let credentials = credentials else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		let request = URLRequest(url: endpoint.appendingPathComponent(ReaderAPIEndpoints.token.rawValue), credentials: credentials)
+		
+		transport.send(request: request) { result in
+			switch result {
+			case .success(let (_, data)):
+				guard let resultData = data else {
+					completion(.failure(TransportError.noData))
+					break
+				}
+				
+				// Convert the return data to UTF8 and then parse out the Auth token
+				guard let accessToken = String(data: resultData, encoding: .utf8) else {
+					completion(.failure(TransportError.noData))
+					break
+				}
+				
+				self.accessToken = accessToken
+				completion(.success(accessToken))
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+	}
+	
+	
+	func retrieveTags(completion: @escaping (Result<[ReaderAPITag]?, Error>) -> Void) {
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		// Add query string for getting JSON (probably should break this out as I will be doing it a lot)
+		guard var components = URLComponents(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.tagList.rawValue), resolvingAgainstBaseURL: false) else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		components.queryItems = [
+			URLQueryItem(name: "output", value: "json")
+		]
+
+		guard let callURL = components.url else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+
+		let conditionalGet = accountMetadata?.conditionalGetInfo[ConditionalGetKeys.tags]
+		let request = URLRequest(url: callURL, credentials: credentials, conditionalGet: conditionalGet)
+		
+		transport.send(request: request, resultType: ReaderAPITagContainer.self) { result in
+			
+			switch result {
+			case .success(let (response, wrapper)):
+				self.storeConditionalGet(key: ConditionalGetKeys.tags, headers: response.allHeaderFields)
+				completion(.success(wrapper?.tags))
+			case .failure(let error):
+				completion(.failure(error))
+			}
+			
+		}
+		
+	}
+
+	func renameTag(oldName: String, newName: String, completion: @escaping (Result<Void, Error>) -> Void) {
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+			switch result {
+			case .success(let token):
+				var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.renameTag.rawValue), credentials: self.credentials)
+				
+				request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+				request.httpMethod = "POST"
+				
+				let oldTagName = "user/-/label/\(oldName)"
+				let newTagName = "user/-/label/\(newName)"
+				let postData = "T=\(token)&s=\(oldTagName)&dest=\(newTagName)".data(using: String.Encoding.utf8)
+				
+				self.transport.send(request: request, method: HTTPMethod.post, payload: postData!, completion: { (result) in
+					switch result {
+					case .success:
+						completion(.success(()))
+						break
+					case .failure(let error):
+						completion(.failure(error))
+						break
+					}
+				})
+				
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+	}
+	
+	func deleteTag(name: String, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+			switch result {
+			case .success(let token):
+				var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.disableTag.rawValue), credentials: self.credentials)
+				
+				
+				request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+				request.httpMethod = "POST"
+				
+				let tagName = "user/-/label/\(name)"
+				let postData = "T=\(token)&s=\(tagName)".data(using: String.Encoding.utf8)
+				
+				self.transport.send(request: request, method: HTTPMethod.post, payload: postData!, completion: { (result) in
+					switch result {
+					case .success:
+						completion(.success(()))
+						break
+					case .failure(let error):
+						completion(.failure(error))
+						break
+					}
+				})
+				
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+		
+	}
+	
+	func retrieveSubscriptions(completion: @escaping (Result<[ReaderAPISubscription]?, Error>) -> Void) {
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		// Add query string for getting JSON (probably should break this out as I will be doing it a lot)
+		guard var components = URLComponents(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.subscriptionList.rawValue), resolvingAgainstBaseURL: false) else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		components.queryItems = [
+			URLQueryItem(name: "output", value: "json")
+		]
+		
+		guard let callURL = components.url else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		let conditionalGet = accountMetadata?.conditionalGetInfo[ConditionalGetKeys.subscriptions]
+		let request = URLRequest(url: callURL, credentials: credentials, conditionalGet: conditionalGet)
+		
+		transport.send(request: request, resultType: ReaderAPISubscriptionContainer.self) { result in
+			
+			switch result {
+			case .success(let (response, container)):
+				self.storeConditionalGet(key: ConditionalGetKeys.subscriptions, headers: response.allHeaderFields)
+				completion(.success(container?.subscriptions))
+			case .failure(let error):
+				completion(.failure(error))
+			}
+			
+		}
+		
+	}
+	
+	func createSubscription(url: String, completion: @escaping (Result<CreateReaderAPISubscriptionResult, Error>) -> Void) {
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+			switch result {
+			case .success(let token):
+				guard var components = URLComponents(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.subscriptionAdd.rawValue), resolvingAgainstBaseURL: false) else {
+					completion(.failure(TransportError.noURL))
+					return
+				}
+				
+				components.queryItems = [
+					URLQueryItem(name: "quickadd", value: url)
+				]
+				
+				guard let callURL = components.url else {
+					completion(.failure(TransportError.noURL))
+					return
+				}
+				
+				var request = URLRequest(url: callURL, credentials: self.credentials)
+				request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+				request.httpMethod = "POST"
+				
+				let postData = "T=\(token)".data(using: String.Encoding.utf8)
+				
+				self.transport.send(request: request, method: HTTPMethod.post, data: postData!, resultType: ReaderAPIQuickAddResult.self, completion: { (result) in
+					switch result {
+					case .success(let (_, subResult)):
+						
+						switch subResult?.numResults {
+						case 0:
+							completion(.success(.alreadySubscribed))
+						default:
+							// We have a feed ID but need to get feed information
+							guard let streamId = subResult?.streamId else {
+								completion(.failure(AccountError.createErrorNotFound))
+								return
+							}
+							
+							// There is no call to get a single subscription entry, so we get them all,
+							// look up the one we just subscribed to and return that
+							self.retrieveSubscriptions(completion: { (result) in
+								switch result {
+								case .success(let subscriptions):
+									guard let subscriptions = subscriptions else {
+										completion(.failure(AccountError.createErrorNotFound))
+										return
+									}
+									
+									let newStreamId = "feed/\(streamId)"
+									
+									guard let subscription = subscriptions.first(where: { (sub) -> Bool in
+										sub.feedID == newStreamId
+									}) else {
+										completion(.failure(AccountError.createErrorNotFound))
+										return
+									}
+									
+									completion(.success(.created(subscription)))
+									
+								case .failure(let error):
+									completion(.failure(error))
+								}
+							})
+							}
+					case .failure(let error):
+						completion(.failure(error))
+					}
+				})
+				
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+	}
+	
+	func renameSubscription(subscriptionID: String, newName: String, completion: @escaping (Result<Void, Error>) -> Void) {
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+			switch result {
+			case .success(let token):
+				var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.subscriptionEdit.rawValue), credentials: self.credentials)
+				
+				
+				request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+				request.httpMethod = "POST"
+				
+				let postData = "T=\(token)&s=\(subscriptionID)&ac=edit&t=\(newName)".data(using: String.Encoding.utf8)
+				
+				self.transport.send(request: request, method: HTTPMethod.post, payload: postData!, completion: { (result) in
+					switch result {
+					case .success:
+						completion(.success(()))
+						break
+					case .failure(let error):
+						completion(.failure(error))
+						break
+					}
+				})
+				
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+	}
+	
+	func deleteSubscription(subscriptionID: String, completion: @escaping (Result<Void, Error>) -> Void) {
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+			switch result {
+			case .success(let token):
+				var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.subscriptionEdit.rawValue), credentials: self.credentials)
+
+				
+				request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+				request.httpMethod = "POST"
+				
+				let postData = "T=\(token)&s=\(subscriptionID)&ac=unsubscribe".data(using: String.Encoding.utf8)
+				
+				self.transport.send(request: request, method: HTTPMethod.post, payload: postData!, completion: { (result) in
+					switch result {
+					case .success:
+						completion(.success(()))
+						break
+					case .failure(let error):
+						completion(.failure(error))
+						break
+					}
+				})
+				
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+	}
+	
+	func createTagging(subscriptionID: String, tagName: String, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+			switch result {
+			case .success(let token):
+				var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.subscriptionEdit.rawValue), credentials: self.credentials)
+				
+				
+				request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+				request.httpMethod = "POST"
+				
+				let tagName = "user/-/label/\(tagName)"
+				let postData = "T=\(token)&s=\(subscriptionID)&ac=edit&a=\(tagName)".data(using: String.Encoding.utf8)
+				
+				self.transport.send(request: request, method: HTTPMethod.post, payload: postData!, completion: { (result) in
+					switch result {
+					case .success:
+						completion(.success(()))
+						break
+					case .failure(let error):
+						completion(.failure(error))
+						break
+					}
+				})
+				
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+		
+	}
+
+	func deleteTagging(subscriptionID: String, tagName: String, completion: @escaping (Result<Void, Error>) -> Void) {
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+			switch result {
+			case .success(let token):
+				var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.subscriptionEdit.rawValue), credentials: self.credentials)
+				
+				
+				request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+				request.httpMethod = "POST"
+				
+				let tagName = "user/-/label/\(tagName)"
+				let postData = "T=\(token)&s=\(subscriptionID)&ac=edit&r=\(tagName)".data(using: String.Encoding.utf8)
+				
+				self.transport.send(request: request, method: HTTPMethod.post, payload: postData!, completion: { (result) in
+					switch result {
+					case .success:
+						completion(.success(()))
+						break
+					case .failure(let error):
+						completion(.failure(error))
+						break
+					}
+				})
+				
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+	}
+	
+	func retrieveEntries(articleIDs: [String], completion: @escaping (Result<([ReaderAPIEntry]?), Error>) -> Void) {
+		
+		guard !articleIDs.isEmpty else {
+			completion(.success(([ReaderAPIEntry]())))
+			return
+		}
+		
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+			switch result {
+			case .success(let token):
+				// Do POST asking for data about all the new articles
+				var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.contents.rawValue), credentials: self.credentials)
+				request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+				request.httpMethod = "POST"
+				
+				// Get ids from above into hex representation of value
+				let idsToFetch = articleIDs.map({ (reference) -> String in
+					return "i=\(reference)"
+				}).joined(separator:"&")
+				
+				let postData = "T=\(token)&output=json&\(idsToFetch)".data(using: String.Encoding.utf8)
+				
+				self.transport.send(request: request, method: HTTPMethod.post, data: postData!, resultType: ReaderAPIEntryWrapper.self, completion: { (result) in
+					switch result {
+					case .success(let (_, entryWrapper)):
+						guard let entryWrapper = entryWrapper else {
+							completion(.failure(ReaderAPIAccountDelegateError.invalidResponse))
+							return
+						}
+						
+						completion(.success((entryWrapper.entries)))
+					case .failure(let error):
+						completion(.failure(error))
+					}
+				})
+				
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+
+	}
+
+	func retrieveEntries(feedID: String, completion: @escaping (Result<([ReaderAPIEntry]?, String?), Error>) -> Void) {
+		
+		let since = Calendar.current.date(byAdding: .month, value: -3, to: Date()) ?? Date()
+		
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		// Add query string for getting JSON (probably should break this out as I will be doing it a lot)
+		guard var components = URLComponents(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.itemIds.rawValue), resolvingAgainstBaseURL: false) else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		components.queryItems = [
+			URLQueryItem(name: "s", value: feedID),
+			URLQueryItem(name: "ot", value: String(since.timeIntervalSince1970)),
+			URLQueryItem(name: "output", value: "json")
+		]
+		
+		guard let callURL = components.url else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		let request = URLRequest(url: callURL, credentials: credentials, conditionalGet: nil)
+		
+		transport.send(request: request, resultType: ReaderAPIReferenceWrapper.self) { result in
+			
+			switch result {
+			case .success(let (_, unreadEntries)):
+				
+				guard let itemRefs = unreadEntries?.itemRefs else {
+					completion(.success(([], nil)))
+					return
+				}
+				
+				let itemIds = itemRefs.map { (reference) -> String in
+					// Convert the IDs to the (stupid) Google Hex Format
+					let idValue = Int(reference.itemId)!
+					return String(idValue, radix: 16, uppercase: false)
+				}
+				
+				self.retrieveEntries(articleIDs: itemIds) { (results) in
+					switch results {
+					case .success(let entries):
+						completion(.success((entries,nil)))
+					case .failure(let error):
+						completion(.failure(error))
+					}
+				}
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+			
+		}
+		
+	}
+
+	func retrieveEntries(completion: @escaping (Result<([ReaderAPIEntry]?, String?, Int?), Error>) -> Void) {
+		
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		let since: Date = {
+			if let lastArticleFetch = self.accountMetadata?.lastArticleFetch {
+				return lastArticleFetch
+			} else {
+				return Calendar.current.date(byAdding: .month, value: -3, to: Date()) ?? Date()
+			}
+		}()
+		
+		let sinceString = since.timeIntervalSince1970
+		
+		// Add query string for getting JSON (probably should break this out as I will be doing it a lot)
+		guard var components = URLComponents(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.itemIds.rawValue), resolvingAgainstBaseURL: false) else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		components.queryItems = [
+			URLQueryItem(name: "o", value: String(sinceString)),
+			URLQueryItem(name: "n", value: "10000"),
+			URLQueryItem(name: "output", value: "json"),
+			URLQueryItem(name: "xt", value: ReaderState.read.rawValue),
+			URLQueryItem(name: "s", value: ReaderStreams.readingList.rawValue)
+		]
+		
+		guard let callURL = components.url else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		let conditionalGet = accountMetadata?.conditionalGetInfo[ConditionalGetKeys.unreadEntries]
+		let request = URLRequest(url: callURL, credentials: credentials, conditionalGet: conditionalGet)
+		
+		self.transport.send(request: request, resultType: ReaderAPIReferenceWrapper.self) { result in
+			
+			switch result {
+			case .success(let (_, entries)):
+				
+				guard let entries = entries else {
+					completion(.failure(ReaderAPIAccountDelegateError.invalidResponse))
+					return
+				}
+				
+				self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+					switch result {
+					case .success(let token):
+						// Do POST asking for data about all the new articles
+						var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.contents.rawValue), credentials: self.credentials)
+						request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+						request.httpMethod = "POST"
+						
+						// Get ids from above into hex representation of value
+						let idsToFetch = entries.itemRefs.map({ (reference) -> String in
+							let idValue = Int(reference.itemId)!
+							let idHexString = String(idValue, radix: 16, uppercase: false)
+							return "i=\(idHexString)"
+						}).joined(separator:"&")
+						
+						let postData = "T=\(token)&output=json&\(idsToFetch)".data(using: String.Encoding.utf8)
+
+						self.transport.send(request: request, method: HTTPMethod.post, data: postData!, resultType: ReaderAPIEntryWrapper.self, completion: { (result) in
+							switch result {
+							case .success(let (response, entryWrapper)):
+								guard let entryWrapper = entryWrapper else {
+									completion(.failure(ReaderAPIAccountDelegateError.invalidResponse))
+									return
+								}
+								
+								let dateInfo = HTTPDateInfo(urlResponse: response)
+								self.accountMetadata?.lastArticleFetch = dateInfo?.date
+								
+								
+								completion(.success((entryWrapper.entries, nil, nil)))
+							case .failure(let error):
+								completion(.failure(error))
+							}
+						})
+						
+						
+					case .failure(let error):
+						completion(.failure(error))
+					}
+				}
+				
+			case .failure(let error):
+				self.accountMetadata?.lastArticleFetch = nil
+				completion(.failure(error))
+			}
+			
+		}
+	}
+	
+	func retrieveEntries(page: String, completion: @escaping (Result<([ReaderAPIEntry]?, String?), Error>) -> Void) {
+		
+		guard let url = URL(string: page), var callComponents = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
+			completion(.success((nil, nil)))
+			return
+		}
+		
+		callComponents.queryItems?.append(URLQueryItem(name: "mode", value: "extended"))
+		let request = URLRequest(url: callComponents.url!, credentials: credentials)
+
+		transport.send(request: request, resultType: [ReaderAPIEntry].self) { result in
+			
+			switch result {
+			case .success(let (response, entries)):
+				
+				let pagingInfo = HTTPLinkPagingInfo(urlResponse: response)
+				completion(.success((entries, pagingInfo.nextPage)))
+
+			case .failure(let error):
+				self.accountMetadata?.lastArticleFetch = nil
+				completion(.failure(error))
+			}
+			
+		}
+		
+	}
+
+	func retrieveUnreadEntries(completion: @escaping (Result<[Int]?, Error>) -> Void) {
+		
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		// Add query string for getting JSON (probably should break this out as I will be doing it a lot)
+		guard var components = URLComponents(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.itemIds.rawValue), resolvingAgainstBaseURL: false) else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		components.queryItems = [
+			URLQueryItem(name: "s", value: ReaderStreams.readingList.rawValue),
+			URLQueryItem(name: "n", value: "10000"),
+			URLQueryItem(name: "xt", value: ReaderState.read.rawValue),
+			URLQueryItem(name: "output", value: "json")
+		]
+		
+		guard let callURL = components.url else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+
+		let conditionalGet = accountMetadata?.conditionalGetInfo[ConditionalGetKeys.unreadEntries]
+		let request = URLRequest(url: callURL, credentials: credentials, conditionalGet: conditionalGet)
+		
+		transport.send(request: request, resultType: ReaderAPIReferenceWrapper.self) { result in
+			
+			switch result {
+			case .success(let (response, unreadEntries)):
+				
+				guard let itemRefs = unreadEntries?.itemRefs else {
+					completion(.success([]))
+					return
+				}
+				
+				let itemIds = itemRefs.map{ Int($0.itemId)! }
+				
+				self.storeConditionalGet(key: ConditionalGetKeys.unreadEntries, headers: response.allHeaderFields)
+				completion(.success(itemIds))
+			case .failure(let error):
+				completion(.failure(error))
+			}
+			
+		}
+		
+	}
+	
+	func updateStateToEntries(entries: [Int], state: ReaderState, add: Bool, completion: @escaping (Result<Void, Error>) -> Void) {
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		self.requestAuthorizationToken(endpoint: baseURL) { (result) in
+			switch result {
+			case .success(let token):
+				// Do POST asking for data about all the new articles
+				var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.editTag.rawValue), credentials: self.credentials)
+				request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+				request.httpMethod = "POST"
+				
+				// Get ids from above into hex representation of value
+				let idsToFetch = entries.map({ (idValue) -> String in
+					let idHexString = String(format: "%.16llx", idValue)
+					return "i=\(idHexString)"
+				}).joined(separator:"&")
+				
+				let actionIndicator = add ? "a" : "r"
+				
+				let postData = "T=\(token)&\(idsToFetch)&\(actionIndicator)=\(state.rawValue)".data(using: String.Encoding.utf8)
+				
+				self.transport.send(request: request, method: HTTPMethod.post, payload: postData!, completion: { (result) in
+					switch result {
+					case .success:
+						completion(.success(()))
+					case .failure(let error):
+						completion(.failure(error))
+					}
+				})
+				
+				
+			case .failure(let error):
+				completion(.failure(error))
+			}
+		}
+	}
+	
+	func createUnreadEntries(entries: [Int], completion: @escaping (Result<Void, Error>) -> Void) {
+		updateStateToEntries(entries: entries, state: .read, add: false, completion: completion)
+	}
+	
+	func deleteUnreadEntries(entries: [Int], completion: @escaping (Result<Void, Error>) -> Void) {
+		updateStateToEntries(entries: entries, state: .read, add: true, completion: completion)
+
+	}
+	
+	func createStarredEntries(entries: [Int], completion: @escaping (Result<Void, Error>) -> Void) {
+		updateStateToEntries(entries: entries, state: .starred, add: true, completion: completion)
+		
+	}
+	
+	func deleteStarredEntries(entries: [Int], completion: @escaping (Result<Void, Error>) -> Void) {
+		updateStateToEntries(entries: entries, state: .starred, add: false, completion: completion)
+	}
+	
+	func retrieveStarredEntries(completion: @escaping (Result<[Int]?, Error>) -> Void) {
+		guard let baseURL = APIBaseURL else {
+			completion(.failure(CredentialsError.incompleteCredentials))
+			return
+		}
+		
+		guard var components = URLComponents(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.itemIds.rawValue), resolvingAgainstBaseURL: false) else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		components.queryItems = [
+			URLQueryItem(name: "s", value: "user/-/state/com.google/starred"),
+			URLQueryItem(name: "n", value: "10000"),
+			URLQueryItem(name: "output", value: "json")
+		]
+		
+		guard let callURL = components.url else {
+			completion(.failure(TransportError.noURL))
+			return
+		}
+		
+		let conditionalGet = accountMetadata?.conditionalGetInfo[ConditionalGetKeys.starredEntries]
+		let request = URLRequest(url: callURL, credentials: credentials, conditionalGet: conditionalGet)
+		
+		transport.send(request: request, resultType: ReaderAPIReferenceWrapper.self) { result in
+			
+			switch result {
+			case .success(let (response, unreadEntries)):
+				
+				guard let itemRefs = unreadEntries?.itemRefs else {
+					completion(.success([]))
+					return
+				}
+				
+				let itemIds = itemRefs.map{ Int($0.itemId)! }
+				
+				self.storeConditionalGet(key: ConditionalGetKeys.starredEntries, headers: response.allHeaderFields)
+				completion(.success(itemIds))
+			case .failure(let error):
+				completion(.failure(error))
+			}
+			
+		}
+		
+	}
+	
+
+	
+}
+
+// MARK: Private
+
+extension ReaderAPICaller {
+	
+	func storeConditionalGet(key: String, headers: [AnyHashable : Any]) {
+		if var conditionalGet = accountMetadata?.conditionalGetInfo {
+			conditionalGet[key] = HTTPConditionalGetInfo(headers: headers)
+			accountMetadata?.conditionalGetInfo = conditionalGet
+		}
+	}
+}
diff --git a/Frameworks/Account/ReaderAPI/ReaderAPIEntry.swift b/Frameworks/Account/ReaderAPI/ReaderAPIEntry.swift
new file mode 100644
index 000000000..d8f85ca6f
--- /dev/null
+++ b/Frameworks/Account/ReaderAPI/ReaderAPIEntry.swift
@@ -0,0 +1,128 @@
+//
+//  ReaderAPIArticle.swift
+//  Account
+//
+//  Created by Jeremy Beker on 5/28/19.
+//  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
+//
+
+import Foundation
+import RSParser
+import RSCore
+
+struct ReaderAPIEntryWrapper: Codable {
+	let id: String
+	let updated: Int
+	let entries: [ReaderAPIEntry]
+	
+	
+	enum CodingKeys: String, CodingKey {
+		case id = "id"
+		case updated = "updated"
+		case entries = "items"
+	}
+}
+
+/* {
+"id": "tag:google.com,2005:reader/item/00058a3b5197197b",
+"crawlTimeMsec": "1559362260113",
+"timestampUsec": "1559362260113787",
+"published": 1554845280,
+"title": "",
+"summary": {
+"content": "\n<p>Found an old screenshot of NetNewsWire 1.0 for iPhone!</p>\n\n<p><img src=\"https://nnw.ranchero.com/uploads/2019/c07c0574b1.jpg\" alt=\"Netnewswire 1.0 for iPhone screenshot showing the list of feeds.\" title=\"NewsGator got renamed to Sitrion, years later, and then renamed again as Limeade.\" border=\"0\" width=\"260\" height=\"320\"></p>\n"
+},
+"alternate": [
+{
+"href": "https://nnw.ranchero.com/2019/04/09/found-an-old.html"
+}
+],
+"categories": [
+"user/-/state/com.google/reading-list",
+"user/-/label/Uncategorized"
+],
+"origin": {
+"streamId": "feed/130",
+"title": "NetNewsWire"
+}
+}
+*/
+struct ReaderAPIEntry: Codable {
+
+	let articleID: String
+	let title: String?
+
+	let publishedTimestamp: Double?
+	let crawledTimestamp: String?
+	let timestampUsec: String?
+	
+	let summary: ReaderAPIArticleSummary
+	let alternates: [ReaderAPIAlternateLocation]
+	let categories: [String]
+	let origin: ReaderAPIEntryOrigin
+
+	enum CodingKeys: String, CodingKey {
+		case articleID = "id"
+		case title = "title"
+		case summary = "summary"
+		case alternates = "alternate"
+		case categories = "categories"
+		case publishedTimestamp = "published"
+		case crawledTimestamp = "crawlTimeMsec"
+		case origin = "origin"
+		case timestampUsec = "timestampUsec"
+	}
+	
+	func parseDatePublished() -> Date? {
+		
+		guard let unixTime = publishedTimestamp else {
+			return nil
+		}
+		
+		return Date(timeIntervalSince1970: unixTime)
+	}
+	
+	func uniqueID() -> String {
+		// Should look something like "tag:google.com,2005:reader/item/00058b10ce338909"
+		// REGEX feels heavy, I should be able to just split on / and take the last element
+		
+		guard let idPart =  articleID.components(separatedBy: "/").last else {
+			return articleID
+		}
+		
+		// Convert hex representation back to integer and then a string representation
+		guard let idNumber = Int(idPart, radix: 16) else {
+			return articleID
+		}
+		
+		return String(idNumber, radix: 10, uppercase: false)
+	}
+}
+
+struct ReaderAPIArticleSummary: Codable {
+	let content: String?
+	
+	enum CodingKeys: String, CodingKey {
+		case content = "content"
+	}
+}
+
+struct ReaderAPIAlternateLocation: Codable {
+	let url: String?
+	
+	enum CodingKeys: String, CodingKey {
+		case url = "href"
+	}
+}
+
+
+struct ReaderAPIEntryOrigin: Codable {
+	let streamId: String?
+	let title: String?
+
+	enum CodingKeys: String, CodingKey {
+		case streamId = "streamId"
+		case title = "title"
+	}
+}
+
diff --git a/Frameworks/Account/ReaderAPI/ReaderAPISubscription.swift b/Frameworks/Account/ReaderAPI/ReaderAPISubscription.swift
new file mode 100644
index 000000000..3072656ec
--- /dev/null
+++ b/Frameworks/Account/ReaderAPI/ReaderAPISubscription.swift
@@ -0,0 +1,104 @@
+//
+//  ReaderAPIFeed.swift
+//  Account
+//
+//  Created by Jeremy Beker on 5/28/19.
+//  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
+//
+
+import Foundation
+import RSCore
+import RSParser
+
+/*
+
+	{
+		"numResults":0,
+		"error": "Already subscribed! https://inessential.com/xml/rss.xml
+	}
+
+*/
+
+struct ReaderAPIQuickAddResult: Codable {
+	let numResults: Int
+	let error: String?
+	let streamId: String?
+	
+	enum CodingKeys: String, CodingKey {
+		case numResults = "numResults"
+		case error = "error"
+		case streamId = "streamId"
+	}
+}
+
+struct ReaderAPISubscriptionContainer: Codable {
+	let subscriptions: [ReaderAPISubscription]
+	
+	enum CodingKeys: String, CodingKey {
+		case subscriptions = "subscriptions"
+	}
+}
+
+/*
+{
+	"id": "feed/1",
+	"title": "Questionable Content",
+	"categories": [
+	{
+		"id": "user/-/label/Comics",
+		"label": "Comics"
+	}
+	],
+	"url": "http://www.questionablecontent.net/QCRSS.xml",
+	"htmlUrl": "http://www.questionablecontent.net",
+	"iconUrl": "https://rss.confusticate.com/f.php?24decabc"
+}
+
+*/
+struct ReaderAPISubscription: Codable {
+	let feedID: String
+	let name: String?
+	let categories: [ReaderAPICategory]
+	let url: String
+	let homePageURL: String?
+	let iconURL: String?
+
+	enum CodingKeys: String, CodingKey {
+		case feedID = "id"
+		case name = "title"
+		case categories = "categories"
+		case url = "url"
+		case homePageURL = "htmlUrl"
+		case iconURL = "iconUrl"
+	}
+
+}
+
+struct ReaderAPICategory: Codable {
+	let categoryId: String
+	let categoryLabel: String
+	
+	enum CodingKeys: String, CodingKey {
+		case categoryId = "id"
+		case categoryLabel = "label"
+	}
+}
+
+struct ReaderAPICreateSubscription: Codable {
+	let feedURL: String
+	enum CodingKeys: String, CodingKey {
+		case feedURL = "feed_url"
+	}
+}
+
+struct ReaderAPISubscriptionChoice: Codable {
+	
+	let name: String?
+	let url: String
+	
+	enum CodingKeys: String, CodingKey {
+		case name = "title"
+		case url = "feed_url"
+	}
+	
+}
diff --git a/Frameworks/Account/ReaderAPI/ReaderAPITag.swift b/Frameworks/Account/ReaderAPI/ReaderAPITag.swift
new file mode 100644
index 000000000..7f827e1a6
--- /dev/null
+++ b/Frameworks/Account/ReaderAPI/ReaderAPITag.swift
@@ -0,0 +1,29 @@
+//
+//  ReaderAPICompatibleTag.swift
+//  Account
+//
+//  Created by Jeremy Beker on 5/28/19.
+//  Copyright © 2019 Ranchero Software, LLC. All rights reserved.
+//
+
+import Foundation
+
+struct ReaderAPITagContainer: Codable {
+	let tags: [ReaderAPITag]
+	
+	enum CodingKeys: String, CodingKey {
+		case tags = "tags"
+	}
+}
+
+struct ReaderAPITag: Codable {
+	
+	let tagID: String
+	let type: String?
+	
+	enum CodingKeys: String, CodingKey {
+		case tagID = "id"
+		case type = "type"
+	}
+	
+}
diff --git a/Frameworks/Account/ReaderAPI/ReaderAPITagging.swift b/Frameworks/Account/ReaderAPI/ReaderAPITagging.swift
new file mode 100644
index 000000000..d907ca445
--- /dev/null
+++ b/Frameworks/Account/ReaderAPI/ReaderAPITagging.swift
@@ -0,0 +1,35 @@
+//
+//  ReaderAPICompatibleTagging.swift
+//  Account
+//
+//  Created by Jeremy Beker on 5/28/19.
+//  Copyright © 2018 Ranchero Software, LLC. All rights reserved.
+//
+
+import Foundation
+
+struct ReaderAPITagging: Codable {
+
+	let taggingID: Int
+	let feedID: Int
+	let name: String
+
+	enum CodingKeys: String, CodingKey {
+		case taggingID = "id"
+		case feedID = "feed_id"
+		case name = "name"
+	}
+
+}
+
+struct ReaderAPICreateTagging: Codable {
+	
+	let feedID: Int
+	let name: String
+	
+	enum CodingKeys: String, CodingKey {
+		case feedID = "feed_id"
+		case name = "name"
+	}
+	
+}
diff --git a/Frameworks/Account/ReaderAPI/ReaderAPIUnreadEntry.swift b/Frameworks/Account/ReaderAPI/ReaderAPIUnreadEntry.swift
new file mode 100644
index 000000000..a69909c21
--- /dev/null
+++ b/Frameworks/Account/ReaderAPI/ReaderAPIUnreadEntry.swift
@@ -0,0 +1,27 @@
+//
+//  ReaderAPIUnreadEntry.swift
+//  Account
+//
+//  Created by Jeremy Beker on 5/28/19.
+//  Copyright © 2019 Ranchero Software, LLC. All rights reserved.
+//
+
+import Foundation
+
+struct ReaderAPIReferenceWrapper: Codable {
+	let itemRefs: [ReaderAPIReference]
+	
+	enum CodingKeys: String, CodingKey {
+		case itemRefs = "itemRefs"
+	}
+}
+
+struct ReaderAPIReference: Codable {
+	
+	let itemId: String
+	
+	enum CodingKeys: String, CodingKey {
+		case itemId = "id"
+	}
+	
+}
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h
new file mode 100644
index 000000000..41cd57434
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h
@@ -0,0 +1,43 @@
+//
+//  SPUDownloadData.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 8/10/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+#import "SUExport.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ * A class for containing downloaded data along with some information about it.
+ */
+SU_EXPORT @interface SPUDownloadData : NSObject <NSSecureCoding>
+
+- (instancetype)initWithData:(NSData *)data textEncodingName:(NSString * _Nullable)textEncodingName MIMEType:(NSString * _Nullable)MIMEType;
+
+/*!
+ * The raw data that was downloaded.
+ */
+@property (nonatomic, readonly) NSData *data;
+
+/*!
+ * The IANA charset encoding name if available. Eg: "utf-8"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *textEncodingName;
+
+/*!
+ * The MIME type if available. Eg: "text/plain"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *MIMEType;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloader.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloader.h
new file mode 100644
index 000000000..5eee9bd5e
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloader.h
@@ -0,0 +1,25 @@
+//
+//  SPUDownloader.h
+//  Downloader
+//
+//  Created by Mayur Pawashe on 4/1/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SPUDownloaderProtocol.h"
+
+@protocol SPUDownloaderDelegate;
+
+// This object implements the protocol which we have defined. It provides the actual behavior for the service. It is 'exported' by the service to make it available to the process hosting the service over an NSXPCConnection.
+@interface SPUDownloader : NSObject <SPUDownloaderProtocol>
+
+// Due to XPC remote object reasons, this delegate is strongly referenced
+// Invoke cleanup when done with this instance
+- (instancetype)initWithDelegate:(id <SPUDownloaderDelegate>)delegate;
+
+@end
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h
new file mode 100644
index 000000000..76e7e750a
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h
@@ -0,0 +1,38 @@
+//
+//  SPUDownloaderDelegate.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 4/1/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUDownloadData;
+
+@protocol SPUDownloaderDelegate <NSObject>
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidSetDestinationName:(NSString *)destinationName temporaryDirectory:(NSString *)temporaryDirectory;
+
+// Under rare cases, this may be called more than once, in which case the current progress should be reset back to 0
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveExpectedContentLength:(int64_t)expectedContentLength;
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveDataOfLength:(uint64_t)length;
+
+// downloadData is nil if this is a persisent download, otherwise it's non-nil if it's a temporary download
+- (void)downloaderDidFinishWithTemporaryDownloadData:(SPUDownloadData * _Nullable)downloadData;
+
+- (void)downloaderDidFailWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h
new file mode 100644
index 000000000..36302df48
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h
@@ -0,0 +1,13 @@
+//
+//  SPUDownloaderDeprecated.h
+//  Sparkle
+//
+//  Created by Deadpikle on 12/20/17.
+//  Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#import "SPUDownloader.h"
+
+@interface SPUDownloaderDeprecated : SPUDownloader <SPUDownloaderProtocol>
+
+@end
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h
new file mode 100644
index 000000000..ebe477fe7
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h
@@ -0,0 +1,34 @@
+//
+//  SPUDownloaderProtocol.h
+//  PersistentDownloader
+//
+//  Created by Mayur Pawashe on 4/1/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUURLRequest;
+
+// The protocol that this service will vend as its API. This header file will also need to be visible to the process hosting the service.
+@protocol SPUDownloaderProtocol
+
+- (void)startPersistentDownloadWithRequest:(SPUURLRequest *)request bundleIdentifier:(NSString *)bundleIdentifier desiredFilename:(NSString *)desiredFilename;
+
+- (void)startTemporaryDownloadWithRequest:(SPUURLRequest *)request;
+
+- (void)downloadDidFinish;
+
+- (void)cleanup;
+
+- (void)cancel;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h
new file mode 100644
index 000000000..4bde75aac
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h
@@ -0,0 +1,20 @@
+//
+//  SPUDownloaderSession.h
+//  Sparkle
+//
+//  Created by Deadpikle on 12/20/17.
+//  Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SPUDownloader.h"
+#import "SPUDownloaderProtocol.h"
+
+NS_CLASS_AVAILABLE(NSURLSESSION_AVAILABLE, 7_0)
+@interface SPUDownloaderSession : SPUDownloader <SPUDownloaderProtocol>
+
+@end
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h
new file mode 100644
index 000000000..694961470
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h
@@ -0,0 +1,35 @@
+//
+//  SPUURLRequest.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 5/19/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+// A class that wraps NSURLRequest and implements NSSecureCoding
+// This class exists because NSURLRequest did not support NSSecureCoding in macOS 10.8
+// I have not verified if NSURLRequest in 10.9 implements NSSecureCoding or not
+@interface SPUURLRequest : NSObject <NSSecureCoding>
+
+// Creates a new URL request
+// Only these properties are currently tracked:
+// * URL
+// * Cache policy
+// * Timeout interval
+// * HTTP header fields
+// * networkServiceType
++ (instancetype)URLRequestWithRequest:(NSURLRequest *)request;
+
+@property (nonatomic, readonly) NSURLRequest *request;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcast.h
index a035f18fc..34276b7da 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcast.h
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcast.h
@@ -9,19 +9,27 @@
 #ifndef SUAPPCAST_H
 #define SUAPPCAST_H
 
+#if __has_feature(modules)
+@import Foundation;
+#else
 #import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class SUAppcastItem;
-SU_EXPORT @interface SUAppcast : NSObject<NSURLDownloadDelegate>
+SU_EXPORT @interface SUAppcast : NSObject
 
-@property (copy) NSString *userAgentString;
-@property (copy) NSDictionary *httpHeaders;
+@property (copy, nullable) NSString *userAgentString;
+@property (copy, nullable) NSDictionary<NSString *, NSString *> *httpHeaders;
 
-- (void)fetchAppcastFromURL:(NSURL *)url completionBlock:(void (^)(NSError *))err;
+- (void)fetchAppcastFromURL:(NSURL *)url inBackground:(BOOL)bg completionBlock:(void (^)(NSError *_Nullable))err;
 - (SUAppcast *)copyWithoutDeltaUpdates;
 
-@property (readonly, copy) NSArray *items;
+@property (readonly, copy, nullable) NSArray *items;
 @end
 
+NS_ASSUME_NONNULL_END
+
 #endif
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
index 86843bfb7..c0380dd83 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
@@ -9,19 +9,26 @@
 #ifndef SUAPPCASTITEM_H
 #define SUAPPCASTITEM_H
 
+#if __has_feature(modules)
+@import Foundation;
+#else
 #import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
+@class SUSignatures;
 
 SU_EXPORT @interface SUAppcastItem : NSObject
 @property (copy, readonly) NSString *title;
-@property (copy, readonly) NSDate *date;
+@property (copy, readonly) NSString *dateString;
 @property (copy, readonly) NSString *itemDescription;
 @property (strong, readonly) NSURL *releaseNotesURL;
-@property (copy, readonly) NSString *DSASignature;
+@property (strong, readonly) SUSignatures *signatures;
 @property (copy, readonly) NSString *minimumSystemVersion;
 @property (copy, readonly) NSString *maximumSystemVersion;
 @property (strong, readonly) NSURL *fileURL;
+@property (nonatomic, readonly) uint64_t contentLength;
 @property (copy, readonly) NSString *versionString;
+@property (copy, readonly) NSString *osString;
 @property (copy, readonly) NSString *displayVersionString;
 @property (copy, readonly) NSDictionary *deltaUpdates;
 @property (strong, readonly) NSURL *infoURL;
@@ -32,6 +39,7 @@ SU_EXPORT @interface SUAppcastItem : NSObject
 
 @property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate;
 @property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate;
+@property (getter=isMacOsUpdate, readonly) BOOL macOsUpdate;
 @property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate;
 
 // Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h
new file mode 100644
index 000000000..f034cd20f
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h
@@ -0,0 +1,22 @@
+//
+//  SUCodeSigningVerifier.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 7/5/12.
+//
+//
+
+#ifndef SUCODESIGNINGVERIFIER_H
+#define SUCODESIGNINGVERIFIER_H
+
+#import <Foundation/Foundation.h>
+#import "SUExport.h"
+
+SU_EXPORT @interface SUCodeSigningVerifier : NSObject
++ (BOOL)codeSignatureAtBundleURL:(NSURL *)oldBundlePath matchesSignatureAtBundleURL:(NSURL *)newBundlePath error:(NSError  **)error;
++ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)bundlePath error:(NSError **)error;
++ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundlePath;
++ (NSDictionary *)codeSignatureInfoAtBundleURL:(NSURL *)bundlePath;
+@end
+
+#endif
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUErrors.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUErrors.h
index d73aadbae..7d2e73ae9 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUErrors.h
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUErrors.h
@@ -9,7 +9,11 @@
 #ifndef SUERRORS_H
 #define SUERRORS_H
 
+#if __has_feature(modules)
+@import Foundation;
+#else
 #import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 
 /**
@@ -17,16 +21,19 @@
  */
 SU_EXPORT extern NSString *const SUSparkleErrorDomain;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
 typedef NS_ENUM(OSStatus, SUError) {
     // Appcast phase errors.
     SUAppcastParseError = 1000,
     SUNoUpdateError = 1001,
     SUAppcastError = 1002,
     SURunningFromDiskImageError = 1003,
-    
-    // Downlaod phase errors.
+
+    // Download phase errors.
     SUTemporaryDirectoryError = 2000,
-    
+    SUDownloadError = 2001,
+
     // Extraction phase errors.
     SUUnarchivingError = 3000,
     SUSignatureError = 3001,
@@ -39,9 +46,11 @@ typedef NS_ENUM(OSStatus, SUError) {
     SURelaunchError = 4004,
     SUInstallationError = 4005,
     SUDowngradeError = 4006,
+    SUInstallationCancelledError = 4007,
     
     // System phase errors
     SUSystemPowerOffError = 5000
 };
+#pragma clang diagnostic pop
 
 #endif
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h
index d7f2a48cf..ed11921a5 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h
@@ -9,10 +9,16 @@
 #ifndef SUSTANDARDVERSIONCOMPARATOR_H
 #define SUSTANDARDVERSIONCOMPARATOR_H
 
+#if __has_feature(modules)
+@import Foundation;
+#else
 #import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 #import "SUVersionComparisonProtocol.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 /*!
     Sparkle's default version comparator.
 
@@ -22,8 +28,15 @@
 */
 SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison>
 
+/*!
+    Initializes a new instance of the standard version comparator.
+ */
+- (instancetype)init;
+
 /*!
     Returns a singleton instance of the comparator.
+ 
+    It is usually preferred to alloc/init new a comparator instead.
 */
 + (SUStandardVersionComparator *)defaultComparator;
 
@@ -35,4 +48,5 @@ SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison
 - (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;
 @end
 
+NS_ASSUME_NONNULL_END
 #endif
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUUpdater.h
index 86024858c..bc1d49163 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUUpdater.h
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUUpdater.h
@@ -9,7 +9,11 @@
 #ifndef SUUPDATER_H
 #define SUUPDATER_H
 
-#import <Foundation/Foundation.h>
+#if __has_feature(modules)
+@import Cocoa;
+#else
+#import <Cocoa/Cocoa.h>
+#endif
 #import "SUExport.h"
 #import "SUVersionComparisonProtocol.h"
 #import "SUVersionDisplayProtocol.h"
@@ -28,62 +32,171 @@ SU_EXPORT @interface SUUpdater : NSObject
 
 @property (unsafe_unretained) IBOutlet id<SUUpdaterDelegate> delegate;
 
+/*!
+ The shared updater for the main bundle.
+ 
+ This is equivalent to passing [NSBundle mainBundle] to SUUpdater::updaterForBundle:
+ */
 + (SUUpdater *)sharedUpdater;
+
+/*!
+ The shared updater for a specified bundle.
+
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
 + (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
+
+/*!
+ Designated initializer for SUUpdater.
+ 
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
 - (instancetype)initForBundle:(NSBundle *)bundle;
 
-@property (readonly, strong) NSBundle *hostBundle;
-@property (strong, readonly) NSBundle *sparkleBundle;
-
-@property BOOL automaticallyChecksForUpdates;
-
-@property NSTimeInterval updateCheckInterval;
-
 /*!
- * The URL of the appcast used to download update information.
- *
- * This property must be called on the main thread.
- */
-@property (copy) NSURL *feedURL;
+ Explicitly checks for updates and displays a progress dialog while doing so.
 
-@property (nonatomic, copy) NSString *userAgentString;
+ This method is meant for a main menu item.
+ Connect any menu item to this action in Interface Builder,
+ and Sparkle will check for updates and report back its findings verbosely
+ when it is invoked.
 
-@property (copy) NSDictionary *httpHeaders;
-
-@property BOOL sendsSystemProfile;
-
-@property BOOL automaticallyDownloadsUpdates;
-
-@property (nonatomic, copy) NSString *decryptionPassword;
-
-/*!
-    Explicitly checks for updates and displays a progress dialog while doing so.
-
-    This method is meant for a main menu item.
-    Connect any menu item to this action in Interface Builder,
-    and Sparkle will check for updates and report back its findings verbosely
-    when it is invoked.
+ This will find updates that the user has opted into skipping.
  */
 - (IBAction)checkForUpdates:(id)sender;
 
 /*!
-    Checks for updates, but does not display any UI unless an update is found.
+ The menu item validation used for the -checkForUpdates: action
+ */
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
 
-    This is meant for programmatically initating a check for updates. That is,
-    it will display no UI unless it actually finds an update, in which case it
-    proceeds as usual.
+/*!
+ Checks for updates, but does not display any UI unless an update is found.
 
-    If the fully automated updating is turned on, however, this will invoke that
-    behavior, and if an update is found, it will be downloaded and prepped for
-    installation.
+ This is meant for programmatically initating a check for updates. That is,
+ it will display no UI unless it actually finds an update, in which case it
+ proceeds as usual.
+
+ If automatic downloading of updates it turned on and allowed, however,
+ this will invoke that behavior, and if an update is found, it will be downloaded
+ in the background silently and will be prepped for installation.
+
+ This will not find updates that the user has opted into skipping.
  */
 - (void)checkForUpdatesInBackground;
 
 /*!
-    Checks for updates and, if available, immediately downloads and installs them.
+ A property indicating whether or not to check for updates automatically.
+
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property BOOL automaticallyChecksForUpdates;
+
+/*!
+ A property indicating whether or not updates can be automatically downloaded in the background.
+
+ Note that automatic downloading of updates can be disallowed by the developer
+ or by the user's system if silent updates cannot be done (eg: if they require authentication).
+ In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set.
+
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property BOOL automaticallyDownloadsUpdates;
+
+/*!
+ A property indicating the current automatic update check interval.
+
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property NSTimeInterval updateCheckInterval;
+
+/*!
+ Begins a "probing" check for updates which will not actually offer to
+ update to that version.
+
+ However, the delegate methods
+ SUUpdaterDelegate::updater:didFindValidUpdate: and
+ SUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
+ so you can use that information in your UI.
+
+ Updates that have been skipped by the user will not be found.
+ */
+- (void)checkForUpdateInformation;
+
+/*!
+ The URL of the appcast used to download update information.
+
+ Setting this property will persist in the host bundle's user defaults.
+ If you don't want persistence, you may want to consider instead implementing
+ SUUpdaterDelegate::feedURLStringForUpdater: or SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
+
+ This property must be called on the main thread.
+ */
+@property (copy) NSURL *feedURL;
+
+/*!
+ The host bundle that is being updated.
+ */
+@property (readonly, strong) NSBundle *hostBundle;
+
+/*!
+ The bundle this class (SUUpdater) is loaded into.
+ */
+@property (strong, readonly) NSBundle *sparkleBundle;
+
+/*!
+ The user agent used when checking for updates.
+
+ The default implementation can be overrided.
+ */
+@property (nonatomic, copy) NSString *userAgentString;
+
+/*!
+ The HTTP headers used when checking for updates.
+
+ The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString)
+ */
+@property (copy) NSDictionary<NSString *, NSString *> *httpHeaders;
+
+/*!
+ A property indicating whether or not the user's system profile information is sent when checking for updates.
+
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property BOOL sendsSystemProfile;
+
+/*!
+ A property indicating the decryption password used for extracting updates shipped as Apple Disk Images (dmg)
+ */
+@property (nonatomic, copy) NSString *decryptionPassword;
+
+/*!
+    This function ignores normal update schedule, ignores user preferences,
+    and interrupts users with an unwanted immediate app update.
+
+    WARNING: this function should not be used in regular apps. This function
+    is a user-unfriendly hack only for very special cases, like unstable
+    rapidly-changing beta builds that would not run correctly if they were
+    even one day out of date.
+
+    Instead of this function you should set `SUAutomaticallyUpdate` to `YES`,
+    which will gracefully install updates when the app quits.
+
+    For UI-less/daemon apps that aren't usually quit, instead of this function,
+    you can use the delegate method
+    SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationInvocation:
+    to immediately start installation when an update was found.
+
     A progress dialog is shown but the user will never be prompted to read the
     release notes.
-    
+
+    This function will cause update to be downloaded twice if automatic updates are
+    enabled.
+
     You may want to respond to the userDidCancelDownload delegate method in case
     the user clicks the "Cancel" button while the update is downloading.
  */
@@ -96,17 +209,6 @@ SU_EXPORT @interface SUUpdater : NSObject
  */
 @property (readonly, copy) NSDate *lastUpdateCheckDate;
 
-/*!
-    Begins a "probing" check for updates which will not actually offer to
-    update to that version.
-
-    However, the delegate methods
-    SUUpdaterDelegate::updater:didFindValidUpdate: and
-    SUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
-    so you can use that information in your UI.
- */
-- (void)checkForUpdateInformation;
-
 /*!
     Appropriately schedules or cancels the update checking timer according to
     the preferences for time interval and automatic checks.
@@ -116,251 +218,14 @@ SU_EXPORT @interface SUUpdater : NSObject
  */
 - (void)resetUpdateCycle;
 
+/*!
+   A property indicating whether or not an update is in progress.
+
+   Note this property is not indicative of whether or not user initiated updates can be performed.
+   Use SUUpdater::validateMenuItem: for that instead.
+ */
 @property (readonly) BOOL updateInProgress;
 
 @end
 
-// -----------------------------------------------------------------------------
-// SUUpdater Notifications for events that might be interesting to more than just the delegate
-// The updater will be the notification object
-// -----------------------------------------------------------------------------
-SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
-#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
-#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
-
-// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
-// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
-
-// -----------------------------------------------------------------------------
-//	SUUpdater Delegate:
-// -----------------------------------------------------------------------------
-
-/*!
-    Provides methods to control the behavior of an SUUpdater object.
- */
-@protocol SUUpdaterDelegate <NSObject>
-@optional
-
-/*!
-    Returns whether to allow Sparkle to pop up.
-
-    For example, this may be used to prevent Sparkle from interrupting a setup assistant.
-
-    \param updater The SUUpdater instance.
- */
-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater;
-
-/*!
-    Returns additional parameters to append to the appcast URL's query string.
-
-    This is potentially based on whether or not Sparkle will also be sending along the system profile.
-
-    \param updater The SUUpdater instance.
-    \param sendingProfile Whether the system profile will also be sent.
-
-    \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
- */
-- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
-
-/*!
-    Returns a custom appcast URL.
-
-    Override this to dynamically specify the entire URL.
-
-    \param updater The SUUpdater instance.
- */
-- (NSString *)feedURLStringForUpdater:(SUUpdater *)updater;
-
-/*!
-    Returns whether Sparkle should prompt the user about automatic update checks.
-
-    Use this to override the default behavior.
-
-    \param updater The SUUpdater instance.
- */
-- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater;
-
-/*!
-    Called after Sparkle has downloaded the appcast from the remote server.
-
-    Implement this if you want to do some special handling with the appcast once it finishes loading.
-
-    \param updater The SUUpdater instance.
-    \param appcast The appcast that was downloaded from the remote server.
- */
-- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
-
-/*!
-    Returns the item in the appcast corresponding to the update that should be installed.
-
-    If you're using special logic or extensions in your appcast,
-    implement this to use your own logic for finding a valid update, if any,
-    in the given appcast.
-
-    \param appcast The appcast that was downloaded from the remote server.
-    \param updater The SUUpdater instance.
- */
-- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater;
-
-/*!
-    Called when a valid update is found by the update driver.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
-
-/*!
-    Called when a valid update is not found.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
-
-/*!
-    Called immediately before downloading the specified update.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be downloaded.
-    \param request The mutable URL request that will be used to download the update.
- */
-- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
-
-/*!
-    Called after the specified update failed to download.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that failed to download.
-    \param error The error generated by the failed download.
- */
-- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
-
-/*!
-    Called when the user clicks the cancel button while and update is being downloaded.
-
-    \param updater The SUUpdater instance.
- */
-- (void)userDidCancelDownload:(SUUpdater *)updater;
-
-/*!
-    Called immediately before installing the specified update.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
-
-/*!
-    Returns whether the relaunch should be delayed in order to perform other tasks.
-
-    This is not called if the user didn't relaunch on the previous update,
-    in that case it will immediately restart.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
-    \param invocation The invocation that must be completed before continuing with the relaunch.
-
-    \return \c YES to delay the relaunch until \p invocation is invoked.
- */
-- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation;
-
-/*!
-    Returns whether the application should be relaunched at all.
-
-    Some apps \b cannot be relaunched under certain circumstances.
-    This method can be used to explicitly prevent a relaunch.
-
-    \param updater The SUUpdater instance.
- */
-- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
-
-/*!
-    Called immediately before relaunching.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
-
-/*!
-    Returns an object that compares version numbers to determine their arithmetic relation to each other.
-
-    This method allows you to provide a custom version comparator.
-    If you don't implement this method or return \c nil,
-    the standard version comparator will be used.
-
-    \sa SUStandardVersionComparator
-
-    \param updater The SUUpdater instance.
- */
-- (id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
-
-/*!
-    Returns an object that formats version numbers for display to the user.
-
-    If you don't implement this method or return \c nil,
-    the standard version formatter will be used.
-
-    \sa SUUpdateAlert
-
-    \param updater The SUUpdater instance.
- */
-- (id<SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
-
-/*!
-    Returns the path which is used to relaunch the client after the update is installed.
-
-    The default is the path of the host bundle.
-
-    \param updater The SUUpdater instance.
- */
-- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
-
-/*!
-    Called before an updater shows a modal alert window,
-    to give the host the opportunity to hide attached windows that may get in the way.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterWillShowModalAlert:(SUUpdater *)updater;
-
-/*!
-    Called after an updater shows a modal alert window,
-    to give the host the opportunity to hide attached windows that may get in the way.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterDidShowModalAlert:(SUUpdater *)updater;
-
-/*!
-    Called when an update is scheduled to be silently installed on quit.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
-    \param invocation Can be used to trigger an immediate silent install and relaunch.
- */
-- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
-
-/*!
-    Calls after an update that was scheduled to be silently installed on quit has been canceled.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that was proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item;
-
-/*!
-    Called after an update is aborted due to an error.
-
-    \param updater The SUUpdater instance.
-    \param error The error that caused the abort
- */
-- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
-
-@end
-
 #endif
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h
new file mode 100644
index 000000000..86d1eb9e9
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h
@@ -0,0 +1,301 @@
+//
+//  SUUpdaterDelegate.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 12/25/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+#import "SUExport.h"
+
+@protocol SUVersionComparison, SUVersionDisplay;
+@class SUUpdater, SUAppcast, SUAppcastItem;
+
+NS_ASSUME_NONNULL_BEGIN
+
+// -----------------------------------------------------------------------------
+// SUUpdater Notifications for events that might be interesting to more than just the delegate
+// The updater will be the notification object
+// -----------------------------------------------------------------------------
+SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
+#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
+#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
+
+// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
+// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
+
+// -----------------------------------------------------------------------------
+//	SUUpdater Delegate:
+// -----------------------------------------------------------------------------
+
+/*!
+ Provides methods to control the behavior of an SUUpdater object.
+ */
+@protocol SUUpdaterDelegate <NSObject>
+@optional
+
+/*!
+ Returns whether to allow Sparkle to pop up.
+ 
+ For example, this may be used to prevent Sparkle from interrupting a setup assistant.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Returns additional parameters to append to the appcast URL's query string.
+ 
+ This is potentially based on whether or not Sparkle will also be sending along the system profile.
+ 
+ \param updater The SUUpdater instance.
+ \param sendingProfile Whether the system profile will also be sent.
+ 
+ \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
+ */
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
+
+/*!
+ Returns a custom appcast URL.
+ 
+ Override this to dynamically specify the entire URL.
+ 
+ An alternative may be to use SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
+ and let the server handle what kind of feed to provide.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns whether Sparkle should prompt the user about automatic update checks.
+ 
+ Use this to override the default behavior.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Called after Sparkle has downloaded the appcast from the remote server.
+ 
+ Implement this if you want to do some special handling with the appcast once it finishes loading.
+ 
+ \param updater The SUUpdater instance.
+ \param appcast The appcast that was downloaded from the remote server.
+ */
+- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
+
+/*!
+ Returns the item in the appcast corresponding to the update that should be installed.
+ 
+ If you're using special logic or extensions in your appcast,
+ implement this to use your own logic for finding a valid update, if any,
+ in the given appcast.
+ 
+ \param appcast The appcast that was downloaded from the remote server.
+ \param updater The SUUpdater instance.
+ */
+- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater;
+
+/*!
+ Called when a valid update is found by the update driver.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called when a valid update is not found.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
+
+/*!
+ Called immediately before downloading the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be downloaded.
+ \param request The mutable URL request that will be used to download the update.
+ */
+- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
+
+/*!
+ Called immediately after succesfull download of the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been downloaded.
+ */
+- (void)updater:(SUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called after the specified update failed to download.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that failed to download.
+ \param error The error generated by the failed download.
+ */
+- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
+
+/*!
+ Called when the user clicks the cancel button while and update is being downloaded.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)userDidCancelDownload:(SUUpdater *)updater;
+
+/*!
+ Called immediately before extracting the specified downloaded update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be extracted.
+ */
+- (void)updater:(SUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately after extracting the specified downloaded update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been extracted.
+ */
+- (void)updater:(SUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately before installing the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
+
+/*!
+ Returns whether the relaunch should be delayed in order to perform other tasks.
+ 
+ This is not called if the user didn't relaunch on the previous update,
+ in that case it will immediately restart.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation The invocation that must be completed with `[invocation invoke]` before continuing with the relaunch.
+ 
+ \return \c YES to delay the relaunch until \p invocation is invoked.
+ */
+- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation;
+
+/*!
+ Returns whether the application should be relaunched at all.
+ 
+ Some apps \b cannot be relaunched under certain circumstances.
+ This method can be used to explicitly prevent a relaunch.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately before relaunching.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Returns an object that compares version numbers to determine their arithmetic relation to each other.
+ 
+ This method allows you to provide a custom version comparator.
+ If you don't implement this method or return \c nil,
+ the standard version comparator will be used.
+ 
+ \sa SUStandardVersionComparator
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns an object that formats version numbers for display to the user.
+ 
+ If you don't implement this method or return \c nil,
+ the standard version formatter will be used.
+ 
+ \sa SUUpdateAlert
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable id<SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns the path which is used to relaunch the client after the update is installed.
+ 
+ The default is the path of the host bundle.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
+
+/*!
+ Called before an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called after an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called when an update is scheduled to be silently installed on quit.
+ This is after an update has been automatically downloaded in the background.
+ (i.e. SUUpdater::automaticallyDownloadsUpdates is YES)
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation Can be used to trigger an immediate silent install and relaunch.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
+
+/*!
+ Calls after an update that was scheduled to be silently installed on quit has been canceled.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that was proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item;
+
+/*!
+ Called after an update is aborted due to an error.
+ 
+ \param updater The SUUpdater instance.
+ \param error The error that caused the abort
+ */
+- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h
index 10c426694..c654fc4d0 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h
@@ -9,9 +9,15 @@
 #ifndef SUVERSIONCOMPARISONPROTOCOL_H
 #define SUVERSIONCOMPARISONPROTOCOL_H
 
-#import <Cocoa/Cocoa.h>
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 /*!
     Provides version comparison facilities for Sparkle.
 */
@@ -27,4 +33,5 @@
 
 @end
 
+NS_ASSUME_NONNULL_END
 #endif
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h
index 97fae4c90..980efb3fe 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h
@@ -6,7 +6,11 @@
 //  Copyright 2009 Elgato Systems GmbH. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 
 /*!
@@ -20,6 +24,6 @@
     Both versions are provided so that important distinguishing information
     can be displayed while also leaving out unnecessary/confusing parts.
 */
-- (void)formatVersion:(NSString **)inOutVersionA andVersion:(NSString **)inOutVersionB;
+- (void)formatVersion:(NSString *_Nonnull*_Nonnull)inOutVersionA andVersion:(NSString *_Nonnull*_Nonnull)inOutVersionB;
 
 @end
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/Sparkle.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/Sparkle.h
index 20ed6979c..5ae2e6a6d 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/Sparkle.h
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/Sparkle.h
@@ -9,8 +9,6 @@
 #ifndef SPARKLE_H
 #define SPARKLE_H
 
-#import <Cocoa/Cocoa.h>
-
 // This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
 // there are name-space collisions) so we can list all of them to start with:
 
@@ -18,8 +16,18 @@
 #import "SUAppcastItem.h"
 #import "SUStandardVersionComparator.h"
 #import "SUUpdater.h"
+#import "SUUpdaterDelegate.h"
 #import "SUVersionComparisonProtocol.h"
 #import "SUVersionDisplayProtocol.h"
 #import "SUErrors.h"
 
+#import "SPUDownloader.h"
+#import "SPUDownloaderDelegate.h"
+#import "SPUDownloaderDeprecated.h"
+#import "SPUDownloadData.h"
+#import "SPUDownloaderProtocol.h"
+#import "SPUDownloaderSession.h"
+#import "SPUURLRequest.h"
+#import "SUCodeSigningVerifier.h"
+
 #endif
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h b/Frameworks/Vendor/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h
index ccd5611d9..a52bf5a2d 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h
@@ -6,31 +6,16 @@
 //  Copyright 2006 Andy Matuschak. All rights reserved.
 //
 
-#ifndef SUUNARCHIVER_H
-#define SUUNARCHIVER_H
-
 #import <Foundation/Foundation.h>
 
-@class SUHost;
-@protocol SUUnarchiverDelegate;
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SUUnarchiverProtocol;
 
 @interface SUUnarchiver : NSObject
 
-@property (copy, readonly) NSString *archivePath;
-@property (copy, readonly) NSString *updateHostBundlePath;
-@property (copy, readonly) NSString *decryptionPassword;
-@property (weak) id<SUUnarchiverDelegate> delegate;
++ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword;
 
-+ (SUUnarchiver *)unarchiverForPath:(NSString *)path updatingHostBundlePath:(NSString *)host withPassword:(NSString *)decryptionPassword;
-
-- (void)start;
 @end
 
-@protocol SUUnarchiverDelegate <NSObject>
-- (void)unarchiverDidFinish:(SUUnarchiver *)unarchiver;
-- (void)unarchiverDidFail:(SUUnarchiver *)unarchiver;
-@optional
-- (void)unarchiver:(SUUnarchiver *)unarchiver extractedProgress:(double)progress;
-@end
-
-#endif
+NS_ASSUME_NONNULL_END
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist
index 5cb9c8da0..7805efaa4 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15E49a</string>
+	<string>18D42</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>Autoupdate</string>
 	<key>CFBundleIconFile</key>
-	<string>AppIcon</string>
+	<string>AppIcon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.sparkle-project.Sparkle.Autoupdate</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.14.0</string>
+	<string>1.21.3 18-g1ff157710</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,21 +25,21 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.14.0</string>
+	<string>1.21.3</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7C1002</string>
+	<string>10B61</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15C43</string>
+	<string>18B71</string>
 	<key>DTSDKName</key>
-	<string>macosx10.11</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0721</string>
+	<string>1010</string>
 	<key>DTXcodeBuild</key>
-	<string>7C1002</string>
+	<string>10B61</string>
 	<key>LSBackgroundOnly</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate
index 0e707366a..ee2732523 100755
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop
new file mode 100755
index 000000000..561ff48c7
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns
index 93fb79e04..7f2a571c8 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib
index 30f3c2c4d..da18126a3 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings
index 057e2f821..4cd92c0dd 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings
index da5902842..c93688a31 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings
index 266c0693a..10e3c5a5d 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings
index f99c8c0e1..698dc6737 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings
index 394c159c0..deed9efb2 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings
index f427ad697..8c38dc674 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings
index 8922b3213..4f2015f0b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings
index 32d3107f9..dab921c62 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings
index 6577569fe..c7a557147 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings
index 99124ccc8..fec4d0d8b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings
new file mode 100644
index 000000000..2a727d3a3
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings
new file mode 100644
index 000000000..9cd6bff18
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings
index f7fb93581..68b6d366b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings
index 08cb2961b..f5e9c6d11 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings
index c6ecfbacb..92c18eeb2 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings
index 25e207938..ec2561b8a 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings
index de3891225..58be0e82b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings
index e366e3bf1..2b9c46152 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings
index 19cb11f79..e55c6fd1b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings
index d3eddf75d..00df86ff1 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings
index 28a407bc9..318baa960 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings
index d5cb60730..c33086d89 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings
index 949fb16ef..a7d2ebce6 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings
index c1ce5a04e..1be2a8079 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings
index e65ac5591..738c9008b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings
index fc728fd55..eca257024 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings
index c41e3dba0..4def140e5 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings
index 521656d38..f7eb257b7 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings
index cbd1ba684..214331cd1 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings
index ea8c82f97..533e20862 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/DarkAqua.css b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/DarkAqua.css
new file mode 100644
index 000000000..a41e0f285
--- /dev/null
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/DarkAqua.css
@@ -0,0 +1,9 @@
+html {
+    color: #FFFFFFD8;
+}
+:link {
+    color: #419CFF;
+}
+:link:active {
+    color: #FF1919;
+}
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Info.plist b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Info.plist
index 64d696e17..3fdc42fff 100644
--- a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Info.plist
+++ b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15E49a</string>
+	<string>18D42</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.14.0</string>
+	<string>1.21.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,20 +25,20 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.14.0</string>
+	<string>1.21.3</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7C1002</string>
+	<string>10B61</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15C43</string>
+	<string>18B71</string>
 	<key>DTSDKName</key>
-	<string>macosx10.11</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0721</string>
+	<string>1010</string>
 	<key>DTXcodeBuild</key>
-	<string>7C1002</string>
+	<string>10B61</string>
 </dict>
 </plist>
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/SUStatus.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/SUStatus.nib
index 30f3c2c4d..da18126a3 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/SUStatus.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/SUStatus.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib
index 46d10f10d..29127f1a4 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib
index 1fafb0334..c619e69f3 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib
index f93d74b0a..57735179e 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings
index 057e2f821..4cd92c0dd 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib
index 86c7ace00..b3d57f661 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib
index 87d4eb263..30a49ec7c 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib
index c39c065f3..f4c853251 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings
index da5902842..c93688a31 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib
index a1fbef90b..ef46ccaaf 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib
index 05bf2cb33..778a46846 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib
index d04d0cd5f..e43590456 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings
index 266c0693a..10e3c5a5d 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib
index 66360626f..7540fa1a5 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib
index a457c2f64..fed8b2565 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib
index 92499cbb1..6ecec4549 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings
index f99c8c0e1..698dc6737 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib
index a3db760fe..6e803a702 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib
index 20302af0e..8ca181cd0 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib
index 157168bbc..353156a68 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings
index 394c159c0..deed9efb2 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib
index df090b491..15f157f4e 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib
index 7ed264797..29d60da43 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib
index 9c0c887c0..72f172e6c 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings
index f427ad697..8c38dc674 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib
index 4fc4bbc4f..9b3f7238a 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib
index 5ae5adefa..265bacc9f 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib
index 8006f904a..87f4e632f 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings
index 8922b3213..4f2015f0b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib
new file mode 100644
index 000000000..a882db0da
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib
new file mode 100644
index 000000000..c7a3311a0
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib
new file mode 100644
index 000000000..60cd95449
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings
index 32d3107f9..dab921c62 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib
index bc13d0c06..5112924b2 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib
index f8f1f1c37..e24e3fd6c 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib
index 7b2b40e6c..88598ebfb 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings
index 6577569fe..c7a557147 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings
index 99124ccc8..fec4d0d8b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib
new file mode 100644
index 000000000..75761ac7b
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib
new file mode 100644
index 000000000..867b7c0b2
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib
new file mode 100644
index 000000000..f1090d7e1
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings
new file mode 100644
index 000000000..2a727d3a3
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib
new file mode 100644
index 000000000..4d7e8a942
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib
new file mode 100644
index 000000000..40571fdd0
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib
new file mode 100644
index 000000000..ff2e24f3b
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings
new file mode 100644
index 000000000..9cd6bff18
Binary files /dev/null and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib
index 3550df4c3..e27ca6db3 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib
index 683ad629d..3e2d8efc0 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib
index 6551540de..0dceed4fd 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib
index 74eb0267e..c0522dcca 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib
index a7bc37b45..5013418a7 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib
index 7581873f9..cc828213f 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings
index f7fb93581..68b6d366b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib
index 7207576b3..27f5abfa6 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib
index 5479c403a..86798fe29 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib
index 67c837f1f..57fcc83a7 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings
index 08cb2961b..f5e9c6d11 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib
index 95105afd5..977dc0a70 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib
index 5a8157128..d52bd5d9a 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib
index 8cecd70a4..7880aef60 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings
index c6ecfbacb..92c18eeb2 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib
index ab9491fb0..fd5b85124 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib
index 14bcaf726..6b05c1f73 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib
index 54e248f9a..b1474d1f0 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings
index 25e207938..ec2561b8a 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib
index f60fb1d0b..19e19ff7c 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib
index 7da34c239..13a6ea648 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib
index 516751a65..690b23a02 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings
index de3891225..58be0e82b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib
index a7ae98316..3de644f16 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib
index d7a2f0f9d..b05aea7ad 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib
index 616cf6a05..fc42fa21a 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings
index e366e3bf1..2b9c46152 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib
index c04684b2e..c43d99661 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib
index c0831eed5..bf5e54da8 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib
index da41ed28e..0773eee71 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings
index 19cb11f79..e55c6fd1b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib
index a7c83d717..f787d8c8d 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib
index 7ae532238..a0ea252e5 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib
index 9864c7aa9..8df1dbba4 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings
index d3eddf75d..00df86ff1 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib
index eace82c80..b4068e824 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib
index e22df9819..998781b59 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib
index fbb2a4bfb..011aaf5a1 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings
index 28a407bc9..318baa960 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib
index df2f8172a..09fb08882 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib
index 1e69dbe47..423b2ce30 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib
index b85d06173..19e13ec5c 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings
index d5cb60730..c33086d89 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib
index c6aa94507..cf9cb702f 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib
index 5ce8b5ffc..0413025e0 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib
index fc3a83ce1..ea04cc1d8 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings
index 949fb16ef..a7d2ebce6 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib
index 58d1b2798..ac4ded9c4 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib
index b3ff81800..fc1c75723 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib
index 02738220f..913fb3b42 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings
index c1ce5a04e..1be2a8079 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib
index 84a4996a7..5c5774cd0 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib
index a89378cb0..bff9b7fd5 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib
index d2abca1ec..00410e33c 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings
index e65ac5591..738c9008b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib
index f16caf04f..9126de587 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib
index 31295fc38..867b481a1 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib
index 6f575498d..25e48c879 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings
index fc728fd55..eca257024 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib
index 08c15cbe4..6526d27c1 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib
index cc72ff88c..4e7b7485c 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib
index aa2c54deb..21bed5f8b 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings
index c41e3dba0..4def140e5 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib
index 987d91502..5d2dda5d6 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib
index 1a77ccfc5..94c9dc790 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib
index bdce46213..ac62cbf7d 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings
index 521656d38..f7eb257b7 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib
index d4e07287a..789fbdbc7 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib
index 0602af81b..9ea3f4d19 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib
index b371b0dfb..aec87f298 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings
index cbd1ba684..214331cd1 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib
index e204c1a4e..c5f6ea824 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib
index 5f242053f..1b4b140c9 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib
index fb32ddc94..1a642e884 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings
index ea8c82f97..533e20862 100644
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings differ
diff --git a/Frameworks/Vendor/Sparkle.framework/Versions/A/Sparkle b/Frameworks/Vendor/Sparkle.framework/Versions/A/Sparkle
index 5b7ce1729..d26bf77f6 100755
Binary files a/Frameworks/Vendor/Sparkle.framework/Versions/A/Sparkle and b/Frameworks/Vendor/Sparkle.framework/Versions/A/Sparkle differ
diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift
index 86503c6eb..a2610aa89 100644
--- a/Mac/AppAssets.swift
+++ b/Mac/AppAssets.swift
@@ -34,8 +34,19 @@ struct AppAssets {
 		return RSImage(named: "accountFeedbin")
 	}()
 	
+	static var accountReader: RSImage! = {
+		return RSImage(named: "accountReader")
+	}()
+	
 	static var faviconTemplateImage: RSImage = {
 		return RSImage(named: "faviconTemplateImage")!
 	}()
-	
+
+	static var avatarLightBackgroundColor: NSColor = {
+		return NSColor(named: NSColor.Name("avatarLightBackgroundColor"))!
+	}()
+
+	static var avatarDarkBackgroundColor: NSColor = {
+		return NSColor(named: NSColor.Name("avatarDarkBackgroundColor"))!
+	}()
 }
diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift
index 269591996..f78cae77e 100644
--- a/Mac/AppDelegate.swift
+++ b/Mac/AppDelegate.swift
@@ -418,6 +418,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 		Browser.open("https://ranchero.com/netnewswire/", inBackground: false)
 	}
 
+	@IBAction func openHowToSupport(_ sender: Any?) {
+		
+		Browser.open("https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/HowToSupportNetNewsWire.markdown", inBackground: false)
+	}
+	
 	@IBAction func openRepository(_ sender: Any?) {
 
 		Browser.open("https://github.com/brentsimmons/NetNewsWire", inBackground: false)
diff --git a/Mac/Base.lproj/Main.storyboard b/Mac/Base.lproj/Main.storyboard
index fe81915b1..8d270183a 100644
--- a/Mac/Base.lproj/Main.storyboard
+++ b/Mac/Base.lproj/Main.storyboard
@@ -537,6 +537,12 @@
                                                 <action selector="openWebsite:" target="Ady-hI-5gd" id="rmL-lt-p8g"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="How To Support NetNewsWire" id="kfC-NQ-g3E">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="openHowToSupport:" target="Ady-hI-5gd" id="SIw-Ug-A4D"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem title="GitHub Repository" id="QfD-Xw-sdF">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
diff --git a/Mac/MainWindow/OPML/ImportOPMLWindowController.swift b/Mac/MainWindow/OPML/ImportOPMLWindowController.swift
index 76038c293..074419f02 100644
--- a/Mac/MainWindow/OPML/ImportOPMLWindowController.swift
+++ b/Mac/MainWindow/OPML/ImportOPMLWindowController.swift
@@ -26,6 +26,10 @@ class ImportOPMLWindowController: NSWindowController {
 
 		for oneAccount in AccountManager.shared.sortedActiveAccounts {
 			
+			if !oneAccount.isOPMLImportSupported {
+				continue
+			}
+			
 			let oneMenuItem = NSMenuItem()
 			oneMenuItem.title = oneAccount.nameForDisplay
 			oneMenuItem.representedObject = oneAccount
diff --git a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift
index 935b97458..c993ac343 100644
--- a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift
+++ b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift
@@ -327,9 +327,10 @@ private extension SidebarOutlineDataSource {
 
 		BatchUpdate.shared.start()
 		source.account?.moveFeed(feed, from: source, to: destination) { result in
+			BatchUpdate.shared.end()
 			switch result {
 			case .success:
-				BatchUpdate.shared.end()
+				break
 			case .failure(let error):
 				NSApplication.shared.presentError(error)
 			}
@@ -389,6 +390,7 @@ private extension SidebarOutlineDataSource {
 						}
 					}
 				case .failure(let error):
+					BatchUpdate.shared.end()
 					NSApplication.shared.presentError(error)
 				}
 			}
@@ -409,6 +411,7 @@ private extension SidebarOutlineDataSource {
 						}
 					}
 				case .failure(let error):
+					BatchUpdate.shared.end()
 					NSApplication.shared.presentError(error)
 				}
 			}
@@ -633,7 +636,7 @@ private extension SidebarOutlineDataSource {
 	}
 	
 	func violatesTagSpecificBehavior(_ parentNode: Node, _ draggedFeeds: Set<PasteboardFeed>) -> Bool {
-		guard let parentAccount = nodeAccount(parentNode), parentAccount.usesTags else {
+		guard let parentAccount = nodeAccount(parentNode), parentAccount.isTagBasedSystem else {
 			return false
 		}
 		
diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift
index 3a2ca3ea9..60f76fa0f 100644
--- a/Mac/MainWindow/Timeline/TimelineViewController.swift
+++ b/Mac/MainWindow/Timeline/TimelineViewController.swift
@@ -11,6 +11,10 @@ import RSCore
 import Articles
 import Account
 
+extension Notification.Name {
+	static let AppleInterfaceThemeChangedNotification = Notification.Name("AppleInterfaceThemeChangedNotification")
+}
+
 protocol TimelineDelegate: class  {
 	func timelineSelectionDidChange(_: TimelineViewController, selectedArticles: [Article]?)
 }
@@ -148,6 +152,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner {
 			NotificationCenter.default.addObserver(self, selector: #selector(accountsDidChange(_:)), name: .AccountsDidChange, object: nil)
 			NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil)
 			NotificationCenter.default.addObserver(self, selector: #selector(calendarDayChanged(_:)), name: .NSCalendarDayChanged, object: nil)
+			DistributedNotificationCenter.default.addObserver(self,	selector: #selector(appleInterfaceThemeChanged), name: .AppleInterfaceThemeChangedNotification, object: nil)
 
 				didRegisterForNotifications = true
 		}
@@ -521,6 +526,15 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner {
 		}
 	}
 
+	@objc func appleInterfaceThemeChanged(_ note: Notification) {
+		appDelegate.authorAvatarDownloader.resetCache()
+		appDelegate.feedIconDownloader.resetCache()
+		appDelegate.faviconDownloader.resetCache()
+		performBlockAndRestoreSelection {
+			tableView.reloadData()
+		}
+	}
+
 	// MARK: - Reloading Data
 
 	private func cellForRowView(_ rowView: NSView) -> NSView? {
@@ -752,7 +766,7 @@ extension TimelineViewController: NSTableViewDelegate {
 			return feedIcon
 		}
 
-		if let favicon = appDelegate.faviconDownloader.favicon(for: feed) {
+		if let favicon = appDelegate.faviconDownloader.faviconAsAvatar(for: feed) {
 			return favicon
 		}
 		
diff --git a/Mac/Preferences/Accounts/AccountsAddLocal.xib b/Mac/Preferences/Accounts/AccountsAddLocal.xib
index c035af932..5f56d2f4b 100644
--- a/Mac/Preferences/Accounts/AccountsAddLocal.xib
+++ b/Mac/Preferences/Accounts/AccountsAddLocal.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14810.12"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,13 +19,13 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="398" height="205"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2048" height="1129"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="398" height="205"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <stackView distribution="fill" orientation="horizontal" alignment="bottom" spacing="19" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uDK-ji-zlT">
-                        <rect key="frame" x="95" y="150" width="209" height="39"/>
+                        <rect key="frame" x="93" y="151" width="213" height="38"/>
                         <subviews>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ySx-qg-WbT">
                                 <rect key="frame" x="0.0" y="0.0" width="36" height="36"/>
@@ -35,7 +36,7 @@
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="accountLocal" id="9RZ-J3-ioX"/>
                             </imageView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="80D-3X-rL2">
-                                <rect key="frame" x="53" y="0.0" width="158" height="39"/>
+                                <rect key="frame" x="53" y="0.0" width="162" height="38"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="On My Mac" id="1d2-Mx-TKe">
                                     <font key="font" metaFont="system" size="32"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -53,10 +54,10 @@
                         </customSpacing>
                     </stackView>
                     <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" spacing="18" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Q7-nI-h5u">
-                        <rect key="frame" x="100" y="107" width="198" height="27"/>
+                        <rect key="frame" x="100" y="105" width="198" height="30"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MWg-UL-xtj">
-                                <rect key="frame" x="-2" y="8" width="44" height="17"/>
+                                <rect key="frame" x="-2" y="12" width="44" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Name:" id="AVh-ns-LEN">
                                     <font key="font" usesAppearanceFont="YES"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -64,7 +65,7 @@
                                 </textFieldCell>
                             </textField>
                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f9b-FM-i8Q">
-                                <rect key="frame" x="58" y="5" width="140" height="22"/>
+                                <rect key="frame" x="58" y="9" width="140" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="140" id="cdf-tS-vno"/>
                                 </constraints>
@@ -111,7 +112,7 @@ Gw
                         </connections>
                     </button>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Kj-Cl-FJQ">
-                        <rect key="frame" x="87" y="57" width="224" height="34"/>
+                        <rect key="frame" x="87" y="57" width="224" height="32"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="220" id="xiK-wa-r3v"/>
                         </constraints>
diff --git a/Mac/Preferences/Accounts/AccountsAddViewController.swift b/Mac/Preferences/Accounts/AccountsAddViewController.swift
index 6c3a4158f..4e3019ea4 100644
--- a/Mac/Preferences/Accounts/AccountsAddViewController.swift
+++ b/Mac/Preferences/Accounts/AccountsAddViewController.swift
@@ -39,7 +39,7 @@ class AccountsAddViewController: NSViewController {
 extension AccountsAddViewController: NSTableViewDataSource {
 	
 	func numberOfRows(in tableView: NSTableView) -> Int {
-		return 2
+		return 3
 	}
 	
 	func tableView(_ tableView: NSTableView, objectValueFor tableColumn: NSTableColumn?, row: Int) -> Any? {
@@ -63,6 +63,9 @@ extension AccountsAddViewController: NSTableViewDelegate {
 			case 1:
 				cell.accountNameLabel?.stringValue = NSLocalizedString("Feedbin", comment: "Feedbin")
 				cell.accountImageView?.image = AppAssets.accountFeedbin
+			case 2:
+				cell.accountNameLabel?.stringValue = NSLocalizedString("Reader API", comment: "Reader API")
+				cell.accountImageView?.image = AppAssets.accountReader
 			default:
 				break
 			}
@@ -87,6 +90,10 @@ extension AccountsAddViewController: NSTableViewDelegate {
 			let accountsFeedbinWindowController = AccountsFeedbinWindowController()
 			accountsFeedbinWindowController.runSheetOnWindow(self.view.window!)
 			accountsAddWindowController = accountsFeedbinWindowController
+		case 2:
+			let accountsReaderAPIWindowController = AccountsReaderAPIWindowController()
+			accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!)
+			accountsAddWindowController = accountsReaderAPIWindowController
 		default:
 			break
 		}
diff --git a/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift b/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift
index 11cdcc109..191599c07 100644
--- a/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift
+++ b/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift
@@ -74,38 +74,36 @@ class AccountsFeedbinWindowController: NSWindowController {
 			self.progressIndicator.stopAnimation(self)
 			
 			switch result {
-			case .success(let authenticated):
-				
-				if authenticated {
-					
-					var newAccount = false
-					if self.account == nil {
-						self.account = AccountManager.shared.createAccount(type: .feedbin)
-						newAccount = true
-					}
-					
-					do {
-						try self.account?.removeBasicCredentials()
-						try self.account?.storeCredentials(credentials)
-						if newAccount {
-							self.account?.refreshAll() { result in
-								switch result {
-								case .success:
-									break
-								case .failure(let error):
-									NSApplication.shared.presentError(error)
-								}
+			case .success(let validatedCredentials):
+			
+				guard let validatedCredentials = validatedCredentials else {
+					self.errorMessageLabel.stringValue = NSLocalizedString("Invalid email/password combination.", comment: "Credentials Error")
+					return
+				}
+				var newAccount = false
+				if self.account == nil {
+					self.account = AccountManager.shared.createAccount(type: .feedbin)
+					newAccount = true
+				}
+			
+				do {
+					try self.account?.removeBasicCredentials()
+					try self.account?.storeCredentials(validatedCredentials)
+					if newAccount {
+						self.account?.refreshAll() { result in
+							switch result {
+							case .success:
+								break
+							case .failure(let error):
+								NSApplication.shared.presentError(error)
 							}
 						}
-						self.hostWindow?.endSheet(self.window!, returnCode: NSApplication.ModalResponse.OK)
-					} catch {
-						self.errorMessageLabel.stringValue = NSLocalizedString("Keychain error while storing credentials.", comment: "Credentials Error")
 					}
-					
-				} else {
-					self.errorMessageLabel.stringValue = NSLocalizedString("Invalid email/password combination.", comment: "Credentials Error")
+					self.hostWindow?.endSheet(self.window!, returnCode: NSApplication.ModalResponse.OK)
+				} catch {
+					self.errorMessageLabel.stringValue = NSLocalizedString("Keychain error while storing credentials.", comment: "Credentials Error")
 				}
-
+				
 			case .failure:
 				
 				self.errorMessageLabel.stringValue = NSLocalizedString("Network error.  Try again later.", comment: "Credentials Error")
diff --git a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift
index 4de8f17af..5ad1aaa7a 100644
--- a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift
+++ b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift
@@ -107,6 +107,8 @@ extension AccountsPreferencesViewController: NSTableViewDelegate {
 				cell.imageView?.image = AppAssets.accountLocal
 			case .feedbin:
 				cell.imageView?.image = NSImage(named: "accountFeedbin")
+			case .readerAPI:
+				cell.imageView?.image = AppAssets.accountReader
 			default:
 				break
 			}
diff --git a/Mac/Preferences/Accounts/AccountsReaderAPI.xib b/Mac/Preferences/Accounts/AccountsReaderAPI.xib
new file mode 100644
index 000000000..03f9f638d
--- /dev/null
+++ b/Mac/Preferences/Accounts/AccountsReaderAPI.xib
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14810.12"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="AccountsReaderAPIWindowController" customModule="NetNewsWire" customModuleProvider="target">
+            <connections>
+                <outlet property="actionButton" destination="9mz-D9-krh" id="ozu-6Q-9Lb"/>
+                <outlet property="apiURLTextField" destination="d7d-ZV-CcZ" id="Af4-uM-Dgd"/>
+                <outlet property="errorMessageLabel" destination="byK-Sd-r7F" id="8zt-9d-dWQ"/>
+                <outlet property="passwordTextField" destination="JSa-LY-zNQ" id="E9W-0F-69m"/>
+                <outlet property="progressIndicator" destination="B0W-bh-Evv" id="Tiq-gx-s3F"/>
+                <outlet property="usernameTextField" destination="78p-Cf-f55" id="RWd-0q-oAL"/>
+                <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="F0z-JX-Cv5">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="240" width="433" height="249"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <view key="contentView" misplaced="YES" id="se5-gp-TjO">
+                <rect key="frame" x="0.0" y="0.0" width="433" height="249"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <subviews>
+                    <stackView distribution="fill" orientation="horizontal" alignment="bottom" spacing="19" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Ht-Fn-0Ya">
+                        <rect key="frame" x="113" y="220" width="207" height="38"/>
+                        <subviews>
+                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ssh-Dh-xbg">
+                                <rect key="frame" x="0.0" y="0.0" width="36" height="36"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="36" id="Ern-Kk-8LX"/>
+                                    <constraint firstAttribute="width" constant="36" id="PLS-68-NMc"/>
+                                </constraints>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="accountReader" id="y38-YL-woC"/>
+                            </imageView>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lti-yM-8LV">
+                                <rect key="frame" x="53" y="0.0" width="156" height="38"/>
+                                <textFieldCell key="cell" lineBreakMode="clipping" title="Reader API" id="ras-dj-nP8">
+                                    <font key="font" metaFont="system" size="32"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                        </subviews>
+                        <visibilityPriorities>
+                            <integer value="1000"/>
+                            <integer value="1000"/>
+                        </visibilityPriorities>
+                        <customSpacing>
+                            <real value="3.4028234663852886e+38"/>
+                            <real value="3.4028234663852886e+38"/>
+                        </customSpacing>
+                    </stackView>
+                    <gridView xPlacement="trailing" yPlacement="center" rowAlignment="none" rowSpacing="12" columnSpacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="zBB-JH-huI">
+                        <rect key="frame" x="79" y="61" width="276" height="127"/>
+                        <rows>
+                            <gridRow id="DRl-lC-vUc"/>
+                            <gridRow id="eW8-uH-txq"/>
+                            <gridRow id="ebD-On-mOK"/>
+                            <gridRow id="DbI-7g-Xme"/>
+                        </rows>
+                        <columns>
+                            <gridColumn id="fCQ-jY-Mts"/>
+                            <gridColumn xPlacement="leading" id="7CY-bX-6x4"/>
+                        </columns>
+                        <gridCells>
+                            <gridCell row="DRl-lC-vUc" column="fCQ-jY-Mts" id="4DI-01-jGD">
+                                <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zy6-9c-8TI">
+                                    <rect key="frame" x="23" y="109" width="41" height="16"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Login:" id="DqN-SV-v35">
+                                        <font key="font" usesAppearanceFont="YES"/>
+                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </gridCell>
+                            <gridCell row="DRl-lC-vUc" column="7CY-bX-6x4" id="Z0b-qS-MUJ">
+                                <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="78p-Cf-f55">
+                                    <rect key="frame" x="76" y="106" width="200" height="21"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="200" id="Qin-jm-4zt"/>
+                                    </constraints>
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="fCk-Tf-q01">
+                                        <font key="font" metaFont="system"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </gridCell>
+                            <gridCell row="eW8-uH-txq" column="fCQ-jY-Mts" id="Hqa-3w-cQv">
+                                <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wEx-TM-rPM">
+                                    <rect key="frame" x="-2" y="76" width="66" height="16"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Password:" id="7g8-Kk-ISg">
+                                        <font key="font" metaFont="system"/>
+                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </gridCell>
+                            <gridCell row="eW8-uH-txq" column="7CY-bX-6x4" id="m16-3v-9pf">
+                                <secureTextField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JSa-LY-zNQ">
+                                    <rect key="frame" x="76" y="73" width="200" height="21"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="200" id="eal-wa-1nU"/>
+                                    </constraints>
+                                    <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="trK-OG-tBe">
+                                        <font key="font" metaFont="system"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        <allowedInputSourceLocales>
+                                            <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+                                        </allowedInputSourceLocales>
+                                    </secureTextFieldCell>
+                                </secureTextField>
+                            </gridCell>
+                            <gridCell row="ebD-On-mOK" column="fCQ-jY-Mts" id="xwR-xz-N6h">
+                                <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="H6f-t4-SMg">
+                                    <rect key="frame" x="7" y="43" width="57" height="16"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="API URL:" id="zBm-dZ-EF1">
+                                        <font key="font" usesAppearanceFont="YES"/>
+                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </gridCell>
+                            <gridCell row="ebD-On-mOK" column="7CY-bX-6x4" id="Wd5-Zp-t61">
+                                <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="d7d-ZV-CcZ" userLabel="API URL Text Field">
+                                    <rect key="frame" x="76" y="40" width="200" height="21"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="200" id="Mki-bb-tDu"/>
+                                    </constraints>
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="0OO-BG-GXI">
+                                        <font key="font" metaFont="system"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </gridCell>
+                            <gridCell row="DbI-7g-Xme" column="fCQ-jY-Mts" headOfMergedCell="xX0-vn-AId" xPlacement="leading" id="xX0-vn-AId">
+                                <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="byK-Sd-r7F">
+                                    <rect key="frame" x="-2" y="6" width="104" height="16"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" id="0yh-Ab-UTX">
+                                        <font key="font" usesAppearanceFont="YES"/>
+                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </gridCell>
+                            <gridCell row="DbI-7g-Xme" column="7CY-bX-6x4" headOfMergedCell="xX0-vn-AId" id="hk5-St-E4y"/>
+                        </gridCells>
+                    </gridView>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9mz-D9-krh">
+                        <rect key="frame" x="340" y="13" width="79" height="32"/>
+                        <buttonCell key="cell" type="push" title="Action" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="IMO-YT-k9Z">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="action:" target="-2" id="Kix-5a-5Og"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XAM-Hb-0Hw">
+                        <rect key="frame" x="258" y="13" width="82" height="32"/>
+                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ufs-ar-BAY">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="cancel:" target="-2" id="WAD-ES-hpq"/>
+                        </connections>
+                    </button>
+                    <progressIndicator hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="B0W-bh-Evv">
+                        <rect key="frame" x="209" y="196" width="16" height="16"/>
+                    </progressIndicator>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="9mz-D9-krh" firstAttribute="leading" secondItem="XAM-Hb-0Hw" secondAttribute="trailing" constant="12" symbolic="YES" id="CC8-HR-FDy"/>
+                    <constraint firstItem="XAM-Hb-0Hw" firstAttribute="centerY" secondItem="9mz-D9-krh" secondAttribute="centerY" id="M2M-fb-kfR"/>
+                    <constraint firstAttribute="bottom" secondItem="9mz-D9-krh" secondAttribute="bottom" constant="20" id="PK2-Ye-400"/>
+                    <constraint firstItem="zBB-JH-huI" firstAttribute="top" secondItem="B0W-bh-Evv" secondAttribute="bottom" constant="8" id="V7z-a7-OOG"/>
+                    <constraint firstItem="9mz-D9-krh" firstAttribute="top" secondItem="zBB-JH-huI" secondAttribute="bottom" constant="20" symbolic="YES" id="Wu3-hp-Vzh"/>
+                    <constraint firstItem="zBB-JH-huI" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="aFI-4s-mMv"/>
+                    <constraint firstAttribute="trailing" secondItem="9mz-D9-krh" secondAttribute="trailing" constant="20" id="fVQ-zN-rKd"/>
+                    <constraint firstItem="B0W-bh-Evv" firstAttribute="top" secondItem="lti-yM-8LV" secondAttribute="bottom" constant="8" id="gq2-tB-pXH"/>
+                    <constraint firstItem="7Ht-Fn-0Ya" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="20" id="jlY-Jg-KJR"/>
+                    <constraint firstItem="B0W-bh-Evv" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="lrN-Gd-iXd"/>
+                    <constraint firstItem="7Ht-Fn-0Ya" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="tAZ-Te-w3H"/>
+                </constraints>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
+            </connections>
+            <point key="canvasLocation" x="116.5" y="136.5"/>
+        </window>
+    </objects>
+    <resources>
+        <image name="accountReader" width="73" height="73"/>
+    </resources>
+</document>
diff --git a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
new file mode 100644
index 000000000..4bdf31256
--- /dev/null
+++ b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
@@ -0,0 +1,125 @@
+//
+//  AccountsAddFeedbinWindowController.swift
+//  NetNewsWire
+//
+//  Created by Maurice Parker on 5/2/19.
+//  Copyright © 2019 Ranchero Software. All rights reserved.
+//
+
+import AppKit
+import Account
+import RSWeb
+
+class AccountsReaderAPIWindowController: NSWindowController {
+
+	@IBOutlet weak var progressIndicator: NSProgressIndicator!
+	@IBOutlet weak var usernameTextField: NSTextField!
+	@IBOutlet weak var apiURLTextField: NSTextField!
+	@IBOutlet weak var passwordTextField: NSSecureTextField!
+	@IBOutlet weak var errorMessageLabel: NSTextField!
+	@IBOutlet weak var actionButton: NSButton!
+	
+	var account: Account?
+	
+	private weak var hostWindow: NSWindow?
+	
+	convenience init() {
+		self.init(windowNibName: NSNib.Name("AccountsReaderAPI"))
+	}
+	
+	override func windowDidLoad() {
+		if let account = account, let credentials = try? account.retrieveBasicCredentials() {
+			if case .basic(let username, let password) = credentials {
+				usernameTextField.stringValue = username
+				passwordTextField.stringValue = password
+			}
+			actionButton.title = NSLocalizedString("Update", comment: "Update")
+		} else {
+			actionButton.title = NSLocalizedString("Create", comment: "Create")
+		}
+	}
+	
+	// MARK: API
+	
+	func runSheetOnWindow(_ hostWindow: NSWindow, completionHandler handler: ((NSApplication.ModalResponse) -> Void)? = nil) {
+		self.hostWindow = hostWindow
+		hostWindow.beginSheet(window!, completionHandler: handler)
+	}
+
+	// MARK: Actions
+	
+	@IBAction func cancel(_ sender: Any) {
+		hostWindow!.endSheet(window!, returnCode: NSApplication.ModalResponse.cancel)
+	}
+	
+	@IBAction func action(_ sender: Any) {
+		
+		self.errorMessageLabel.stringValue = ""
+		
+		guard !usernameTextField.stringValue.isEmpty && !passwordTextField.stringValue.isEmpty && !apiURLTextField.stringValue.isEmpty else {
+			self.errorMessageLabel.stringValue = NSLocalizedString("Username, password & API URL are required.", comment: "Credentials Error")
+			return
+		}
+		
+		actionButton.isEnabled = false
+		progressIndicator.isHidden = false
+		progressIndicator.startAnimation(self)
+		
+		guard let apiURL = URL(string: apiURLTextField.stringValue) else {
+			self.errorMessageLabel.stringValue = NSLocalizedString("Invalid API URL.", comment: "Credentials Error")
+			return
+		}
+		
+		let credentials = Credentials.readerAPIBasicLogin(username: usernameTextField.stringValue, password: passwordTextField.stringValue)
+		Account.validateCredentials(type: .readerAPI, credentials: credentials, endpoint: apiURL) { [weak self] result in
+			
+			guard let self = self else { return }
+			
+			self.actionButton.isEnabled = true
+			self.progressIndicator.isHidden = true
+			self.progressIndicator.stopAnimation(self)
+			
+			switch result {
+			case .success(let validatedCredentials):
+				guard let validatedCredentials = validatedCredentials else {
+					self.errorMessageLabel.stringValue = NSLocalizedString("Invalid email/password combination.", comment: "Credentials Error")
+					return
+				}
+				
+				
+				var newAccount = false
+				if self.account == nil {
+					self.account = AccountManager.shared.createAccount(type: .readerAPI)
+					newAccount = true
+				}
+				
+				do {
+					self.account?.endpointURL = apiURL
+
+					try self.account?.removeReaderAPIAuthCredentials()
+					try self.account?.storeCredentials(validatedCredentials)
+					
+					if newAccount {
+						self.account?.refreshAll() { result in
+							switch result {
+							case .success:
+								break
+							case .failure(let error):
+								NSApplication.shared.presentError(error)
+							}
+						}
+					}
+					self.hostWindow?.endSheet(self.window!, returnCode: NSApplication.ModalResponse.OK)
+				} catch {
+					self.errorMessageLabel.stringValue = NSLocalizedString("Keychain error while storing credentials.", comment: "Credentials Error")
+				}
+				
+			case .failure:
+				self.errorMessageLabel.stringValue = NSLocalizedString("Network error.  Try again later.", comment: "Credentials Error")
+			}
+			
+		}
+		
+	}
+    
+}
diff --git a/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json
new file mode 100644
index 000000000..d8d735f71
--- /dev/null
+++ b/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "accountReader.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf b/Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf
new file mode 100644
index 000000000..8e49ad8aa
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/avatarDarkBackgroundColor.colorset/Contents.json b/Mac/Resources/Assets.xcassets/avatarDarkBackgroundColor.colorset/Contents.json
new file mode 100644
index 000000000..de7a620f3
--- /dev/null
+++ b/Mac/Resources/Assets.xcassets/avatarDarkBackgroundColor.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "56",
+          "alpha" : "1.000",
+          "blue" : "56",
+          "green" : "56"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Mac/Resources/Assets.xcassets/avatarLightBackgroundColor.colorset/Contents.json b/Mac/Resources/Assets.xcassets/avatarLightBackgroundColor.colorset/Contents.json
new file mode 100644
index 000000000..57a5cc49d
--- /dev/null
+++ b/Mac/Resources/Assets.xcassets/avatarLightBackgroundColor.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "242",
+          "alpha" : "1.000",
+          "blue" : "242",
+          "green" : "242"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Mac/Resources/NetNewsWire.sdef b/Mac/Resources/NetNewsWire.sdef
index 56feb0dcf..c025b6e1d 100644
--- a/Mac/Resources/NetNewsWire.sdef
+++ b/Mac/Resources/NetNewsWire.sdef
@@ -202,10 +202,10 @@
             <property name="modified date" code="MDat" type="date" access="r" description="date the article was last modified">
                 <cocoa key="dateModified"/>
             </property>
-            <property name="read" code="Read" type="boolean" access="r" description="has the article been read">
+            <property name="read" code="Read" type="boolean" access="rw" description="has the article been read">
                 <cocoa key="read"/>
             </property>
-            <property name="starred" code="Star" type="boolean" access="r" description="has the article been marked with a star">
+            <property name="starred" code="Star" type="boolean" access="rw" description="has the article been marked with a star">
                 <cocoa key="starred"/>
             </property>
             <property name="deleted" code="Delt" type="boolean" access="r" description="has the article been deleted by the user">
diff --git a/Mac/Scriptability/Account+Scriptability.swift b/Mac/Scriptability/Account+Scriptability.swift
index 80637f6be..6b338b75b 100644
--- a/Mac/Scriptability/Account+Scriptability.swift
+++ b/Mac/Scriptability/Account+Scriptability.swift
@@ -142,6 +142,8 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta
                 osType = "FWrg"
         case .newsBlur:
                 osType = "NBlr"
+		case .readerAPI:
+				osType = "Grdr"
         }
         return osType.fourCharCode()
     }
diff --git a/Mac/Scriptability/Article+Scriptability.swift b/Mac/Scriptability/Article+Scriptability.swift
index 75b2d7d61..eca5bb971 100644
--- a/Mac/Scriptability/Article+Scriptability.swift
+++ b/Mac/Scriptability/Article+Scriptability.swift
@@ -107,12 +107,22 @@ class ScriptableArticle: NSObject, UniqueIdScriptingObject, ScriptingObjectConta
 
     @objc(read)
     var read:Bool  {
-        return article.status.boolStatus(forKey:.read)
+		get {
+			return article.status.boolStatus(forKey:.read)
+		}
+		set {
+			markArticles([self.article], statusKey: .read, flag: newValue)
+		}
     }
 
     @objc(starred)
     var starred:Bool  {
-        return article.status.boolStatus(forKey:.starred)
+		get {
+			return article.status.boolStatus(forKey:.starred)
+		}
+		set {
+			markArticles([self.article], statusKey: .starred, flag: newValue)
+		}
     }
 
     @objc(deleted)
diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index 08cbcb50d..52c120d44 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -155,6 +155,9 @@
 		51F85BF92274AA7B00C787DC /* UIBarButtonItem-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F85BF82274AA7B00C787DC /* UIBarButtonItem-Extensions.swift */; };
 		51F85BFB2275D85000C787DC /* Array-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F85BFA2275D85000C787DC /* Array-Extensions.swift */; };
 		51F85BFD2275DCA800C787DC /* SingleLineUILabelSizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F85BFC2275DCA800C787DC /* SingleLineUILabelSizer.swift */; };
+		557EE1AE22B6F4E1004206FA /* SettingsReaderAPIAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 557EE1A522B6F4E1004206FA /* SettingsReaderAPIAccountView.swift */; };
+		55E15BCB229D65A900D6602A /* AccountsReaderAPI.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55E15BC1229D65A900D6602A /* AccountsReaderAPI.xib */; };
+		55E15BCC229D65A900D6602A /* AccountsReaderAPIWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E15BCA229D65A900D6602A /* AccountsReaderAPIWindowController.swift */; };
 		6581C73820CED60100F4AD34 /* SafariExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73720CED60100F4AD34 /* SafariExtensionHandler.swift */; };
 		6581C73A20CED60100F4AD34 /* SafariExtensionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73920CED60100F4AD34 /* SafariExtensionViewController.swift */; };
 		6581C73D20CED60100F4AD34 /* SafariExtensionViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6581C73B20CED60100F4AD34 /* SafariExtensionViewController.xib */; };
@@ -750,6 +753,9 @@
 		51F85BF82274AA7B00C787DC /* UIBarButtonItem-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIBarButtonItem-Extensions.swift"; sourceTree = "<group>"; };
 		51F85BFA2275D85000C787DC /* Array-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array-Extensions.swift"; sourceTree = "<group>"; };
 		51F85BFC2275DCA800C787DC /* SingleLineUILabelSizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleLineUILabelSizer.swift; sourceTree = "<group>"; };
+		557EE1A522B6F4E1004206FA /* SettingsReaderAPIAccountView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsReaderAPIAccountView.swift; sourceTree = "<group>"; };
+		55E15BC1229D65A900D6602A /* AccountsReaderAPI.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AccountsReaderAPI.xib; sourceTree = "<group>"; };
+		55E15BCA229D65A900D6602A /* AccountsReaderAPIWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsReaderAPIWindowController.swift; sourceTree = "<group>"; };
 		6581C73320CED60000F4AD34 /* Subscribe to Feed.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Subscribe to Feed.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6581C73420CED60100F4AD34 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		6581C73720CED60100F4AD34 /* SafariExtensionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariExtensionHandler.swift; sourceTree = "<group>"; };
@@ -1060,6 +1066,7 @@
 		5183CCEB227117C70010922C /* Settings */ = {
 			isa = PBXGroup;
 			children = (
+				557EE1A522B6F4E1004206FA /* SettingsReaderAPIAccountView.swift */,
 				510D708122B041CC004E8F65 /* SettingsAccountLabelView.swift */,
 				510D707322B028E1004E8F65 /* SettingsAddAccountView.swift */,
 				51F772EC22B2789B0087D9D1 /* SettingsDetailAccountView.swift */,
@@ -1662,6 +1669,8 @@
 		84C9FC6F22629E1200D921D6 /* Accounts */ = {
 			isa = PBXGroup;
 			children = (
+				55E15BC1229D65A900D6602A /* AccountsReaderAPI.xib */,
+				55E15BCA229D65A900D6602A /* AccountsReaderAPIWindowController.swift */,
 				84C9FC7022629E1200D921D6 /* AccountsTableViewBackgroundView.swift */,
 				84C9FC7122629E1200D921D6 /* AccountsControlsBackgroundView.swift */,
 				84C9FC7222629E1200D921D6 /* AccountsPreferencesViewController.swift */,
@@ -1963,12 +1972,12 @@
 				ORGANIZATIONNAME = "Ranchero Software";
 				TargetAttributes = {
 					6581C73220CED60000F4AD34 = {
-						DevelopmentTeam = SHJK2V3AJG;
-						ProvisioningStyle = Manual;
+						DevelopmentTeam = 96VR936H35;
+						ProvisioningStyle = Automatic;
 					};
 					840D617B2029031C009BC708 = {
 						CreatedOnToolsVersion = 9.3;
-						DevelopmentTeam = SHJK2V3AJG;
+						DevelopmentTeam = 96VR936H35;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
@@ -1978,8 +1987,8 @@
 					};
 					849C645F1ED37A5D003D8FC0 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = SHJK2V3AJG;
-						ProvisioningStyle = Manual;
+						DevelopmentTeam = 96VR936H35;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.HardenedRuntime = {
 								enabled = 1;
@@ -1988,7 +1997,7 @@
 					};
 					849C64701ED37A5D003D8FC0 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = SHJK2V3AJG;
+						DevelopmentTeam = 96VR936H35;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 849C645F1ED37A5D003D8FC0;
 					};
@@ -2256,6 +2265,7 @@
 				5144EA52227B8E4500D19003 /* AccountsFeedbin.xib in Resources */,
 				8405DDA222168920008CE1BF /* TimelineTableView.xib in Resources */,
 				8483630E2262A3FE00DA1D35 /* MainWindow.storyboard in Resources */,
+				55E15BCB229D65A900D6602A /* AccountsReaderAPI.xib in Resources */,
 				84BAE64921CEDAF20046DB56 /* CrashReporterWindow.xib in Resources */,
 				84C9FC8E22629E8F00D921D6 /* Credits.rtf in Resources */,
 				84BBB12D20142A4700F054F5 /* Inspector.storyboard in Resources */,
@@ -2380,6 +2390,7 @@
 				51F85BF722749FA100C787DC /* UIFont-Extensions.swift in Sources */,
 				515436882291D75D005E1CDF /* AddLocalAccountViewController.swift in Sources */,
 				51C452AF2265108300C03939 /* ArticleArray.swift in Sources */,
+				557EE1AE22B6F4E1004206FA /* SettingsReaderAPIAccountView.swift in Sources */,
 				51C4528E2265099C00C03939 /* SmartFeedsController.swift in Sources */,
 				51C4529C22650A1000C03939 /* SingleFaviconDownloader.swift in Sources */,
 				51E595A6228CC36500FCC42B /* ArticleStatusSyncTimer.swift in Sources */,
@@ -2476,6 +2487,7 @@
 				8477ACBE22238E9500DF7F37 /* SearchFeedDelegate.swift in Sources */,
 				51E3EB33229AB02C00645299 /* ErrorHandler.swift in Sources */,
 				8472058120142E8900AD578B /* FeedInspectorViewController.swift in Sources */,
+				55E15BCC229D65A900D6602A /* AccountsReaderAPIWindowController.swift in Sources */,
 				5144EA382279FC6200D19003 /* AccountsAddLocalWindowController.swift in Sources */,
 				84AD1EAA2031617300BC20B7 /* PasteboardFolder.swift in Sources */,
 				5144EA51227B8E4500D19003 /* AccountsFeedbinWindowController.swift in Sources */,
diff --git a/README.md b/README.md
index 48d115651..597d76c16 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,19 @@ This allows for a pristine project with code signing set up with the appropriate
 developer ID and certificates, and for dev to be able to have local settings
 without needing to check in anything into source control.
 
-As an example, make a `../../SharedXcodeSettings/DeveloperSettings.xcconfig` file and
-give it the contents
+As an example, make a directory SharedXcodeSettings next to where you have this repository.
+An example of the structure is:
+
+```
+aDirectory/
+  SharedXcodeSettings/
+    DeveloperSettings.xcconfig
+  NetNewsWire
+    NewNewsSire.xcworkspace
+```
+
+Then create a plain text file in it: `SharedXcodeSettings/DeveloperSettings.xcconfig` and
+give it the contents:
 
 ```
 CODE_SIGN_IDENTITY = Mac Developer
diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift
index c37b49793..833228120 100644
--- a/Shared/Article Rendering/ArticleRenderer.swift	
+++ b/Shared/Article Rendering/ArticleRenderer.swift	
@@ -86,11 +86,10 @@ private extension ArticleRenderer {
 	}
 
 	func titleOrTitleLink() -> String {
-		let escapedTitle = title.escapeHTML()
 		if let link = article?.preferredLink {
-			return escapedTitle.htmlByAddingLink(link)
+			return title.htmlByAddingLink(link)
 		}
-		return escapedTitle
+		return title
 	}
 
 	func substitutions() -> [String: String] {
@@ -211,11 +210,7 @@ private extension ArticleRenderer {
 	}
 
 	func base64String(forImage image: RSImage) -> String? {
-		#if os(macOS)
-		return image.tiffRepresentation?.base64EncodedString()
-		#else
-		return image.pngData()?.base64EncodedString()
-		#endif
+		return image.dataRepresentation()?.base64EncodedString()
 	}
 
 	func singleArticleSpecifiedAuthor() -> Author? {
diff --git a/Shared/Extensions/RSImage-Extensions.swift b/Shared/Extensions/RSImage-Extensions.swift
index 2e62704b3..3406a959b 100644
--- a/Shared/Extensions/RSImage-Extensions.swift
+++ b/Shared/Extensions/RSImage-Extensions.swift
@@ -21,16 +21,17 @@ extension RSImage {
 			}
 		}
 	}
-}
-
-private extension RSImage {
 
 	static func scaledForAvatar(_ data: Data) -> RSImage? {
 		let scaledMaxPixelSize = Int(ceil(CGFloat(RSImage.avatarSize) * RSScreen.mainScreenScale))
-		guard let cgImage = RSImage.scaleImage(data, maxPixelSize: scaledMaxPixelSize) else {
+		guard var cgImage = RSImage.scaleImage(data, maxPixelSize: scaledMaxPixelSize) else {
 			return nil
 		}
 		
+		if cgImage.width < avatarSize || cgImage.height < avatarSize {
+			cgImage = RSImage.compositeAvatar(cgImage)
+		}
+		
 		#if os(iOS)
 		return RSImage(cgImage: cgImage)
 		#else
@@ -41,3 +42,49 @@ private extension RSImage {
 	}
 	
 }
+
+private extension RSImage {
+	
+	#if os(iOS)
+	
+	static func compositeAvatar(_ avatar: CGImage) -> CGImage {
+		let rect = CGRect(x: 0, y: 0, width: avatarSize, height: avatarSize)
+		UIGraphicsBeginImageContext(rect.size)
+		if let context = UIGraphicsGetCurrentContext() {
+			context.setFillColor(AppAssets.avatarLightBackgroundColor.cgColor)
+			context.fill(rect)
+			context.translateBy(x: 0.0, y: CGFloat(integerLiteral: avatarSize));
+			context.scaleBy(x: 1.0, y: -1.0)
+			let avatarRect = CGRect(x: (avatarSize - avatar.width) / 2, y: (avatarSize - avatar.height) / 2, width: avatar.width, height: avatar.height)
+			context.draw(avatar, in: avatarRect)
+		}
+		let img = UIGraphicsGetImageFromCurrentImageContext()
+		UIGraphicsEndImageContext()
+		return img!.cgImage!
+	}
+	
+	#else
+
+	static func compositeAvatar(_ avatar: CGImage) -> CGImage {
+		var resultRect = CGRect(x: 0, y: 0, width: avatarSize, height: avatarSize)
+		let resultImage = NSImage(size: resultRect.size)
+		
+		resultImage.lockFocus()
+		if let context = NSGraphicsContext.current?.cgContext {
+			if NSApplication.shared.effectiveAppearance.isDarkMode {
+				context.setFillColor(AppAssets.avatarDarkBackgroundColor.cgColor)
+			} else {
+				context.setFillColor(AppAssets.avatarLightBackgroundColor.cgColor)
+			}
+			context.fill(resultRect)
+			let avatarRect = CGRect(x: (avatarSize - avatar.width) / 2, y: (avatarSize - avatar.height) / 2, width: avatar.width, height: avatar.height)
+			context.draw(avatar, in: avatarRect)
+		}
+		resultImage.unlockFocus()
+		
+		return resultImage.cgImage(forProposedRect: &resultRect, context: nil, hints: nil)!
+	}
+
+	#endif
+	
+}
diff --git a/Shared/Favicons/FaviconDownloader.swift b/Shared/Favicons/FaviconDownloader.swift
index 52c598d05..0cedd923c 100644
--- a/Shared/Favicons/FaviconDownloader.swift
+++ b/Shared/Favicons/FaviconDownloader.swift
@@ -24,6 +24,7 @@ final class FaviconDownloader {
 	private var homePageToFaviconURLCache = [String: String]() //homePageURL: faviconURL
 	private var homePageURLsWithNoFaviconURL = Set<String>()
 	private let queue: DispatchQueue
+	private var cache = [Feed: RSImage]() // faviconURL: RSImage
 
 	struct UserInfoKey {
 		static let faviconURL = "faviconURL"
@@ -40,6 +41,10 @@ final class FaviconDownloader {
 
 	// MARK: - API
 
+	func resetCache() {
+		cache = [Feed: RSImage]()
+	}
+	
 	func favicon(for feed: Feed) -> RSImage? {
 
 		assert(Thread.isMainThread)
@@ -61,6 +66,22 @@ final class FaviconDownloader {
 
 		return nil
 	}
+	
+	func faviconAsAvatar(for feed: Feed) -> RSImage? {
+		
+		if let image = cache[feed] {
+			return image
+		}
+		
+		if let image = favicon(for: feed), let imageData = image.dataRepresentation() {
+			if let scaledImage = RSImage.scaledForAvatar(imageData) {
+				cache[feed] = scaledImage
+				return scaledImage
+			}
+		}
+		
+		return nil
+	}
 
 	func favicon(with faviconURL: String) -> RSImage? {
 
diff --git a/Shared/Favicons/SingleFaviconDownloader.swift b/Shared/Favicons/SingleFaviconDownloader.swift
index 044b23761..57730a903 100644
--- a/Shared/Favicons/SingleFaviconDownloader.swift
+++ b/Shared/Favicons/SingleFaviconDownloader.swift
@@ -99,7 +99,7 @@ private extension SingleFaviconDownloader {
 		queue.async {
 
 			if let data = self.diskCache[self.diskKey], !data.isEmpty {
-				RSImage.scaledForAvatar(data, imageResultBlock: callback)
+				RSImage.rs_image(with: data, imageResultBlock: callback)
 				return
 			}
 
@@ -134,7 +134,7 @@ private extension SingleFaviconDownloader {
 
 			if let data = data, !data.isEmpty, let response = response, response.statusIsOK, error == nil {
 				self.saveToDisk(data)
-				RSImage.scaledForAvatar(data, imageResultBlock: callback)
+				RSImage.rs_image(with: data, imageResultBlock: callback)
 				return
 			}
 
diff --git a/Shared/Images/AuthorAvatarDownloader.swift b/Shared/Images/AuthorAvatarDownloader.swift
index e1629996b..ef0b04eba 100644
--- a/Shared/Images/AuthorAvatarDownloader.swift
+++ b/Shared/Images/AuthorAvatarDownloader.swift
@@ -27,6 +27,10 @@ final class AuthorAvatarDownloader {
 		NotificationCenter.default.addObserver(self, selector: #selector(imageDidBecomeAvailable(_:)), name: .ImageDidBecomeAvailable, object: imageDownloader)
 	}
 
+	func resetCache() {
+		cache = [String: RSImage]()
+	}
+	
 	func image(for author: Author) -> RSImage? {
 
 		guard let avatarURL = author.avatarURL else {
diff --git a/Shared/Images/FeedIconDownloader.swift b/Shared/Images/FeedIconDownloader.swift
index 630a13b94..2fa08b0dc 100644
--- a/Shared/Images/FeedIconDownloader.swift
+++ b/Shared/Images/FeedIconDownloader.swift
@@ -31,6 +31,10 @@ public final class FeedIconDownloader {
 		self.imageDownloader = imageDownloader
 	}
 
+	func resetCache() {
+		cache = [Feed: RSImage]()
+	}
+
 	func icon(for feed: Feed) -> RSImage? {
 
 		if let cachedImage = cache[feed] {
diff --git a/Shared/Timeline/ArticleArray.swift b/Shared/Timeline/ArticleArray.swift
index d8878eaa7..1e40e7593 100644
--- a/Shared/Timeline/ArticleArray.swift
+++ b/Shared/Timeline/ArticleArray.swift
@@ -53,6 +53,9 @@ extension Array where Element == Article {
 	func sortedByDate(_ sortDirection: ComparisonResult) -> ArticleArray {
 
 		let articles = sorted { (article1, article2) -> Bool in
+			if article1.logicalDatePublished == article2.logicalDatePublished {
+				return article1.articleID < article2.articleID
+			}
 			if sortDirection == .orderedDescending {
 				return article1.logicalDatePublished > article2.logicalDatePublished
 			}
diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift
index a0ce2fc62..4e1387d3e 100644
--- a/iOS/AppAssets.swift
+++ b/iOS/AppAssets.swift
@@ -10,6 +10,14 @@ import RSCore
 
 struct AppAssets {
 
+	static var avatarDarkBackgroundColor: UIColor {
+		return UIColor(named: "avatarDarkBackgroundColor")!
+	}
+
+	static var avatarLightBackgroundColor: UIColor {
+		return UIColor(named: "avatarLightBackgroundColor")!
+	}
+	
 	static var circleClosedImage: RSImage = {
 		return RSImage(named: "circleClosedImage")!
 	}()
diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift
index 4b35170a8..4d65c3bc3 100644
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/MasterTimeline/MasterTimelineViewController.swift
@@ -407,7 +407,7 @@ private extension MasterTimelineViewController {
 			return feedIconImage
 		}
 		
-		if let feed = article.feed, let faviconImage = appDelegate.faviconDownloader.favicon(for: feed) {
+		if let feed = article.feed, let faviconImage = appDelegate.faviconDownloader.faviconAsAvatar(for: feed) {
 			return faviconImage
 		}
 		
diff --git a/iOS/Resources/Assets.xcassets/avatarDarkBackgroundColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/avatarDarkBackgroundColor.colorset/Contents.json
new file mode 100644
index 000000000..de7a620f3
--- /dev/null
+++ b/iOS/Resources/Assets.xcassets/avatarDarkBackgroundColor.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "56",
+          "alpha" : "1.000",
+          "blue" : "56",
+          "green" : "56"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iOS/Resources/Assets.xcassets/avatarLightBackgroundColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/avatarLightBackgroundColor.colorset/Contents.json
new file mode 100644
index 000000000..57a5cc49d
--- /dev/null
+++ b/iOS/Resources/Assets.xcassets/avatarLightBackgroundColor.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "242",
+          "alpha" : "1.000",
+          "blue" : "242",
+          "green" : "242"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iOS/Settings/SettingsFeedbinAccountView.swift b/iOS/Settings/SettingsFeedbinAccountView.swift
index 2412ff993..1b3f370fb 100644
--- a/iOS/Settings/SettingsFeedbinAccountView.swift
+++ b/iOS/Settings/SettingsFeedbinAccountView.swift
@@ -79,7 +79,7 @@ struct SettingsFeedbinAccountView : View {
 			switch result {
 			case .success(let authenticated):
 				
-				if authenticated {
+				if (authenticated != nil) {
 					
 					var newAccount = false
 					let workAccount: Account
diff --git a/iOS/Settings/SettingsReaderAPIAccountView.swift b/iOS/Settings/SettingsReaderAPIAccountView.swift
new file mode 100644
index 000000000..68322d7ab
--- /dev/null
+++ b/iOS/Settings/SettingsReaderAPIAccountView.swift
@@ -0,0 +1,187 @@
+//
+//  SettingsReaderAPIAccountView.swift
+//  NetNewsWire-iOS
+//
+//  Created by Jeremy Beker on 5/28/2019.
+//  Copyright © 2019 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Combine
+import Account
+import RSWeb
+
+struct SettingsReaderAPIAccountView : View {
+	@Environment(\.isPresented) private var isPresented
+	@ObjectBinding var viewModel: ViewModel
+	@State var busy: Bool = false
+	@State var error: Text = Text("")
+
+	var body: some View {
+		NavigationView {
+			List {
+				Section(header:
+					SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: "Google Reader Compatible").padding()
+				)  {
+					HStack {
+						Text("Email:")
+						Divider()
+						TextField($viewModel.email)
+						.textContentType(.username)
+					}
+					HStack {
+						Text("Password:")
+						Divider()
+						SecureField($viewModel.password)
+					}
+					HStack {
+						Text("API URL:")
+						Divider()
+						TextField($viewModel.apiURL)
+							.textContentType(.URL)
+					}
+				}
+				Section(footer:
+					HStack {
+						Spacer()
+						error.color(.red)
+						Spacer()
+					}
+					) {
+					HStack {
+						Spacer()
+						Button(action: { self.addAccount() }) {
+							if viewModel.isUpdate {
+								Text("Update Account")
+							} else {
+								Text("Add Account")
+							}
+						}
+						.disabled(!viewModel.isValid)
+						Spacer()
+					}
+				}
+			}
+			.disabled(busy)
+			.listStyle(.grouped)
+			.navigationBarTitle(Text(""), displayMode: .inline)
+			.navigationBarItems(leading:
+				Button(action: { self.dismiss() }) { Text("Cancel") }
+			)
+		}
+	}
+	
+	private func addAccount() {
+		
+		busy = true
+		error = Text("")
+		
+		let emailAddress = viewModel.email.trimmingCharacters(in: .whitespaces)
+		let credentials = Credentials.readerAPIBasicLogin(username: emailAddress, password: viewModel.password)
+		guard let apiURL = URL(string: viewModel.apiURL) else {
+			self.error = Text("Invalide API URL.")
+			return
+		}
+
+		Account.validateCredentials(type: .readerAPI, credentials: credentials, endpoint: apiURL) { result in
+			
+			self.busy = false
+			
+			switch result {
+			case .success(let authenticated):
+				
+				if (authenticated != nil) {
+					
+					var newAccount = false
+					let workAccount: Account
+					if self.viewModel.account == nil {
+						workAccount = AccountManager.shared.createAccount(type: .readerAPI)
+						newAccount = true
+					} else {
+						workAccount = self.viewModel.account!
+					}
+					
+					do {
+						
+						do {
+							try workAccount.removeBasicCredentials()
+						} catch {}
+						
+						workAccount.endpointURL = apiURL
+						
+						try workAccount.storeCredentials(credentials)
+						
+						if newAccount {
+							workAccount.refreshAll() { result in }
+						}
+						
+						self.dismiss()
+						
+					} catch {
+						self.error = Text("Keychain error while storing credentials.")
+					}
+					
+				} else {
+					self.error = Text("Invalid email/password combination.")
+				}
+				
+			case .failure:
+				self.error = Text("Network error. Try again later.")
+			}
+			
+		}
+		
+	}
+	
+	private func dismiss() {
+		isPresented?.value = false
+	}
+	
+	class ViewModel: BindableObject {
+		let didChange = PassthroughSubject<ViewModel, Never>()
+		var account: Account? = nil
+		
+		init() {
+		}
+		
+		init(account: Account) {
+			self.account = account
+			if case .basic(let username, let password) = try? account.retrieveBasicCredentials() {
+				self.email = username
+				self.password = password
+			}
+		}
+
+		var email: String = "" {
+			didSet {
+				didChange.send(self)
+			}
+		}
+		var password: String = "" {
+			didSet {
+				didChange.send(self)
+			}
+		}
+		var apiURL: String = "" {
+			didSet {
+				didChange.send(self)
+			}
+		}
+		var isUpdate: Bool {
+			return account != nil
+		}
+		
+		var isValid: Bool {
+			return !email.isEmpty && !password.isEmpty
+		}
+	}
+	
+}
+
+#if DEBUG
+struct SettingsReaderAPIAccountView_Previews : PreviewProvider {
+    static var previews: some View {
+		SettingsReaderAPIAccountView(viewModel: SettingsReaderAPIAccountView.ViewModel())
+    }
+}
+#endif
diff --git a/iOS/Settings/SettingsView.swift b/iOS/Settings/SettingsView.swift
index 5cc2a4863..bf7eacc1a 100644
--- a/iOS/Settings/SettingsView.swift
+++ b/iOS/Settings/SettingsView.swift
@@ -93,19 +93,27 @@ struct SettingsView : View {
 	
 	var createSubscriptionsImportAccounts: ActionSheet {
 		var buttons = [ActionSheet.Button]()
+		
 		for account in viewModel.activeAccounts {
+			if !account.isOPMLImportSupported {
+				continue
+			}
+			
 			let button = ActionSheet.Button.default(Text(verbatim: account.nameForDisplay)) {
 				self.subscriptionsImportAccounts = nil
 				self.subscriptionsImportDocumentPicker = Modal(SettingsSubscriptionsImportDocumentPickerView(account: account))
 			}
+			
 			buttons.append(button)
 		}
+		
 		buttons.append(.cancel { self.subscriptionsImportAccounts = nil })
 		return ActionSheet(title: Text("Import Subscriptions..."), message: Text("Select the account to import your OPML file into."), buttons: buttons)
 	}
 	
 	var createSubscriptionsExportAccounts: ActionSheet {
 		var buttons = [ActionSheet.Button]()
+		
 		for account in viewModel.accounts {
 			let button = ActionSheet.Button.default(Text(verbatim: account.nameForDisplay)) {
 				self.subscriptionsExportAccounts = nil
@@ -113,6 +121,7 @@ struct SettingsView : View {
 			}
 			buttons.append(button)
 		}
+		
 		buttons.append(.cancel { self.subscriptionsExportAccounts = nil })
 		return ActionSheet(title: Text("Export Subscriptions..."), message: Text("Select the account to export out of."), buttons: buttons)
 	}
diff --git a/iOS/Settings/UIKit/FeedbinAccountViewController.swift b/iOS/Settings/UIKit/FeedbinAccountViewController.swift
index c12d3d941..3cbf24bea 100644
--- a/iOS/Settings/UIKit/FeedbinAccountViewController.swift
+++ b/iOS/Settings/UIKit/FeedbinAccountViewController.swift
@@ -67,7 +67,7 @@ class FeedbinAccountViewController: UIViewController {
 			
 			switch result {
 			case .success(let authenticated):
-				if authenticated {
+				if (authenticated != nil) {
 					var newAccount = false
 					if self.account == nil {
 						self.account = AccountManager.shared.createAccount(type: .feedbin)
diff --git a/submodules/RSCore b/submodules/RSCore
index aa7107080..111690033 160000
--- a/submodules/RSCore
+++ b/submodules/RSCore
@@ -1 +1 @@
-Subproject commit aa7107080e90d5be11ae54fd41ee4dd192468e30
+Subproject commit 111690033354afc1cf57e37a326c344a0fe93b77
diff --git a/submodules/RSWeb b/submodules/RSWeb
index 5d648e405..afcbd0819 160000
--- a/submodules/RSWeb
+++ b/submodules/RSWeb
@@ -1 +1 @@
-Subproject commit 5d648e4050b700bb20fc7ae3303f087edcb3228f
+Subproject commit afcbd0819c85b263acc892361ed840a9628eba4d