diff --git a/IceCubesApp.xcodeproj/project.pbxproj b/IceCubesApp.xcodeproj/project.pbxproj
index f5411a55..3a3d2b3a 100644
--- a/IceCubesApp.xcodeproj/project.pbxproj
+++ b/IceCubesApp.xcodeproj/project.pbxproj
@@ -1275,7 +1275,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1310,7 +1310,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1345,7 +1345,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1379,7 +1379,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1448,6 +1448,7 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = "";
 			};
 			name = Debug;
 		};
@@ -1507,6 +1508,7 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = "";
 			};
 			name = Release;
 		};
@@ -1571,7 +1573,7 @@
 				SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES = YES;
 				SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
 				SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
 				_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = NO;
 			};
@@ -1638,7 +1640,7 @@
 				SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES = YES;
 				SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
 				SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
 				_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = NO;
 			};
@@ -1674,7 +1676,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1709,7 +1711,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
diff --git a/IceCubesNotifications/NotificationService.swift b/IceCubesNotifications/NotificationService.swift
index eb934c04..d108f305 100644
--- a/IceCubesNotifications/NotificationService.swift
+++ b/IceCubesNotifications/NotificationService.swift
@@ -12,14 +12,18 @@ import UserNotifications
 class NotificationService: UNNotificationServiceExtension {
   var contentHandler: ((UNNotificationContent) -> Void)?
   var bestAttemptContent: UNMutableNotificationContent?
+  
+  private let pushKeys = PushKeys()
 
-  @MainActor override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
+  @MainActor
+  override func didReceive(_ request: UNNotificationRequest,
+                           withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
     self.contentHandler = contentHandler
     bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
 
     if var bestAttemptContent {
-      let privateKey = PushNotificationsService.shared.notificationsPrivateKeyAsKey
-      let auth = PushNotificationsService.shared.notificationsAuthKeyAsKey
+      let privateKey = pushKeys.notificationsPrivateKeyAsKey
+      let auth = pushKeys.notificationsAuthKeyAsKey
 
       guard let encodedPayload = bestAttemptContent.userInfo["m"] as? String,
             let payload = Data(base64Encoded: encodedPayload.URLSafeBase64ToBase64())
diff --git a/Packages/Account/Package.swift b/Packages/Account/Package.swift
index 05638ddd..de62f62d 100644
--- a/Packages/Account/Package.swift
+++ b/Packages/Account/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -34,6 +34,7 @@ let package = Package(
         .product(name: "ButtonKit", package: "ButtonKit"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/AppAccount/Package.swift b/Packages/AppAccount/Package.swift
index 9bc861b6..f82ec68e 100644
--- a/Packages/AppAccount/Package.swift
+++ b/Packages/AppAccount/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -32,6 +32,7 @@ let package = Package(
         .product(name: "DesignSystem", package: "DesignSystem"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/Conversations/Package.swift b/Packages/Conversations/Package.swift
index dce06f6d..3690e447 100644
--- a/Packages/Conversations/Package.swift
+++ b/Packages/Conversations/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -32,6 +32,7 @@ let package = Package(
         .product(name: "DesignSystem", package: "DesignSystem"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/DesignSystem/Package.swift b/Packages/DesignSystem/Package.swift
index bb212390..b2e47bcd 100644
--- a/Packages/DesignSystem/Package.swift
+++ b/Packages/DesignSystem/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -33,6 +33,7 @@ let package = Package(
         .product(name: "EmojiText", package: "EmojiText"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/DesignSystem/Sources/DesignSystem/SceneDelegate.swift b/Packages/DesignSystem/Sources/DesignSystem/SceneDelegate.swift
index 297252e6..2fc0c272 100644
--- a/Packages/DesignSystem/Sources/DesignSystem/SceneDelegate.swift
+++ b/Packages/DesignSystem/Sources/DesignSystem/SceneDelegate.swift
@@ -29,6 +29,13 @@ import UIKit
 
   override public init() {
     super.init()
+    
+    Task { @MainActor in
+      setup()
+    }
+  }
+  
+  private func setup() {
     #if os(visionOS)
       windowWidth = window?.bounds.size.width ?? 0
       windowHeight = window?.bounds.size.height ?? 0
diff --git a/Packages/Env/Package.swift b/Packages/Env/Package.swift
index 8c7b09b4..dbcfdf12 100644
--- a/Packages/Env/Package.swift
+++ b/Packages/Env/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -30,6 +30,7 @@ let package = Package(
         .product(name: "KeychainSwift", package: "keychain-swift"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/Explore/Package.swift b/Packages/Explore/Package.swift
index c8b24a08..89351b10 100644
--- a/Packages/Explore/Package.swift
+++ b/Packages/Explore/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -36,6 +36,7 @@ let package = Package(
         .product(name: "DesignSystem", package: "DesignSystem"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/Lists/Package.swift b/Packages/Lists/Package.swift
index 403f7920..4d2fe653 100644
--- a/Packages/Lists/Package.swift
+++ b/Packages/Lists/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -34,6 +34,7 @@ let package = Package(
         .product(name: "DesignSystem", package: "DesignSystem"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/MediaUI/Package.swift b/Packages/MediaUI/Package.swift
index ba6c1e04..b66e7e5c 100644
--- a/Packages/MediaUI/Package.swift
+++ b/Packages/MediaUI/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -28,6 +28,7 @@ let package = Package(
         .product(name: "DesignSystem", package: "DesignSystem"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/Models/Package.swift b/Packages/Models/Package.swift
index d8edd7e4..d9c09196 100644
--- a/Packages/Models/Package.swift
+++ b/Packages/Models/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -26,6 +26,7 @@ let package = Package(
         "SwiftSoup",
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/Network/Package.swift b/Packages/Network/Package.swift
index 0c8e01fe..1a931175 100644
--- a/Packages/Network/Package.swift
+++ b/Packages/Network/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -26,6 +26,7 @@ let package = Package(
         .product(name: "Models", package: "Models"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/Notifications/Package.swift b/Packages/Notifications/Package.swift
index 149a2433..62233b14 100644
--- a/Packages/Notifications/Package.swift
+++ b/Packages/Notifications/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -34,6 +34,7 @@ let package = Package(
         .product(name: "DesignSystem", package: "DesignSystem"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/StatusKit/Package.swift b/Packages/StatusKit/Package.swift
index f20bdab3..533a6189 100644
--- a/Packages/StatusKit/Package.swift
+++ b/Packages/StatusKit/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -38,6 +38,7 @@ let package = Package(
         .product(name: "LRUCache", package: "LRUCache"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),
diff --git a/Packages/StatusKit/Sources/StatusKit/Editor/Components/UTTypeSupported.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/UTTypeSupported.swift
index fc158a3c..d8691545 100644
--- a/Packages/StatusKit/Sources/StatusKit/Editor/Components/UTTypeSupported.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Editor/Components/UTTypeSupported.swift
@@ -1,5 +1,5 @@
-@preconcurrency import AVFoundation
-import Foundation
+import AVFoundation
+@preconcurrency import Foundation
 import PhotosUI
 import SwiftUI
 import UIKit
diff --git a/Packages/Timeline/Package.swift b/Packages/Timeline/Package.swift
index b0c48db0..832091d5 100644
--- a/Packages/Timeline/Package.swift
+++ b/Packages/Timeline/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -38,6 +38,7 @@ let package = Package(
         .product(name: "Bodega", package: "Bodega"),
       ],
       swiftSettings: [
+        .swiftLanguageMode(.v6),
         .enableExperimentalFeature("StrictConcurrency"),
       ]
     ),