diff --git a/IceCubesApp.xcodeproj/project.pbxproj b/IceCubesApp.xcodeproj/project.pbxproj
index ca721a9f..c2bd790d 100644
--- a/IceCubesApp.xcodeproj/project.pbxproj
+++ b/IceCubesApp.xcodeproj/project.pbxproj
@@ -41,7 +41,6 @@
 		9F2B92F6295AE04800DE16D0 /* Tabs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2B92F5295AE04800DE16D0 /* Tabs.swift */; };
 		9F2B92FA295DA7D700DE16D0 /* AddAccountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2B92F9295DA7D700DE16D0 /* AddAccountsView.swift */; };
 		9F2B92FC295DA94500DE16D0 /* InstanceInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2B92FB295DA94500DE16D0 /* InstanceInfoView.swift */; };
-		9F35DB44294F9A7D00B3281A /* Status in Frameworks */ = {isa = PBXBuildFile; productRef = 9F35DB43294F9A7D00B3281A /* Status */; };
 		9F35DB4729506F6600B3281A /* NotificationTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F35DB4629506F6600B3281A /* NotificationTab.swift */; };
 		9F35DB4A29506FA100B3281A /* Notifications in Frameworks */ = {isa = PBXBuildFile; productRef = 9F35DB4929506FA100B3281A /* Notifications */; };
 		9F35DB4C2952005C00B3281A /* MessagesTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F35DB4B2952005C00B3281A /* MessagesTab.swift */; };
@@ -71,7 +70,6 @@
 		9FAD858B29743F7400496AB1 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAD858A29743F7400496AB1 /* ShareViewController.swift */; };
 		9FAD858E29743F7400496AB1 /* (null) in Resources */ = {isa = PBXBuildFile; };
 		9FAD859229743F7400496AB1 /* IceCubesShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 9FAD858829743F7400496AB1 /* IceCubesShareExtension.appex */; platformFilters = (ios, maccatalyst, ); settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		9FAD85982974405D00496AB1 /* Status in Frameworks */ = {isa = PBXBuildFile; productRef = 9FAD85972974405D00496AB1 /* Status */; };
 		9FAD859A297440CB00496AB1 /* KeychainSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 9FAD8599297440CB00496AB1 /* KeychainSwift */; };
 		9FAD859C2974422700496AB1 /* AppAccount in Frameworks */ = {isa = PBXBuildFile; productRef = 9FAD859B2974422700496AB1 /* AppAccount */; };
 		9FAD859E2974569B00496AB1 /* Account in Frameworks */ = {isa = PBXBuildFile; productRef = 9FAD859D2974569B00496AB1 /* Account */; };
@@ -90,12 +88,14 @@
 		9FC14EF22B494D180006CEE1 /* TagsGroupSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC14EF12B494D180006CEE1 /* TagsGroupSettingView.swift */; };
 		9FC14EF42B494D940006CEE1 /* RemoteTimelinesSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC14EF32B494D940006CEE1 /* RemoteTimelinesSettingView.swift */; };
 		9FC14EF62B494DFF0006CEE1 /* RecenTagsSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC14EF52B494DFF0006CEE1 /* RecenTagsSettingView.swift */; };
+		9FC2A38B2B49D19A00DFD1C1 /* StatusKit in Frameworks */ = {isa = PBXBuildFile; productRef = 9FC2A38A2B49D19A00DFD1C1 /* StatusKit */; };
+		9FC2A38D2B49D1A200DFD1C1 /* StatusKit in Frameworks */ = {isa = PBXBuildFile; productRef = 9FC2A38C2B49D1A200DFD1C1 /* StatusKit */; };
+		9FC2A38F2B49D1AA00DFD1C1 /* StatusKit in Frameworks */ = {isa = PBXBuildFile; productRef = 9FC2A38E2B49D1AA00DFD1C1 /* StatusKit */; };
 		9FD34823293D06E800DB0EE9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9FD34822293D06E800DB0EE9 /* Assets.xcassets */; };
 		9FD542E72962D2FF0045321A /* Lists in Frameworks */ = {isa = PBXBuildFile; productRef = 9FD542E62962D2FF0045321A /* Lists */; };
 		9FE151A6293C90F900E9683D /* IconSelectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FE151A5293C90F900E9683D /* IconSelectorView.swift */; };
 		9FE3DB57296FEFCA00628CB0 /* AppAccount in Frameworks */ = {isa = PBXBuildFile; productRef = 9FE3DB56296FEFCA00628CB0 /* AppAccount */; };
 		9FFF677C299B7B2C00FE700A /* Notifications in Frameworks */ = {isa = PBXBuildFile; productRef = 9FFF677B299B7B2C00FE700A /* Notifications */; };
-		9FFF677E299B7D2800FE700A /* Status in Frameworks */ = {isa = PBXBuildFile; productRef = 9FFF677D299B7D2800FE700A /* Status */; };
 		9FFF6780299B7D2B00FE700A /* DesignSystem in Frameworks */ = {isa = PBXBuildFile; productRef = 9FFF677F299B7D2B00FE700A /* DesignSystem */; };
 		9FFF6782299B7D3A00FE700A /* Account in Frameworks */ = {isa = PBXBuildFile; productRef = 9FFF6781299B7D3A00FE700A /* Account */; };
 		C9B22677297F6C2E001F9EFE /* ContentSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9B22676297F6C2E001F9EFE /* ContentSettingsView.swift */; };
@@ -190,7 +190,6 @@
 		9F2B92F5295AE04800DE16D0 /* Tabs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tabs.swift; sourceTree = "<group>"; };
 		9F2B92F9295DA7D700DE16D0 /* AddAccountsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAccountsView.swift; sourceTree = "<group>"; };
 		9F2B92FB295DA94500DE16D0 /* InstanceInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceInfoView.swift; sourceTree = "<group>"; };
-		9F35DB42294F9A2900B3281A /* Status */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Status; path = Packages/Status; sourceTree = "<group>"; };
 		9F35DB45294FA04C00B3281A /* DesignSystem */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = DesignSystem; path = Packages/DesignSystem; sourceTree = "<group>"; };
 		9F35DB4629506F6600B3281A /* NotificationTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationTab.swift; sourceTree = "<group>"; };
 		9F35DB4829506F7F00B3281A /* Notifications */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Notifications; path = Packages/Notifications; sourceTree = "<group>"; };
@@ -231,6 +230,7 @@
 		9FC14EF12B494D180006CEE1 /* TagsGroupSettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagsGroupSettingView.swift; sourceTree = "<group>"; };
 		9FC14EF32B494D940006CEE1 /* RemoteTimelinesSettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteTimelinesSettingView.swift; sourceTree = "<group>"; };
 		9FC14EF52B494DFF0006CEE1 /* RecenTagsSettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecenTagsSettingView.swift; sourceTree = "<group>"; };
+		9FC2A3892B49D10000DFD1C1 /* StatusKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = StatusKit; path = Packages/StatusKit; sourceTree = "<group>"; };
 		9FC60CB82AE6C2F600C6EAD2 /* IceCubesActionExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = IceCubesActionExtension.entitlements; sourceTree = "<group>"; };
 		9FCBB3D22984EFD5009B77EE /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		9FCBB3D429859615009B77EE /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -268,8 +268,8 @@
 				9FFF6780299B7D2B00FE700A /* DesignSystem in Frameworks */,
 				9F2A5428296AB683009B2D7C /* Models in Frameworks */,
 				9FFF6782299B7D3A00FE700A /* Account in Frameworks */,
+				9FC2A38D2B49D1A200DFD1C1 /* StatusKit in Frameworks */,
 				9F2A5426296AB67E009B2D7C /* KeychainSwift in Frameworks */,
-				9FFF677E299B7D2800FE700A /* Status in Frameworks */,
 				9F2A5424296AB67A009B2D7C /* Env in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -283,8 +283,8 @@
 				9FAD85A4297456A800496AB1 /* DesignSystem in Frameworks */,
 				9FAD859E2974569B00496AB1 /* Account in Frameworks */,
 				9FAD859C2974422700496AB1 /* AppAccount in Frameworks */,
+				9FC2A38F2B49D1AA00DFD1C1 /* StatusKit in Frameworks */,
 				9FAD859A297440CB00496AB1 /* KeychainSwift in Frameworks */,
-				9FAD85982974405D00496AB1 /* Status in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -306,10 +306,10 @@
 				9F398AAB2935FFDB00A889F2 /* Models in Frameworks */,
 				9F5E581929545BE700A53960 /* Env in Frameworks */,
 				9F2A540A29699705009B2D7C /* ReceiptParser in Frameworks */,
-				9F35DB44294F9A7D00B3281A /* Status in Frameworks */,
 				DA0B24FB2A6876D50045BDD7 /* SFSafeSymbols in Frameworks */,
 				9F295540292B6C3400E0E81B /* Timeline in Frameworks */,
 				9F35DB4A29506FA100B3281A /* Notifications in Frameworks */,
+				9FC2A38B2B49D19A00DFD1C1 /* StatusKit in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -462,12 +462,12 @@
 				9F55C68E295598F900F94077 /* Explore */,
 				9F5E581729545B5500A53960 /* Env */,
 				9F398AA32935F90100A889F2 /* Models */,
+				9FC2A3892B49D10000DFD1C1 /* StatusKit */,
 				9FE0346A2ADD59AC00529EA8 /* MediaUI */,
 				9F29553D292B67B600E0E81B /* Network */,
 				9FD542E52962D2CE0045321A /* Lists */,
 				9F35DB4829506F7F00B3281A /* Notifications */,
 				9F29553E292B6AF600E0E81B /* Timeline */,
-				9F35DB42294F9A2900B3281A /* Status */,
 			);
 			sourceTree = "<group>";
 		};
@@ -574,9 +574,9 @@
 				9F2A5427296AB683009B2D7C /* Models */,
 				9F7D93932980063100EE6B7A /* AppAccount */,
 				9FFF677B299B7B2C00FE700A /* Notifications */,
-				9FFF677D299B7D2800FE700A /* Status */,
 				9FFF677F299B7D2B00FE700A /* DesignSystem */,
 				9FFF6781299B7D3A00FE700A /* Account */,
+				9FC2A38C2B49D1A200DFD1C1 /* StatusKit */,
 			);
 			productName = IceCubesNotifications;
 			productReference = 9F2A5416296AB631009B2D7C /* IceCubesNotifications.appex */;
@@ -596,13 +596,13 @@
 			);
 			name = IceCubesShareExtension;
 			packageProductDependencies = (
-				9FAD85972974405D00496AB1 /* Status */,
 				9FAD8599297440CB00496AB1 /* KeychainSwift */,
 				9FAD859B2974422700496AB1 /* AppAccount */,
 				9FAD859D2974569B00496AB1 /* Account */,
 				9FAD859F297456A100496AB1 /* Models */,
 				9FAD85A1297456A400496AB1 /* Env */,
 				9FAD85A3297456A800496AB1 /* DesignSystem */,
+				9FC2A38E2B49D1AA00DFD1C1 /* StatusKit */,
 			);
 			productName = IceCubesShareExtension;
 			productReference = 9FAD858829743F7400496AB1 /* IceCubesShareExtension.appex */;
@@ -631,7 +631,6 @@
 				9F398AA82935FFDB00A889F2 /* Account */,
 				9F398AAA2935FFDB00A889F2 /* Models */,
 				9FAE4ACD29379A5A00772766 /* KeychainSwift */,
-				9F35DB43294F9A7D00B3281A /* Status */,
 				9F35DB4929506FA100B3281A /* Notifications */,
 				9F5E581829545BE700A53960 /* Env */,
 				9F55C68F2955993C00F94077 /* Explore */,
@@ -641,6 +640,7 @@
 				9F2A540B29699705009B2D7C /* RevenueCat */,
 				9FE3DB56296FEFCA00628CB0 /* AppAccount */,
 				DA0B24FA2A6876D50045BDD7 /* SFSafeSymbols */,
+				9FC2A38A2B49D19A00DFD1C1 /* StatusKit */,
 			);
 			productName = IceCubesApp;
 			productReference = 9FBFE639292A715500C250E9 /* Ice Cubes.app */;
@@ -1458,10 +1458,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = Models;
 		};
-		9F35DB43294F9A7D00B3281A /* Status */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Status;
-		};
 		9F35DB4929506FA100B3281A /* Notifications */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = Notifications;
@@ -1490,10 +1486,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = AppAccount;
 		};
-		9FAD85972974405D00496AB1 /* Status */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Status;
-		};
 		9FAD8599297440CB00496AB1 /* KeychainSwift */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9FAE4ACC29379A5A00772766 /* XCRemoteSwiftPackageReference "keychain-swift" */;
@@ -1528,6 +1520,18 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = Network;
 		};
+		9FC2A38A2B49D19A00DFD1C1 /* StatusKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = StatusKit;
+		};
+		9FC2A38C2B49D1A200DFD1C1 /* StatusKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = StatusKit;
+		};
+		9FC2A38E2B49D1AA00DFD1C1 /* StatusKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = StatusKit;
+		};
 		9FD542E62962D2FF0045321A /* Lists */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = Lists;
@@ -1540,10 +1544,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = Notifications;
 		};
-		9FFF677D299B7D2800FE700A /* Status */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Status;
-		};
 		9FFF677F299B7D2B00FE700A /* DesignSystem */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = DesignSystem;
diff --git a/IceCubesApp/App/AppRegistry.swift b/IceCubesApp/App/AppRegistry.swift
index 9f8f2ca6..d5e05b33 100644
--- a/IceCubesApp/App/AppRegistry.swift
+++ b/IceCubesApp/App/AppRegistry.swift
@@ -8,7 +8,7 @@ import LinkPresentation
 import Lists
 import MediaUI
 import Models
-import Status
+import StatusKit
 import SwiftUI
 import Timeline
 
diff --git a/IceCubesApp/App/Main/AppView.swift b/IceCubesApp/App/Main/AppView.swift
index 448a94cc..2aa31073 100644
--- a/IceCubesApp/App/Main/AppView.swift
+++ b/IceCubesApp/App/Main/AppView.swift
@@ -7,7 +7,7 @@ import KeychainSwift
 import MediaUI
 import Network
 import RevenueCat
-import Status
+import StatusKit
 import SwiftUI
 import Timeline
 
diff --git a/IceCubesApp/App/Main/IceCubesApp+Scene.swift b/IceCubesApp/App/Main/IceCubesApp+Scene.swift
index e9866779..04368a0a 100644
--- a/IceCubesApp/App/Main/IceCubesApp+Scene.swift
+++ b/IceCubesApp/App/Main/IceCubesApp+Scene.swift
@@ -1,6 +1,6 @@
 import Env
 import MediaUI
-import Status
+import StatusKit
 import SwiftUI
 
 extension IceCubesApp {
diff --git a/IceCubesApp/App/Main/IceCubesApp.swift b/IceCubesApp/App/Main/IceCubesApp.swift
index cb910989..2df414b5 100644
--- a/IceCubesApp/App/Main/IceCubesApp.swift
+++ b/IceCubesApp/App/Main/IceCubesApp.swift
@@ -7,7 +7,7 @@ import KeychainSwift
 import MediaUI
 import Network
 import RevenueCat
-import Status
+import StatusKit
 import SwiftUI
 import Timeline
 
diff --git a/IceCubesApp/App/Report/ReportView.swift b/IceCubesApp/App/Report/ReportView.swift
index db7bab81..1b329d92 100644
--- a/IceCubesApp/App/Report/ReportView.swift
+++ b/IceCubesApp/App/Report/ReportView.swift
@@ -2,7 +2,7 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Status
+import StatusKit
 import SwiftUI
 
 public struct ReportView: View {
diff --git a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift
index 4edbb8f4..f868da7c 100644
--- a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift
+++ b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift
@@ -4,7 +4,7 @@ import Env
 import Models
 import Network
 import Observation
-import Status
+import StatusKit
 import SwiftUI
 
 @Observable class DisplaySettingsLocalValues {
diff --git a/IceCubesApp/App/Tabs/Settings/HapticSettingsView.swift b/IceCubesApp/App/Tabs/Settings/HapticSettingsView.swift
index 13a826f5..6c799c6a 100644
--- a/IceCubesApp/App/Tabs/Settings/HapticSettingsView.swift
+++ b/IceCubesApp/App/Tabs/Settings/HapticSettingsView.swift
@@ -1,7 +1,7 @@
 import DesignSystem
 import Env
 import Models
-import Status
+import StatusKit
 import SwiftUI
 
 @MainActor
diff --git a/IceCubesApp/App/Tabs/Tabs.swift b/IceCubesApp/App/Tabs/Tabs.swift
index 9bf2601f..feea6eab 100644
--- a/IceCubesApp/App/Tabs/Tabs.swift
+++ b/IceCubesApp/App/Tabs/Tabs.swift
@@ -2,7 +2,7 @@ import Account
 import DesignSystem
 import Explore
 import Foundation
-import Status
+import StatusKit
 import SwiftUI
 
 @MainActor
diff --git a/IceCubesShareExtension/ShareViewController.swift b/IceCubesShareExtension/ShareViewController.swift
index df639ab0..00a4c913 100644
--- a/IceCubesShareExtension/ShareViewController.swift
+++ b/IceCubesShareExtension/ShareViewController.swift
@@ -3,7 +3,7 @@ import AppAccount
 import DesignSystem
 import Env
 import Network
-import Status
+import StatusKit
 import SwiftUI
 import UIKit
 
diff --git a/Packages/Account/Package.swift b/Packages/Account/Package.swift
index fe1b989b..ce9c0468 100644
--- a/Packages/Account/Package.swift
+++ b/Packages/Account/Package.swift
@@ -19,7 +19,7 @@ let package = Package(
   dependencies: [
     .package(name: "Network", path: "../Network"),
     .package(name: "Models", path: "../Models"),
-    .package(name: "Status", path: "../Status"),
+    .package(name: "StatusKit", path: "../StatusKit"),
     .package(name: "Env", path: "../Env"),
   ],
   targets: [
@@ -28,7 +28,7 @@ let package = Package(
       dependencies: [
         .product(name: "Network", package: "Network"),
         .product(name: "Models", package: "Models"),
-        .product(name: "Status", package: "Status"),
+        .product(name: "StatusKit", package: "StatusKit"),
         .product(name: "Env", package: "Env"),
       ],
       swiftSettings: [
diff --git a/Packages/Account/Sources/Account/AccountDetailView.swift b/Packages/Account/Sources/Account/AccountDetailView.swift
index a9066c9d..4458e5c6 100644
--- a/Packages/Account/Sources/Account/AccountDetailView.swift
+++ b/Packages/Account/Sources/Account/AccountDetailView.swift
@@ -4,7 +4,7 @@ import Env
 import Models
 import Network
 import Shimmer
-import Status
+import StatusKit
 import SwiftUI
 
 @MainActor
diff --git a/Packages/Account/Sources/Account/AccountDetailViewModel.swift b/Packages/Account/Sources/Account/AccountDetailViewModel.swift
index 8a3e8972..ac4f4c57 100644
--- a/Packages/Account/Sources/Account/AccountDetailViewModel.swift
+++ b/Packages/Account/Sources/Account/AccountDetailViewModel.swift
@@ -2,7 +2,7 @@ import Env
 import Models
 import Network
 import Observation
-import Status
+import StatusKit
 import SwiftUI
 
 @MainActor
diff --git a/Packages/Account/Sources/Account/Edit/EditAccountViewModel.swift b/Packages/Account/Sources/Account/Edit/EditAccountViewModel.swift
index 4fb53d85..25323a56 100644
--- a/Packages/Account/Sources/Account/Edit/EditAccountViewModel.swift
+++ b/Packages/Account/Sources/Account/Edit/EditAccountViewModel.swift
@@ -3,7 +3,7 @@ import Network
 import Observation
 import SwiftUI
 import PhotosUI
-import Status
+import StatusKit
 
 @MainActor
 @Observable class EditAccountViewModel {
diff --git a/Packages/Account/Sources/Account/StatusesLists/AccountStatusesListView.swift b/Packages/Account/Sources/Account/StatusesLists/AccountStatusesListView.swift
index a5f530d4..cdd6b93d 100644
--- a/Packages/Account/Sources/Account/StatusesLists/AccountStatusesListView.swift
+++ b/Packages/Account/Sources/Account/StatusesLists/AccountStatusesListView.swift
@@ -1,4 +1,4 @@
-import Status
+import StatusKit
 import Network
 import SwiftUI
 import Env
diff --git a/Packages/Account/Sources/Account/StatusesLists/AccountStatusesListViewModel.swift b/Packages/Account/Sources/Account/StatusesLists/AccountStatusesListViewModel.swift
index 19f4f869..377ddb1b 100644
--- a/Packages/Account/Sources/Account/StatusesLists/AccountStatusesListViewModel.swift
+++ b/Packages/Account/Sources/Account/StatusesLists/AccountStatusesListViewModel.swift
@@ -1,6 +1,6 @@
 import SwiftUI
 import Models
-import Status
+import StatusKit
 import Network
 import Env
 
diff --git a/Packages/Explore/Package.swift b/Packages/Explore/Package.swift
index 42af2919..c8b24a08 100644
--- a/Packages/Explore/Package.swift
+++ b/Packages/Explore/Package.swift
@@ -21,7 +21,7 @@ let package = Package(
     .package(name: "Network", path: "../Network"),
     .package(name: "Models", path: "../Models"),
     .package(name: "Env", path: "../Env"),
-    .package(name: "Status", path: "../Status"),
+    .package(name: "StatusKit", path: "../StatusKit"),
     .package(name: "DesignSystem", path: "../DesignSystem"),
   ],
   targets: [
@@ -32,7 +32,7 @@ let package = Package(
         .product(name: "Network", package: "Network"),
         .product(name: "Models", package: "Models"),
         .product(name: "Env", package: "Env"),
-        .product(name: "Status", package: "Status"),
+        .product(name: "StatusKit", package: "StatusKit"),
         .product(name: "DesignSystem", package: "DesignSystem"),
       ],
       swiftSettings: [
diff --git a/Packages/Explore/Sources/Explore/CardsListView.swift b/Packages/Explore/Sources/Explore/CardsListView.swift
index 90ca911b..323db574 100644
--- a/Packages/Explore/Sources/Explore/CardsListView.swift
+++ b/Packages/Explore/Sources/Explore/CardsListView.swift
@@ -1,6 +1,6 @@
 import DesignSystem
 import Models
-import Status
+import StatusKit
 import SwiftUI
 
 public struct CardsListView: View {
diff --git a/Packages/Explore/Sources/Explore/ExploreView.swift b/Packages/Explore/Sources/Explore/ExploreView.swift
index e1bc2de2..67c8a737 100644
--- a/Packages/Explore/Sources/Explore/ExploreView.swift
+++ b/Packages/Explore/Sources/Explore/ExploreView.swift
@@ -4,7 +4,7 @@ import Env
 import Models
 import Network
 import Shimmer
-import Status
+import StatusKit
 import SwiftUI
 
 @MainActor
diff --git a/Packages/Notifications/Package.swift b/Packages/Notifications/Package.swift
index 116afea1..149a2433 100644
--- a/Packages/Notifications/Package.swift
+++ b/Packages/Notifications/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
     .package(name: "Network", path: "../Network"),
     .package(name: "Models", path: "../Models"),
     .package(name: "Env", path: "../Env"),
-    .package(name: "Status", path: "../Status"),
+    .package(name: "StatusKit", path: "../StatusKit"),
     .package(name: "DesignSystem", path: "../DesignSystem"),
   ],
   targets: [
@@ -30,7 +30,7 @@ let package = Package(
         .product(name: "Network", package: "Network"),
         .product(name: "Models", package: "Models"),
         .product(name: "Env", package: "Env"),
-        .product(name: "Status", package: "Status"),
+        .product(name: "StatusKit", package: "StatusKit"),
         .product(name: "DesignSystem", package: "DesignSystem"),
       ],
       swiftSettings: [
diff --git a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift
index a428331f..f9dbb160 100644
--- a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift
+++ b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift
@@ -3,7 +3,7 @@ import EmojiText
 import Env
 import Models
 import Network
-import Status
+import StatusKit
 import SwiftUI
 
 @MainActor
diff --git a/Packages/Status/Package.resolved b/Packages/Status/Package.resolved
deleted file mode 100644
index dbb480c8..00000000
--- a/Packages/Status/Package.resolved
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "emojitext",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/divadretlaw/EmojiText",
-      "state" : {
-        "revision" : "e24d8c0def5c77c551fee34fca09c38baa0860e6",
-        "version" : "3.3.0"
-      }
-    },
-    {
-      "identity" : "keychain-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/evgenyneu/keychain-swift",
-      "state" : {
-        "branch" : "master",
-        "revision" : "c1fde55798b164cad44b5e23cfa2f0f1ebcd76af"
-      }
-    },
-    {
-      "identity" : "nuke",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kean/Nuke",
-      "state" : {
-        "revision" : "6241e100294a2aa70d1811641585ab7da780bd0f",
-        "version" : "12.0.0"
-      }
-    },
-    {
-      "identity" : "swiftsoup",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/scinfu/SwiftSoup.git",
-      "state" : {
-        "revision" : "f707b8680cddb96dc1855632340a572ef37bbb98",
-        "version" : "2.5.3"
-      }
-    },
-    {
-      "identity" : "swiftui-shimmer",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/markiv/SwiftUI-Shimmer",
-      "state" : {
-        "revision" : "965a7cbcbf094cbcf22b9251a2323bdc3432e171",
-        "version" : "1.1.0"
-      }
-    }
-  ],
-  "version" : 2
-}
diff --git a/Packages/Status/.gitignore b/Packages/StatusKit/.gitignore
similarity index 100%
rename from Packages/Status/.gitignore
rename to Packages/StatusKit/.gitignore
diff --git a/Packages/Status/.swiftpm/xcode/xcshareddata/xcschemes/Status.xcscheme b/Packages/StatusKit/.swiftpm/xcode/xcshareddata/xcschemes/StatusKit-Package.xcscheme
similarity index 87%
rename from Packages/Status/.swiftpm/xcode/xcshareddata/xcschemes/Status.xcscheme
rename to Packages/StatusKit/.swiftpm/xcode/xcshareddata/xcschemes/StatusKit-Package.xcscheme
index a532f6ad..0f053ae1 100644
--- a/Packages/Status/.swiftpm/xcode/xcshareddata/xcschemes/Status.xcscheme
+++ b/Packages/StatusKit/.swiftpm/xcode/xcshareddata/xcschemes/StatusKit-Package.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Status"
-               BuildableName = "Status"
-               BlueprintName = "Status"
+               BlueprintIdentifier = "StatusKit"
+               BuildableName = "StatusKit"
+               BlueprintName = "StatusKit"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -49,9 +49,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "Status"
-            BuildableName = "Status"
-            BlueprintName = "Status"
+            BlueprintIdentifier = "StatusKit"
+            BuildableName = "StatusKit"
+            BlueprintName = "StatusKit"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
diff --git a/Packages/StatusKit/.swiftpm/xcode/xcshareddata/xcschemes/StatusKit.xcscheme b/Packages/StatusKit/.swiftpm/xcode/xcshareddata/xcschemes/StatusKit.xcscheme
new file mode 100644
index 00000000..0f053ae1
--- /dev/null
+++ b/Packages/StatusKit/.swiftpm/xcode/xcshareddata/xcschemes/StatusKit.xcscheme
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "StatusKit"
+               BuildableName = "StatusKit"
+               BlueprintName = "StatusKit"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "StatusKit"
+            BuildableName = "StatusKit"
+            BlueprintName = "StatusKit"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Packages/Status/Package.swift b/Packages/StatusKit/Package.swift
similarity index 93%
rename from Packages/Status/Package.swift
rename to Packages/StatusKit/Package.swift
index 3f09906c..2374e329 100644
--- a/Packages/Status/Package.swift
+++ b/Packages/StatusKit/Package.swift
@@ -4,7 +4,7 @@
 import PackageDescription
 
 let package = Package(
-  name: "Status",
+  name: "StatusKit",
   defaultLocalization: "en",
   platforms: [
     .iOS(.v17),
@@ -12,8 +12,8 @@ let package = Package(
   ],
   products: [
     .library(
-      name: "Status",
-      targets: ["Status"]
+      name: "StatusKit",
+      targets: ["StatusKit"]
     ),
   ],
   dependencies: [
@@ -28,7 +28,7 @@ let package = Package(
   ],
   targets: [
     .target(
-      name: "Status",
+      name: "StatusKit",
       dependencies: [
         .product(name: "AppAccount", package: "AppAccount"),
         .product(name: "Models", package: "Models"),
diff --git a/Packages/Status/README.md b/Packages/StatusKit/README.md
similarity index 100%
rename from Packages/Status/README.md
rename to Packages/StatusKit/README.md
diff --git a/Packages/Status/Sources/Status/Detail/StatusDetailView.swift b/Packages/StatusKit/Sources/StatusKit/Detail/StatusDetailView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Detail/StatusDetailView.swift
rename to Packages/StatusKit/Sources/StatusKit/Detail/StatusDetailView.swift
diff --git a/Packages/Status/Sources/Status/Detail/StatusDetailViewModel.swift b/Packages/StatusKit/Sources/StatusKit/Detail/StatusDetailViewModel.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Detail/StatusDetailViewModel.swift
rename to Packages/StatusKit/Sources/StatusKit/Detail/StatusDetailViewModel.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/AIPrompt.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AIPrompt.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/AIPrompt.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/AIPrompt.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/AccessoryView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/AccessoryView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/AutoComplete/AutoCompleteView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/AutoCompleteView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/AutoComplete/AutoCompleteView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/AutoCompleteView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/AutoComplete/ExpandedView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/ExpandedView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/AutoComplete/ExpandedView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/ExpandedView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/AutoComplete/MentionsView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/MentionsView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/AutoComplete/MentionsView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/MentionsView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/AutoComplete/RecentTagsView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/RecentTagsView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/AutoComplete/RecentTagsView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/RecentTagsView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/AutoComplete/RemoteTagsView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/RemoteTagsView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/AutoComplete/RemoteTagsView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/RemoteTagsView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/CameraPickerView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/CameraPickerView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/CameraPickerView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/CameraPickerView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/CategorizedEmojiContainer.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/CategorizedEmojiContainer.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/CategorizedEmojiContainer.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/CategorizedEmojiContainer.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/Compressor.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/Compressor.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/Compressor.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/Compressor.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/GIF/GIFPickerView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/GIF/GIFPickerView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/GIF/GIFPickerView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/GIF/GIFPickerView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/MediaContainer.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaContainer.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/MediaContainer.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaContainer.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/MediaEditView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaEditView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/MediaEditView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaEditView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/MediaView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/MediaView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/PollView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/PollView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/PollView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/PollView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Components/UTTypeSupported.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/UTTypeSupported.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Components/UTTypeSupported.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Components/UTTypeSupported.swift
diff --git a/Packages/Status/Sources/Status/Editor/Drafts/DraftsListView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Drafts/DraftsListView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Drafts/DraftsListView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Drafts/DraftsListView.swift
diff --git a/Packages/Status/Sources/Status/Editor/EditorFocusState.swift b/Packages/StatusKit/Sources/StatusKit/Editor/EditorFocusState.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/EditorFocusState.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/EditorFocusState.swift
diff --git a/Packages/Status/Sources/Status/Editor/EditorView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/EditorView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/EditorView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/EditorView.swift
diff --git a/Packages/Status/Sources/Status/Editor/MainView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/MainView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/MainView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/MainView.swift
diff --git a/Packages/Status/Sources/Status/Editor/Namespace.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Namespace.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/Namespace.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/Namespace.swift
diff --git a/Packages/Status/Sources/Status/Editor/PrivacyMenu.swift b/Packages/StatusKit/Sources/StatusKit/Editor/PrivacyMenu.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/PrivacyMenu.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/PrivacyMenu.swift
diff --git a/Packages/Status/Sources/Status/Editor/ToolbarItems.swift b/Packages/StatusKit/Sources/StatusKit/Editor/ToolbarItems.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/ToolbarItems.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/ToolbarItems.swift
diff --git a/Packages/Status/Sources/Status/Editor/UITextView/Coordinator.swift b/Packages/StatusKit/Sources/StatusKit/Editor/UITextView/Coordinator.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/UITextView/Coordinator.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/UITextView/Coordinator.swift
diff --git a/Packages/Status/Sources/Status/Editor/UITextView/Modifiers.swift b/Packages/StatusKit/Sources/StatusKit/Editor/UITextView/Modifiers.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/UITextView/Modifiers.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/UITextView/Modifiers.swift
diff --git a/Packages/Status/Sources/Status/Editor/UITextView/Representable.swift b/Packages/StatusKit/Sources/StatusKit/Editor/UITextView/Representable.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/UITextView/Representable.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/UITextView/Representable.swift
diff --git a/Packages/Status/Sources/Status/Editor/UITextView/TextView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/UITextView/TextView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/UITextView/TextView.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/UITextView/TextView.swift
diff --git a/Packages/Status/Sources/Status/Editor/ViewModeMode.swift b/Packages/StatusKit/Sources/StatusKit/Editor/ViewModeMode.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/ViewModeMode.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/ViewModeMode.swift
diff --git a/Packages/Status/Sources/Status/Editor/ViewModel.swift b/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Editor/ViewModel.swift
rename to Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
diff --git a/Packages/Status/Sources/Status/Embed/StatusEmbeddedView.swift b/Packages/StatusKit/Sources/StatusKit/Embed/StatusEmbeddedView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Embed/StatusEmbeddedView.swift
rename to Packages/StatusKit/Sources/StatusKit/Embed/StatusEmbeddedView.swift
diff --git a/Packages/Status/Sources/Status/Ext/Visibility.swift b/Packages/StatusKit/Sources/StatusKit/Ext/Visibility.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Ext/Visibility.swift
rename to Packages/StatusKit/Sources/StatusKit/Ext/Visibility.swift
diff --git a/Packages/Status/Sources/Status/History/StatusEditHistoryView.swift b/Packages/StatusKit/Sources/StatusKit/History/StatusEditHistoryView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/History/StatusEditHistoryView.swift
rename to Packages/StatusKit/Sources/StatusKit/History/StatusEditHistoryView.swift
diff --git a/Packages/Status/Sources/Status/LanguageDetection/LanguageDetection.swift b/Packages/StatusKit/Sources/StatusKit/LanguageDetection/LanguageDetection.swift
similarity index 100%
rename from Packages/Status/Sources/Status/LanguageDetection/LanguageDetection.swift
rename to Packages/StatusKit/Sources/StatusKit/LanguageDetection/LanguageDetection.swift
diff --git a/Packages/Status/Sources/Status/List/ReblogCache.swift b/Packages/StatusKit/Sources/StatusKit/List/ReblogCache.swift
similarity index 100%
rename from Packages/Status/Sources/Status/List/ReblogCache.swift
rename to Packages/StatusKit/Sources/StatusKit/List/ReblogCache.swift
diff --git a/Packages/Status/Sources/Status/List/StatusesFetcher.swift b/Packages/StatusKit/Sources/StatusKit/List/StatusesFetcher.swift
similarity index 100%
rename from Packages/Status/Sources/Status/List/StatusesFetcher.swift
rename to Packages/StatusKit/Sources/StatusKit/List/StatusesFetcher.swift
diff --git a/Packages/Status/Sources/Status/List/StatusesListView.swift b/Packages/StatusKit/Sources/StatusKit/List/StatusesListView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/List/StatusesListView.swift
rename to Packages/StatusKit/Sources/StatusKit/List/StatusesListView.swift
diff --git a/Packages/Status/Sources/Status/Poll/StatusPollView.swift b/Packages/StatusKit/Sources/StatusKit/Poll/StatusPollView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Poll/StatusPollView.swift
rename to Packages/StatusKit/Sources/StatusKit/Poll/StatusPollView.swift
diff --git a/Packages/Status/Sources/Status/Poll/StatusPollViewModel.swift b/Packages/StatusKit/Sources/StatusKit/Poll/StatusPollViewModel.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Poll/StatusPollViewModel.swift
rename to Packages/StatusKit/Sources/StatusKit/Poll/StatusPollViewModel.swift
diff --git a/Packages/Status/Sources/Status/Row/StatusActionButtonStyle.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/StatusActionButtonStyle.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift
diff --git a/Packages/Status/Sources/Status/Row/StatusRowAccessibilityLabel.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowAccessibilityLabel.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/StatusRowAccessibilityLabel.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/StatusRowAccessibilityLabel.swift
diff --git a/Packages/Status/Sources/Status/Row/StatusRowView.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/StatusRowView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
diff --git a/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/StatusRowViewModel.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowActionsView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowActionsView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowCardView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowCardView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowCardView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowCardView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowContentView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContentView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowContentView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContentView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowContextMenu.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContextMenu.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowContextMenu.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContextMenu.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowDetailView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowDetailView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowDetailView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowDetailView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowMediaPreviewView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowMediaPreviewView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowReblogView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowReblogView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowReblogView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowReblogView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowReplyView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowReplyView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowReplyView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowReplyView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowSpoilerView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowSpoilerView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowSpoilerView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowSpoilerView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowSwipeView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowSwipeView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowSwipeView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowSwipeView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowTagView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTagView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowTagView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTagView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowTextView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTextView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowTextView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTextView.swift
diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowTranslateView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTranslateView.swift
similarity index 100%
rename from Packages/Status/Sources/Status/Row/Subviews/StatusRowTranslateView.swift
rename to Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTranslateView.swift
diff --git a/Packages/Timeline/Package.swift b/Packages/Timeline/Package.swift
index 0d161b53..ab9c1c68 100644
--- a/Packages/Timeline/Package.swift
+++ b/Packages/Timeline/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
     .package(name: "Network", path: "../Network"),
     .package(name: "Models", path: "../Models"),
     .package(name: "Env", path: "../Env"),
-    .package(name: "Status", path: "../Status"),
+    .package(name: "StatusKit", path: "../StatusKit"),
     .package(name: "DesignSystem", path: "../DesignSystem"),
     .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "1.0.0"),
     .package(url: "https://github.com/mergesort/Bodega", exact: "2.1.0"),
@@ -32,7 +32,7 @@ let package = Package(
         .product(name: "Network", package: "Network"),
         .product(name: "Models", package: "Models"),
         .product(name: "Env", package: "Env"),
-        .product(name: "Status", package: "Status"),
+        .product(name: "StatusKit", package: "StatusKit"),
         .product(name: "DesignSystem", package: "DesignSystem"),
         .product(name: "SwiftUIIntrospect", package: "SwiftUI-Introspect"),
         .product(name: "Bodega", package: "Bodega"),
diff --git a/Packages/Timeline/Sources/Timeline/View/TimelineView.swift b/Packages/Timeline/Sources/Timeline/View/TimelineView.swift
index 90085528..0e468710 100644
--- a/Packages/Timeline/Sources/Timeline/View/TimelineView.swift
+++ b/Packages/Timeline/Sources/Timeline/View/TimelineView.swift
@@ -4,7 +4,7 @@ import Env
 import Models
 import Network
 import Shimmer
-import Status
+import StatusKit
 import SwiftData
 import SwiftUI
 import SwiftUIIntrospect
diff --git a/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift b/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift
index 9945bdc6..90bb5922 100644
--- a/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift
+++ b/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift
@@ -2,7 +2,7 @@ import Env
 import Models
 import Network
 import Observation
-import Status
+import StatusKit
 import SwiftUI
 
 @MainActor