diff --git a/Sources/BackupFeature/Controllers/BackupConfigController.swift b/Sources/BackupFeature/Controllers/BackupConfigController.swift
index f2e0220380a545b5d8a79cc5c7517d7676930ba1..7f30002cda725e7883e11d25dcb26053cc0ff42a 100644
--- a/Sources/BackupFeature/Controllers/BackupConfigController.swift
+++ b/Sources/BackupFeature/Controllers/BackupConfigController.swift
@@ -8,7 +8,7 @@ import DrawerFeature
 import ComposableArchitecture
 
 final class BackupConfigController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private lazy var screenView = BackupConfigView()
 
diff --git a/Sources/BackupFeature/ViewModels/BackupConfigViewModel.swift b/Sources/BackupFeature/ViewModels/BackupConfigViewModel.swift
index 410535e63a8f348ef7882aa9dfad4bd90674ae4a..20ecc78451a20f26d467f8455dacb950b4acf7d9 100644
--- a/Sources/BackupFeature/ViewModels/BackupConfigViewModel.swift
+++ b/Sources/BackupFeature/ViewModels/BackupConfigViewModel.swift
@@ -32,9 +32,9 @@ struct BackupConfigViewModel {
 extension BackupConfigViewModel {
   static func live() -> Self {
     class Context {
-      @Dependency(\.navigator) var navigator: Navigator
-      @Dependency(\.backupService) var service: BackupService
-      @Dependency(\.app.hudManager) var hudManager: HUDManager
+      @Dependency(\.navigator) var navigator
+      @Dependency(\.backupService) var service
+      @Dependency(\.app.hudManager) var hudManager
     }
 
     let context = Context()
diff --git a/Sources/BackupFeature/ViewModels/BackupSFTPViewModel.swift b/Sources/BackupFeature/ViewModels/BackupSFTPViewModel.swift
index bd18ee5f294fafcdf2ad8d28eb8465b36429f916..f4c0b87cae090a84fbd133c663b0f12dac6395a1 100644
--- a/Sources/BackupFeature/ViewModels/BackupSFTPViewModel.swift
+++ b/Sources/BackupFeature/ViewModels/BackupSFTPViewModel.swift
@@ -18,7 +18,7 @@ struct SFTPViewState {
 }
 
 final class BackupSFTPViewModel {
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<SFTPViewState, Never> {
     stateSubject.eraseToAnyPublisher()
diff --git a/Sources/BackupFeature/ViewModels/BackupSetupViewModel.swift b/Sources/BackupFeature/ViewModels/BackupSetupViewModel.swift
index a470e6c647c987e1af9668fe3a57807075377980..6a83392de718912afa010751284983b8051ea817 100644
--- a/Sources/BackupFeature/ViewModels/BackupSetupViewModel.swift
+++ b/Sources/BackupFeature/ViewModels/BackupSetupViewModel.swift
@@ -11,7 +11,7 @@ struct BackupSetupViewModel {
 extension BackupSetupViewModel {
   static func live() -> Self {
     class Context {
-      @Dependency(\.backupService) var service: BackupService
+      @Dependency(\.backupService) var service
     }
 
     let context = Context()
diff --git a/Sources/BackupFeature/ViewModels/BackupViewModel.swift b/Sources/BackupFeature/ViewModels/BackupViewModel.swift
index 378590c3edadce9b7036e2f262fcedc6f36c9626..8e16b8a7720791825b65afdb6cb75e4f01e08a30 100644
--- a/Sources/BackupFeature/ViewModels/BackupViewModel.swift
+++ b/Sources/BackupFeature/ViewModels/BackupViewModel.swift
@@ -16,7 +16,7 @@ struct BackupViewModel {
 extension BackupViewModel {
   static func live() -> Self {
     class Context {
-      @Dependency(\.backupService) var service: BackupService
+      @Dependency(\.backupService) var service
     }
 
     let context = Context()
diff --git a/Sources/ChatFeature/Controllers/SingleChatController.swift b/Sources/ChatFeature/Controllers/SingleChatController.swift
index 4ae089ad95fab266d3300d0f73c1b19345e59c81..5e69a83fb704ba64990d718ace2555728c4fd5e1 100644
--- a/Sources/ChatFeature/Controllers/SingleChatController.swift
+++ b/Sources/ChatFeature/Controllers/SingleChatController.swift
@@ -28,9 +28,9 @@ public final class SingleChatController: UIViewController {
 //  @Dependency var makeReportDrawer: MakeReportDrawer
 //  @Dependency var makeAppScreenshot: MakeAppScreenshot
 
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
-  @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
+  @Dependency(\.reportingStatus) var reportingStatus
 
   let voxophone = Voxophone()
 
diff --git a/Sources/ChatListFeature/Controller/ChatListController.swift b/Sources/ChatListFeature/Controller/ChatListController.swift
index 7383b423c17c6acca5df900204af90d7db50c9d9..f1442559f2720f9c158290929feac7079ea98dbd 100644
--- a/Sources/ChatListFeature/Controller/ChatListController.swift
+++ b/Sources/ChatListFeature/Controller/ChatListController.swift
@@ -8,8 +8,8 @@ import Dependencies
 import AppNavigation
 
 public final class ChatListController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
   
   private lazy var screenView = ChatListView()
   private lazy var topLeftView = ChatListTopLeftNavView()
diff --git a/Sources/ChatListFeature/Controller/ChatListSearchTableController.swift b/Sources/ChatListFeature/Controller/ChatListSearchTableController.swift
index 284a571745afde1d577fa0a34afe48be13fd3d76..7acf852277a5f615552f183ff697819833d4a1e1 100644
--- a/Sources/ChatListFeature/Controller/ChatListSearchTableController.swift
+++ b/Sources/ChatListFeature/Controller/ChatListSearchTableController.swift
@@ -17,7 +17,7 @@ class ChatSearchListTableViewDiffableDataSource: UITableViewDiffableDataSource<S
 }
 
 final class ChatSearchTableController: UITableViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private let viewModel: ChatListViewModel
   private let cellHeight: CGFloat = 83.0
diff --git a/Sources/ChatListFeature/Controller/ChatListTableController.swift b/Sources/ChatListFeature/Controller/ChatListTableController.swift
index e1c2e06b98954ab0f99d4fa6452fd781a6ede8bd..0f0364e03322c8a777cb6fec6c7b5d03805bfd7a 100644
--- a/Sources/ChatListFeature/Controller/ChatListTableController.swift
+++ b/Sources/ChatListFeature/Controller/ChatListTableController.swift
@@ -13,7 +13,7 @@ extension ChatInfo: Differentiable {
 }
 
 final class ChatListTableController: UITableViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private var rows = [ChatInfo]()
   private let viewModel: ChatListViewModel
diff --git a/Sources/ContactFeature/Controllers/ContactController.swift b/Sources/ContactFeature/Controllers/ContactController.swift
index ee9bb011bd4eff7300dcff42ea5af2524434f6ce..6a7ad78f83e9ef60846333fd4e98aae4c7321b8b 100644
--- a/Sources/ContactFeature/Controllers/ContactController.swift
+++ b/Sources/ContactFeature/Controllers/ContactController.swift
@@ -10,8 +10,8 @@ import DrawerFeature
 import ScrollViewController
 
 public final class ContactController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ContactView()
   private lazy var scrollViewController = ScrollViewController()
diff --git a/Sources/ContactFeature/ViewModels/ContactViewModel.swift b/Sources/ContactFeature/ViewModels/ContactViewModel.swift
index 6e20c16e65aea219159179fcea4739f8447f858f..99b3440b1dce4842647e76f4b8ee12b40a583d65 100644
--- a/Sources/ContactFeature/ViewModels/ContactViewModel.swift
+++ b/Sources/ContactFeature/ViewModels/ContactViewModel.swift
@@ -19,9 +19,9 @@ struct ContactViewState: Equatable {
 }
 
 final class ContactViewModel {
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
   
   @KeyObject(.username, defaultValue: nil) var username: String?
   @KeyObject(.sharingEmail, defaultValue: false) var sharingEmail: Bool
diff --git a/Sources/ContactListFeature/ContactListController.swift b/Sources/ContactListFeature/ContactListController.swift
index 36d8e8b4c65c2801480e0aca20ae60528e706b77..49afcb17dff5817292751f5855691ca73ff06f25 100644
--- a/Sources/ContactListFeature/ContactListController.swift
+++ b/Sources/ContactListFeature/ContactListController.swift
@@ -7,8 +7,8 @@ import AppResources
 import AppNavigation
 
 public final class ContactListController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ContactListView()
   private lazy var tableController = ContactListTableController(viewModel)
diff --git a/Sources/ContactListFeature/ContactListViewModel.swift b/Sources/ContactListFeature/ContactListViewModel.swift
index 3e509accc5cfd7c71e76ec7e6dc814da5a63af9a..1e77da1135d61f769318242d06875626cb27ab33 100644
--- a/Sources/ContactListFeature/ContactListViewModel.swift
+++ b/Sources/ContactListFeature/ContactListViewModel.swift
@@ -11,9 +11,9 @@ import AppCore
 import Dependencies
 
 final class ContactListViewModel {
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.reportingStatus) var reportingStatus
 
   var myId: Data {
     try! messenger.e2e.get()!.getContact().getId()
diff --git a/Sources/CountryListFeature/CountryListController.swift b/Sources/CountryListFeature/CountryListController.swift
index dd6ad4e65985464e7ae3c323a30df35da6033ab9..ee36ffdd17741d7942208879bf6c9b499fa12125 100644
--- a/Sources/CountryListFeature/CountryListController.swift
+++ b/Sources/CountryListFeature/CountryListController.swift
@@ -6,7 +6,7 @@ import AppResources
 import Dependencies
 
 public final class CountryListController: UIViewController, UITableViewDelegate {
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = CountryListView()
 
diff --git a/Sources/GroupDraftFeature/GroupDraftController.swift b/Sources/GroupDraftFeature/GroupDraftController.swift
index 27dd858fa3abc733e288f4495d53f0aaad629741..321f44fada0da71b7835fb88d0b22f5d1c1c7b61 100644
--- a/Sources/GroupDraftFeature/GroupDraftController.swift
+++ b/Sources/GroupDraftFeature/GroupDraftController.swift
@@ -7,7 +7,7 @@ import Dependencies
 import AppNavigation
 
 public final class GroupDraftController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private lazy var titleLabel = UILabel()
   private lazy var createButton = UIButton()
diff --git a/Sources/LaunchFeature/LaunchController.swift b/Sources/LaunchFeature/LaunchController.swift
index d6d1780b9c64bae58cf3508c0e3be095144cea90..2684c669cd4860ec49c7efebba6abba9ea138fd4 100644
--- a/Sources/LaunchFeature/LaunchController.swift
+++ b/Sources/LaunchFeature/LaunchController.swift
@@ -7,7 +7,7 @@ import DrawerFeature
 import AppNavigation
 
 public final class LaunchController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private lazy var screenView = LaunchView()
   private let viewModel = LaunchViewModel()
diff --git a/Sources/MenuFeature/Controllers/MenuController.swift b/Sources/MenuFeature/Controllers/MenuController.swift
index 17a9a73505fc73230b5fad387c0dd9c247621ea1..06a5661af2abe64618eab5f2c9fc5afcb03d4af2 100644
--- a/Sources/MenuFeature/Controllers/MenuController.swift
+++ b/Sources/MenuFeature/Controllers/MenuController.swift
@@ -8,8 +8,8 @@ import AppNavigation
 import DrawerFeature
 
 public final class MenuController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = MenuView()
 
diff --git a/Sources/MenuFeature/ViewModels/MenuViewModel.swift b/Sources/MenuFeature/ViewModels/MenuViewModel.swift
index 3005d8e2a7b22b375f44dfdac8635fd31f8c47d3..ea74991de9aaa0dd7a1e342686b89024289c84b2 100644
--- a/Sources/MenuFeature/ViewModels/MenuViewModel.swift
+++ b/Sources/MenuFeature/ViewModels/MenuViewModel.swift
@@ -8,8 +8,8 @@ import ReportingFeature
 import ComposableArchitecture
 
 final class MenuViewModel {
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.reportingStatus) var reportingStatus
 
   @KeyObject(.avatar, defaultValue: nil) var avatar: Data?
   @KeyObject(.username, defaultValue: "") var username: String
diff --git a/Sources/OnboardingFeature/Controllers/OnboardingCodeController.swift b/Sources/OnboardingFeature/Controllers/OnboardingCodeController.swift
index 92cdda4e7d229e51328343edce602841a14bb529..8fd333cbdb11af72c101f78dbdcd67a7d407b83c 100644
--- a/Sources/OnboardingFeature/Controllers/OnboardingCodeController.swift
+++ b/Sources/OnboardingFeature/Controllers/OnboardingCodeController.swift
@@ -9,8 +9,8 @@ import DrawerFeature
 import ScrollViewController
 
 public final class OnboardingCodeController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = OnboardingCodeView()
   private lazy var scrollViewController = ScrollViewController()
diff --git a/Sources/OnboardingFeature/Controllers/OnboardingEmailController.swift b/Sources/OnboardingFeature/Controllers/OnboardingEmailController.swift
index d15c6594393c5cb7942d78abd3173378dc4756b4..fc71f8ccaa0f54efd2f5af455b805841523c9093 100644
--- a/Sources/OnboardingFeature/Controllers/OnboardingEmailController.swift
+++ b/Sources/OnboardingFeature/Controllers/OnboardingEmailController.swift
@@ -9,8 +9,8 @@ import DrawerFeature
 import ScrollViewController
 
 public final class OnboardingEmailController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = OnboardingEmailView()
   private lazy var scrollViewController = ScrollViewController()
diff --git a/Sources/OnboardingFeature/Controllers/OnboardingPhoneController.swift b/Sources/OnboardingFeature/Controllers/OnboardingPhoneController.swift
index 4eadd53e32ffa9fa633f2fd61824dab9e871c70b..768e4cbd239aff9ccab254fd0430e514d217390f 100644
--- a/Sources/OnboardingFeature/Controllers/OnboardingPhoneController.swift
+++ b/Sources/OnboardingFeature/Controllers/OnboardingPhoneController.swift
@@ -9,8 +9,8 @@ import DrawerFeature
 import ScrollViewController
 
 public final class OnboardingPhoneController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = OnboardingPhoneView()
   private lazy var scrollViewController = ScrollViewController()
diff --git a/Sources/OnboardingFeature/Controllers/OnboardingStartController.swift b/Sources/OnboardingFeature/Controllers/OnboardingStartController.swift
index 0fd4158db96cda5d8f7cea46388de3b6890a7864..cfa8dad0812ef6950e7232637cb133a70f7f3636 100644
--- a/Sources/OnboardingFeature/Controllers/OnboardingStartController.swift
+++ b/Sources/OnboardingFeature/Controllers/OnboardingStartController.swift
@@ -4,7 +4,7 @@ import AppNavigation
 import ComposableArchitecture
 
 public final class OnboardingStartController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private lazy var screenView = OnboardingStartView()
 
diff --git a/Sources/OnboardingFeature/Controllers/OnboardingUsernameController.swift b/Sources/OnboardingFeature/Controllers/OnboardingUsernameController.swift
index 619a983b7149929bf7ca1232aff937bcaf34baa8..fcbfebaaa044ab0b3c54646fc2b9c8235959486b 100644
--- a/Sources/OnboardingFeature/Controllers/OnboardingUsernameController.swift
+++ b/Sources/OnboardingFeature/Controllers/OnboardingUsernameController.swift
@@ -9,8 +9,8 @@ import DrawerFeature
 import ScrollViewController
 
 public final class OnboardingUsernameController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = OnboardingUsernameView()
   private lazy var scrollViewController = ScrollViewController()
diff --git a/Sources/OnboardingFeature/Controllers/OnboardingWelcomeController.swift b/Sources/OnboardingFeature/Controllers/OnboardingWelcomeController.swift
index 701e1359cea59cfd2912d099b7d6fe897aa2de64..4c74f46fbb28f3a08509692257e59e6230c325e8 100644
--- a/Sources/OnboardingFeature/Controllers/OnboardingWelcomeController.swift
+++ b/Sources/OnboardingFeature/Controllers/OnboardingWelcomeController.swift
@@ -9,8 +9,8 @@ import AppNavigation
 import DrawerFeature
 
 public final class OnboardingWelcomeController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   @KeyObject(.username, defaultValue: "") var username: String
 
diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingCodeViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingCodeViewModel.swift
index 994b83b211a75eeb4bafb4e95ec683e263325881..de57405fcb07c431f33e639f7a7b7b4a3b4dfa15 100644
--- a/Sources/OnboardingFeature/ViewModels/OnboardingCodeViewModel.swift
+++ b/Sources/OnboardingFeature/ViewModels/OnboardingCodeViewModel.swift
@@ -21,9 +21,9 @@ final class OnboardingCodeViewModel {
     stateSubject.eraseToAnyPublisher()
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   @KeyObject(.email, defaultValue: nil) var email: String?
   @KeyObject(.phone, defaultValue: nil) var phone: String?
diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingEmailViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingEmailViewModel.swift
index a175a674fa981f7d48cf2409c8d84041f60da5dc..01e5e6281f1e033dfd29814e9e62809e351c2e42 100644
--- a/Sources/OnboardingFeature/ViewModels/OnboardingEmailViewModel.swift
+++ b/Sources/OnboardingFeature/ViewModels/OnboardingEmailViewModel.swift
@@ -15,9 +15,9 @@ final class OnboardingEmailViewModel {
     var status: InputField.ValidationStatus = .unknown(nil)
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<ViewState, Never> {
     stateSubject.eraseToAnyPublisher()
diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingPhoneViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingPhoneViewModel.swift
index 39d9f282be5757d19bc7ef47ff450dcfd2d1f48e..c60f176063e7ad63f7069e7cc7f7d341ca8f048b 100644
--- a/Sources/OnboardingFeature/ViewModels/OnboardingPhoneViewModel.swift
+++ b/Sources/OnboardingFeature/ViewModels/OnboardingPhoneViewModel.swift
@@ -18,9 +18,9 @@ final class OnboardingPhoneViewModel {
     var country: Country = .fromMyPhone()
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<ViewState, Never> {
     stateSubject.eraseToAnyPublisher()
diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift
index 917e9fea3bcd5f21227f5a285ceafe620b271e9f..21ff5adbede032d0cd47efded7f9220e007ba0ba 100644
--- a/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift
+++ b/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift
@@ -16,10 +16,10 @@ final class OnboardingUsernameViewModel {
     var didConfirm: Bool = false
   }
 
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   @KeyObject(.username, defaultValue: "") var username: String
 
diff --git a/Sources/ProfileFeature/Controllers/ProfileCodeController.swift b/Sources/ProfileFeature/Controllers/ProfileCodeController.swift
index d5d640db0263cf29abda90a9b1ec962e89e9081c..a291ea8fb026964dac7432c3fcbc333ffd0b384e 100644
--- a/Sources/ProfileFeature/Controllers/ProfileCodeController.swift
+++ b/Sources/ProfileFeature/Controllers/ProfileCodeController.swift
@@ -8,8 +8,8 @@ import AppNavigation
 import ScrollViewController
 
 public final class ProfileCodeController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ProfileCodeView()
   private lazy var scrollViewController = ScrollViewController()
diff --git a/Sources/ProfileFeature/Controllers/ProfileController.swift b/Sources/ProfileFeature/Controllers/ProfileController.swift
index 23dca61bf795b7ede333f78d8ed0c2d7fdfa2588..f598486b49149d9013e5af2bda1c3ec2eb46a6e0 100644
--- a/Sources/ProfileFeature/Controllers/ProfileController.swift
+++ b/Sources/ProfileFeature/Controllers/ProfileController.swift
@@ -8,8 +8,8 @@ import DrawerFeature
 import ComposableArchitecture
 
 public final class ProfileController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ProfileView()
 
diff --git a/Sources/ProfileFeature/Controllers/ProfileEmailController.swift b/Sources/ProfileFeature/Controllers/ProfileEmailController.swift
index ef9ef2f8f501ae6160d96cd72376d33222d9cdac..0d7d9e3f0219af788c7429a9e2bfa3acbaf82008 100644
--- a/Sources/ProfileFeature/Controllers/ProfileEmailController.swift
+++ b/Sources/ProfileFeature/Controllers/ProfileEmailController.swift
@@ -8,8 +8,8 @@ import ScrollViewController
 import ComposableArchitecture
 
 public final class ProfileEmailController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ProfileEmailView()
   private lazy var scrollViewController = ScrollViewController()
diff --git a/Sources/ProfileFeature/Controllers/ProfilePhoneController.swift b/Sources/ProfileFeature/Controllers/ProfilePhoneController.swift
index 99ac70b864328dd362fe88a2487fc3ba8fec2ce2..c7d9e8c7ee82214f7a66069da2640299caf9a89e 100644
--- a/Sources/ProfileFeature/Controllers/ProfilePhoneController.swift
+++ b/Sources/ProfileFeature/Controllers/ProfilePhoneController.swift
@@ -8,8 +8,8 @@ import AppNavigation
 import ScrollViewController
 
 public final class ProfilePhoneController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ProfilePhoneView()
   private lazy var scrollViewController = ScrollViewController()
diff --git a/Sources/ProfileFeature/ViewModels/ProfileCodeViewModel.swift b/Sources/ProfileFeature/ViewModels/ProfileCodeViewModel.swift
index a018da77f237fc1c4b604ea791aa0289452638d0..5dc1176a6943c69a78f3a3e04000a783fcb0f586 100644
--- a/Sources/ProfileFeature/ViewModels/ProfileCodeViewModel.swift
+++ b/Sources/ProfileFeature/ViewModels/ProfileCodeViewModel.swift
@@ -20,9 +20,9 @@ final class ProfileCodeViewModel {
     stateSubject.eraseToAnyPublisher()
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   @KeyObject(.email, defaultValue: nil) var email: String?
   @KeyObject(.phone, defaultValue: nil) var phone: String?
diff --git a/Sources/ProfileFeature/ViewModels/ProfileEmailViewModel.swift b/Sources/ProfileFeature/ViewModels/ProfileEmailViewModel.swift
index 96210b7dc00867639c7861d377d868df11bb8b62..2fc959aea69cb0f53bc8c1452a07273b58d29664 100644
--- a/Sources/ProfileFeature/ViewModels/ProfileEmailViewModel.swift
+++ b/Sources/ProfileFeature/ViewModels/ProfileEmailViewModel.swift
@@ -15,9 +15,9 @@ final class ProfileEmailViewModel {
     var status: InputField.ValidationStatus = .unknown(nil)
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<ViewState, Never> {
     stateSubject.eraseToAnyPublisher()
diff --git a/Sources/ProfileFeature/ViewModels/ProfilePhoneViewModel.swift b/Sources/ProfileFeature/ViewModels/ProfilePhoneViewModel.swift
index 90387a69dde095491775b47cd4e138ae6786f483..901053939fb2a01fa1173d879c6fe36b28ac368b 100644
--- a/Sources/ProfileFeature/ViewModels/ProfilePhoneViewModel.swift
+++ b/Sources/ProfileFeature/ViewModels/ProfilePhoneViewModel.swift
@@ -18,9 +18,9 @@ final class ProfilePhoneViewModel {
     var country: Country = .fromMyPhone()
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<ViewState, Never> {
     stateSubject.eraseToAnyPublisher()
diff --git a/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift b/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift
index 07ab592ebd904e0a1dc91314e7b616a5cea7a646..4d7eb1b323d8d55716affe0b59803a35fea933e7 100644
--- a/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift
+++ b/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift
@@ -31,11 +31,11 @@ final class ProfileViewModel {
   @KeyObject(.sharingEmail, defaultValue: false) var isEmailSharing: Bool
   @KeyObject(.sharingPhone, defaultValue: false) var isPhoneSharing: Bool
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.backupService) var backupService: BackupService
-  @Dependency(\.permissions) var permissions: PermissionsManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.permissions) var permissions
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
+  @Dependency(\.backupService) var backupService
 
   var name: String { username! }
 
diff --git a/Sources/RequestPermissionFeature/RequestPermissionController.swift b/Sources/RequestPermissionFeature/RequestPermissionController.swift
index 9c12752c92e20763c81647fe501e749d014eca3e..8a7bba156608fd46b924966bdaa247b04cd8bacd 100644
--- a/Sources/RequestPermissionFeature/RequestPermissionController.swift
+++ b/Sources/RequestPermissionFeature/RequestPermissionController.swift
@@ -8,8 +8,8 @@ import AppNavigation
 import PermissionsFeature
 
 public final class RequestPermissionController: UIViewController {
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
-  @Dependency(\.permissions) var permissions: PermissionsManager
+  @Dependency(\.permissions) var permissions
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = RequestPermissionView()
 
diff --git a/Sources/RequestsFeature/Controllers/RequestsContainerController.swift b/Sources/RequestsFeature/Controllers/RequestsContainerController.swift
index 49ab70bc1481be2c6797d9af64c2c3162c2026b3..7d134ab4c845a43e5e7e4c2cf32699ba6741093f 100644
--- a/Sources/RequestsFeature/Controllers/RequestsContainerController.swift
+++ b/Sources/RequestsFeature/Controllers/RequestsContainerController.swift
@@ -8,8 +8,8 @@ import AppNavigation
 import ContactFeature
 
 public final class RequestsContainerController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = RequestsContainerView()
   private var cancellables = Set<AnyCancellable>()
diff --git a/Sources/RequestsFeature/Controllers/RequestsReceivedController.swift b/Sources/RequestsFeature/Controllers/RequestsReceivedController.swift
index 3ee84bb9e1b29b539448cb11e222fbcf3c452ce8..bc618608bff7b81e0d38658f9dcb578f14df2814 100644
--- a/Sources/RequestsFeature/Controllers/RequestsReceivedController.swift
+++ b/Sources/RequestsFeature/Controllers/RequestsReceivedController.swift
@@ -10,8 +10,8 @@ import DrawerFeature
 import CountryListFeature
 
 final class RequestsReceivedController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.toastManager) var toaster: ToastManager
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.toastManager) var toaster
 
   private lazy var screenView = RequestsReceivedView()
   private var cancellables = Set<AnyCancellable>()
diff --git a/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift b/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift
index 6481b67c4a5c25a148980b6a3ed2d454d61f7822..809e53b500a86030f932609c7fcf998be5b057f5 100644
--- a/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift
+++ b/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift
@@ -10,9 +10,9 @@ import CombineSchedulers
 import XXMessengerClient
 
 final class RequestsFailedViewModel {
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
   
   @KeyObject(.username, defaultValue: nil) var username: String?
   @KeyObject(.sharingEmail, defaultValue: false) var sharingEmail: Bool
diff --git a/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift b/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift
index abe6ba7b6c2e20c14115ce6f54535f841c693930..6293a25bd8795b5d5b5fe56954216c09db468b73 100644
--- a/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift
+++ b/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift
@@ -18,11 +18,11 @@ struct RequestSent: Hashable, Equatable {
 }
 
 final class RequestsSentViewModel {
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.toastManager) var toastManager: ToastManager
-  @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
+  @Dependency(\.app.toastManager) var toastManager
+  @Dependency(\.reportingStatus) var reportingStatus
   
   @KeyObject(.username, defaultValue: nil) var username: String?
   @KeyObject(.sharingEmail, defaultValue: false) var sharingEmail: Bool
diff --git a/Sources/RestoreFeature/Controllers/RestoreController.swift b/Sources/RestoreFeature/Controllers/RestoreController.swift
index ac6f6ae1b3778411c35f750734fe2498371e3f90..ef73b2ccd6f76f1ef7ec2a27e8e75af9d7c9a6a2 100644
--- a/Sources/RestoreFeature/Controllers/RestoreController.swift
+++ b/Sources/RestoreFeature/Controllers/RestoreController.swift
@@ -7,7 +7,7 @@ import DrawerFeature
 import ComposableArchitecture
 
 public final class RestoreController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private lazy var screenView = RestoreView()
 
diff --git a/Sources/RestoreFeature/Controllers/RestoreListController.swift b/Sources/RestoreFeature/Controllers/RestoreListController.swift
index cbce48e53d9b5943a84495906dfd64cc38bfd484..b4274095e81af0e7f9672fd729699ce8cac4b380 100644
--- a/Sources/RestoreFeature/Controllers/RestoreListController.swift
+++ b/Sources/RestoreFeature/Controllers/RestoreListController.swift
@@ -7,7 +7,7 @@ import DrawerFeature
 import ComposableArchitecture
 
 public final class RestoreListController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private lazy var screenView = RestoreListView()
 
diff --git a/Sources/RestoreFeature/Controllers/RestoreSuccessController.swift b/Sources/RestoreFeature/Controllers/RestoreSuccessController.swift
index 6fca825a4df49a270c800ca78b3f5d7757659a66..cad61beee324f7814d23a917f8648a03e08cdb16 100644
--- a/Sources/RestoreFeature/Controllers/RestoreSuccessController.swift
+++ b/Sources/RestoreFeature/Controllers/RestoreSuccessController.swift
@@ -6,8 +6,8 @@ import Dependencies
 import AppNavigation
 
 public final class RestoreSuccessController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = RestoreSuccessView()
   private var cancellables = Set<AnyCancellable>()
diff --git a/Sources/RestoreFeature/ViewModels/RestoreListViewModel.swift b/Sources/RestoreFeature/ViewModels/RestoreListViewModel.swift
index 40428ff3d9c49c175afb5d48d5cf8c18af28320b..323b07949159aba1fc1bc2bca224d3e8ed050177 100644
--- a/Sources/RestoreFeature/ViewModels/RestoreListViewModel.swift
+++ b/Sources/RestoreFeature/ViewModels/RestoreListViewModel.swift
@@ -12,7 +12,7 @@ public struct RestorationDetails {
 }
 
 final class RestoreListViewModel {
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
+  @Dependency(\.app.hudManager) var hudManager
 
   var sftpPublisher: AnyPublisher<Void, Never> {
     sftpSubject.eraseToAnyPublisher()
diff --git a/Sources/RestoreFeature/ViewModels/RestoreSFTPViewModel.swift b/Sources/RestoreFeature/ViewModels/RestoreSFTPViewModel.swift
index d18036fc37123a30f56b7126b4e595e4e9a1a89b..3af77801cb933e381fc9867030b67cde74508af0 100644
--- a/Sources/RestoreFeature/ViewModels/RestoreSFTPViewModel.swift
+++ b/Sources/RestoreFeature/ViewModels/RestoreSFTPViewModel.swift
@@ -16,7 +16,7 @@ struct SFTPViewState {
 }
 
 final class RestoreSFTPViewModel {
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<SFTPViewState, Never> {
     stateSubject.eraseToAnyPublisher()
diff --git a/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift b/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift
index 1f7d88498e0f0e6ff1c04b654624a54b97bfadd3..3ada5751407c4db8070954a325b52f7b6f889cec 100644
--- a/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift
+++ b/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift
@@ -38,8 +38,8 @@ extension Step: Equatable {
 }
 
 final class RestoreViewModel {
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.app.messenger) var messenger: Messenger
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.app.messenger) var messenger
 
   @KeyObject(.phone, defaultValue: nil) var phone: String?
   @KeyObject(.email, defaultValue: nil) var email: String?
diff --git a/Sources/ScanFeature/Controllers/ScanContainerController.swift b/Sources/ScanFeature/Controllers/ScanContainerController.swift
index 435710b65d50319e33f4ab0bf1de67f538692f36..32b9931408111fa4ff1f8b6ae153768555764049 100644
--- a/Sources/ScanFeature/Controllers/ScanContainerController.swift
+++ b/Sources/ScanFeature/Controllers/ScanContainerController.swift
@@ -8,8 +8,8 @@ import AppNavigation
 import DrawerFeature
 
 public final class ScanContainerController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ScanContainerView()
 
diff --git a/Sources/ScanFeature/Controllers/ScanController.swift b/Sources/ScanFeature/Controllers/ScanController.swift
index e21b9d035bf0d664a06d7f2873244747614f2bf9..a755f79f87ed1f2e0487d9887f2f58da694cda2b 100644
--- a/Sources/ScanFeature/Controllers/ScanController.swift
+++ b/Sources/ScanFeature/Controllers/ScanController.swift
@@ -8,9 +8,9 @@ import PermissionsFeature
 import ComposableArchitecture
 
 final class ScanController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.permissions) var permissions: PermissionsManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.permissions) var permissions
 
   private lazy var screenView = ScanView()
 
diff --git a/Sources/ScanFeature/ViewModels/ScanDisplayViewModel.swift b/Sources/ScanFeature/ViewModels/ScanDisplayViewModel.swift
index 75410119075162b70a45a95e8622b36083bb637e..924a7daa65286248ac17706618e889c060970072 100644
--- a/Sources/ScanFeature/ViewModels/ScanDisplayViewModel.swift
+++ b/Sources/ScanFeature/ViewModels/ScanDisplayViewModel.swift
@@ -16,7 +16,7 @@ struct ScanDisplayViewState: Equatable {
 }
 
 final class ScanDisplayViewModel {
-    @Dependency(\.app.messenger) var messenger: Messenger
+    @Dependency(\.app.messenger) var messenger
 
     @KeyObject(.email, defaultValue: nil) var email: String?
     @KeyObject(.phone, defaultValue: nil) var phone: String?
diff --git a/Sources/ScanFeature/ViewModels/ScanViewModel.swift b/Sources/ScanFeature/ViewModels/ScanViewModel.swift
index d69cbd692028a4485b276e75e7209d85301b087b..feaa49b16b0fed0e96f08a4fe982cd6e22e5ec42 100644
--- a/Sources/ScanFeature/ViewModels/ScanViewModel.swift
+++ b/Sources/ScanFeature/ViewModels/ScanViewModel.swift
@@ -23,8 +23,8 @@ enum ScanError: Equatable {
 }
 
 final class ScanViewModel {
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.reportingStatus) var reportingStatus
 
   var contactPublisher: AnyPublisher<XXModels.Contact, Never> {
     contactSubject.eraseToAnyPublisher()
diff --git a/Sources/SearchFeature/Controllers/SearchContainerController.swift b/Sources/SearchFeature/Controllers/SearchContainerController.swift
index ec9bcd59eb990643390ba4d458c184d488b4d193..812ed8b3c64e5d0634490d1b7fc29da9af9e599f 100644
--- a/Sources/SearchFeature/Controllers/SearchContainerController.swift
+++ b/Sources/SearchFeature/Controllers/SearchContainerController.swift
@@ -9,8 +9,8 @@ import AppNavigation
 import DrawerFeature
 
 public final class SearchContainerController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = SearchContainerView()
 
diff --git a/Sources/SearchFeature/Controllers/SearchLeftController.swift b/Sources/SearchFeature/Controllers/SearchLeftController.swift
index 4485fa22e286efcc668220c973c8aa4ab9ea0b3a..86a70d112ee90e1760abf676fd898e3965585ee9 100644
--- a/Sources/SearchFeature/Controllers/SearchLeftController.swift
+++ b/Sources/SearchFeature/Controllers/SearchLeftController.swift
@@ -10,7 +10,7 @@ import DrawerFeature
 import CountryListFeature
 
 final class SearchLeftController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
   @KeyObject(.email, defaultValue: nil) var email: String?
   @KeyObject(.phone, defaultValue: nil) var phone: String?
   @KeyObject(.sharingEmail, defaultValue: false) var isSharingEmail: Bool
diff --git a/Sources/SearchFeature/Controllers/SearchRightController.swift b/Sources/SearchFeature/Controllers/SearchRightController.swift
index 3445f2266bc8a43dd479eb7cfe2bb9287e49e34b..29d640c5b1fe6c5c34b89460e250a7208af78529 100644
--- a/Sources/SearchFeature/Controllers/SearchRightController.swift
+++ b/Sources/SearchFeature/Controllers/SearchRightController.swift
@@ -4,7 +4,7 @@ import AppNavigation
 import ComposableArchitecture
 
 final class SearchRightController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private lazy var screenView = SearchRightView()
 
diff --git a/Sources/SearchFeature/ViewModels/SearchContainerViewModel.swift b/Sources/SearchFeature/ViewModels/SearchContainerViewModel.swift
index 1571afdae49af23f77a166b50518bffe21f92582..2a5c5bddfc0c150e3576705d19d73e82373298d4 100644
--- a/Sources/SearchFeature/ViewModels/SearchContainerViewModel.swift
+++ b/Sources/SearchFeature/ViewModels/SearchContainerViewModel.swift
@@ -6,7 +6,7 @@ import PermissionsFeature
 import ComposableArchitecture
 
 final class SearchContainerViewModel {
-  @Dependency(\.permissions) var permissions: PermissionsManager
+  @Dependency(\.permissions) var permissions
   //@Dependency(\.app.dummyTraffic) var dummyTraffic: DummyTraffic
 
   @KeyObject(.dummyTrafficOn, defaultValue: false) var dummyTrafficOn
diff --git a/Sources/SearchFeature/ViewModels/SearchRightViewModel.swift b/Sources/SearchFeature/ViewModels/SearchRightViewModel.swift
index 12dab510ef00415aaa67d419f2f3c3e75000540e..d0f9a2cc90b8bbcc7155928482d70590fffbd107 100644
--- a/Sources/SearchFeature/ViewModels/SearchRightViewModel.swift
+++ b/Sources/SearchFeature/ViewModels/SearchRightViewModel.swift
@@ -26,9 +26,9 @@ enum ScanningError: Equatable {
 }
 
 final class SearchRightViewModel {
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.permissions) var permissions: PermissionsManager
-  @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
+  @Dependency(\.permissions) var permissions
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.reportingStatus) var reportingStatus
 
   var foundPublisher: AnyPublisher<XXModels.Contact, Never> {
     foundSubject.eraseToAnyPublisher()
diff --git a/Sources/SettingsFeature/Controllers/SettingsAdvancedController.swift b/Sources/SettingsFeature/Controllers/SettingsAdvancedController.swift
index 96225a7dbebff485ce4289417abe0646150fc6f1..67d5153cf241963490fbd9351f0d58079a7ed78c 100644
--- a/Sources/SettingsFeature/Controllers/SettingsAdvancedController.swift
+++ b/Sources/SettingsFeature/Controllers/SettingsAdvancedController.swift
@@ -5,7 +5,7 @@ import AppResources
 import AppNavigation
 
 public final class SettingsAdvancedController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private lazy var screenView = SettingsAdvancedView()
 
diff --git a/Sources/SettingsFeature/Controllers/SettingsDeleteController.swift b/Sources/SettingsFeature/Controllers/SettingsDeleteController.swift
index 0c64d28d92144c28ed4718a281b352f8ab749669..e9b48cb44dc6265e9908c69d7c2a0de5e447b639 100644
--- a/Sources/SettingsFeature/Controllers/SettingsDeleteController.swift
+++ b/Sources/SettingsFeature/Controllers/SettingsDeleteController.swift
@@ -9,7 +9,7 @@ import DrawerFeature
 import ScrollViewController
 
 public final class SettingsDeleteController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   @KeyObject(.username, defaultValue: "") var username: String
 
diff --git a/Sources/SettingsFeature/Controllers/SettingsMainController.swift b/Sources/SettingsFeature/Controllers/SettingsMainController.swift
index 574c0dca110aa011dd7643eae8e60a2b028827e5..932108f9981b5fe472f9b82e659e7d7b34bbad52 100644
--- a/Sources/SettingsFeature/Controllers/SettingsMainController.swift
+++ b/Sources/SettingsFeature/Controllers/SettingsMainController.swift
@@ -9,8 +9,8 @@ import DrawerFeature
 import ScrollViewController
 
 public final class SettingsMainController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var scrollViewController = ScrollViewController()
   private lazy var screenView = SettingsMainView {
diff --git a/Sources/SettingsFeature/ViewModels/SettingsAdvancedViewModel.swift b/Sources/SettingsFeature/ViewModels/SettingsAdvancedViewModel.swift
index 585880a067a7664e55035300cf9deeb2e15c0c70..e45fe8021fa6001ff1c172e3600bc0e65c7706e9 100644
--- a/Sources/SettingsFeature/ViewModels/SettingsAdvancedViewModel.swift
+++ b/Sources/SettingsFeature/ViewModels/SettingsAdvancedViewModel.swift
@@ -21,9 +21,9 @@ final class SettingsAdvancedViewModel {
   private var cancellables = Set<AnyCancellable>()
   private let isShowingUsernamesKey = "isShowingUsernames"
 
-  @Dependency(\.app.log) var logger: Logger
-  @Dependency(\.crashReport) var crashReport: CrashReport
-  @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
+  @Dependency(\.app.log) var logger
+  @Dependency(\.crashReport) var crashReport
+  @Dependency(\.reportingStatus) var reportingStatus
 
   var sharePublisher: AnyPublisher<URL, Never> {
     shareRelay.eraseToAnyPublisher()
diff --git a/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift b/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift
index 1eeb1c333a4b4a275125c00ab5f26bc9e2819408..05073defcb5aa9ca0c294776d841fcf575de95ec 100644
--- a/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift
+++ b/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift
@@ -7,10 +7,10 @@ import AppResources
 import XXMessengerClient
 
 final class SettingsDeleteViewModel {
-  @Dependency(\.keychain) var keychain: KeychainManager
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
+  @Dependency(\.keychain) var keychain
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
   @KeyObject(.username, defaultValue: nil) var username: String?
 
   private var isCurrentlyDeleting = false
diff --git a/Sources/TermsFeature/TermsConditionsController.swift b/Sources/TermsFeature/TermsConditionsController.swift
index ce67d0e4e30f1de7a45b7013ab32615319dc799f..708e8d330219edf0a89291edc2d2176c46eff102 100644
--- a/Sources/TermsFeature/TermsConditionsController.swift
+++ b/Sources/TermsFeature/TermsConditionsController.swift
@@ -8,7 +8,7 @@ import AppNavigation
 import ComposableArchitecture
 
 public final class TermsConditionsController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   @KeyObject(.username, defaultValue: nil) var username: String?
   @KeyObject(.acceptedTerms, defaultValue: false) var didAcceptTerms: Bool