diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj
index 5278ba11..066b26e4 100644
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@@ -1062,27 +1062,27 @@
 		D641C780213DD7C4004B4513 /* Screens */ = {
 			isa = PBXGroup;
 			children = (
-				D6C693FA2162FE5D007D6A6D /* Utilities */,
-				D6F2E960249E772F005846BB /* Crash Reporter */,
-				D641C782213DD7F0004B4513 /* Main */,
-				D641C783213DD7FE004B4513 /* Onboarding */,
-				D6A4DCC92553666600D9DE31 /* Fast Account Switcher */,
-				D641C781213DD7DD004B4513 /* Timeline */,
-				D641C784213DD819004B4513 /* Profile */,
-				D641C785213DD83B004B4513 /* Conversation */,
-				D641C786213DD852004B4513 /* Notifications */,
-				D641C787213DD862004B4513 /* Compose */,
+				D6A3BC822321F69400FD64D5 /* Account List */,
 				D6B053A023BD2BED00A066FA /* Asset Picker */,
+				0411610522B457290030A9B7 /* Attachment Gallery */,
+				D627944823A6AD5100D38C68 /* Bookmarks */,
+				D641C787213DD862004B4513 /* Compose */,
+				D641C785213DD83B004B4513 /* Conversation */,
+				D6F2E960249E772F005846BB /* Crash Reporter */,
 				D627FF77217E94F200CC0648 /* Drafts */,
 				D627943C23A5635D00D38C68 /* Explore */,
-				D6BC9DD8232D8BCA002CA326 /* Search */,
-				D627944B23A9A02400D38C68 /* Lists */,
+				D6A4DCC92553666600D9DE31 /* Fast Account Switcher */,
 				D641C788213DD86D004B4513 /* Large Image */,
-				0411610522B457290030A9B7 /* Attachment Gallery */,
-				D6A3BC822321F69400FD64D5 /* Account List */,
-				D6A3BC8C2321FF9B00FD64D5 /* Status Action Account List */,
-				D627944823A6AD5100D38C68 /* Bookmarks */,
+				D627944B23A9A02400D38C68 /* Lists */,
+				D641C782213DD7F0004B4513 /* Main */,
+				D641C786213DD852004B4513 /* Notifications */,
+				D641C783213DD7FE004B4513 /* Onboarding */,
 				D641C789213DD87E004B4513 /* Preferences */,
+				D641C784213DD819004B4513 /* Profile */,
+				D6BC9DD8232D8BCA002CA326 /* Search */,
+				D6A3BC8C2321FF9B00FD64D5 /* Status Action Account List */,
+				D641C781213DD7DD004B4513 /* Timeline */,
+				D6C693FA2162FE5D007D6A6D /* Utilities */,
 			);
 			path = Screens;
 			sourceTree = "<group>";
@@ -1454,35 +1454,35 @@
 		D6BED1722126661300F02DA0 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				D620483323D3801D008A63EF /* LinkTextView.swift */,
-				D620483523D38075008A63EF /* ContentTextView.swift */,
-				D620483723D38190008A63EF /* StatusContentTextView.swift */,
+				D6B4A4FE2506B81A000C81C1 /* AccountDisplayNameLabel.swift */,
 				D68E6F5E253C9B2D001A1B4C /* BaseEmojiLabel.swift */,
+				D620483523D38075008A63EF /* ContentTextView.swift */,
+				D6E426B225337C7000C02E1C /* CustomEmojiImageView.swift */,
 				D6969E9F240C8384002843CE /* EmojiLabel.swift */,
-				D68E6F58253C9969001A1B4C /* MultiSourceEmojiLabel.swift */,
+				D67C1794266D57D10070F250 /* FastAccountSwitcherIndicatorView.swift */,
+				D6EAE0DA2550CC8A002DB0AC /* FocusableTextField.swift */,
 				D641C77E213DC78A004B4513 /* InlineTextAttachment.swift */,
-				04ED00B021481ED800567C53 /* SteppedProgressView.swift */,
+				D620483323D3801D008A63EF /* LinkTextView.swift */,
+				D68E6F58253C9969001A1B4C /* MultiSourceEmojiLabel.swift */,
 				D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */,
 				D627943123A5466600D38C68 /* SelectableTableViewCell.swift */,
-				D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */,
+				D620483723D38190008A63EF /* StatusContentTextView.swift */,
+				04ED00B021481ED800567C53 /* SteppedProgressView.swift */,
 				D6403CC124A6B72D00E81C55 /* VisualEffectImageButton.swift */,
 				D686BBE224FBF8110068E6AA /* WrappedProgressView.swift */,
-				D6B4A4FE2506B81A000C81C1 /* AccountDisplayNameLabel.swift */,
-				D6E426B225337C7000C02E1C /* CustomEmojiImageView.swift */,
-				D6EAE0DA2550CC8A002DB0AC /* FocusableTextField.swift */,
-				D67C1794266D57D10070F250 /* FastAccountSwitcherIndicatorView.swift */,
+				D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */,
+				D6A3BC872321F78000FD64D5 /* Account Cell */,
 				D67C57A721E2649B00C3118B /* Account Detail */,
 				D626494023C122C800612E6E /* Asset Picker */,
-				D61959D0241E842400A37B8E /* Draft Cell */,
-				D641C78A213DD926004B4513 /* Status */,
 				D6C7D27B22B6EBE200071952 /* Attachments */,
-				D623A53B2635F4E20095BD04 /* Poll */,
-				D641C78B213DD92F004B4513 /* Profile Header */,
-				D641C78C213DD937004B4513 /* Notifications */,
-				D6A3BC872321F78000FD64D5 /* Account Cell */,
+				D6DEA0DB268400AF00FE896A /* Confirm Load More Cell */,
+				D61959D0241E842400A37B8E /* Draft Cell */,
 				D611C2CC232DC5FC00C86A49 /* Hashtag Cell */,
 				D61AC1DA232EA43100C54D2D /* Instance Cell */,
-				D6DEA0DB268400AF00FE896A /* Confirm Load More Cell */,
+				D641C78C213DD937004B4513 /* Notifications */,
+				D623A53B2635F4E20095BD04 /* Poll */,
+				D641C78B213DD92F004B4513 /* Profile Header */,
+				D641C78A213DD926004B4513 /* Status */,
 				D6420AEB26BED17500ED8175 /* Timeline Description Cell */,
 			);
 			path = Views;
@@ -1491,24 +1491,24 @@
 		D6C693FA2162FE5D007D6A6D /* Utilities */ = {
 			isa = PBXGroup;
 			children = (
-				D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */,
-				D6C693FD2162FEEA007D6A6D /* UIViewController+Children.swift */,
-				D6E0DC8D216EDF1E00369478 /* Previewing.swift */,
-				D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */,
-				D6B8DB332182A59300424AF7 /* UIAlertController+Visibility.swift */,
-				D6BC8747219738E1006163F1 /* EnhancedTableViewController.swift */,
-				D6B22A0E2560D52D004D82EF /* TabbedPageViewController.swift */,
-				D68FEC4E232C5BC300C84F23 /* SegmentedPageViewController.swift */,
-				D693DE5623FE1A6A0061E07D /* EnhancedNavigationViewController.swift */,
-				D693DE5823FE24300061E07D /* InteractivePushTransition.swift */,
-				D6DFC69D242C490400ACC392 /* TrackpadScrollGestureRecognizer.swift */,
-				D6412B0224AFF6A600F5412E /* TabBarScrollableViewController.swift */,
 				D65C6BF425478A9C00A6E89C /* BackgroundableViewController.swift */,
-				D6B81F3B2560365300F6E31D /* RefreshableViewController.swift */,
-				D65234C8256189D0001AF9CF /* TimelineLikeTableViewController.swift */,
 				D653F410267D1E32004E32B1 /* DiffableTimelineLikeTableViewController.swift */,
 				D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */,
+				D693DE5623FE1A6A0061E07D /* EnhancedNavigationViewController.swift */,
+				D6BC8747219738E1006163F1 /* EnhancedTableViewController.swift */,
+				D693DE5823FE24300061E07D /* InteractivePushTransition.swift */,
+				D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */,
+				D6E0DC8D216EDF1E00369478 /* Previewing.swift */,
+				D6B81F3B2560365300F6E31D /* RefreshableViewController.swift */,
+				D68FEC4E232C5BC300C84F23 /* SegmentedPageViewController.swift */,
 				D6A6C10425B6138A00298D0F /* StatusTablePrefetching.swift */,
+				D6412B0224AFF6A600F5412E /* TabBarScrollableViewController.swift */,
+				D6B22A0E2560D52D004D82EF /* TabbedPageViewController.swift */,
+				D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */,
+				D65234C8256189D0001AF9CF /* TimelineLikeTableViewController.swift */,
+				D6DFC69D242C490400ACC392 /* TrackpadScrollGestureRecognizer.swift */,
+				D6B8DB332182A59300424AF7 /* UIAlertController+Visibility.swift */,
+				D6C693FD2162FEEA007D6A6D /* UIViewController+Children.swift */,
 			);
 			path = Utilities;
 			sourceTree = "<group>";
@@ -1555,36 +1555,36 @@
 			isa = PBXGroup;
 			children = (
 				D6E4885C24A2890C0011C13E /* Tusker.entitlements */,
+				D640D76822BAF5E6004FBE69 /* DomainBlocks.plist */,
+				D6D4DDDB212518A200E1C4BB /* Info.plist */,
 				D6D4DDCF212518A000E1C4BB /* AppDelegate.swift */,
-				D6AC956623C4347E008C9946 /* MainSceneDelegate.swift */,
+				D6CA6A91249FAD8900AD45C1 /* AudioSessionHelper.swift */,
 				D68C2AE225869BAB00548EFF /* AuxiliarySceneDelegate.swift */,
 				D69693F925859A8000F4E116 /* ComposeSceneDelegate.swift */,
+				D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */,
+				D6B30E08254BAF63009CAEE5 /* ImageGrayscalifier.swift */,
+				D60E2F2B24423EAD005F8713 /* LazilyDecoding.swift */,
 				D64D0AAC2128D88B005A6F37 /* LocalData.swift */,
+				D6AC956623C4347E008C9946 /* MainSceneDelegate.swift */,
+				D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */,
 				D6945C2E23AC47C3005C403C /* SavedDataManager.swift */,
 				D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */,
 				D6DFC69F242C4CCC00ACC392 /* WeakArray.swift */,
-				D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */,
-				D60E2F2B24423EAD005F8713 /* LazilyDecoding.swift */,
-				D6CA6A91249FAD8900AD45C1 /* AudioSessionHelper.swift */,
-				D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */,
-				D6B30E08254BAF63009CAEE5 /* ImageGrayscalifier.swift */,
-				D6E57FA525C26FAB00341037 /* Localizable.stringsdict */,
-				D67B506B250B28FF00FAECFB /* Vendor */,
-				D6F1F84E2193B9BE00F5FE67 /* Caching */,
-				D6757A7A2157E00100721E32 /* XCallbackURL */,
-				D62D241E217AA46B005076CC /* Shortcuts */,
-				D663626021360A9600C9CBA2 /* Preferences */,
-				D6AEBB3F2321640F00E5038B /* Activities */,
-				D667E5F62135C2ED0057A976 /* Extensions */,
-				D61959D2241E846D00A37B8E /* Models */,
-				D6370B9924421FE00092A7FF /* CoreData */,
-				D6F953F121251A2F00CF0F2B /* Controllers */,
-				D641C780213DD7C4004B4513 /* Screens */,
-				D6BED1722126661300F02DA0 /* Views */,
 				D6D4DDD6212518A200E1C4BB /* Assets.xcassets */,
+				D6AEBB3F2321640F00E5038B /* Activities */,
+				D6F1F84E2193B9BE00F5FE67 /* Caching */,
+				D6F953F121251A2F00CF0F2B /* Controllers */,
+				D6370B9924421FE00092A7FF /* CoreData */,
+				D667E5F62135C2ED0057A976 /* Extensions */,
 				D6D4DDD8212518A200E1C4BB /* LaunchScreen.storyboard */,
-				D6D4DDDB212518A200E1C4BB /* Info.plist */,
-				D640D76822BAF5E6004FBE69 /* DomainBlocks.plist */,
+				D6E57FA525C26FAB00341037 /* Localizable.stringsdict */,
+				D61959D2241E846D00A37B8E /* Models */,
+				D663626021360A9600C9CBA2 /* Preferences */,
+				D641C780213DD7C4004B4513 /* Screens */,
+				D62D241E217AA46B005076CC /* Shortcuts */,
+				D67B506B250B28FF00FAECFB /* Vendor */,
+				D6BED1722126661300F02DA0 /* Views */,
+				D6757A7A2157E00100721E32 /* XCallbackURL */,
 			);
 			path = Tusker;
 			sourceTree = "<group>";