diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift
index 94725f96d..15935d317 100644
--- a/Mac/AppAssets.swift
+++ b/Mac/AppAssets.swift
@@ -92,19 +92,11 @@ struct AppAssets {
 	}()
 
 	static var filterActive: RSImage = {
-		if #available(macOS 11.0, *) {
-			return NSImage(systemSymbolName: "line.horizontal.3.decrease.circle.fill", accessibilityDescription: nil)!
-		} else {
-			return RSImage(named: "filterActive")!
-		}
+		return NSImage(systemSymbolName: "line.horizontal.3.decrease.circle.fill", accessibilityDescription: nil)!
 	}()
 
 	static var filterInactive: RSImage = {
-		if #available(macOS 11.0, *) {
-			return NSImage(systemSymbolName: "line.horizontal.3.decrease.circle", accessibilityDescription: nil)!
-		} else {
-			return RSImage(named: "filterInactive")!
-		}
+		return NSImage(systemSymbolName: "line.horizontal.3.decrease.circle", accessibilityDescription: nil)!
 	}()
 
 	static var iconLightBackgroundColor: NSColor = {
@@ -148,14 +140,10 @@ struct AppAssets {
 	}()
 	
 	static var masterFolderImage: IconImage {
-		if #available(macOS 11.0, *) {
-			let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)!
-			let preferredColor = NSColor(named: "AccentColor")!
-			let coloredImage = image.tinted(with: preferredColor)
-			return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
-		} else {
-			return IconImage(RSImage(named: NSImage.folderName)!)
-		}
+		let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)!
+		let preferredColor = NSColor(named: "AccentColor")!
+		let coloredImage = image.tinted(with: preferredColor)
+		return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
 	}
 
 	static var markAllAsReadImage: RSImage = {
@@ -173,48 +161,29 @@ struct AppAssets {
 	}()
 
 	static var preferencesToolbarAccountsImage: RSImage = {
-		if #available(macOS 11.0, *) {
-			return NSImage(systemSymbolName: "at", accessibilityDescription: nil)!
-		} else {
-			return NSImage(named: NSImage.userAccountsName)!
-		}
+		return NSImage(systemSymbolName: "at", accessibilityDescription: nil)!
 	}()
 	
 	static var preferencesToolbarExtensionsImage: RSImage = {
-		if #available(macOS 11.0, *) {
-			return RSImage(named: "preferencesToolbarExtensions")!
-		} else {
-			return NSImage(contentsOfFile: "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/KEXT.icns")!
-		}
+		return RSImage(named: "preferencesToolbarExtensions")!
 	}()
 	
 	static var preferencesToolbarGeneralImage: RSImage = {
-		if #available(macOS 11.0, *) {
-			return NSImage(systemSymbolName: "gearshape", accessibilityDescription: nil)!
-		} else {
-			return NSImage(named: NSImage.preferencesGeneralName)!
-		}
+		return NSImage(systemSymbolName: "gearshape", accessibilityDescription: nil)!
 	}()
 	
 	static var preferencesToolbarAdvancedImage: RSImage = {
-		if #available(macOS 11.0, *) {
-			return NSImage(systemSymbolName: "gearshape.2", accessibilityDescription: nil)!
-		} else {
-			return NSImage(named: NSImage.advancedName)!
-		}
+		return NSImage(systemSymbolName: "gearshape.2", accessibilityDescription: nil)!
 	}()
 
-	@available(macOS 11.0, *)
 	static var readClosedImage: RSImage = {
 		return NSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: nil)!
 	}()
 
-	@available(macOS 11.0, *)
 	static var readOpenImage: RSImage = {
 		return NSImage(systemSymbolName: "circle", accessibilityDescription: nil)!
 	}()
 	
-	@available(macOS 11.0, *)
 	static var refreshImage: RSImage = {
 		return NSImage(systemSymbolName: "arrow.clockwise", accessibilityDescription: nil)!
 	}()
@@ -223,35 +192,27 @@ struct AppAssets {
 		return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true, isBackgroundSupressed: true)
 	}()
 	
-	@available(macOS 11.0, *)
 	static var shareImage: RSImage = {
 		return NSImage(systemSymbolName: "square.and.arrow.up", accessibilityDescription: nil)!
 	}()
 
-	@available(macOS 11.0, *)
 	static var sidebarToggleImage: RSImage = {
 		return NSImage(systemSymbolName: "sidebar.left", accessibilityDescription: nil)!
 	}()
 	
-	@available(macOS 11.0, *)
 	static var starClosedImage: RSImage = {
 		return NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
 	}()
 
-	@available(macOS 11.0, *)
 	static var starOpenImage: RSImage = {
 		return NSImage(systemSymbolName: "star", accessibilityDescription: nil)!
 	}()
-	
+
 	static var starredFeedImage: IconImage = {
-		if #available(macOS 11.0, *) {
-			let image = NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
-			let preferredColor = NSColor(named: "StarColor")!
-			let coloredImage = image.tinted(with: preferredColor)
-			return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
-		} else {
-			return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isBackgroundSupressed: true)
-		}
+		let image = NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
+		let preferredColor = NSColor(named: "StarColor")!
+		let coloredImage = image.tinted(with: preferredColor)
+		return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
 	}()
 
 	static var timelineSeparatorColor: NSColor = {
@@ -267,63 +228,37 @@ struct AppAssets {
 	}()
 
 	static var todayFeedImage: IconImage = {
-		if #available(macOS 11.0, *) {
-			let image = NSImage(systemSymbolName: "sun.max.fill", accessibilityDescription: nil)!
-			let preferredColor = NSColor.orange
-			let coloredImage = image.tinted(with: preferredColor)
-			return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
-		} else {
-			return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isBackgroundSupressed: true)
-		}
+		let image = NSImage(systemSymbolName: "sun.max.fill", accessibilityDescription: nil)!
+		let preferredColor = NSColor.orange
+		let coloredImage = image.tinted(with: preferredColor)
+		return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
 	}()
 
 	static var unreadFeedImage: IconImage = {
-		if #available(macOS 11.0, *) {
-			let image = NSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: nil)!
-			let preferredColor = NSColor(named: "AccentColor")!
-			let coloredImage = image.tinted(with: preferredColor)
-			return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
-		} else {
-			return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isBackgroundSupressed: true)
-		}
+		let image = NSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: nil)!
+		let preferredColor = NSColor(named: "AccentColor")!
+		let coloredImage = image.tinted(with: preferredColor)
+		return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
 	}()
 
 	static var swipeMarkReadImage: RSImage = {
-		if #available(OSX 11.0, *) {
-			return RSImage(systemSymbolName: "circle", accessibilityDescription: "Mark Read")!
-				.withSymbolConfiguration(.init(scale: .large))!
-		} else {
-			// TODO: remove swipeMarkRead asset when dropping support for macOS 10.15
-			return RSImage(named: "swipeMarkRead")!
-		}
+		return RSImage(systemSymbolName: "circle", accessibilityDescription: "Mark Read")!
+			.withSymbolConfiguration(.init(scale: .large))!
 	}()
 
 	static var swipeMarkUnreadImage: RSImage = {
-		if #available(OSX 11.0, *) {
-			return RSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: "Mark Unread")!
-				.withSymbolConfiguration(.init(scale: .large))!
-		} else {
-			// TODO: remove swipeMarkUnread asset when dropping support for macOS 10.15
-			return RSImage(named: "swipeMarkUnread")!
-		}
+		return RSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: "Mark Unread")!
+			.withSymbolConfiguration(.init(scale: .large))!
 	}()
 
 	static var swipeMarkStarredImage: RSImage = {
-		if #available(OSX 11.0, *) {
-			return RSImage(systemSymbolName: "star.fill", accessibilityDescription: "Star")!
-				.withSymbolConfiguration(.init(scale: .large))!
-		} else {
-			return RSImage(named: "swipeMarkStarred")!
-		}
+		return RSImage(systemSymbolName: "star.fill", accessibilityDescription: "Star")!
+			.withSymbolConfiguration(.init(scale: .large))!
 	}()
 
 	static var swipeMarkUnstarredImage: RSImage = {
-		if #available(OSX 11.0, *) {
-			return RSImage(systemSymbolName: "star", accessibilityDescription: "Unstar")!
-				.withSymbolConfiguration(.init(scale: .large))!
-		} else {
-			return RSImage(named: "swipeMarkUnstarred")!
-		}
+		return RSImage(systemSymbolName: "star", accessibilityDescription: "Unstar")!
+			.withSymbolConfiguration(.init(scale: .large))!
 	}()
 	
 	static var starColor: NSColor = {
diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift
index ab9056c67..e9c2ff9b8 100644
--- a/Mac/AppDelegate.swift
+++ b/Mac/AppDelegate.swift
@@ -394,13 +394,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 	// MARK: Main Window
 	
 	func createMainWindowController() -> MainWindowController {
-		let controller: MainWindowController
-		if #available(macOS 11.0, *) {
-			controller = windowControllerWithName("UnifiedWindow") as! MainWindowController
-		} else {
-			controller = windowControllerWithName("MainWindow") as! MainWindowController
-		}
-		
+		let controller: MainWindowController = windowControllerWithName("UnifiedWindow") as! MainWindowController
+
 		if !(mainWindowController?.isOpen ?? false) {
 			mainWindowControllers.removeAll()
 		}
@@ -800,30 +795,19 @@ internal extension AppDelegate {
 			attrs[.font] = NSFont.systemFont(ofSize: NSFont.smallSystemFontSize)
 			attrs[.foregroundColor] = NSColor.textColor
 			
-			if #available(macOS 11.0, *) {
-				let titleParagraphStyle = NSMutableParagraphStyle()
-				titleParagraphStyle.alignment = .center
-				attrs[.paragraphStyle] = titleParagraphStyle
-			}
+			let titleParagraphStyle = NSMutableParagraphStyle()
+			titleParagraphStyle.alignment = .center
+			attrs[.paragraphStyle] = titleParagraphStyle
 
 			let websiteText = NSMutableAttributedString()
 			websiteText.append(NSAttributedString(string: NSLocalizedString("Author‘s website:", comment: "Author's Website"), attributes: attrs))
 
-			if #available(macOS 11.0, *) {
-				websiteText.append(NSAttributedString(string: "\n"))
-			} else {
-				websiteText.append(NSAttributedString(string: " "))
-			}
+			websiteText.append(NSAttributedString(string: "\n"))
 
 			attrs[.link] = theme.creatorHomePage
 			websiteText.append(NSAttributedString(string: theme.creatorHomePage, attributes: attrs))
 
-			let textViewWidth: CGFloat
-			if #available(macOS 11.0, *) {
-				textViewWidth = 200
-			} else {
-				textViewWidth = 400
-			}
+			let textViewWidth: CGFloat = 200
 
 			let textView = NSTextView(frame: CGRect(x: 0, y: 0, width: textViewWidth, height: 15))
 			textView.isEditable = false
diff --git a/Mac/Base.lproj/MainWindow.storyboard b/Mac/Base.lproj/MainWindow.storyboard
deleted file mode 100644
index 3b6350a2a..000000000
--- a/Mac/Base.lproj/MainWindow.storyboard
+++ /dev/null
@@ -1,619 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Window Controller-->
-        <scene sceneID="R2V-B0-nI4">
-            <objects>
-                <windowController id="B8D-0N-5wS" customClass="MainWindowController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
-                    <window key="window" title="NetNewsWire" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="IQv-IB-iLA">
-                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
-                        <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
-                        <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-                        <rect key="contentRect" x="196" y="240" width="480" height="270"/>
-                        <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
-                        <toolbar key="toolbar" implicitIdentifier="3C53153F-2D4C-441B-B551-D28ADBB5869C" explicitIdentifier="MainWindowToolbar" displayMode="iconOnly" sizeMode="regular" id="463-wM-1ZF">
-                            <allowedToolbarItems>
-                                <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="d4b-Sp-qek"/>
-                                <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="YMs-P5-Xhn"/>
-                                <toolbarItem implicitItemIdentifier="DD0FA79F-72C1-488B-B113-0D2DE89AA468" explicitItemIdentifier="search" label="Search" paletteLabel="Search" toolTip="Search Articles" id="1Ql-WJ-KYi">
-                                    <size key="minSize" width="96" height="22"/>
-                                    <size key="maxSize" width="320" height="28"/>
-                                    <searchField key="view" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" id="Fcs-4u-xuP">
-                                        <rect key="frame" x="0.0" y="14" width="320" height="22"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="syc-TO-rPc">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </searchFieldCell>
-                                    </searchField>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="C3050605-E4B0-40CB-BA19-F64DF68BCFFA" explicitItemIdentifier="share" label="Share" paletteLabel="Share" toolTip="Share" image="NSShareTemplate" id="nv0-Ju-lP7" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" verticalHuggingPriority="750" id="ypo-pI-PTN">
-                                        <rect key="frame" x="0.0" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSShareTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XW2-7k-h4r">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="toolbarShowShareMenu:" target="Oky-zY-oP4" id="zUk-sS-frQ"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="3552D790-D29C-4BF2-AF02-5BEFE49C7FB9" explicitItemIdentifier="newFeed" label="New Feed" paletteLabel="New Feed" toolTip="New Feed" image="NSAddTemplate" id="Skp-5r-70Q" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" verticalHuggingPriority="750" id="rHO-y7-lG9">
-                                        <rect key="frame" x="11" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSAddTemplate" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="eHD-pU-GaN">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="showAddFeedWindow:" target="Oky-zY-oP4" id="iT9-YI-UmL"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="25C9E98A-867B-4EE2-BC1A-7B453D6B40BF" explicitItemIdentifier="newFolder" label="New Folder" paletteLabel="New Folder" toolTip="New Folder" image="newFolder" id="st0-Wp-nPK" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" verticalHuggingPriority="750" id="nvZ-IA-qOA">
-                                        <rect key="frame" x="15" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="newFolder" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" id="Huj-Sy-XeN">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="showAddFolderWindow:" target="Oky-zY-oP4" id="JH4-ym-YWq"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="D783290E-C822-40DF-8CB8-925D92EA4D83" explicitItemIdentifier="nextUnread" label="Next Unread" paletteLabel="Next Unread" toolTip="Go to Next Unread" image="nextUnread" id="p7Y-Vm-ILH" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" verticalHuggingPriority="750" id="1g8-XX-BhA" customClass="RSDarkModeAdaptingToolbarButton" customModule="RSCore">
-                                        <rect key="frame" x="18" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="nextUnread" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" id="aBl-Z6-Tfa">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="nextUnread:" target="Oky-zY-oP4" id="tR6-kc-nFc"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="4A460A5C-B005-4797-AA95-FD667F0A61C2" explicitItemIdentifier="markAllAsRead" label="Mark All as Read" paletteLabel="Mark All as Read" toolTip="Mark All as Read" image="markAllRead" id="lst-vn-0Iw" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" verticalHuggingPriority="750" id="0d4-hY-S6r">
-                                        <rect key="frame" x="29" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="markAllRead" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" id="e9z-YJ-Rib">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="markAllAsRead:" target="Oky-zY-oP4" id="qQg-Wj-NpN"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="540B93C9-F805-41C8-A638-3DC0825A020B" explicitItemIdentifier="markRead" label="Mark Read" paletteLabel="Mark Read" toolTip="Mark Read or Unread" image="markRead" id="N7D-g2-EPD" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" verticalHuggingPriority="750" id="Pe3-wh-G7e">
-                                        <rect key="frame" x="13" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="markRead" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" id="2FV-93-DIY">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="toggleRead:" target="B8D-0N-5wS" id="r02-sN-noB"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="09CE2FC7-B9B6-4A74-85B3-2DED57082923" explicitItemIdentifier="markStar" label="Star" paletteLabel="Star" toolTip="Star or Unstar" image="star" id="Gxg-WQ-ufC" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" verticalHuggingPriority="750" id="Ehx-31-ELo">
-                                        <rect key="frame" x="0.0" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="star" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" id="xYM-n6-bee">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="toggleStarred:" target="Oky-zY-oP4" id="44J-UK-89l"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="4DED27B7-8961-48F3-A995-9C961E2C0257" explicitItemIdentifier="openInBrowser" label="Open in Browser" paletteLabel="Open in Browser" toolTip="Open in Browser" image="openInBrowser" id="tid-SB-me3" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" allowsExpansionToolTips="YES" verticalHuggingPriority="750" id="pgp-lZ-j6S">
-                                        <rect key="frame" x="28" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="openInBrowser" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" id="PNN-ND-sO0">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="openArticleInBrowser:" target="Oky-zY-oP4" id="txK-8m-Gcm"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="94C3EB28-587B-4C5C-9647-F8A2A240A1FD" explicitItemIdentifier="refresh" label="Refresh" paletteLabel="Refresh" toolTip="Refresh" image="NSRefreshTemplate" id="QD0-SQ-OIM" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" verticalHuggingPriority="750" id="tRb-KW-Z3i">
-                                        <rect key="frame" x="5" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSRefreshTemplate" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aGM-Q8-k4r">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="refreshAll:" target="Oky-zY-oP4" id="KRz-Df-3zA"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="642D2379-B9AF-4990-8E09-A1115C60ED1A" explicitItemIdentifier="readerView" label="Reader" paletteLabel="Reader" toolTip="Reader View" id="6Vm-OW-3mR" customClass="RSToolbarItem" customModule="RSCore">
-                                    <size key="minSize" width="38" height="25"/>
-                                    <size key="maxSize" width="38" height="27"/>
-                                    <button key="view" verticalHuggingPriority="750" id="1b9-Tf-u5V" customClass="LegacyArticleExtractorButton" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="3" y="14" width="38" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="sXz-Xe-Kd7">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="toggleArticleExtractor:" target="B8D-0N-5wS" id="ZKQ-SK-5YJ"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="ACB5604B-4543-4985-BA1A-54ADA9DF5845" explicitItemIdentifier="cleanUp" label="Clean UP" paletteLabel="Clean Up" toolTip="Clean Up" image="cleanUp" sizingBehavior="auto" id="SsT-iS-pKE" customClass="RSToolbarItem" customModule="RSCore">
-                                    <button key="view" verticalHuggingPriority="750" id="9At-yP-WNY">
-                                        <rect key="frame" x="10" y="14" width="36" height="23"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="cleanUp" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Zwg-74-ZkZ">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                    <connections>
-                                        <action selector="cleanUp:" target="Oky-zY-oP4" id="UCH-DG-yk4"/>
-                                    </connections>
-                                </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="596363B5-CE41-417C-B8AB-11CC2C99BCA5" label="Article Theme" paletteLabel="Article Theme" title="Item 1" sizingBehavior="auto" id="3Hc-al-vK2">
-                                    <nil key="toolTip"/>
-                                    <popUpButton key="view" verticalHuggingPriority="750" id="MFT-nb-eLG">
-                                        <rect key="frame" x="4" y="14" width="74" height="25"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <popUpButtonCell key="cell" type="roundTextured" title="Item 1" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" selectedItem="xAs-IL-tMv" id="ior-Gb-LTq">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="menu"/>
-                                            <menu key="menu" id="1Ac-Uq-Yeu">
-                                                <items>
-                                                    <menuItem title="Item 1" state="on" id="xAs-IL-tMv"/>
-                                                    <menuItem title="Item 2" id="T8e-ib-OTb"/>
-                                                    <menuItem title="Item 3" id="Gfy-76-Njz"/>
-                                                </items>
-                                            </menu>
-                                        </popUpButtonCell>
-                                    </popUpButton>
-                                </toolbarItem>
-                            </allowedToolbarItems>
-                            <defaultToolbarItems>
-                                <toolbarItem reference="Skp-5r-70Q"/>
-                                <toolbarItem reference="st0-Wp-nPK"/>
-                                <toolbarItem reference="QD0-SQ-OIM"/>
-                                <toolbarItem reference="YMs-P5-Xhn"/>
-                                <toolbarItem reference="lst-vn-0Iw"/>
-                                <toolbarItem reference="1Ql-WJ-KYi"/>
-                                <toolbarItem reference="YMs-P5-Xhn"/>
-                                <toolbarItem reference="p7Y-Vm-ILH"/>
-                                <toolbarItem reference="Gxg-WQ-ufC"/>
-                                <toolbarItem reference="N7D-g2-EPD"/>
-                                <toolbarItem reference="6Vm-OW-3mR"/>
-                                <toolbarItem reference="tid-SB-me3"/>
-                                <toolbarItem reference="nv0-Ju-lP7"/>
-                            </defaultToolbarItems>
-                            <connections>
-                                <outlet property="delegate" destination="B8D-0N-5wS" id="bgf-8m-klH"/>
-                            </connections>
-                        </toolbar>
-                        <connections>
-                            <outlet property="delegate" destination="B8D-0N-5wS" id="JSn-lq-Uwe"/>
-                        </connections>
-                    </window>
-                    <connections>
-                        <outlet property="articleThemePopUpButton" destination="MFT-nb-eLG" id="lHc-ej-PrT"/>
-                        <segue destination="reS-fe-pD8" kind="relationship" relationship="window.shadowedContentViewController" id="WS2-WB-dc4"/>
-                    </connections>
-                </windowController>
-                <customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-666" y="-124"/>
-        </scene>
-        <!--Split View Controller-->
-        <scene sceneID="vhK-r2-b3N">
-            <objects>
-                <splitViewController id="wEf-EP-9Fq" sceneMemberID="viewController">
-                    <splitViewItems>
-                        <splitViewItem canCollapse="YES" holdingPriority="260" behavior="sidebar" id="XVW-Gk-g7U"/>
-                        <splitViewItem holdingPriority="255" behavior="contentList" id="UkR-qu-7uT"/>
-                        <splitViewItem id="EtR-h8-kPm"/>
-                    </splitViewItems>
-                    <splitView key="splitView" wantsLayer="YES" dividerStyle="thin" vertical="YES" id="3QF-bA-qOw">
-                        <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <connections>
-                            <outlet property="delegate" destination="wEf-EP-9Fq" id="0ic-vQ-NKS"/>
-                        </connections>
-                    </splitView>
-                    <connections>
-                        <outlet property="splitView" destination="3QF-bA-qOw" id="YxK-5q-cOe"/>
-                        <segue destination="XML-A3-pDn" kind="relationship" relationship="splitItems" id="Dul-5N-qJu"/>
-                        <segue destination="36G-bQ-b96" kind="relationship" relationship="splitItems" id="yFZ-cm-NcZ"/>
-                        <segue destination="Vho-7i-T8m" kind="relationship" relationship="splitItems" id="Foq-XC-qoZ"/>
-                    </connections>
-                </splitViewController>
-                <customObject id="FnK-xf-eZm" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-607" y="805"/>
-        </scene>
-        <!--View Controller-->
-        <scene sceneID="ZPA-jO-OkH">
-            <objects>
-                <viewController id="reS-fe-pD8" sceneMemberID="viewController">
-                    <customView key="view" wantsLayer="YES" id="hWY-jP-A4m">
-                        <rect key="frame" x="0.0" y="0.0" width="581" height="300"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <subviews>
-                            <containerView translatesAutoresizingMaskIntoConstraints="NO" id="K1o-Ws-XMQ">
-                                <rect key="frame" x="0.0" y="0.0" width="581" height="300"/>
-                                <connections>
-                                    <segue destination="wEf-EP-9Fq" kind="embed" id="IT3-aj-bSe"/>
-                                </connections>
-                            </containerView>
-                        </subviews>
-                        <constraints>
-                            <constraint firstItem="K1o-Ws-XMQ" firstAttribute="top" secondItem="hWY-jP-A4m" secondAttribute="top" id="JPX-I3-QMN"/>
-                            <constraint firstItem="K1o-Ws-XMQ" firstAttribute="leading" secondItem="hWY-jP-A4m" secondAttribute="leading" id="Vqi-IQ-2V0"/>
-                            <constraint firstAttribute="trailing" secondItem="K1o-Ws-XMQ" secondAttribute="trailing" id="Y9X-7J-odJ"/>
-                            <constraint firstAttribute="bottom" secondItem="K1o-Ws-XMQ" secondAttribute="bottom" id="spp-4y-rEm"/>
-                        </constraints>
-                    </customView>
-                </viewController>
-                <customObject id="6Eo-XA-2Zy" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-638.5" y="401"/>
-        </scene>
-        <!--Sidebar View Controller-->
-        <scene sceneID="Yae-mu-VsH">
-            <objects>
-                <viewController id="XML-A3-pDn" userLabel="Sidebar View Controller" customClass="SidebarViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" wantsLayer="YES" id="bJZ-bH-vgc">
-                        <rect key="frame" x="0.0" y="0.0" width="240" height="307"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <subviews>
-                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="32" horizontalPageScroll="10" verticalLineScroll="32" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="cJj-Wv-9ep">
-                                <rect key="frame" x="0.0" y="0.0" width="240" height="307"/>
-                                <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="2eU-Wz-F9g">
-                                    <rect key="frame" x="0.0" y="0.0" width="240" height="307"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <subviews>
-                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="32" rowSizeStyle="systemDefault" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="16" outlineTableColumn="ih9-mJ-EA7" id="cnV-kg-Dn2" customClass="SidebarOutlineView" customModule="NetNewsWire" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="270" height="307"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                            <size key="intercellSpacing" width="3" height="0.0"/>
-                                            <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
-                                            <tableColumns>
-                                                <tableColumn width="238" minWidth="23" maxWidth="1000" id="ih9-mJ-EA7">
-                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                        <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                                    </tableHeaderCell>
-                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="sXh-y7-12P">
-                                                        <font key="font" metaFont="system"/>
-                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
-                                                    <prototypeCellViews>
-                                                        <tableCellView identifier="HeaderCell" id="qkt-WA-5tB">
-                                                            <rect key="frame" x="11" y="0.0" width="247" height="17"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                            <subviews>
-                                                                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fNJ-z1-0Up">
-                                                                    <rect key="frame" x="0.0" y="1" width="145" height="14"/>
-                                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                                    <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="HEADER CELL" id="dRB-0K-qxz">
-                                                                        <font key="font" metaFont="smallSystemBold"/>
-                                                                        <color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                                    </textFieldCell>
-                                                                </textField>
-                                                            </subviews>
-                                                            <connections>
-                                                                <outlet property="textField" destination="fNJ-z1-0Up" id="jEh-Oo-s62"/>
-                                                            </connections>
-                                                        </tableCellView>
-                                                        <tableCellView identifier="DataCell" id="HJn-Tm-YNO" customClass="SidebarCell" customModule="NetNewsWire" customModuleProvider="target">
-                                                            <rect key="frame" x="11" y="17" width="247" height="17"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                        </tableCellView>
-                                                    </prototypeCellViews>
-                                                </tableColumn>
-                                            </tableColumns>
-                                            <accessibility description="Feeds"/>
-                                            <connections>
-                                                <outlet property="delegate" destination="XML-A3-pDn" id="fPE-cv-p5c"/>
-                                                <outlet property="keyboardDelegate" destination="h5K-zR-cUa" id="BlT-aW-sea"/>
-                                                <outlet property="menu" destination="p3f-EZ-sSD" id="KTA-tl-UrO"/>
-                                            </connections>
-                                        </outlineView>
-                                    </subviews>
-                                    <nil key="backgroundColor"/>
-                                </clipView>
-                                <constraints>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="166" id="pzy-wh-tgi"/>
-                                </constraints>
-                                <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="vs5-5h-CXe">
-                                    <rect key="frame" x="-100" y="-100" width="238" height="15"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                </scroller>
-                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="FWV-kB-qct">
-                                    <rect key="frame" x="224" y="17" width="15" height="102"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                </scroller>
-                            </scrollView>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="HZs-Zf-G8s" customClass="SidebarStatusBarView" customModule="NetNewsWire" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="-28" width="240" height="28"/>
-                                <subviews>
-                                    <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="agw-l1-HkL">
-                                        <rect key="frame" x="0.0" y="25" width="240" height="5"/>
-                                    </box>
-                                    <progressIndicator hidden="YES" wantsLayer="YES" maxValue="100" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="y9c-Xf-2fS">
-                                        <rect key="frame" x="20" y="3" width="40" height="20"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="40" id="1Yw-ER-8pT"/>
-                                        </constraints>
-                                    </progressIndicator>
-                                    <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iyL-pW-cT6">
-                                        <rect key="frame" x="62" y="6" width="160" height="16"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="dVE-XG-mlU">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="y9c-Xf-2fS" firstAttribute="centerY" secondItem="HZs-Zf-G8s" secondAttribute="centerY" constant="1" id="5Du-sw-hBK"/>
-                                    <constraint firstItem="agw-l1-HkL" firstAttribute="leading" secondItem="HZs-Zf-G8s" secondAttribute="leading" id="FVd-l8-q2q"/>
-                                    <constraint firstItem="iyL-pW-cT6" firstAttribute="centerY" secondItem="HZs-Zf-G8s" secondAttribute="centerY" id="Hht-GZ-3Ls"/>
-                                    <constraint firstAttribute="trailing" secondItem="agw-l1-HkL" secondAttribute="trailing" id="MaE-c5-LIY"/>
-                                    <constraint firstItem="iyL-pW-cT6" firstAttribute="leading" secondItem="y9c-Xf-2fS" secondAttribute="trailing" constant="4" id="TAM-VN-Syu"/>
-                                    <constraint firstItem="y9c-Xf-2fS" firstAttribute="leading" secondItem="HZs-Zf-G8s" secondAttribute="leading" constant="20" symbolic="YES" id="TV9-iE-nuE"/>
-                                    <constraint firstItem="agw-l1-HkL" firstAttribute="top" secondItem="HZs-Zf-G8s" secondAttribute="top" id="rBv-S6-j3b"/>
-                                    <constraint firstAttribute="height" constant="28" id="xOq-XX-qcd"/>
-                                </constraints>
-                                <connections>
-                                    <outlet property="bottomConstraint" destination="UN9-Wa-uxb" id="SYv-ax-8md"/>
-                                    <outlet property="heightConstraint" destination="xOq-XX-qcd" id="ktU-yd-g8x"/>
-                                    <outlet property="progressIndicator" destination="y9c-Xf-2fS" id="gaf-6e-siu"/>
-                                    <outlet property="progressLabel" destination="iyL-pW-cT6" id="Zpv-44-cfX"/>
-                                </connections>
-                            </customView>
-                        </subviews>
-                        <constraints>
-                            <constraint firstItem="HZs-Zf-G8s" firstAttribute="top" secondItem="cJj-Wv-9ep" secondAttribute="bottom" id="0Zg-oW-o7U"/>
-                            <constraint firstItem="cJj-Wv-9ep" firstAttribute="leading" secondItem="bJZ-bH-vgc" secondAttribute="leading" id="5Rs-9M-TKq"/>
-                            <constraint firstItem="cJj-Wv-9ep" firstAttribute="top" secondItem="bJZ-bH-vgc" secondAttribute="top" id="A7C-VI-drt"/>
-                            <constraint firstAttribute="trailing" secondItem="iyL-pW-cT6" secondAttribute="trailing" constant="20" id="Mnm-9S-Qpm"/>
-                            <constraint firstAttribute="bottom" secondItem="HZs-Zf-G8s" secondAttribute="bottom" constant="-28" id="UN9-Wa-uxb"/>
-                            <constraint firstAttribute="trailing" secondItem="HZs-Zf-G8s" secondAttribute="trailing" id="iNE-nb-QEB"/>
-                            <constraint firstItem="HZs-Zf-G8s" firstAttribute="leading" secondItem="bJZ-bH-vgc" secondAttribute="leading" id="tPp-xB-CgB"/>
-                            <constraint firstAttribute="trailing" secondItem="cJj-Wv-9ep" secondAttribute="trailing" id="vo7-3F-Fd3"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="outlineView" destination="cnV-kg-Dn2" id="FVf-OT-E3h"/>
-                    </connections>
-                </viewController>
-                <customObject id="Jih-JO-hIE" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-                <menu id="p3f-EZ-sSD">
-                    <items>
-                        <menuItem title="Item 1" id="ZDH-CV-Y2s">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                        </menuItem>
-                        <menuItem title="Item 2" id="1F7-qu-7oN">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                        </menuItem>
-                        <menuItem title="Item 3" id="r9E-FO-GoU">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                        </menuItem>
-                    </items>
-                    <connections>
-                        <outlet property="delegate" destination="XML-A3-pDn" id="XJm-Ua-9UB"/>
-                    </connections>
-                </menu>
-                <customObject id="h5K-zR-cUa" customClass="SidebarKeyboardDelegate" customModule="NetNewsWire" customModuleProvider="target">
-                    <connections>
-                        <outlet property="sidebarViewController" destination="XML-A3-pDn" id="kwd-Zc-HJm"/>
-                    </connections>
-                </customObject>
-            </objects>
-            <point key="canvasLocation" x="-74" y="-186.5"/>
-        </scene>
-        <!--Timeline Container View Controller-->
-        <scene sceneID="zUD-i8-QYC">
-            <objects>
-                <viewController id="36G-bQ-b96" customClass="TimelineContainerViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" id="Dnl-L5-xFP">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="198"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <subviews>
-                            <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lSU-OC-sEC">
-                                <rect key="frame" x="8" y="176" width="46" height="19"/>
-                                <popUpButtonCell key="cell" type="recessed" title="Sort" bezelStyle="recessed" alignment="center" lineBreakMode="truncatingTail" borderStyle="border" tag="1" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="bl0-6I-cH2">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
-                                    <font key="font" metaFont="smallSystemBold"/>
-                                    <menu key="menu" id="dN0-S2-uqU">
-                                        <items>
-                                            <menuItem title="Sort" tag="1" hidden="YES" id="4BZ-ya-evy">
-                                                <attributedString key="attributedTitle"/>
-                                                <modifierMask key="keyEquivalentModifierMask"/>
-                                            </menuItem>
-                                            <menuItem title="Newest Article on Top" state="on" tag="2" id="40c-kt-vhO">
-                                                <connections>
-                                                    <action selector="sortByNewestArticleOnTop:" target="Ebq-4s-EwK" id="vYg-MZ-zve"/>
-                                                </connections>
-                                            </menuItem>
-                                            <menuItem title="Oldest Article on Top" tag="3" id="sOF-Ez-vIL">
-                                                <connections>
-                                                    <action selector="sortByOldestArticleOnTop:" target="Ebq-4s-EwK" id="KFG-M7-blB"/>
-                                                </connections>
-                                            </menuItem>
-                                            <menuItem isSeparatorItem="YES" id="xQP-gm-iO9"/>
-                                            <menuItem title="Group by Feed" tag="4" id="YSR-5C-Yjd">
-                                                <connections>
-                                                    <action selector="groupByFeedToggled:" target="Ebq-4s-EwK" id="4y9-5l-ToF"/>
-                                                </connections>
-                                            </menuItem>
-                                        </items>
-                                    </menu>
-                                </popUpButtonCell>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="DoO-KI-ena"/>
-                                </constraints>
-                            </popUpButton>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iA5-go-AO0">
-                                <rect key="frame" x="350" y="180" width="13" height="13"/>
-                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="filterInactive" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="j7d-36-DO5">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <color key="contentTintColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                <connections>
-                                    <action selector="toggleReadArticlesFilter:" target="Ebq-4s-EwK" id="tcC-72-Npk"/>
-                                </connections>
-                            </button>
-                            <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="7p6-pA-iw6">
-                                <rect key="frame" x="0.0" y="172" width="375" height="5"/>
-                            </box>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Zpk-pq-9nW" customClass="TimelineContainerView" customModule="NetNewsWire" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="174"/>
-                            </customView>
-                        </subviews>
-                        <constraints>
-                            <constraint firstAttribute="trailing" secondItem="Zpk-pq-9nW" secondAttribute="trailing" id="67d-pI-I9C"/>
-                            <constraint firstAttribute="trailing" secondItem="iA5-go-AO0" secondAttribute="trailing" constant="12" id="9Dl-n9-vRI"/>
-                            <constraint firstItem="lSU-OC-sEC" firstAttribute="leading" secondItem="Dnl-L5-xFP" secondAttribute="leading" constant="8" id="Ceb-sA-ECJ"/>
-                            <constraint firstItem="Zpk-pq-9nW" firstAttribute="top" secondItem="7p6-pA-iw6" secondAttribute="bottom" id="KCa-8b-a6y"/>
-                            <constraint firstItem="lSU-OC-sEC" firstAttribute="centerY" secondItem="iA5-go-AO0" secondAttribute="centerY" id="OeL-Zp-iRT"/>
-                            <constraint firstItem="Zpk-pq-9nW" firstAttribute="leading" secondItem="Dnl-L5-xFP" secondAttribute="leading" id="XF2-31-E1x"/>
-                            <constraint firstAttribute="trailing" secondItem="7p6-pA-iw6" secondAttribute="trailing" id="fG3-fe-Stb"/>
-                            <constraint firstAttribute="bottom" secondItem="Zpk-pq-9nW" secondAttribute="bottom" id="fyv-EG-PC8"/>
-                            <constraint firstItem="7p6-pA-iw6" firstAttribute="leading" secondItem="Dnl-L5-xFP" secondAttribute="leading" id="pZU-jW-B1h"/>
-                            <constraint firstItem="7p6-pA-iw6" firstAttribute="top" secondItem="Dnl-L5-xFP" secondAttribute="top" constant="23" id="tUm-nX-Jce"/>
-                            <constraint firstItem="iA5-go-AO0" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="lSU-OC-sEC" secondAttribute="trailing" constant="8" id="yCg-gc-exN"/>
-                            <constraint firstItem="lSU-OC-sEC" firstAttribute="top" secondItem="Dnl-L5-xFP" secondAttribute="top" constant="3" id="zay-ZJ-od3"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="containerView" destination="Zpk-pq-9nW" id="Kye-yX-Wyn"/>
-                        <outlet property="groupByFeedMenuItem" destination="YSR-5C-Yjd" id="1aN-9S-nE1"/>
-                        <outlet property="newestToOldestMenuItem" destination="40c-kt-vhO" id="AGa-fX-EVy"/>
-                        <outlet property="oldestToNewestMenuItem" destination="sOF-Ez-vIL" id="qSg-ST-ww9"/>
-                        <outlet property="readFilteredButton" destination="iA5-go-AO0" id="kQg-2g-zNZ"/>
-                        <outlet property="viewOptionsPopUpButton" destination="lSU-OC-sEC" id="Z8V-rm-n2m"/>
-                    </connections>
-                </viewController>
-                <customObject id="Ebq-4s-EwK" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-                <customObject id="ZOV-xh-WJE" customClass="TimelineKeyboardDelegate" customModule="NetNewsWire" customModuleProvider="target">
-                    <connections>
-                        <outlet property="timelineViewController" destination="36G-bQ-b96" id="rED-2Z-kh6"/>
-                    </connections>
-                </customObject>
-            </objects>
-            <point key="canvasLocation" x="62" y="394"/>
-        </scene>
-        <!--Detail View Controller-->
-        <scene sceneID="HMt-bN-oMN">
-            <objects>
-                <viewController id="Vho-7i-T8m" userLabel="Detail View Controller" customClass="DetailViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
-                    <customView key="view" id="cJ9-6s-66u" customClass="DetailContainerView" customModule="NetNewsWire" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="730" height="300"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <subviews>
-                            <customView hidden="YES" alphaValue="0.90000000000000002" translatesAutoresizingMaskIntoConstraints="NO" id="xI5-lx-RD8" customClass="DetailStatusBarView" customModule="NetNewsWire" customModuleProvider="target">
-                                <rect key="frame" x="6" y="2" width="12" height="20"/>
-                                <subviews>
-                                    <textField focusRingType="none" horizontalHuggingPriority="850" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Dim-ed-Dcz" userLabel="URL Label">
-                                        <rect key="frame" x="4" y="2" width="4" height="16"/>
-                                        <textFieldCell key="cell" lineBreakMode="truncatingMiddle" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" usesSingleLineMode="YES" id="znU-Fh-L7H">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="Dim-ed-Dcz" firstAttribute="centerY" secondItem="xI5-lx-RD8" secondAttribute="centerY" id="Hna-uB-3F7"/>
-                                    <constraint firstAttribute="trailing" secondItem="Dim-ed-Dcz" secondAttribute="trailing" constant="6" id="O5q-ZN-DjZ"/>
-                                    <constraint firstAttribute="height" constant="20" id="Sfk-Ri-WoD"/>
-                                    <constraint firstItem="Dim-ed-Dcz" firstAttribute="leading" secondItem="xI5-lx-RD8" secondAttribute="leading" constant="6" id="Y9c-WR-ZBY"/>
-                                </constraints>
-                                <connections>
-                                    <outlet property="urlLabel" destination="Dim-ed-Dcz" id="8fY-oo-cGT"/>
-                                </connections>
-                            </customView>
-                        </subviews>
-                        <constraints>
-                            <constraint firstItem="xI5-lx-RD8" firstAttribute="leading" secondItem="cJ9-6s-66u" secondAttribute="leading" constant="6" id="5vz-ys-CAo"/>
-                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="xI5-lx-RD8" secondAttribute="trailing" constant="6" id="pbD-LN-Gk1"/>
-                            <constraint firstAttribute="bottom" secondItem="xI5-lx-RD8" secondAttribute="bottom" constant="2" id="zsv-B0-ChW"/>
-                        </constraints>
-                        <connections>
-                            <outlet property="detailStatusBarView" destination="xI5-lx-RD8" id="yIZ-aP-fKF"/>
-                        </connections>
-                    </customView>
-                    <connections>
-                        <outlet property="containerView" destination="cJ9-6s-66u" id="gXc-Pz-9sQ"/>
-                        <outlet property="statusBarView" destination="xI5-lx-RD8" id="meP-4g-U63"/>
-                    </connections>
-                </viewController>
-                <customObject id="vzM-Vn-mEn" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="68" y="946"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="NSAddTemplate" width="18" height="17"/>
-        <image name="NSRefreshTemplate" width="18" height="21"/>
-        <image name="NSShareTemplate" width="19" height="23"/>
-        <image name="cleanUp" width="149" height="113"/>
-        <image name="filterInactive" width="13" height="13"/>
-        <image name="markAllRead" width="22" height="19"/>
-        <image name="markRead" width="19" height="19"/>
-        <image name="newFolder" width="19" height="19"/>
-        <image name="nextUnread" width="24" height="19"/>
-        <image name="openInBrowser" width="19" height="19"/>
-        <image name="star" width="19" height="19"/>
-    </resources>
-</document>
diff --git a/Mac/Base.lproj/UnifiedWindow.storyboard b/Mac/Base.lproj/UnifiedWindow.storyboard
index 2a537adbc..e53e9b398 100644
--- a/Mac/Base.lproj/UnifiedWindow.storyboard
+++ b/Mac/Base.lproj/UnifiedWindow.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -90,13 +90,13 @@
                         <rect key="frame" x="0.0" y="0.0" width="240" height="307"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="28" horizontalPageScroll="10" verticalLineScroll="28" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="cJj-Wv-9ep">
+                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="32" horizontalPageScroll="10" verticalLineScroll="32" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="cJj-Wv-9ep">
                                 <rect key="frame" x="0.0" y="0.0" width="240" height="307"/>
                                 <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="2eU-Wz-F9g">
                                     <rect key="frame" x="0.0" y="0.0" width="240" height="307"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="28" rowSizeStyle="systemDefault" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="13" outlineTableColumn="ih9-mJ-EA7" id="cnV-kg-Dn2" customClass="SidebarOutlineView" customModule="NetNewsWire" customModuleProvider="target">
+                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="32" rowSizeStyle="systemDefault" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="13" outlineTableColumn="ih9-mJ-EA7" id="cnV-kg-Dn2" customClass="SidebarOutlineView" customModule="NetNewsWire" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="240" height="307"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="0.0"/>
@@ -119,7 +119,7 @@
                                                             <rect key="frame" x="11" y="0.0" width="217" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fNJ-z1-0Up">
+                                                                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fNJ-z1-0Up">
                                                                     <rect key="frame" x="0.0" y="1" width="145" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="HEADER CELL" id="dRB-0K-qxz">
@@ -174,7 +174,7 @@
                                             <constraint firstAttribute="width" constant="40" id="1Yw-ER-8pT"/>
                                         </constraints>
                                     </progressIndicator>
-                                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iyL-pW-cT6">
+                                    <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iyL-pW-cT6">
                                         <rect key="frame" x="62" y="6" width="160" height="16"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="dVE-XG-mlU">
                                             <font key="font" metaFont="system"/>
@@ -250,10 +250,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lSU-OC-sEC">
-                                <rect key="frame" x="8" y="176" width="47" height="19"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="DoO-KI-ena"/>
-                                </constraints>
+                                <rect key="frame" x="8" y="176" width="46" height="19"/>
                                 <popUpButtonCell key="cell" type="recessed" title="Sort" bezelStyle="recessed" alignment="center" lineBreakMode="truncatingTail" borderStyle="border" tag="1" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="bl0-6I-cH2">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                     <font key="font" metaFont="smallSystemBold"/>
@@ -282,6 +279,9 @@
                                         </items>
                                     </menu>
                                 </popUpButtonCell>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="18" id="DoO-KI-ena"/>
+                                </constraints>
                             </popUpButton>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iA5-go-AO0">
                                 <rect key="frame" x="350" y="180" width="13" height="13"/>
@@ -345,7 +345,7 @@
                             <customView hidden="YES" alphaValue="0.90000000000000002" translatesAutoresizingMaskIntoConstraints="NO" id="xI5-lx-RD8" customClass="DetailStatusBarView" customModule="NetNewsWire" customModuleProvider="target">
                                 <rect key="frame" x="6" y="2" width="12" height="20"/>
                                 <subviews>
-                                    <textField horizontalHuggingPriority="850" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Dim-ed-Dcz" userLabel="URL Label">
+                                    <textField focusRingType="none" horizontalHuggingPriority="850" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Dim-ed-Dcz" userLabel="URL Label">
                                         <rect key="frame" x="4" y="2" width="4" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="truncatingMiddle" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" usesSingleLineMode="YES" id="znU-Fh-L7H">
                                             <font key="font" metaFont="system"/>
diff --git a/Mac/Inspector/BuiltinSmartFeedInspectorViewController.swift b/Mac/Inspector/BuiltinSmartFeedInspectorViewController.swift
index bbd1a928d..3c6c7b908 100644
--- a/Mac/Inspector/BuiltinSmartFeedInspectorViewController.swift
+++ b/Mac/Inspector/BuiltinSmartFeedInspectorViewController.swift
@@ -64,8 +64,6 @@ private extension BuiltinSmartFeedInspectorViewController {
 	func updateUI() {
 		nameTextField?.stringValue = smartFeed?.nameForDisplay ?? ""
 		windowTitle = smartFeed?.nameForDisplay ?? NSLocalizedString("Smart Feed Inspector", comment: "Smart Feed Inspector window title")
-		if #available(macOS 11.0, *) {
-			smartFeedImageView?.image = smartFeed?.smallIcon?.image
-		}
+		smartFeedImageView?.image = smartFeed?.smallIcon?.image
 	}
 }
diff --git a/Mac/Inspector/FolderInspectorViewController.swift b/Mac/Inspector/FolderInspectorViewController.swift
index d67dfca80..63f76b0d7 100644
--- a/Mac/Inspector/FolderInspectorViewController.swift
+++ b/Mac/Inspector/FolderInspectorViewController.swift
@@ -47,11 +47,9 @@ final class FolderInspectorViewController: NSViewController, Inspector {
 	override func viewDidLoad() {
 		updateUI()
 		
-		if #available(macOS 11.0, *) {
-			let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)!
-			folderImageView.image = image
-			folderImageView.contentTintColor = NSColor.controlAccentColor
-		}
+		let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)!
+		folderImageView.image = image
+		folderImageView.contentTintColor = NSColor.controlAccentColor
 		
 		NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange(_:)), name: .DisplayNameDidChange, object: nil)
 	}
diff --git a/Mac/MainWindow/Detail/DetailWebView.swift b/Mac/MainWindow/Detail/DetailWebView.swift
index a6e4a5c45..b217b54f2 100644
--- a/Mac/MainWindow/Detail/DetailWebView.swift
+++ b/Mac/MainWindow/Detail/DetailWebView.swift
@@ -67,33 +67,31 @@ final class DetailWebView: WKWebView {
 	
 	private func bigSurOffsetFix() {
 		/*
-		On macOS 11, when a user exits full screen
-		or exits zoomed mode by disconnecting an external display
-		the webview's `origin.y` is offset by a sizeable amount.
-		
-		This code adjusts the height of the window by -1pt/+1pt,
-		which puts the webview back in the correct place.
-		*/
-		if #available(macOS 11, *) {
-			guard var frame = window?.frame else {
-				return
-			}
-
-			guard !inBigSurOffsetFix else {
-				return
-			}
-			
-			inBigSurOffsetFix = true
-			
-			defer {
-				inBigSurOffsetFix = false
-			}
-
-			frame.size = NSSize(width: window!.frame.width, height: window!.frame.height - 1)
-			window!.setFrame(frame, display: false)
-			frame.size = NSSize(width: window!.frame.width, height: window!.frame.height + 1)
-			window!.setFrame(frame, display: false)
+		 On macOS 11, when a user exits full screen
+		 or exits zoomed mode by disconnecting an external display
+		 the webview's `origin.y` is offset by a sizeable amount.
+		 
+		 This code adjusts the height of the window by -1pt/+1pt,
+		 which puts the webview back in the correct place.
+		 */
+		guard var frame = window?.frame else {
+			return
 		}
+		
+		guard !inBigSurOffsetFix else {
+			return
+		}
+		
+		inBigSurOffsetFix = true
+		
+		defer {
+			inBigSurOffsetFix = false
+		}
+		
+		frame.size = NSSize(width: window!.frame.width, height: window!.frame.height - 1)
+		window!.setFrame(frame, display: false)
+		frame.size = NSSize(width: window!.frame.width, height: window!.frame.height + 1)
+		window!.setFrame(frame, display: false)
 	}
 }
 
diff --git a/Mac/MainWindow/Detail/DetailWebViewController.swift b/Mac/MainWindow/Detail/DetailWebViewController.swift
index b4e4abf94..e714bde48 100644
--- a/Mac/MainWindow/Detail/DetailWebViewController.swift
+++ b/Mac/MainWindow/Detail/DetailWebViewController.swift
@@ -331,10 +331,7 @@ private extension DetailWebViewController {
 	}
 
 	func fetchScrollInfo(_ completion: @escaping (ScrollInfo?) -> Void) {
-		var javascriptString = "var x = {contentHeight: document.body.scrollHeight, offsetY: document.body.scrollTop}; x"
-		if #available(macOS 10.15, *) {
-			javascriptString = "var x = {contentHeight: document.body.scrollHeight, offsetY: window.pageYOffset}; x"
-		}
+		var javascriptString = "var x = {contentHeight: document.body.scrollHeight, offsetY: window.pageYOffset}; x"
 
 		webView.evaluateJavaScript(javascriptString) { (info, error) in
 			guard let info = info as? [String: Any] else {
diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index 6a4f4c8e0..b5a966381 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -67,19 +67,13 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 		
 		updateArticleThemeMenu()
 
-		if #available(macOS 11.0, *) {
-			let toolbar = NSToolbar(identifier: "MainWindowToolbar")
-			toolbar.allowsUserCustomization = true
-			toolbar.autosavesConfiguration = true
-			toolbar.displayMode = .iconOnly
-			toolbar.delegate = self
-			self.window?.toolbar = toolbar
-		} else {
-			if !AppDefaults.shared.showTitleOnMainWindow {
-				window?.titleVisibility = .hidden
-			}
-		}
-		
+		let toolbar = NSToolbar(identifier: "MainWindowToolbar")
+		toolbar.allowsUserCustomization = true
+		toolbar.autosavesConfiguration = true
+		toolbar.displayMode = .iconOnly
+		toolbar.delegate = self
+		self.window?.toolbar = toolbar
+
 		if let window = window {
 			let point = NSPoint(x: 128, y: 64)
 			let size = NSSize(width: 1345, height: 900)
@@ -776,175 +770,135 @@ extension NSToolbarItem.Identifier {
 extension MainWindowController: NSToolbarDelegate {
 
 	func toolbar(_ toolbar: NSToolbar, itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier, willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? {
-		if #available(macOS 11.0, *) {
 
-			switch itemIdentifier {
+		switch itemIdentifier {
 
-			case .sidebarToggle:
-				let title = NSLocalizedString("Toggle Sidebar", comment: "Toggle Sidebar")
-				return buildToolbarButton(.toggleSidebar, title, AppAssets.sidebarToggleImage, "toggleTheSidebar:")
+		case .sidebarToggle:
+			let title = NSLocalizedString("Toggle Sidebar", comment: "Toggle Sidebar")
+			return buildToolbarButton(.toggleSidebar, title, AppAssets.sidebarToggleImage, "toggleTheSidebar:")
 
-			case .refresh:
-				let title = NSLocalizedString("Refresh", comment: "Refresh")
-				return buildToolbarButton(.refresh, title, AppAssets.refreshImage, "refreshAll:")
-			
-			case .newSidebarItemMenu:
-				let toolbarItem = NSMenuToolbarItem(itemIdentifier: .newSidebarItemMenu)
-				toolbarItem.image = AppAssets.addNewSidebarItemImage
-				let description = NSLocalizedString("Add Item", comment: "Add Item")
-				toolbarItem.toolTip = description
-				toolbarItem.label = description
-				toolbarItem.menu = buildNewSidebarItemMenu()
-				return toolbarItem
+		case .refresh:
+			let title = NSLocalizedString("Refresh", comment: "Refresh")
+			return buildToolbarButton(.refresh, title, AppAssets.refreshImage, "refreshAll:")
 
-			case .markAllAsRead:
-				let title = NSLocalizedString("Mark All as Read", comment: "Mark All as Read")
-				return buildToolbarButton(.markAllAsRead, title, AppAssets.markAllAsReadImage, "markAllAsRead:")
-			
-			case .toggleReadArticlesFilter:
-				let title = NSLocalizedString("Read Articles Filter", comment: "Read Articles Filter")
-				return buildToolbarButton(.toggleReadArticlesFilter, title, AppAssets.filterInactive, "toggleReadArticlesFilter:")
-			
-			case .timelineTrackingSeparator:
-				return NSTrackingSeparatorToolbarItem(identifier: .timelineTrackingSeparator, splitView: splitViewController!.splitView, dividerIndex: 1)
+		case .newSidebarItemMenu:
+			let toolbarItem = NSMenuToolbarItem(itemIdentifier: .newSidebarItemMenu)
+			toolbarItem.image = AppAssets.addNewSidebarItemImage
+			let description = NSLocalizedString("Add Item", comment: "Add Item")
+			toolbarItem.toolTip = description
+			toolbarItem.label = description
+			toolbarItem.menu = buildNewSidebarItemMenu()
+			return toolbarItem
 
-			case .markRead:
-				let title = NSLocalizedString("Mark Read", comment: "Mark Read")
-				return buildToolbarButton(.markRead, title, AppAssets.readClosedImage, "toggleRead:")
-			
-			case .markStar:
-				let title = NSLocalizedString("Star", comment: "Star")
-				return buildToolbarButton(.markStar, title, AppAssets.starOpenImage, "toggleStarred:")
-			
-			case .nextUnread:
-				let title = NSLocalizedString("Next Unread", comment: "Next Unread")
-				return buildToolbarButton(.nextUnread, title, AppAssets.nextUnreadImage, "nextUnread:")
-			
-			case .readerView:
-				let toolbarItem = RSToolbarItem(itemIdentifier: .readerView)
-				toolbarItem.autovalidates = true
-				let description = NSLocalizedString("Reader View", comment: "Reader View")
-				toolbarItem.toolTip = description
-				toolbarItem.label = description
-				let button = ArticleExtractorButton()
-				button.action = #selector(toggleArticleExtractor(_:))
-				toolbarItem.view = button
-				return toolbarItem
+		case .markAllAsRead:
+			let title = NSLocalizedString("Mark All as Read", comment: "Mark All as Read")
+			return buildToolbarButton(.markAllAsRead, title, AppAssets.markAllAsReadImage, "markAllAsRead:")
 
-			case .share:
-				let title = NSLocalizedString("Share", comment: "Share")
-				return buildToolbarButton(.share, title, AppAssets.shareImage, "toolbarShowShareMenu:")
-			
-			case .openInBrowser:
-				let title = NSLocalizedString("Open in Browser", comment: "Open in Browser")
-				return buildToolbarButton(.openInBrowser, title, AppAssets.openInBrowserImage, "openArticleInBrowser:")
-			
-			case .articleThemeMenu:
-				articleThemeMenuToolbarItem.image = AppAssets.articleTheme
-				let description = NSLocalizedString("Article Theme", comment: "Article Theme")
-				articleThemeMenuToolbarItem.toolTip = description
-				articleThemeMenuToolbarItem.label = description
-				return articleThemeMenuToolbarItem
+		case .toggleReadArticlesFilter:
+			let title = NSLocalizedString("Read Articles Filter", comment: "Read Articles Filter")
+			return buildToolbarButton(.toggleReadArticlesFilter, title, AppAssets.filterInactive, "toggleReadArticlesFilter:")
 
-			case .search:
-				let toolbarItem = NSSearchToolbarItem(itemIdentifier: .search)
-				let description = NSLocalizedString("Search", comment: "Search")
-				toolbarItem.toolTip = description
-				toolbarItem.label = description
-				return toolbarItem
+		case .timelineTrackingSeparator:
+			return NSTrackingSeparatorToolbarItem(identifier: .timelineTrackingSeparator, splitView: splitViewController!.splitView, dividerIndex: 1)
 
-			case .cleanUp:
-				let title = NSLocalizedString("Clean Up", comment: "Clean Up")
-				return buildToolbarButton(.cleanUp, title, AppAssets.cleanUpImage, "cleanUp:")
-			
-			default:
-				break
-			}
+		case .markRead:
+			let title = NSLocalizedString("Mark Read", comment: "Mark Read")
+			return buildToolbarButton(.markRead, title, AppAssets.readClosedImage, "toggleRead:")
 
+		case .markStar:
+			let title = NSLocalizedString("Star", comment: "Star")
+			return buildToolbarButton(.markStar, title, AppAssets.starOpenImage, "toggleStarred:")
+
+		case .nextUnread:
+			let title = NSLocalizedString("Next Unread", comment: "Next Unread")
+			return buildToolbarButton(.nextUnread, title, AppAssets.nextUnreadImage, "nextUnread:")
+
+		case .readerView:
+			let toolbarItem = RSToolbarItem(itemIdentifier: .readerView)
+			toolbarItem.autovalidates = true
+			let description = NSLocalizedString("Reader View", comment: "Reader View")
+			toolbarItem.toolTip = description
+			toolbarItem.label = description
+			let button = ArticleExtractorButton()
+			button.action = #selector(toggleArticleExtractor(_:))
+			toolbarItem.view = button
+			return toolbarItem
+
+		case .share:
+			let title = NSLocalizedString("Share", comment: "Share")
+			return buildToolbarButton(.share, title, AppAssets.shareImage, "toolbarShowShareMenu:")
+
+		case .openInBrowser:
+			let title = NSLocalizedString("Open in Browser", comment: "Open in Browser")
+			return buildToolbarButton(.openInBrowser, title, AppAssets.openInBrowserImage, "openArticleInBrowser:")
+
+		case .articleThemeMenu:
+			articleThemeMenuToolbarItem.image = AppAssets.articleTheme
+			let description = NSLocalizedString("Article Theme", comment: "Article Theme")
+			articleThemeMenuToolbarItem.toolTip = description
+			articleThemeMenuToolbarItem.label = description
+			return articleThemeMenuToolbarItem
+
+		case .search:
+			let toolbarItem = NSSearchToolbarItem(itemIdentifier: .search)
+			let description = NSLocalizedString("Search", comment: "Search")
+			toolbarItem.toolTip = description
+			toolbarItem.label = description
+			return toolbarItem
+
+		case .cleanUp:
+			let title = NSLocalizedString("Clean Up", comment: "Clean Up")
+			return buildToolbarButton(.cleanUp, title, AppAssets.cleanUpImage, "cleanUp:")
+
+		default:
+			break
 		}
-		
+
 		return nil
 	}
 	
 	func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
-		if #available(macOS 11.0, *) {
-			return [
-				.sidebarToggle,
-				.refresh,
-				.newSidebarItemMenu,
-				.sidebarTrackingSeparator,
-				.markAllAsRead,
-				.toggleReadArticlesFilter,
-				.timelineTrackingSeparator,
-				.flexibleSpace,
-				.nextUnread,
-				.markRead,
-				.markStar,
-				.readerView,
-				.openInBrowser,
-				.share,
-				.articleThemeMenu,
-				.search,
-				.cleanUp
-			]
-		} else {
-			return [
-				.newFeed,
-				.newFolder,
-				.refresh,
-				.flexibleSpace,
-				.markAllAsRead,
-				.search,
-				.flexibleSpace,
-				.nextUnread,
-				.markStar,
-				.markRead,
-				.readerView,
-				.openInBrowser,
-				.share,
-				.cleanUp
-			]
-		}
+		[
+			.sidebarToggle,
+			.refresh,
+			.newSidebarItemMenu,
+			.sidebarTrackingSeparator,
+			.markAllAsRead,
+			.toggleReadArticlesFilter,
+			.timelineTrackingSeparator,
+			.flexibleSpace,
+			.nextUnread,
+			.markRead,
+			.markStar,
+			.readerView,
+			.openInBrowser,
+			.share,
+			.articleThemeMenu,
+			.search,
+			.cleanUp
+		]
 	}
-	
+
 	func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
-		if #available(macOS 11.0, *) {
-			return [
-				.flexibleSpace,
-				.refresh,
-				.newSidebarItemMenu,
-				.sidebarTrackingSeparator,
-				.markAllAsRead,
-				.toggleReadArticlesFilter,
-				.timelineTrackingSeparator,
-				.markRead,
-				.markStar,
-				.nextUnread,
-				.readerView,
-				.share,
-				.openInBrowser,
-				.flexibleSpace,
-				.search
-			]
-		} else {
-			return [
-				.newFeed,
-				.newFolder,
-				.refresh,
-				.flexibleSpace,
-				.markAllAsRead,
-				.search,
-				.flexibleSpace,
-				.nextUnread,
-				.markStar,
-				.markRead,
-				.readerView,
-				.openInBrowser,
-				.share
-			]
-		}
+		[
+			.flexibleSpace,
+			.refresh,
+			.newSidebarItemMenu,
+			.sidebarTrackingSeparator,
+			.markAllAsRead,
+			.toggleReadArticlesFilter,
+			.timelineTrackingSeparator,
+			.markRead,
+			.markStar,
+			.nextUnread,
+			.readerView,
+			.share,
+			.openInBrowser,
+			.flexibleSpace,
+			.search
+		]
 	}
-	
+
 	func toolbarWillAddItem(_ notification: Notification) {
 		guard let item = notification.userInfo?["item"] as? NSToolbarItem else {
 			return
@@ -955,20 +909,11 @@ extension MainWindowController: NSToolbarDelegate {
 			button.sendAction(on: .leftMouseDown)
 		}
 
-		if #available(macOS 11.0, *) {
-			if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem {
-				searchItem.searchField.delegate = self
-				searchItem.searchField.target = self
-				searchItem.searchField.action = #selector(runSearch(_:))
-				currentSearchField = searchItem.searchField
-			}
-		} else {
-			if item.itemIdentifier == .search, let searchField = item.view as? NSSearchField {
-				searchField.delegate = self
-				searchField.target = self
-				searchField.action = #selector(runSearch(_:))
-				currentSearchField = searchField
-			}
+		if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem {
+			searchItem.searchField.delegate = self
+			searchItem.searchField.target = self
+			searchItem.searchField.action = #selector(runSearch(_:))
+			currentSearchField = searchItem.searchField
 		}
 	}
 
@@ -977,23 +922,13 @@ extension MainWindowController: NSToolbarDelegate {
 			return
 		}
 
-		if #available(macOS 11.0, *) {
-			if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem {
-				searchItem.searchField.delegate = nil
-				searchItem.searchField.target = nil
-				searchItem.searchField.action = nil
-				currentSearchField = nil
-			}
-		} else {
-			if item.itemIdentifier == .search, let searchField = item.view as? NSSearchField {
-				searchField.delegate = nil
-				searchField.target = nil
-				searchField.action = nil
-				currentSearchField = nil
-			}
+		if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem {
+			searchItem.searchField.delegate = nil
+			searchItem.searchField.target = nil
+			searchItem.searchField.action = nil
+			currentSearchField = nil
 		}
 	}
-	
 }
 
 // MARK: - Private
@@ -1122,7 +1057,7 @@ private extension MainWindowController {
 			menuItem.title = commandName
 		}
 		
-		if #available(macOS 11.0, *), let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
+		if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
 			button.image = markingRead ? AppAssets.readClosedImage : AppAssets.readOpenImage
 		}
 		
@@ -1133,71 +1068,34 @@ private extension MainWindowController {
 		guard !AppDefaults.shared.isDeveloperBuild else {
 			return false
 		}
-		
 
-		if #available(macOS 11.0, *) {
 
-			guard let toolbarItem = item as? NSToolbarItem, let toolbarButton = toolbarItem.view as? ArticleExtractorButton else {
-				if let menuItem = item as? NSMenuItem {
-					menuItem.state = isShowingExtractedArticle ? .on : .off
-				}
-				return currentLink != nil
+		guard let toolbarItem = item as? NSToolbarItem, let toolbarButton = toolbarItem.view as? ArticleExtractorButton else {
+			if let menuItem = item as? NSMenuItem {
+				menuItem.state = isShowingExtractedArticle ? .on : .off
 			}
-			
-			if currentTimelineViewController?.selectedArticles.first?.feed != nil {
-				toolbarButton.isEnabled = true
-			}
-
-			guard let state = articleExtractor?.state else {
-				toolbarButton.buttonState = .off
-				return currentLink != nil
-			}
-
-			switch state {
-			case .processing:
-				toolbarButton.buttonState = .animated
-			case .failedToParse:
-				toolbarButton.buttonState = .error
-			case .ready, .cancelled, .complete:
-				toolbarButton.buttonState = isShowingExtractedArticle ? .on : .off
-			}
-
-		} else {
-			
-			guard let toolbarItem = item as? NSToolbarItem, let toolbarButton = toolbarItem.view as? LegacyArticleExtractorButton else {
-				if let menuItem = item as? NSMenuItem {
-					menuItem.state = isShowingExtractedArticle ? .on : .off
-				}
-				return currentLink != nil
-			}
-			
-			if currentTimelineViewController?.selectedArticles.first?.feed != nil {
-				toolbarButton.isEnabled = true
-			}
-			
-			toolbarButton.state = isShowingExtractedArticle ? .on : .off
-
-			guard let state = articleExtractor?.state else {
-				toolbarButton.isError = false
-				toolbarButton.isInProgress = false
-				toolbarButton.state = .off
-				return currentLink != nil
-			}
-			
-			switch state {
-			case .processing:
-				toolbarButton.isError = false
-				toolbarButton.isInProgress = true
-			case .failedToParse:
-				toolbarButton.isError = true
-				toolbarButton.isInProgress = false
-			case .ready, .cancelled, .complete:
-				toolbarButton.isError = false
-				toolbarButton.isInProgress = false
-			}
-			
+			return currentLink != nil
 		}
 
+		if currentTimelineViewController?.selectedArticles.first?.feed != nil {
+			toolbarButton.isEnabled = true
+		}
+
+		guard let state = articleExtractor?.state else {
+			toolbarButton.buttonState = .off
+			return currentLink != nil
+		}
+
+		switch state {
+		case .processing:
+			toolbarButton.buttonState = .animated
+		case .failedToParse:
+			toolbarButton.buttonState = .error
+		case .ready, .cancelled, .complete:
+			toolbarButton.buttonState = isShowingExtractedArticle ? .on : .off
+		}
+
+
 		return true
 	}
 
@@ -1245,7 +1143,7 @@ private extension MainWindowController {
 			menuItem.title = commandName
 		}
 
-		if #available(macOS 11.0, *), let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
+		if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
 			button.image = starring ? AppAssets.starOpenImage : AppAssets.starClosedImage
 		}
 
@@ -1271,7 +1169,7 @@ private extension MainWindowController {
 
 		guard let isReadFiltered = timelineContainerViewController?.isReadFiltered else {
 			(item as? NSMenuItem)?.title = hideCommand
-			if #available(macOS 11.0, *), let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
+			if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
 				toolbarItem.toolTip = hideCommand
 				button.image = AppAssets.filterInactive
 			}
@@ -1280,13 +1178,13 @@ private extension MainWindowController {
 
 		if isReadFiltered {
 			(item as? NSMenuItem)?.title = showCommand
-			if #available(macOS 11.0, *), let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
+			if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
 				toolbarItem.toolTip = showCommand
 				button.image = AppAssets.filterActive
 			}
 		} else {
 			(item as? NSMenuItem)?.title = hideCommand
-			if #available(macOS 11.0, *), let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
+			if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
 				toolbarItem.toolTip = hideCommand
 				button.image = AppAssets.filterInactive
 			}
@@ -1321,53 +1219,43 @@ private extension MainWindowController {
 		guard timelineSourceMode != .search else {
 			let localizedLabel = NSLocalizedString("Search: %@", comment: "Search")
 			window?.title = NSString.localizedStringWithFormat(localizedLabel as NSString, searchString ?? "") as String
-			if #available(macOS 11.0, *) {
-				window?.subtitle = ""
-			}
+			window?.subtitle = ""
 			return
 		}
 		
 		func setSubtitle(_ count: Int) {
 			let localizedLabel = NSLocalizedString("%d unread", comment: "Unread")
 			let formattedLabel = NSString.localizedStringWithFormat(localizedLabel as NSString, count)
-			if #available(macOS 11.0, *) {
-				window?.subtitle = formattedLabel as String
-			}
+			window?.subtitle = formattedLabel as String
 		}
 		
 		guard let selectedObjects = selectedObjectsInSidebar(), selectedObjects.count > 0 else {
 			window?.title = appDelegate.appName!
-			if #available(macOS 11.0, *) {
-				setSubtitle(appDelegate.unreadCount)
-			}
+			setSubtitle(appDelegate.unreadCount)
 			return
 		}
 		
 		guard selectedObjects.count == 1 else {
 			window?.title = NSLocalizedString("Multiple", comment: "Multiple")
-			if #available(macOS 11.0, *) {
-				let unreadCount = selectedObjects.reduce(0, { result, selectedObject in
-					if let unreadCountProvider = selectedObject as? UnreadCountProvider {
-						return result + unreadCountProvider.unreadCount
-					} else {
-						return result
-					}
-				})
-				setSubtitle(unreadCount)
-			}
+			let unreadCount = selectedObjects.reduce(0, { result, selectedObject in
+				if let unreadCountProvider = selectedObject as? UnreadCountProvider {
+					return result + unreadCountProvider.unreadCount
+				} else {
+					return result
+				}
+			})
+			setSubtitle(unreadCount)
 			return
 		}
-		
+
 		if let displayNameProvider = currentFeedOrFolder as? DisplayNameProvider {
 			window?.title = displayNameProvider.nameForDisplay
-			if #available(macOS 11.0, *) {
-				if let unreadCountProvider = currentFeedOrFolder as? UnreadCountProvider {
-					setSubtitle(unreadCountProvider.unreadCount)
-				}
+			if let unreadCountProvider = currentFeedOrFolder as? UnreadCountProvider {
+				setSubtitle(unreadCountProvider.unreadCount)
 			}
 		}
 	}
-	
+
 	func startArticleExtractorForCurrentLink() {
 		if let link = currentLink, let extractor = ArticleExtractor(link) {
 			extractor.delegate = self
diff --git a/Mac/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift b/Mac/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift
index 7a082b434..c13996732 100644
--- a/Mac/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift
+++ b/Mac/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift
@@ -23,11 +23,7 @@ struct SidebarCellAppearance: Equatable {
 			textFieldFontSize = 11
 		case .large:
 			imageSize = CGSize(width: 22, height: 22)
-			if #available(macOS 11.0, *) {
-				textFieldFontSize = 15
-			} else {
-				textFieldFontSize = 13
-			}
+			textFieldFontSize = 15
 		default:
 			imageSize = CGSize(width: 19, height: 19)
 			textFieldFontSize = 13
diff --git a/Mac/MainWindow/Timeline/Cell/TimelineCellAppearance.swift b/Mac/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
index dbfdf045b..83e5a81c5 100644
--- a/Mac/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
+++ b/Mac/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
@@ -56,11 +56,7 @@ struct TimelineCellAppearance: Equatable {
 
 		self.showIcon = showIcon
 		
-		if #available(macOS 11.0, *) {
-			cellPadding = NSEdgeInsets(top: 8.0, left: 4.0, bottom: 10.0, right: 4.0)
-		} else {
-			cellPadding = NSEdgeInsets(top: 8.0, left: 18.0, bottom: 10.0, right: 18.0)
-		}
+		cellPadding = NSEdgeInsets(top: 8.0, left: 4.0, bottom: 10.0, right: 4.0)
 
 		let margin = self.cellPadding.left + self.unreadCircleDimension + self.unreadCircleMarginRight
 		self.boxLeftMargin = margin
diff --git a/Mac/MainWindow/Timeline/TimelineTableRowView.swift b/Mac/MainWindow/Timeline/TimelineTableRowView.swift
index bf42f4edd..d06f39930 100644
--- a/Mac/MainWindow/Timeline/TimelineTableRowView.swift
+++ b/Mac/MainWindow/Timeline/TimelineTableRowView.swift
@@ -59,21 +59,12 @@ class TimelineTableRowView : NSTableRowView {
 		separator!.wantsLayer = true
 		separator!.layer?.backgroundColor = AppAssets.timelineSeparatorColor.cgColor
 		addSubview(separator!)
-		if #available(macOS 11.0, *) {
-			NSLayoutConstraint.activate([
-				separator!.leadingAnchor.constraint(equalTo: cellView.leadingAnchor, constant: 20),
-				separator!.trailingAnchor.constraint(equalTo: cellView.trailingAnchor, constant: -4),
-				separator!.heightAnchor.constraint(equalToConstant: 1),
-				separator!.bottomAnchor.constraint(equalTo: bottomAnchor, constant: 0)
-			])
-		} else {
-			NSLayoutConstraint.activate([
-				separator!.leadingAnchor.constraint(equalTo: cellView.leadingAnchor, constant: 34),
-				separator!.trailingAnchor.constraint(equalTo: cellView.trailingAnchor, constant: -28),
-				separator!.heightAnchor.constraint(equalToConstant: 1),
-				separator!.bottomAnchor.constraint(equalTo: bottomAnchor, constant: 0)
-			])
-		}
+
+		NSLayoutConstraint.activate([
+			separator!.leadingAnchor.constraint(equalTo: cellView.leadingAnchor, constant: 20),
+			separator!.trailingAnchor.constraint(equalTo: cellView.trailingAnchor, constant: -4),
+			separator!.heightAnchor.constraint(equalToConstant: 1),
+			separator!.bottomAnchor.constraint(equalTo: bottomAnchor, constant: 0)
+		])
 	}
-	
 }
diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift
index 87672f34a..31e573c0a 100644
--- a/Mac/MainWindow/Timeline/TimelineViewController.swift
+++ b/Mac/MainWindow/Timeline/TimelineViewController.swift
@@ -207,10 +207,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
 		tableView.doubleAction = #selector(openArticleInBrowser(_:))
 		tableView.setDraggingSourceOperationMask(.copy, forLocal: false)
 		tableView.keyboardDelegate = keyboardDelegate
-		
-		if #available(macOS 11.0, *) {
-			tableView.style = .inset
-		}
+		tableView.style = .inset
 		
 		if !didRegisterForNotifications {
 			NotificationCenter.default.addObserver(self, selector: #selector(statusesDidChange(_:)), name: .StatusesDidChange, object: nil)
diff --git a/Mac/Preferences/Accounts/AccountsFeedWranglerWindowController.swift b/Mac/Preferences/Accounts/AccountsFeedWranglerWindowController.swift
index d7d185c9d..2ddda6205 100644
--- a/Mac/Preferences/Accounts/AccountsFeedWranglerWindowController.swift
+++ b/Mac/Preferences/Accounts/AccountsFeedWranglerWindowController.swift
@@ -128,10 +128,7 @@ class AccountsFeedWranglerWindowController: NSWindowController {
 	
 	// MARK: Autofill
 	func enableAutofill() {
-		if #available(macOS 11, *) {
-			usernameTextField.contentType = .username
-			passwordTextField.contentType = .password
-		}
-	}
-	
+		usernameTextField.contentType = .username
+		passwordTextField.contentType = .password
+	}	
 }
diff --git a/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift b/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift
index 444e152d0..10eb7287f 100644
--- a/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift
+++ b/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift
@@ -133,10 +133,8 @@ class AccountsFeedbinWindowController: NSWindowController {
 	
 	// MARK: Autofill
 	func enableAutofill() {
-		if #available(macOS 11, *) {
 			usernameTextField.contentType = .username
 			passwordTextField.contentType = .password
-		}
 	}
 	
 }
diff --git a/Mac/Preferences/Accounts/AccountsNewsBlurWindowController.swift b/Mac/Preferences/Accounts/AccountsNewsBlurWindowController.swift
index 00f47778e..9d8a4788c 100644
--- a/Mac/Preferences/Accounts/AccountsNewsBlurWindowController.swift
+++ b/Mac/Preferences/Accounts/AccountsNewsBlurWindowController.swift
@@ -129,10 +129,7 @@ class AccountsNewsBlurWindowController: NSWindowController {
 	
 	// MARK: Autofill
 	func enableAutofill() {
-		if #available(macOS 11, *) {
-			usernameTextField.contentType = .username
-			passwordTextField.contentType = .password
-		}
-	}
-	
+		usernameTextField.contentType = .username
+		passwordTextField.contentType = .password
+	}	
 }
diff --git a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
index b00d4646d..bf52673b2 100644
--- a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
+++ b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
@@ -197,10 +197,7 @@ class AccountsReaderAPIWindowController: NSWindowController {
 	
 	// MARK: Autofill
 	func enableAutofill() {
-		if #available(macOS 11, *) {
-			usernameTextField.contentType = .username
-			passwordTextField.contentType = .password
-		}
-	}
-    
+		usernameTextField.contentType = .username
+		passwordTextField.contentType = .password
+	}    
 }
diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index 6f7458441..9b89109fb 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -436,7 +436,6 @@
 		848363052262A3CC00DA1D35 /* AddFolderSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 848363032262A3CC00DA1D35 /* AddFolderSheet.xib */; };
 		848363082262A3DD00DA1D35 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 848363062262A3DD00DA1D35 /* Main.storyboard */; };
 		8483630B2262A3F000DA1D35 /* RenameSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 848363092262A3F000DA1D35 /* RenameSheet.xib */; };
-		8483630E2262A3FE00DA1D35 /* MainWindow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8483630C2262A3FE00DA1D35 /* MainWindow.storyboard */; };
 		848B937221C8C5540038DC0D /* CrashReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848B937121C8C5540038DC0D /* CrashReporter.swift */; };
 		848D578E21543519005FFAD5 /* PasteboardFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848D578D21543519005FFAD5 /* PasteboardFeed.swift */; };
 		848F6AE51FC29CFB002D422E /* FaviconDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848F6AE41FC29CFA002D422E /* FaviconDownloader.swift */; };
@@ -1078,7 +1077,6 @@
 		848363042262A3CC00DA1D35 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Mac/Base.lproj/AddFolderSheet.xib; sourceTree = SOURCE_ROOT; };
 		848363072262A3DD00DA1D35 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		8483630A2262A3F000DA1D35 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Mac/Base.lproj/RenameSheet.xib; sourceTree = SOURCE_ROOT; };
-		8483630D2262A3FE00DA1D35 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Mac/Base.lproj/MainWindow.storyboard; sourceTree = SOURCE_ROOT; };
 		848B937121C8C5540038DC0D /* CrashReporter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrashReporter.swift; sourceTree = "<group>"; };
 		848D578D21543519005FFAD5 /* PasteboardFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardFeed.swift; sourceTree = "<group>"; };
 		848F6AE41FC29CFA002D422E /* FaviconDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FaviconDownloader.swift; sourceTree = "<group>"; };
@@ -1788,7 +1786,6 @@
 		842E45E11ED8C681000A8B52 /* MainWindow */ = {
 			isa = PBXGroup;
 			children = (
-				8483630C2262A3FE00DA1D35 /* MainWindow.storyboard */,
 				51C0307F257D815A00609262 /* UnifiedWindow.storyboard */,
 				849A975D1ED9EB72007D329B /* MainWindowController.swift */,
 				519B8D322143397200FA689C /* SharingServiceDelegate.swift */,
@@ -2863,7 +2860,6 @@
 				5144EA52227B8E4500D19003 /* AccountsFeedbin.xib in Resources */,
 				8405DDA222168920008CE1BF /* TimelineTableView.xib in Resources */,
 				B528F81E23333C7E00E735DD /* page.html in Resources */,
-				8483630E2262A3FE00DA1D35 /* MainWindow.storyboard in Resources */,
 				3B826DCB2385C84800FC1ADB /* AccountsFeedWrangler.xib in Resources */,
 				55E15BCB229D65A900D6602A /* AccountsReaderAPI.xib in Resources */,
 				49F40DF82335B71000552BF4 /* newsfoot.js in Resources */,
@@ -3602,14 +3598,6 @@
 			name = RenameSheet.xib;
 			sourceTree = "<group>";
 		};
-		8483630C2262A3FE00DA1D35 /* MainWindow.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				8483630D2262A3FE00DA1D35 /* Base */,
-			);
-			name = MainWindow.storyboard;
-			sourceTree = "<group>";
-		};
 		84C9FC8022629E4800D921D6 /* Preferences.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/Shared/Extensions/NSView-Extensions.swift b/Shared/Extensions/NSView-Extensions.swift
index e9449208e..b2f50c8b3 100644
--- a/Shared/Extensions/NSView-Extensions.swift
+++ b/Shared/Extensions/NSView-Extensions.swift
@@ -12,19 +12,10 @@ extension NSView {
 
 	func constraintsToMakeSubViewFullSize(_ subview: NSView) -> [NSLayoutConstraint] {
 		
-		if #available(macOS 11, *) {
-			let leadingConstraint = NSLayoutConstraint(item: subview, attribute: .leading, relatedBy: .equal, toItem: self.safeAreaLayoutGuide, attribute: .leading, multiplier: 1.0, constant: 0.0)
-			let trailingConstraint = NSLayoutConstraint(item: subview, attribute: .trailing, relatedBy: .equal, toItem: self.safeAreaLayoutGuide, attribute: .trailing, multiplier: 1.0, constant: 0.0)
-			let topConstraint = NSLayoutConstraint(item: subview, attribute: .top, relatedBy: .equal, toItem: self.safeAreaLayoutGuide, attribute: .top, multiplier: 1.0, constant: 0.0)
-			let bottomConstraint = NSLayoutConstraint(item: subview, attribute: .bottom, relatedBy: .equal, toItem: self.safeAreaLayoutGuide, attribute: .bottom, multiplier: 1.0, constant: 0.0)
-			return [leadingConstraint, trailingConstraint, topConstraint, bottomConstraint]
-		} else {
-			let leadingConstraint = NSLayoutConstraint(item: subview, attribute: .leading, relatedBy: .equal, toItem: self, attribute: .leading, multiplier: 1.0, constant: 0.0)
-			let trailingConstraint = NSLayoutConstraint(item: subview, attribute: .trailing, relatedBy: .equal, toItem: self, attribute: .trailing, multiplier: 1.0, constant: 0.0)
-			let topConstraint = NSLayoutConstraint(item: subview, attribute: .top, relatedBy: .equal, toItem: self, attribute: .top, multiplier: 1.0, constant: 0.0)
-			let bottomConstraint = NSLayoutConstraint(item: subview, attribute: .bottom, relatedBy: .equal, toItem: self, attribute: .bottom, multiplier: 1.0, constant: 0.0)
-			return [leadingConstraint, trailingConstraint, topConstraint, bottomConstraint]
-		}
-		
+		let leadingConstraint = NSLayoutConstraint(item: subview, attribute: .leading, relatedBy: .equal, toItem: self.safeAreaLayoutGuide, attribute: .leading, multiplier: 1.0, constant: 0.0)
+		let trailingConstraint = NSLayoutConstraint(item: subview, attribute: .trailing, relatedBy: .equal, toItem: self.safeAreaLayoutGuide, attribute: .trailing, multiplier: 1.0, constant: 0.0)
+		let topConstraint = NSLayoutConstraint(item: subview, attribute: .top, relatedBy: .equal, toItem: self.safeAreaLayoutGuide, attribute: .top, multiplier: 1.0, constant: 0.0)
+		let bottomConstraint = NSLayoutConstraint(item: subview, attribute: .bottom, relatedBy: .equal, toItem: self.safeAreaLayoutGuide, attribute: .bottom, multiplier: 1.0, constant: 0.0)
+		return [leadingConstraint, trailingConstraint, topConstraint, bottomConstraint]
 	}
 }
diff --git a/xcconfig/NetNewsWire_project.xcconfig b/xcconfig/NetNewsWire_project.xcconfig
index 28b53b1cd..7732c9d95 100644
--- a/xcconfig/NetNewsWire_project.xcconfig
+++ b/xcconfig/NetNewsWire_project.xcconfig
@@ -39,7 +39,7 @@ GCC_WARN_UNDECLARED_SELECTOR = YES
 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
 GCC_WARN_UNUSED_FUNCTION = YES
 GCC_WARN_UNUSED_VARIABLE = YES
-MACOSX_DEPLOYMENT_TARGET = 10.15
+MACOSX_DEPLOYMENT_TARGET = 14.0
 IPHONEOS_DEPLOYMENT_TARGET = 13.4
 //SDKROOT = macosx
 SWIFT_SWIFT3_OBJC_INFERENCE = Off
diff --git a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig
index 5076b10cc..1ed262541 100644
--- a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig
+++ b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig
@@ -1,9 +1,8 @@
 // High Level Settings common to both the Mac application and any extensions we bundle with it
-MARKETING_VERSION = 6.1.4b1
-CURRENT_PROJECT_VERSION = 6119
+MARKETING_VERSION = 6.1.5b2
+CURRENT_PROJECT_VERSION = 6500
 
 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
 COMBINE_HIDPI_IMAGES = YES
-MACOSX_DEPLOYMENT_TARGET = 10.15
 SDKROOT = macosx;