diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj
index 380f21eac..2085c8901 100644
--- a/Mastodon.xcodeproj/project.pbxproj
+++ b/Mastodon.xcodeproj/project.pbxproj
@@ -1342,7 +1342,7 @@
 			path = Protocol;
 			sourceTree = "<group>";
 		};
-		2D76319C25C151DE00929FB9 /* Diffiable */ = {
+		2D76319C25C151DE00929FB9 /* Diffable */ = {
 			isa = PBXGroup;
 			children = (
 				DB4F097826A039B400D62E92 /* Onboarding */,
@@ -1357,7 +1357,7 @@
 				DB3E6FE52806A5BA00B035AE /* Discovery */,
 				DB0617FA27855B660030EE79 /* Settings */,
 			);
-			path = Diffiable;
+			path = Diffable;
 			sourceTree = "<group>";
 		};
 		2D7631A425C1532200929FB9 /* Share */ = {
@@ -1762,7 +1762,7 @@
 			children = (
 				DB89BA1025C10FF5008580ED /* Mastodon.entitlements */,
 				DB427DE325BAA00100D1B89D /* Info.plist */,
-				2D76319C25C151DE00929FB9 /* Diffiable */,
+				2D76319C25C151DE00929FB9 /* Diffable */,
 				DB8AF55525C1379F002E6C99 /* Scene */,
 				DB8AF54125C13647002E6C99 /* Coordinator */,
 				DB8AF56225C138BC002E6C99 /* Extension */,
diff --git a/Mastodon/Diffiable/Account/SelectedAccountItem.swift b/Mastodon/Diffable/Account/SelectedAccountItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Account/SelectedAccountItem.swift
rename to Mastodon/Diffable/Account/SelectedAccountItem.swift
diff --git a/Mastodon/Diffiable/Account/SelectedAccountSection.swift b/Mastodon/Diffable/Account/SelectedAccountSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Account/SelectedAccountSection.swift
rename to Mastodon/Diffable/Account/SelectedAccountSection.swift
diff --git a/Mastodon/Diffiable/Discovery/DiscoveryItem.swift b/Mastodon/Diffable/Discovery/DiscoveryItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Discovery/DiscoveryItem.swift
rename to Mastodon/Diffable/Discovery/DiscoveryItem.swift
diff --git a/Mastodon/Diffiable/Discovery/DiscoverySection.swift b/Mastodon/Diffable/Discovery/DiscoverySection.swift
similarity index 100%
rename from Mastodon/Diffiable/Discovery/DiscoverySection.swift
rename to Mastodon/Diffable/Discovery/DiscoverySection.swift
diff --git a/Mastodon/Diffiable/Notification/NotificationItem.swift b/Mastodon/Diffable/Notification/NotificationItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Notification/NotificationItem.swift
rename to Mastodon/Diffable/Notification/NotificationItem.swift
diff --git a/Mastodon/Diffiable/Notification/NotificationSection.swift b/Mastodon/Diffable/Notification/NotificationSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Notification/NotificationSection.swift
rename to Mastodon/Diffable/Notification/NotificationSection.swift
diff --git a/Mastodon/Diffiable/Onboarding/CategoryPickerItem.swift b/Mastodon/Diffable/Onboarding/CategoryPickerItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Onboarding/CategoryPickerItem.swift
rename to Mastodon/Diffable/Onboarding/CategoryPickerItem.swift
diff --git a/Mastodon/Diffiable/Onboarding/CategoryPickerSection.swift b/Mastodon/Diffable/Onboarding/CategoryPickerSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Onboarding/CategoryPickerSection.swift
rename to Mastodon/Diffable/Onboarding/CategoryPickerSection.swift
diff --git a/Mastodon/Diffiable/Onboarding/PickServerItem.swift b/Mastodon/Diffable/Onboarding/PickServerItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Onboarding/PickServerItem.swift
rename to Mastodon/Diffable/Onboarding/PickServerItem.swift
diff --git a/Mastodon/Diffiable/Onboarding/PickServerSection.swift b/Mastodon/Diffable/Onboarding/PickServerSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Onboarding/PickServerSection.swift
rename to Mastodon/Diffable/Onboarding/PickServerSection.swift
diff --git a/Mastodon/Diffiable/Onboarding/RegisterItem.swift b/Mastodon/Diffable/Onboarding/RegisterItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Onboarding/RegisterItem.swift
rename to Mastodon/Diffable/Onboarding/RegisterItem.swift
diff --git a/Mastodon/Diffiable/Onboarding/RegisterSection.swift b/Mastodon/Diffable/Onboarding/RegisterSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Onboarding/RegisterSection.swift
rename to Mastodon/Diffable/Onboarding/RegisterSection.swift
diff --git a/Mastodon/Diffiable/Onboarding/ServerRuleItem.swift b/Mastodon/Diffable/Onboarding/ServerRuleItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Onboarding/ServerRuleItem.swift
rename to Mastodon/Diffable/Onboarding/ServerRuleItem.swift
diff --git a/Mastodon/Diffiable/Onboarding/ServerRuleSection.swift b/Mastodon/Diffable/Onboarding/ServerRuleSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Onboarding/ServerRuleSection.swift
rename to Mastodon/Diffable/Onboarding/ServerRuleSection.swift
diff --git a/Mastodon/Diffiable/Profile/ProfileFieldItem.swift b/Mastodon/Diffable/Profile/ProfileFieldItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Profile/ProfileFieldItem.swift
rename to Mastodon/Diffable/Profile/ProfileFieldItem.swift
diff --git a/Mastodon/Diffiable/Profile/ProfileFieldSection.swift b/Mastodon/Diffable/Profile/ProfileFieldSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Profile/ProfileFieldSection.swift
rename to Mastodon/Diffable/Profile/ProfileFieldSection.swift
diff --git a/Mastodon/Diffiable/RecommandAccount/RecommendAccountItem.swift b/Mastodon/Diffable/RecommandAccount/RecommendAccountItem.swift
similarity index 100%
rename from Mastodon/Diffiable/RecommandAccount/RecommendAccountItem.swift
rename to Mastodon/Diffable/RecommandAccount/RecommendAccountItem.swift
diff --git a/Mastodon/Diffiable/RecommandAccount/RecommendAccountSection.swift b/Mastodon/Diffable/RecommandAccount/RecommendAccountSection.swift
similarity index 100%
rename from Mastodon/Diffiable/RecommandAccount/RecommendAccountSection.swift
rename to Mastodon/Diffable/RecommandAccount/RecommendAccountSection.swift
diff --git a/Mastodon/Diffiable/Report/ReportItem.swift b/Mastodon/Diffable/Report/ReportItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Report/ReportItem.swift
rename to Mastodon/Diffable/Report/ReportItem.swift
diff --git a/Mastodon/Diffiable/Report/ReportSection.swift b/Mastodon/Diffable/Report/ReportSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Report/ReportSection.swift
rename to Mastodon/Diffable/Report/ReportSection.swift
diff --git a/Mastodon/Diffiable/Search/SearchHistoryItem.swift b/Mastodon/Diffable/Search/SearchHistoryItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Search/SearchHistoryItem.swift
rename to Mastodon/Diffable/Search/SearchHistoryItem.swift
diff --git a/Mastodon/Diffiable/Search/SearchHistorySection.swift b/Mastodon/Diffable/Search/SearchHistorySection.swift
similarity index 100%
rename from Mastodon/Diffiable/Search/SearchHistorySection.swift
rename to Mastodon/Diffable/Search/SearchHistorySection.swift
diff --git a/Mastodon/Diffiable/Search/SearchItem.swift b/Mastodon/Diffable/Search/SearchItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Search/SearchItem.swift
rename to Mastodon/Diffable/Search/SearchItem.swift
diff --git a/Mastodon/Diffiable/Search/SearchResultItem.swift b/Mastodon/Diffable/Search/SearchResultItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Search/SearchResultItem.swift
rename to Mastodon/Diffable/Search/SearchResultItem.swift
diff --git a/Mastodon/Diffiable/Search/SearchResultSection.swift b/Mastodon/Diffable/Search/SearchResultSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Search/SearchResultSection.swift
rename to Mastodon/Diffable/Search/SearchResultSection.swift
diff --git a/Mastodon/Diffiable/Search/SearchSection.swift b/Mastodon/Diffable/Search/SearchSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Search/SearchSection.swift
rename to Mastodon/Diffable/Search/SearchSection.swift
diff --git a/Mastodon/Diffiable/Settings/SettingsItem.swift b/Mastodon/Diffable/Settings/SettingsItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Settings/SettingsItem.swift
rename to Mastodon/Diffable/Settings/SettingsItem.swift
diff --git a/Mastodon/Diffiable/Settings/SettingsSection.swift b/Mastodon/Diffable/Settings/SettingsSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Settings/SettingsSection.swift
rename to Mastodon/Diffable/Settings/SettingsSection.swift
diff --git a/Mastodon/Diffiable/Status/StatusItem.swift b/Mastodon/Diffable/Status/StatusItem.swift
similarity index 100%
rename from Mastodon/Diffiable/Status/StatusItem.swift
rename to Mastodon/Diffable/Status/StatusItem.swift
diff --git a/Mastodon/Diffiable/Status/StatusSection.swift b/Mastodon/Diffable/Status/StatusSection.swift
similarity index 100%
rename from Mastodon/Diffiable/Status/StatusSection.swift
rename to Mastodon/Diffable/Status/StatusSection.swift
diff --git a/Mastodon/Diffiable/User/UserItem.swift b/Mastodon/Diffable/User/UserItem.swift
similarity index 100%
rename from Mastodon/Diffiable/User/UserItem.swift
rename to Mastodon/Diffable/User/UserItem.swift
diff --git a/Mastodon/Diffiable/User/UserSection.swift b/Mastodon/Diffable/User/UserSection.swift
similarity index 100%
rename from Mastodon/Diffiable/User/UserSection.swift
rename to Mastodon/Diffable/User/UserSection.swift
diff --git a/Mastodon/Scene/Profile/Follower/FollowerListViewModel.swift b/Mastodon/Scene/Profile/Follower/FollowerListViewModel.swift
index 1b0d505b5..f96a02ddc 100644
--- a/Mastodon/Scene/Profile/Follower/FollowerListViewModel.swift
+++ b/Mastodon/Scene/Profile/Follower/FollowerListViewModel.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import Combine
-import Combine
 import CoreData
 import CoreDataStack
 import GameplayKit
diff --git a/Mastodon/Scene/Report/ReportResult/ReportResultView.swift b/Mastodon/Scene/Report/ReportResult/ReportResultView.swift
index 75021934b..361f5db24 100644
--- a/Mastodon/Scene/Report/ReportResult/ReportResultView.swift
+++ b/Mastodon/Scene/Report/ReportResult/ReportResultView.swift
@@ -8,7 +8,6 @@
 import UIKit
 import SwiftUI
 import MastodonSDK
-import MastodonUI
 import MastodonAsset
 import MastodonCore
 import MastodonUI
diff --git a/MastodonSDK/Package.swift b/MastodonSDK/Package.swift
index ca241038b..8db2a1ca5 100644
--- a/MastodonSDK/Package.swift
+++ b/MastodonSDK/Package.swift
@@ -25,9 +25,9 @@ let package = Package(
     ],
     dependencies: [
         .package(name: "ArkanaKeys", path: "../dependencies/ArkanaKeys"),
-        .package(name: "FaviconFinder", url: "https://github.com/will-lumley/FaviconFinder.git", from: "3.2.2"),
-        .package(name: "Introspect", url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.3"),
-        .package(name: "UITextView+Placeholder", url: "https://github.com/MainasuK/UITextView-Placeholder.git", from: "1.4.1"),
+        .package(url: "https://github.com/will-lumley/FaviconFinder.git", from: "3.2.2"),
+        .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.3"),
+        .package(url: "https://github.com/MainasuK/UITextView-Placeholder.git", from: "1.4.1"),
         .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.4.0"),
         .package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "4.1.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.0.3"),
@@ -112,8 +112,8 @@ let package = Package(
                 .product(name: "FLAnimatedImage", package: "FLAnimatedImage"),
                 .product(name: "FaviconFinder", package: "FaviconFinder"),
                 .product(name: "Nuke", package: "Nuke"),
-                .product(name: "Introspect", package: "Introspect"),
-                .product(name: "UITextView+Placeholder", package: "UITextView+Placeholder"),
+                .product(name: "Introspect", package: "SwiftUI-Introspect"),
+                .product(name: "UITextView+Placeholder", package: "UITextView-Placeholder"),
                 .product(name: "UIHostingConfigurationBackport", package: "UIHostingConfigurationBackport"),
                 .product(name: "TabBarPager", package: "TabBarPager"),
                 .product(name: "ThirdPartyMailer", package: "ThirdPartyMailer"),
diff --git a/README.md b/README.md
index bf35b4599..d2a19e715 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # Mastodon
+
 [![CI](https://github.com/mastodon/mastodon-ios/actions/workflows/main.yml/badge.svg)](https://github.com/mastodon/mastodon-ios/actions/workflows/main.yml) [![Crowdin](https://badges.crowdin.net/mastodon-for-ios/localized.svg)](https://crowdin.com/project/mastodon-for-ios)
 
 
@@ -11,12 +12,14 @@ This is the repository for the official iOS App for Mastodon. You can install it
 Read this blog post for this app to learn more. 
 > [Developing an official iOS app for Mastodon](https://blog.joinmastodon.org/2021/02/developing-an-official-ios-app-for-mastodon/)
 
-## Getting Start
+## Getting Started
+
 - Read the setup guide [here](./Documentation/Setup.md)
 - About [contributing](./Documentation/CONTRIBUTING.md)
 - [Documentation folder](./Documentation/)
 
 ## Acknowledgments
+
 Thanks to these open-sources projects listed [here](./Documentation/Acknowledgments.md).
 
 ## License
diff --git a/ShareActionExtension/Scene/ComposeViewController.swift b/ShareActionExtension/Scene/ComposeViewController.swift
index c93c05147..a7605da17 100644
--- a/ShareActionExtension/Scene/ComposeViewController.swift
+++ b/ShareActionExtension/Scene/ComposeViewController.swift
@@ -8,7 +8,6 @@
 import os.log
 import UIKit
 import Combine
-import MastodonUI
 import SwiftUI
 import MastodonAsset
 import MastodonLocalization
diff --git a/ShareActionExtension/Scene/ComposeViewModel.swift b/ShareActionExtension/Scene/ComposeViewModel.swift
index 4470cfbe8..93515b7dc 100644
--- a/ShareActionExtension/Scene/ComposeViewModel.swift
+++ b/ShareActionExtension/Scene/ComposeViewModel.swift
@@ -11,7 +11,6 @@ import Combine
 import CoreData
 import CoreDataStack
 import MastodonSDK
-import MastodonUI
 import SwiftUI
 import UniformTypeIdentifiers
 import MastodonAsset
diff --git a/ShareActionExtension/Scene/View/ComposeToolbarView.swift b/ShareActionExtension/Scene/View/ComposeToolbarView.swift
index 557706fd8..07833ac90 100644
--- a/ShareActionExtension/Scene/View/ComposeToolbarView.swift
+++ b/ShareActionExtension/Scene/View/ComposeToolbarView.swift
@@ -9,7 +9,6 @@ import os.log
 import UIKit
 import Combine
 import MastodonSDK
-import MastodonUI
 import MastodonAsset
 import MastodonLocalization
 import MastodonCore