From fb20e204d0e9f3415913f3dbc2bafde2a9b2f605 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Thu, 7 Mar 2024 22:57:21 +0000
Subject: [PATCH 01/28] Change Feature.pushAction assert failure to a fatal
 error

---
 .../DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
index c596488888..7d33568aca 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
@@ -126,8 +126,7 @@ struct DataBrokerProtectionFeature: Subfeature {
 
     func pushAction(method: CCFSubscribeActionName, webView: WKWebView, params: Encodable) {
         guard let broker = broker else {
-            assertionFailure("Cannot continue without broker instance")
-            return
+            fatalError("Cannot continue without broker instance")
         }
         os_log("Pushing into WebView: %@ params %@", log: .action, method.rawValue, String(describing: params))
 

From b4e525dd8eb31fffe9511f1534d87e8c72ec4358 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Mon, 11 Mar 2024 19:48:49 +0000
Subject: [PATCH 02/28] Add error handling to Database

---
 .../DataBrokerProtectionDatabase.swift        | 323 +++++++-----------
 1 file changed, 120 insertions(+), 203 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
index 4007b2ebb0..2aae6b0221 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
@@ -20,30 +20,30 @@ import Foundation
 import Common
 
 protocol DataBrokerProtectionRepository {
-    func save(_ profile: DataBrokerProtectionProfile) async -> Bool
-    func fetchProfile() -> DataBrokerProtectionProfile?
-    func deleteProfileData()
+    func save(_ profile: DataBrokerProtectionProfile) async throws
+    func fetchProfile() throws -> DataBrokerProtectionProfile?
+    func deleteProfileData() throws
 
-    func fetchChildBrokers(for parentBroker: String) -> [DataBroker]
+    func fetchChildBrokers(for parentBroker: String) throws -> [DataBroker]
 
     func saveOptOutOperation(optOut: OptOutOperationData, extractedProfile: ExtractedProfile) throws
 
-    func brokerProfileQueryData(for brokerId: Int64, and profileQueryId: Int64) -> BrokerProfileQueryData?
-    func fetchAllBrokerProfileQueryData() -> [BrokerProfileQueryData]
-    func fetchExtractedProfiles(for brokerId: Int64) -> [ExtractedProfile]
+    func brokerProfileQueryData(for brokerId: Int64, and profileQueryId: Int64) throws -> BrokerProfileQueryData?
+    func fetchAllBrokerProfileQueryData() throws -> [BrokerProfileQueryData]
+    func fetchExtractedProfiles(for brokerId: Int64) throws -> [ExtractedProfile]
 
-    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64)
-    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64)
-    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64)
-    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64)
-    func updateRemovedDate(_ date: Date?, on extractedProfileId: Int64)
+    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) throws
+    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws
+    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) throws
+    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws
+    func updateRemovedDate(_ date: Date?, on extractedProfileId: Int64) throws
 
-    func add(_ historyEvent: HistoryEvent)
-    func fetchLastEvent(brokerId: Int64, profileQueryId: Int64) -> HistoryEvent?
-    func hasMatches() -> Bool
+    func add(_ historyEvent: HistoryEvent) throws
+    func fetchLastEvent(brokerId: Int64, profileQueryId: Int64) throws -> HistoryEvent?
+    func hasMatches() throws -> Bool
 
-    func fetchAttemptInformation(for extractedProfileId: Int64) -> AttemptInformation?
-    func addAttempt(extractedProfileId: Int64, attemptUUID: UUID, dataBroker: String, lastStageDate: Date, startTime: Date)
+    func fetchAttemptInformation(for extractedProfileId: Int64) throws -> AttemptInformation?
+    func addAttempt(extractedProfileId: Int64, attemptUUID: UUID, dataBroker: String, lastStageDate: Date, startTime: Date) throws
 }
 
 final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
@@ -57,52 +57,29 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
         self.vault = vault
     }
 
-    func save(_ profile: DataBrokerProtectionProfile) async -> Bool {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-
-            if try vault.fetchProfile(with: Self.profileId) != nil {
-                try await updateProfile(profile, vault: vault)
-            } else {
-                try await saveNewProfile(profile, vault: vault)
-            }
-
-            return true
-        } catch {
-            os_log("Database error: saveProfile, error: %{public}@", log: .error, error.localizedDescription)
+    func save(_ profile: DataBrokerProtectionProfile) async throws {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
 
-            return false
+        if try vault.fetchProfile(with: Self.profileId) != nil {
+            try await updateProfile(profile, vault: vault)
+        } else {
+            try await saveNewProfile(profile, vault: vault)
         }
     }
 
-    public func fetchProfile() -> DataBrokerProtectionProfile? {
-        do {
-            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-            return try vault.fetchProfile(with: Self.profileId)
-        } catch {
-            os_log("Database error: fetchProfile, error: %{public}@", log: .error, error.localizedDescription)
-            return nil
-        }
+    public func fetchProfile() throws -> DataBrokerProtectionProfile? {
+        let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        return try vault.fetchProfile(with: Self.profileId)
     }
 
-    public func deleteProfileData() {
-        do {
-            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-            try vault.deleteProfileData()
-        } catch {
-            os_log("Database error: removeProfileData, error: %{public}@", log: .error, error.localizedDescription)
-            return
-        }
+    public func deleteProfileData() throws {
+        let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        try vault.deleteProfileData()
     }
 
-    func fetchChildBrokers(for parentBroker: String) -> [DataBroker] {
-        do {
-            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-            return try vault.fetchChildBrokers(for: parentBroker)
-        } catch {
-            os_log("Database error: fetchChildBrokers, error: %{public}@", log: .error, error.localizedDescription)
-            return [DataBroker]()
-        }
+    func fetchChildBrokers(for parentBroker: String) throws -> [DataBroker] {
+        let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        return try vault.fetchChildBrokers(for: parentBroker)
     }
 
     func save(_ extractedProfile: ExtractedProfile, brokerId: Int64, profileQueryId: Int64) throws -> Int64 {
@@ -111,147 +88,101 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
         return try vault.save(extractedProfile: extractedProfile, brokerId: brokerId, profileQueryId: profileQueryId)
     }
 
-    func brokerProfileQueryData(for brokerId: Int64, and profileQueryId: Int64) -> BrokerProfileQueryData? {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-            if let broker = try vault.fetchBroker(with: brokerId),
-                let profileQuery = try vault.fetchProfileQuery(with: profileQueryId),
-                let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) {
-
-                let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)
-
-                return BrokerProfileQueryData(
-                    dataBroker: broker,
-                    profileQuery: profileQuery,
-                    scanOperationData: scanOperation,
-                    optOutOperationsData: optOutOperations
-                )
-            } else {
-                // We should throw here. The caller probably needs to know that some of the
-                // models he was looking for where not found. This will be worked on the error handling task/project.
-                return nil
-            }
-        } catch {
-            os_log("Database error: brokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
+    func brokerProfileQueryData(for brokerId: Int64, and profileQueryId: Int64) throws -> BrokerProfileQueryData? {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        guard let broker = try vault.fetchBroker(with: brokerId),
+              let profileQuery = try vault.fetchProfileQuery(with: profileQueryId),
+              let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else {
+            // TODO perhaps this should error if we query for things that don't exist?
             return nil
         }
-    }
 
-    func fetchExtractedProfiles(for brokerId: Int64) -> [ExtractedProfile] {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)
 
-            return try vault.fetchExtractedProfiles(for: brokerId)
-        } catch {
-            os_log("Database error: fetchExtractedProfiles for scan, error: %{public}@", log: .error, error.localizedDescription)
-            return [ExtractedProfile]()
-        }
+        return BrokerProfileQueryData(
+            dataBroker: broker,
+            profileQuery: profileQuery,
+            scanOperationData: scanOperation,
+            optOutOperationsData: optOutOperations
+        )
     }
 
-    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+    func fetchExtractedProfiles(for brokerId: Int64) throws -> [ExtractedProfile] {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        return try vault.fetchExtractedProfiles(for: brokerId)
+    }
 
-            try vault.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
-        } catch {
-            os_log("Database error: updatePreferredRunDate for scan, error: %{public}@", log: .error, error.localizedDescription)
-        }
+    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) throws {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        try vault.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
     }
 
-    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
 
-            try vault.updatePreferredRunDate(
-                date,
-                brokerId: brokerId,
-                profileQueryId: profileQueryId,
-                extractedProfileId: extractedProfileId
-            )
-        } catch {
-            os_log("Database error: updatePreferredRunDate for optOut, error: %{public}@", log: .error, error.localizedDescription)
-        }
+        try vault.updatePreferredRunDate(
+            date,
+            brokerId: brokerId,
+            profileQueryId: profileQueryId,
+            extractedProfileId: extractedProfileId)
     }
 
-    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-
-            try vault.updateLastRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
-        } catch {
-            os_log("Database error: updateLastRunDate for scan, error: %{public}@", log: .error, error.localizedDescription)
-        }
+    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) throws {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        try vault.updateLastRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
     }
 
-    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
 
-            try vault.updateLastRunDate(
-                date,
-                brokerId: brokerId,
-                profileQueryId: profileQueryId,
-                extractedProfileId: extractedProfileId
-            )
-        } catch {
-            os_log("Database error: updateLastRunDate for optOut, error: %{public}@", log: .error, error.localizedDescription)
-        }
+        try vault.updateLastRunDate(
+            date,
+            brokerId: brokerId,
+            profileQueryId: profileQueryId,
+            extractedProfileId: extractedProfileId
+        )
     }
 
-    func updateRemovedDate(_ date: Date?, on extractedProfileId: Int64) {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-
-            try vault.updateRemovedDate(for: extractedProfileId, with: date)
-        } catch {
-            os_log("Database error: updateRemoveDate, error: %{public}@", log: .error, error.localizedDescription)
-        }
+    func updateRemovedDate(_ date: Date?, on extractedProfileId: Int64) throws {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        try vault.updateRemovedDate(for: extractedProfileId, with: date)
     }
 
-    func add(_ historyEvent: HistoryEvent) {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+    func add(_ historyEvent: HistoryEvent) throws {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
 
-            if  let extractedProfileId = historyEvent.extractedProfileId {
-                try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId, extractedProfileId: extractedProfileId)
-            } else {
-                try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId)
-            }
-        } catch {
-            os_log("Database error: addHistoryEvent, error: %{public}@", log: .error, error.localizedDescription)
+        if  let extractedProfileId = historyEvent.extractedProfileId {
+            try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId, extractedProfileId: extractedProfileId)
+        } else {
+            try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId)
         }
     }
 
-    func fetchAllBrokerProfileQueryData() -> [BrokerProfileQueryData] {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-            let brokers = try vault.fetchAllBrokers()
-            let profileQueries = try vault.fetchAllProfileQueries(for: Self.profileId)
-            var brokerProfileQueryDataList = [BrokerProfileQueryData]()
-
-            for broker in brokers {
-                for profileQuery in profileQueries {
-                    if let brokerId = broker.id, let profileQueryId = profileQuery.id {
-                        guard let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else { continue }
-                        let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)
-
-                        let brokerProfileQueryData = BrokerProfileQueryData(
-                            dataBroker: broker,
-                            profileQuery: profileQuery,
-                            scanOperationData: scanOperation,
-                            optOutOperationsData: optOutOperations
-                        )
-
-                        brokerProfileQueryDataList.append(brokerProfileQueryData)
-                    }
+    func fetchAllBrokerProfileQueryData() throws -> [BrokerProfileQueryData] {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        let brokers = try vault.fetchAllBrokers()
+        let profileQueries = try vault.fetchAllProfileQueries(for: Self.profileId)
+        var brokerProfileQueryDataList = [BrokerProfileQueryData]()
+
+        for broker in brokers {
+            for profileQuery in profileQueries {
+                if let brokerId = broker.id, let profileQueryId = profileQuery.id {
+                    guard let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else { continue }
+                    let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)
+
+                    let brokerProfileQueryData = BrokerProfileQueryData(
+                        dataBroker: broker,
+                        profileQuery: profileQuery,
+                        scanOperationData: scanOperation,
+                        optOutOperationsData: optOutOperations
+                    )
+
+                    brokerProfileQueryDataList.append(brokerProfileQueryData)
                 }
             }
-
-            return brokerProfileQueryDataList
-        } catch {
-            os_log("Database error: fetchAllBrokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
-            return [BrokerProfileQueryData]()
         }
+
+        return brokerProfileQueryDataList
     }
 
     func saveOptOutOperation(optOut: OptOutOperationData, extractedProfile: ExtractedProfile) throws {
@@ -264,29 +195,19 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
                        preferredRunDate: optOut.preferredRunDate)
     }
 
-    func fetchLastEvent(brokerId: Int64, profileQueryId: Int64) -> HistoryEvent? {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-            let events = try vault.fetchEvents(brokerId: brokerId, profileQueryId: profileQueryId)
+    func fetchLastEvent(brokerId: Int64, profileQueryId: Int64) throws -> HistoryEvent? {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        let events = try vault.fetchEvents(brokerId: brokerId, profileQueryId: profileQueryId)
 
-            return events.max(by: { $0.date < $1.date })
-        } catch {
-            os_log("Database error: fetchLastEvent, error: %{public}@", log: .error, error.localizedDescription)
-            return nil
-        }
+        return events.max(by: { $0.date < $1.date })
     }
 
-    func hasMatches() -> Bool {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-            return try vault.hasMatches()
-        } catch {
-            os_log("Database error: wereThereAnyMatches, error: %{public}@", log: .error, error.localizedDescription)
-            return false
-        }
+    func hasMatches() throws -> Bool {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        return try vault.hasMatches()
     }
 
-    func fetchAttemptInformation(for extractedProfileId: Int64) -> AttemptInformation? {
+    func fetchAttemptInformation(for extractedProfileId: Int64) throws -> AttemptInformation? {
         do {
             let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
             return try vault.fetchAttemptInformation(for: extractedProfileId)
@@ -296,17 +217,13 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
         }
     }
 
-    func addAttempt(extractedProfileId: Int64, attemptUUID: UUID, dataBroker: String, lastStageDate: Date, startTime: Date) {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-            try vault.save(extractedProfileId: extractedProfileId,
-                           attemptUUID: attemptUUID,
-                           dataBroker: dataBroker,
-                           lastStageDate: lastStageDate,
-                           startTime: startTime)
-        } catch {
-            os_log("Database error: addAttempt, error: %{public}@", log: .error, error.localizedDescription)
-        }
+    func addAttempt(extractedProfileId: Int64, attemptUUID: UUID, dataBroker: String, lastStageDate: Date, startTime: Date) throws {
+        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        try vault.save(extractedProfileId: extractedProfileId,
+                       attemptUUID: attemptUUID,
+                       dataBroker: dataBroker,
+                       lastStageDate: lastStageDate,
+                       startTime: startTime)
     }
 }
 
@@ -335,7 +252,7 @@ extension DataBrokerProtectionDatabase {
         let newProfileQueries = profile.profileQueries
         _ = try vault.save(profile: profile)
 
-        if let brokers = FileResources().fetchBrokerFromResourceFiles() {
+        if let brokers = try FileResources().fetchBrokerFromResourceFiles() {
             var brokerIDs = [Int64]()
 
             for broker in brokers {
@@ -357,11 +274,11 @@ extension DataBrokerProtectionDatabase {
 
         let newProfileQueries = profile.profileQueries
 
-        let databaseBrokerProfileQueryData = fetchAllBrokerProfileQueryData()
+        let databaseBrokerProfileQueryData = try fetchAllBrokerProfileQueryData()
         let databaseProfileQueries = databaseBrokerProfileQueryData.map { $0.profileQuery }
 
         // The queries we need to create are the one that exist on the new ones but not in the database
-        let profileQueriesToCreate = Set(newProfileQueries).subtracting(Set(databaseProfileQueries))
+        var profileQueriesToCreate = Set(newProfileQueries).subtracting(Set(databaseProfileQueries))
 
         // The queries that need update exist in both the new and the database
         // We assume updated queries will be not deprecated
@@ -432,7 +349,7 @@ extension DataBrokerProtectionDatabase {
 
             if !profile.deprecated {
                 for brokerID in brokerIDs where !profile.deprecated {
-                    updatePreferredRunDate(Date(), brokerId: brokerID, profileQueryId: profileQueryID)
+                    try updatePreferredRunDate(Date(), brokerId: brokerID, profileQueryId: profileQueryID)
                 }
             }
         }

From 7e9b11c243fdea50c1707d481603231c270fb96d Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Mon, 11 Mar 2024 19:49:01 +0000
Subject: [PATCH 03/28] Add error handling to DataManager

---
 .../DataBrokerProtectionDataManager.swift     | 67 ++++++++++---------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
index 52eabbae92..73a0e4919c 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
@@ -24,19 +24,19 @@ public protocol DataBrokerProtectionDataManaging {
     var delegate: DataBrokerProtectionDataManagerDelegate? { get set }
 
     init(fakeBrokerFlag: DataBrokerDebugFlag)
-    func saveProfile(_ profile: DataBrokerProtectionProfile) async -> Bool
-    func fetchProfile(ignoresCache: Bool) -> DataBrokerProtectionProfile?
-    func fetchBrokerProfileQueryData(ignoresCache: Bool) async -> [BrokerProfileQueryData]
-    func hasMatches() -> Bool
+    func saveProfile(_ profile: DataBrokerProtectionProfile) async throws
+    func fetchProfile(ignoresCache: Bool) throws -> DataBrokerProtectionProfile?
+    func fetchBrokerProfileQueryData(ignoresCache: Bool) async throws -> [BrokerProfileQueryData]
+    func hasMatches() throws -> Bool
 }
 
 extension DataBrokerProtectionDataManaging {
-    func fetchProfile() -> DataBrokerProtectionProfile? {
-        fetchProfile(ignoresCache: false)
+    func fetchProfile() throws -> DataBrokerProtectionProfile? {
+        try fetchProfile(ignoresCache: false)
     }
 
-    func fetchBrokerProfileQueryData() async -> [BrokerProfileQueryData] {
-        await fetchBrokerProfileQueryData(ignoresCache: false)
+    func fetchBrokerProfileQueryData() async throws -> [BrokerProfileQueryData] {
+        try await fetchBrokerProfileQueryData(ignoresCache: false)
     }
 }
 
@@ -58,21 +58,26 @@ public class DataBrokerProtectionDataManager: DataBrokerProtectionDataManaging {
         cache.delegate = self
     }
 
-    public func saveProfile(_ profile: DataBrokerProtectionProfile) async -> Bool {
-        let result = await database.save(profile)
+    public func saveProfile(_ profile: DataBrokerProtectionProfile) async throws {
+        do {
+            try await database.save(profile)
+        } catch {
+            // We should still invalidate the cache if the save fails
+            // TODO might be a good place to send a pixel
+            cache.invalidate()
+            throw error
+        }
         cache.invalidate()
         cache.profile = profile
-
-        return result
     }
 
-    public func fetchProfile(ignoresCache: Bool = false) -> DataBrokerProtectionProfile? {
+    public func fetchProfile(ignoresCache: Bool = false) throws -> DataBrokerProtectionProfile? {
         if !ignoresCache, cache.profile != nil {
             os_log("Returning cached profile", log: .dataBrokerProtection)
             return cache.profile
         }
 
-        if let profile = database.fetchProfile() {
+        if let profile = try database.fetchProfile() {
             cache.profile = profile
             return profile
         } else {
@@ -81,42 +86,40 @@ public class DataBrokerProtectionDataManager: DataBrokerProtectionDataManaging {
         }
     }
 
-    public func fetchBrokerProfileQueryData(ignoresCache: Bool = false) async -> [BrokerProfileQueryData] {
+    public func fetchBrokerProfileQueryData(ignoresCache: Bool = false) async throws -> [BrokerProfileQueryData] {
         if !ignoresCache, !cache.brokerProfileQueryData.isEmpty {
             os_log("Returning cached brokerProfileQueryData", log: .dataBrokerProtection)
             return cache.brokerProfileQueryData
         }
 
-        let queryData = database.fetchAllBrokerProfileQueryData()
+        let queryData = try database.fetchAllBrokerProfileQueryData()
         cache.brokerProfileQueryData = queryData
         return queryData
     }
 
-    public func hasMatches() -> Bool {
-        return database.hasMatches()
+    public func hasMatches() throws -> Bool {
+        return try database.hasMatches()
     }
 }
 
 extension DataBrokerProtectionDataManager: InMemoryDataCacheDelegate {
-    public func flushCache(profile: DataBrokerProtectionProfile?) async -> Bool {
-        guard let profile = profile else { return false }
-        let result = await saveProfile(profile)
+    public func flushCache(profile: DataBrokerProtectionProfile?) async throws {
+        guard let profile = profile else { return }
+        try await saveProfile(profile)
 
         delegate?.dataBrokerProtectionDataManagerDidUpdateData()
-
-        return result
     }
 
-    public func removeAllData() {
-        database.deleteProfileData()
+    public func removeAllData() throws {
+        try database.deleteProfileData()
 
         delegate?.dataBrokerProtectionDataManagerDidDeleteData()
     }
 }
 
 public protocol InMemoryDataCacheDelegate: AnyObject {
-    func flushCache(profile: DataBrokerProtectionProfile?) async -> Bool
-    func removeAllData()
+    func flushCache(profile: DataBrokerProtectionProfile?) async throws
+    func removeAllData() throws
 }
 
 public final class InMemoryDataCache {
@@ -138,10 +141,8 @@ public final class InMemoryDataCache {
 }
 
 extension InMemoryDataCache: DBPUICommunicationDelegate {
-    func saveProfile() async -> Bool {
-        _ = await delegate?.flushCache(profile: profile)
-
-        return true
+    func saveProfile() async throws {
+        try await delegate?.flushCache(profile: profile)
     }
 
     private func indexForName(matching name: DBPUIUserProfileName, in profile: DataBrokerProtectionProfile) -> Int? {
@@ -177,9 +178,9 @@ extension InMemoryDataCache: DBPUICommunicationDelegate {
         return DBPUIUserProfile(names: names, birthYear: profile.birthYear, addresses: addresses)
     }
 
-    func deleteProfileData() {
+    func deleteProfileData() throws {
         profile = emptyProfile
-        delegate?.removeAllData()
+        try delegate?.removeAllData()
     }
 
     func addNameToCurrentUserProfile(_ name: DBPUIUserProfileName) -> Bool {

From f582ffe4e691400e0b32f6474ef9e64f4c192d33 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Mon, 11 Mar 2024 19:49:33 +0000
Subject: [PATCH 04/28] Add error handling to BrokerUpdater

---
 .../DataBrokerProtectionBrokerUpdater.swift   | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
index f3203334e2..ef0df8bc17 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
@@ -20,38 +20,40 @@ import Foundation
 import Common
 
 protocol ResourcesRepository {
-    func fetchBrokerFromResourceFiles() -> [DataBroker]?
+    func fetchBrokerFromResourceFiles() throws -> [DataBroker]?
 }
 
 final class FileResources: ResourcesRepository {
 
+    enum FileResourcesError: Error {
+        case bundleResourceURLNil
+    }
+
     private let fileManager: FileManager
 
     init(fileManager: FileManager = .default) {
         self.fileManager = fileManager
     }
 
-    func fetchBrokerFromResourceFiles() -> [DataBroker]? {
+    func fetchBrokerFromResourceFiles() throws -> [DataBroker]? {
         guard let resourceURL = Bundle.module.resourceURL else {
-            return nil
+            //TODO haven't decided the best course of action here. Something has gone horribly wrong. Pixel? Assert?
+            // I don't think we have the means to fire a pixel here :Sob:
+            // "This property may not contain a path for non-standard bundle formats or for some older bundle formats"
+            throw FileResourcesError.bundleResourceURLNil
         }
 
-        do {
-            let fileURLs = try fileManager.contentsOfDirectory(
-                at: resourceURL,
-                includingPropertiesForKeys: nil,
-                options: [.skipsHiddenFiles]
-            )
+        let fileURLs = try fileManager.contentsOfDirectory(
+            at: resourceURL,
+            includingPropertiesForKeys: nil,
+            options: [.skipsHiddenFiles]
+        )
 
-            let brokerJSONFiles = fileURLs.filter {
-                $0.isJSON && !$0.hasFakePrefix
-            }
-
-            return brokerJSONFiles.map(DataBroker.initFromResource(_:))
-        } catch {
-            os_log("Error fetching brokers JSON files from resources", log: .dataBrokerProtection)
-            return nil
+        let brokerJSONFiles = fileURLs.filter {
+            $0.isJSON && !$0.hasFakePrefix
         }
+
+        return try brokerJSONFiles.map(DataBroker.initFromResource(_:))
     }
 }
 
@@ -118,7 +120,7 @@ public struct DataBrokerProtectionBrokerUpdater {
     }
 
     public func updateBrokers() {
-        guard let brokers = resources.fetchBrokerFromResourceFiles() else { return }
+        guard let brokers = try? resources.fetchBrokerFromResourceFiles() else { return } //TODO not this
 
         for broker in brokers {
             do {

From 16b5efef4f2fdb127eb16df45dfef08085f4de29 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Mon, 11 Mar 2024 19:50:08 +0000
Subject: [PATCH 05/28] Change UICommunicationLayer methods to throw errors
 instead of returning a bool

---
 .../UI/DBPUICommunicationLayer.swift          | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift
index 9f77b8a675..016129e10b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift
@@ -23,9 +23,9 @@ import UserScript
 import Common
 
 protocol DBPUICommunicationDelegate: AnyObject {
-    func saveProfile() async -> Bool
+    func saveProfile() async throws
     func getUserProfile() -> DBPUIUserProfile?
-    func deleteProfileData()
+    func deleteProfileData() throws
     func addNameToCurrentUserProfile(_ name: DBPUIUserProfileName) -> Bool
     func setNameAtIndexInCurrentUserProfile(_ payload: DBPUINameAtIndex) -> Bool
     func removeNameAtIndexFromUserProfile(_ index: DBPUIIndex) -> Bool
@@ -127,9 +127,12 @@ struct DBPUICommunicationLayer: Subfeature {
     func saveProfile(params: Any, original: WKScriptMessage) async throws -> Encodable? {
         os_log("Web UI requested to save the profile", log: .dataBrokerProtection)
 
-        let success = await delegate?.saveProfile()
-
-        return DBPUIStandardResponse(version: Constants.version, success: success ?? false)
+        do {
+            try await delegate?.saveProfile()
+            return DBPUIStandardResponse(version: Constants.version, success: true)
+        } catch {
+            return DBPUIStandardResponse(version: Constants.version, success: false)
+        }
     }
 
     func getCurrentUserProfile(params: Any, original: WKScriptMessage) async throws -> Encodable? {
@@ -141,8 +144,12 @@ struct DBPUICommunicationLayer: Subfeature {
     }
 
     func deleteUserProfileData(params: Any, original: WKScriptMessage) async throws -> Encodable? {
-        delegate?.deleteProfileData()
-        return DBPUIStandardResponse(version: Constants.version, success: true)
+        do {
+            try delegate?.deleteProfileData()
+            return DBPUIStandardResponse(version: Constants.version, success: true)
+        } catch {
+            return DBPUIStandardResponse(version: Constants.version, success: false)
+        }
     }
 
     func addNameToCurrentUserProfile(params: Any, original: WKScriptMessage) async throws -> Encodable? {

From 499b46180cb005ef40a6b425338b94148e400b89 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Mon, 11 Mar 2024 19:50:46 +0000
Subject: [PATCH 06/28] Update classes to handle DB errors (either temporarily
 or permanently) to allow merging

---
 DuckDuckGo/DBP/DBPHomeViewController.swift    | 10 +++--
 .../DBP/DataBrokerProtectionAppEvents.swift   |  4 +-
 .../DataBrokerProtectionFeatureDisabler.swift |  6 ++-
 .../SubscriptionFeatureAvailability.swift     |  2 +-
 ...ataBrokerProtectionBackgroundManager.swift |  2 +-
 .../DataBrokerDatabaseBrowserViewModel.swift  |  5 ++-
 .../DataBrokerRunCustomJSONViewModel.swift    |  2 +-
 .../DataBrokerForceOptOutViewModel.swift      | 11 +++++-
 .../Model/DBPUIViewModel.swift                |  2 +-
 .../Model/DataBroker.swift                    |  8 ++--
 ...taBrokerProfileQueryOperationManager.swift | 32 ++++++++--------
 .../OperationPreferredDateUpdater.swift       | 38 ++++++++++++-------
 .../MismatchCalculatorUseCase.swift           |  5 ++-
 .../Operations/ScanOperation.swift            |  2 +-
 ...DataBrokerProtectionEngagementPixels.swift |  2 +-
 .../DataBrokerProtectionProcessor.swift       | 21 ++++++----
 .../DataBrokerProtectionScheduler.swift       |  3 +-
 .../DataBrokerProtectionViewController.swift  |  2 +-
 18 files changed, 96 insertions(+), 61 deletions(-)

diff --git a/DuckDuckGo/DBP/DBPHomeViewController.swift b/DuckDuckGo/DBP/DBPHomeViewController.swift
index e590867c10..a5b9a03c99 100644
--- a/DuckDuckGo/DBP/DBPHomeViewController.swift
+++ b/DuckDuckGo/DBP/DBPHomeViewController.swift
@@ -83,9 +83,13 @@ final class DBPHomeViewController: NSViewController {
             attachDataBrokerContainerView()
         }
 
-        if dataBrokerProtectionManager.dataManager.fetchProfile() != nil {
-            let dbpDateStore = DefaultWaitlistActivationDateStore(source: .dbp)
-            dbpDateStore.updateLastActiveDate()
+        do {
+            if try dataBrokerProtectionManager.dataManager.fetchProfile() != nil {
+                let dbpDateStore = DefaultWaitlistActivationDateStore(source: .dbp)
+                dbpDateStore.updateLastActiveDate()
+            }
+        } catch {
+            os_log("Database error during DBPHomeViewController.viewDidLoad", log: .dataBrokerProtection)
         }
     }
 
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift b/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
index 11292e7ac3..fe949f0edc 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
@@ -45,8 +45,8 @@ struct DataBrokerProtectionAppEvents {
 
             // If we don't have profileQueries it means there's no user profile saved in our DB
             // In this case, let's disable the agent and delete any left-over data because there's nothing for it to do
-            let profileQueries = await DataBrokerProtectionManager.shared.dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
-            if profileQueries.count > 0 {
+            if let profileQueries = try? await DataBrokerProtectionManager.shared.dataManager.fetchBrokerProfileQueryData(ignoresCache: true),
+               profileQueries.count > 0 {
                 restartBackgroundAgent(loginItemsManager: loginItemsManager)
             } else {
                 featureVisibility.disableAndDeleteForWaitlistUsers()
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift b/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
index ddee393084..1afb5f7eeb 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
@@ -46,7 +46,11 @@ struct DataBrokerProtectionFeatureDisabler: DataBrokerProtectionFeatureDisabling
 
             scheduler.disableLoginItem()
 
-            dataManager.removeAllData()
+            do {
+                try dataManager.removeAllData()
+            } catch {
+                os_log("Database error during DataBrokerProtectionFeatureDisabler.disableAndDelete", log: .dataBrokerProtection)
+            }
 
             DataBrokerProtectionLoginItemPixels.fire(pixel: .dataBrokerDisableAndDeleteDaily, frequency: .dailyOnly)
             NotificationCenter.default.post(name: .dbpWasDisabled, object: nil)
diff --git a/DuckDuckGo/Subscription/SubscriptionFeatureAvailability.swift b/DuckDuckGo/Subscription/SubscriptionFeatureAvailability.swift
index 6599bd0ee9..d0aab53af3 100644
--- a/DuckDuckGo/Subscription/SubscriptionFeatureAvailability.swift
+++ b/DuckDuckGo/Subscription/SubscriptionFeatureAvailability.swift
@@ -61,7 +61,7 @@ struct DefaultSubscriptionFeatureAvailability: SubscriptionFeatureAvailability {
 
     private var isDBPActivated: Bool {
 #if DBP
-        return DataBrokerProtectionManager.shared.dataManager.fetchProfile(ignoresCache: true) != nil
+        return (try? DataBrokerProtectionManager.shared.dataManager.fetchProfile(ignoresCache: true)) != nil
 #else
         return false
 #endif
diff --git a/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift b/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift
index 787a859f90..a10fb1fd97 100644
--- a/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift
+++ b/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift
@@ -79,7 +79,7 @@ public final class DataBrokerProtectionBackgroundManager {
         pixelHandler.fire(.backgroundAgentRunOperationsAndStartSchedulerIfPossible)
 
         // If there's no saved profile we don't need to start the scheduler
-        if dataManager.fetchProfile() != nil {
+        if (try? dataManager.fetchProfile()) != nil {
             scheduler.runQueuedOperations(showWebView: false) { [weak self] error in
                 guard error == nil else {
                     // Ideally we'd fire a pixel here, however at the moment the scheduler never ever returns an error
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
index 514957192a..02d5ef5bc8 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
@@ -48,7 +48,10 @@ final class DataBrokerDatabaseBrowserViewModel: ObservableObject {
         guard let dataManager = self.dataManager else { return }
 
         Task {
-            let data = await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
+            guard let data = try? await dataManager.fetchBrokerProfileQueryData(ignoresCache: true) else {
+                assertionFailure("DataManager error during DataBrokerDatavaseBrowserViewModel.updateTables")
+                return
+            }
 
             let profileBrokers = data.map { $0.dataBroker }
             let dataBrokers = Array(Set(profileBrokers)).sorted { $0.id ?? 0 < $1.id ?? 0 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
index 9109f0baed..22c9c09fbc 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
@@ -76,7 +76,7 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
             captchaService: CaptchaService())
 
         let fileResources = FileResources()
-        self.brokers = fileResources.fetchBrokerFromResourceFiles() ?? [DataBroker]()
+        self.brokers = (try? fileResources.fetchBrokerFromResourceFiles()) ?? [DataBroker]() // TODO not this
     }
 
     func runJSON(jsonString: String) {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
index 3668052d2f..f81761e347 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
@@ -30,7 +30,10 @@ final class DataBrokerForceOptOutViewModel: ObservableObject {
 
     private func loadNotRemovedOptOutData() {
         Task { @MainActor in
-            let brokerProfileData = await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
+            guard let brokerProfileData = try? await dataManager.fetchBrokerProfileQueryData(ignoresCache: true) else {
+                assertionFailure()
+                return
+            }
             self.optOutData = brokerProfileData
                 .flatMap { profileData in
                     profileData.optOutOperationsData.map { ($0, profileData.dataBroker.name) }
@@ -70,6 +73,10 @@ struct OptOutViewData: Identifiable {
 private extension DataBrokerProtectionDataManager {
 
     func setAsRemoved(_ extractedProfileID: Int64) {
-        self.database.updateRemovedDate(Date(), on: extractedProfileID)
+        do {
+            try self.database.updateRemovedDate(Date(), on: extractedProfileID)
+        } catch {
+            assertionFailure()
+        }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
index ef1db86240..352cb93be8 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
@@ -77,6 +77,6 @@ extension DBPUIViewModel: DBPUIScanOps {
     }
 
     func updateCacheWithCurrentScans() async {
-        _ = await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
+        _ = try? await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
index e1a17f590b..e717d3f8b2 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
@@ -167,13 +167,11 @@ struct DataBroker: Codable, Sendable {
         return optOutType == .parentSiteOptOut
     }
 
-    static func initFromResource(_ url: URL) -> DataBroker {
-        // swiftlint:disable:next force_try
-        let data = try! Data(contentsOf: url)
+    static func initFromResource(_ url: URL) throws -> DataBroker {
+        let data = try Data(contentsOf: url)
         let jsonDecoder = JSONDecoder()
         jsonDecoder.dateDecodingStrategy = .millisecondsSince1970
-        // swiftlint:disable:next force_try
-        let broker = try! jsonDecoder.decode(DataBroker.self, from: data)
+        let broker = try jsonDecoder.decode(DataBroker.self, from: data)
         return broker
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
index 73f08604f6..8bcebb945b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
@@ -112,7 +112,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
         }
 
         defer {
-            database.updateLastRunDate(Date(), brokerId: brokerId, profileQueryId: profileQueryId)
+            try? database.updateLastRunDate(Date(), brokerId: brokerId, profileQueryId: profileQueryId)
             os_log("Finished scan operation: %{public}@", log: .dataBrokerProtection, String(describing: brokerProfileQueryData.dataBroker.name))
             notificationCenter.post(name: DataBrokerProtectionNotifications.didFinishScan, object: brokerProfileQueryData.dataBroker.name)
         }
@@ -121,7 +121,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
 
         do {
             let event = HistoryEvent(brokerId: brokerId, profileQueryId: profileQueryId, type: .scanStarted)
-            database.add(event)
+            try database.add(event)
 
             let extractedProfiles = try await runner.scan(brokerProfileQueryData, stageCalculator: stageCalculator, showWebView: showWebView, shouldRunNextStep: shouldRunNextStep)
             os_log("Extracted profiles: %@", log: .dataBrokerProtection, extractedProfiles)
@@ -129,19 +129,19 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
             if !extractedProfiles.isEmpty {
                 stageCalculator.fireScanSuccess(matchesFound: extractedProfiles.count)
                 let event = HistoryEvent(brokerId: brokerId, profileQueryId: profileQueryId, type: .matchesFound(count: extractedProfiles.count))
-                database.add(event)
+                try database.add(event)
 
                 for extractedProfile in extractedProfiles {
 
                     // We check if the profile exists in the database.
-                    let extractedProfilesForBroker = database.fetchExtractedProfiles(for: brokerId)
+                    let extractedProfilesForBroker = try database.fetchExtractedProfiles(for: brokerId)
                     let doesProfileExistsInDatabase = extractedProfilesForBroker.contains { $0.identifier == extractedProfile.identifier }
 
                     // If the profile exists we do not create a new opt-out operation
                     if doesProfileExistsInDatabase, let alreadyInDatabaseProfile = extractedProfilesForBroker.first(where: { $0.identifier == extractedProfile.identifier }), let id = alreadyInDatabaseProfile.id {
                         // If it was removed in the past but was found again when scanning, it means it appearead again, so we reset the remove date.
                         if alreadyInDatabaseProfile.removedDate != nil {
-                            database.updateRemovedDate(nil, on: id)
+                            try database.updateRemovedDate(nil, on: id)
                         }
 
                         os_log("Extracted profile already exists in database: %@", log: .dataBrokerProtection, id.description)
@@ -170,7 +170,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
             } else {
                 stageCalculator.fireScanFailed()
                 let event = HistoryEvent(brokerId: brokerId, profileQueryId: profileQueryId, type: .noMatchFound)
-                database.add(event)
+                try database.add(event)
             }
 
             // Check for removed profiles
@@ -185,8 +185,8 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                 for removedProfile in removedProfiles {
                     if let extractedProfileId = removedProfile.id {
                         let event = HistoryEvent(extractedProfileId: extractedProfileId, brokerId: brokerId, profileQueryId: profileQueryId, type: .optOutConfirmed)
-                        database.add(event)
-                        database.updateRemovedDate(Date(), on: extractedProfileId)
+                        try database.add(event)
+                        try database.updateRemovedDate(Date(), on: extractedProfileId)
                         shouldSendProfileRemovedNotification = true
                         try updateOperationDataDates(
                             origin: .scan,
@@ -199,7 +199,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
 
                         os_log("Profile removed from optOutsData: %@", log: .dataBrokerProtection, String(describing: removedProfile))
 
-                        if let attempt = database.fetchAttemptInformation(for: extractedProfileId), let attemptUUID = UUID(uuidString: attempt.attemptId) {
+                        if let attempt = try database.fetchAttemptInformation(for: extractedProfileId), let attemptUUID = UUID(uuidString: attempt.attemptId) {
                             let now = Date()
                             let calculateDurationSinceLastStage = now.timeIntervalSince(attempt.lastStageDate) * 1000
                             let calculateDurationSinceStart = now.timeIntervalSince(attempt.startDate) * 1000
@@ -237,9 +237,9 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
     }
 
     private func sendProfileRemovedNotificationIfNecessary(userNotificationService: DataBrokerProtectionUserNotificationService, database: DataBrokerProtectionRepository) {
-        let savedExtractedProfiles = database.fetchAllBrokerProfileQueryData().flatMap { $0.extractedProfiles }
 
-        guard savedExtractedProfiles.count > 0 else {
+        guard let savedExtractedProfiles = try? database.fetchAllBrokerProfileQueryData().flatMap({ $0.extractedProfiles }),
+            savedExtractedProfiles.count > 0 else {
             return
         }
 
@@ -286,7 +286,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
         defer {
             os_log("Finished opt-out operation: %{public}@", log: .dataBrokerProtection, String(describing: brokerProfileQueryData.dataBroker.name))
 
-            database.updateLastRunDate(Date(), brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
+            try? database.updateLastRunDate(Date(), brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
             do {
                 try updateOperationDataDates(
                     origin: .optOut,
@@ -311,7 +311,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
         }
 
         do {
-            database.add(.init(extractedProfileId: extractedProfileId, brokerId: brokerId, profileQueryId: profileQueryId, type: .optOutStarted))
+            try database.add(.init(extractedProfileId: extractedProfileId, brokerId: brokerId, profileQueryId: profileQueryId, type: .optOutStarted))
 
             try await runner.optOut(profileQuery: brokerProfileQueryData,
                                     extractedProfile: extractedProfile,
@@ -323,12 +323,12 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
             updater.updateChildrenBrokerForParentBroker(brokerProfileQueryData.dataBroker,
                                                         profileQueryId: profileQueryId)
 
-            database.addAttempt(extractedProfileId: extractedProfileId,
+            try database.addAttempt(extractedProfileId: extractedProfileId,
                                 attemptUUID: stageDurationCalculator.attemptId,
                                 dataBroker: stageDurationCalculator.dataBroker,
                                 lastStageDate: stageDurationCalculator.lastStateTime,
                                 startTime: stageDurationCalculator.startTime)
-            database.add(.init(extractedProfileId: extractedProfileId, brokerId: brokerId, profileQueryId: profileQueryId, type: .optOutRequested))
+            try database.add(.init(extractedProfileId: extractedProfileId, brokerId: brokerId, profileQueryId: profileQueryId, type: .optOutRequested))
         } catch {
             stageDurationCalculator.fireOptOutFailure()
             handleOperationError(
@@ -383,7 +383,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
             }
         }
 
-        database.add(event)
+        try? database.add(event)
 
         do {
             try updateOperationDataDates(
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
index 1b27e2025d..b0a1e00f84 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
@@ -47,8 +47,8 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
                                   extractedProfileId: Int64?,
                                   schedulingConfig: DataBrokerScheduleConfig) throws {
 
-        guard let brokerProfileQuery = database.brokerProfileQueryData(for: brokerId,
-                                                                       and: profileQueryId) else { return }
+        guard let brokerProfileQuery = try database.brokerProfileQueryData(for: brokerId,
+                                                                           and: profileQueryId) else { return }
 
         try updateScanOperationDataDates(origin: origin,
                                          brokerId: brokerId,
@@ -71,15 +71,20 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
     /// 1, This method fetches scan operations with the profileQueryId and with child sites of parentBrokerId
     /// 2. Then for each one it updates the preferredRunDate of the scan to its confirm scan
     func updateChildrenBrokerForParentBroker(_ parentBroker: DataBroker, profileQueryId: Int64) {
-        let childBrokers = database.fetchChildBrokers(for: parentBroker.name)
-
-        childBrokers.forEach { childBroker in
-            if let childBrokerId = childBroker.id {
-                let confirmOptOutScanDate = Date().addingTimeInterval(childBroker.schedulingConfig.confirmOptOutScan.hoursToSeconds)
-                database.updatePreferredRunDate(confirmOptOutScanDate,
-                                                brokerId: childBrokerId,
-                                                profileQueryId: profileQueryId)
+        do {
+            // Temporary do/catch to allow merging error handling work in stages
+            let childBrokers =  try database.fetchChildBrokers(for: parentBroker.name)
+
+            try childBrokers.forEach { childBroker in
+                if let childBrokerId = childBroker.id {
+                    let confirmOptOutScanDate = Date().addingTimeInterval(childBroker.schedulingConfig.confirmOptOutScan.hoursToSeconds)
+                    try database.updatePreferredRunDate(confirmOptOutScanDate,
+                                                    brokerId: childBrokerId,
+                                                    profileQueryId: profileQueryId)
+                }
             }
+        } catch {
+            os_log("Database error during updateChildrenBrokerForParentBroker", log: .dataBrokerProtection)
         }
     }
 
@@ -147,10 +152,15 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
                                          brokerId: Int64,
                                          profileQueryId: Int64,
                                          extractedProfileId: Int64?) {
-        if let extractedProfileId = extractedProfileId {
-            database.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
-        } else {
-            database.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
+        do {
+            // Temporary do/catch to allow merging error handling work in stages
+            if let extractedProfileId = extractedProfileId {
+                try database.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
+            } else {
+                try database.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
+            }
+        } catch {
+            os_log("Database error during updatePreferredRunDate", log: .dataBrokerProtection)
         }
 
         os_log("Updating preferredRunDate on operation with brokerId %{public}@ and profileQueryId %{public}@", log: .dataBrokerProtection, brokerId.description, profileQueryId.description)
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift
index ad3e963fe3..209cbb30b1 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift
@@ -41,7 +41,10 @@ struct MismatchCalculatorUseCase {
     let pixelHandler: EventMapping<DataBrokerProtectionPixels>
 
     func calculateMismatches() {
-        let brokerProfileQueryData = database.fetchAllBrokerProfileQueryData()
+        guard let brokerProfileQueryData = try? database.fetchAllBrokerProfileQueryData() else {
+            os_log("Database error during MismatchCalculatorUseCase.calculateMismatches", log: .dataBrokerProtection)
+            return
+        }
         let parentBrokerProfileQueryData = brokerProfileQueryData.filter { $0.dataBroker.parent == nil }
 
         for parent in parentBrokerProfileQueryData {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
index ac26510a64..bedb36dd99 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
@@ -57,7 +57,7 @@ final class ScanOperation: DataBrokerOperation {
         self.shouldRunNextStep = shouldRunNextStep
     }
 
-    func run(inputValue: Void,
+    func run(inputValue: InputValue,
              webViewHandler: WebViewHandler? = nil,
              actionsHandler: ActionsHandler? = nil,
              stageCalculator: StageDurationCalculator, // We do not need it for scans - for now.
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEngagementPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEngagementPixels.swift
index f00192e769..e825e0eb33 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEngagementPixels.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEngagementPixels.swift
@@ -113,7 +113,7 @@ final class DataBrokerProtectionEngagementPixels {
     }
 
     func fireEngagementPixel(currentDate: Date = Date()) {
-        guard database.fetchProfile() != nil else {
+        guard (try? database.fetchProfile()) != nil else {
             os_log("No profile. We do not fire any pixel because we do not consider it an engaged user.", log: .dataBrokerProtection)
             return
         }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
index 0eddaad17e..6d5f8602ed 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
@@ -116,14 +116,19 @@ final class DataBrokerProtectionProcessor {
         // This will fire the DAU/WAU/MAU pixels,
         engagementPixels.fireEngagementPixel()
 
-        let brokersProfileData = database.fetchAllBrokerProfileQueryData()
-        let dataBrokerOperationCollections = createDataBrokerOperationCollections(from: brokersProfileData,
-                                                                                  operationType: operationType,
-                                                                                  priorityDate: priorityDate,
-                                                                                  showWebView: showWebView)
-
-        for collection in dataBrokerOperationCollections {
-            operationQueue.addOperation(collection)
+        do {
+            // Temporary do/catch to allow merging error handling work in stages
+            let brokersProfileData = try database.fetchAllBrokerProfileQueryData()
+            let dataBrokerOperationCollections = createDataBrokerOperationCollections(from: brokersProfileData,
+                                                                                      operationType: operationType,
+                                                                                      priorityDate: priorityDate,
+                                                                                      showWebView: showWebView)
+
+            for collection in dataBrokerOperationCollections {
+                operationQueue.addOperation(collection)
+            }
+        } catch {
+            os_log("Database error during Processor.runOperations", log: .dataBrokerProtection)
         }
 
         operationQueue.addBarrierBlock {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift
index 7ad31ed349..8825842cf8 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift
@@ -177,7 +177,8 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
 
             self.userNotificationService.sendFirstScanCompletedNotification()
 
-            if self.dataManager.hasMatches() {
+            if let hasMatches = try? self.dataManager.hasMatches(),
+                hasMatches {
                 self.userNotificationService.scheduleCheckInNotificationIfPossible()
             }
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
index ce258c3565..c525617c8d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
@@ -51,7 +51,7 @@ final public class DataBrokerProtectionViewController: NSViewController {
                                              webView: webView)
 
         Task {
-            _ = dataManager.fetchProfile(ignoresCache: true)
+            _ = try? dataManager.fetchProfile(ignoresCache: true)
         }
 
         super.init(nibName: nil, bundle: nil)

From e4469ceeb7d2045af122b5d3b60090b32878e4ba Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 18:55:02 +0000
Subject: [PATCH 07/28] Add os logging back to Database

---
 .../DataBrokerProtectionDatabase.swift        | 276 ++++++++++++------
 1 file changed, 183 insertions(+), 93 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
index 2aae6b0221..873d3e9ca0 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
@@ -58,153 +58,238 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
     }
 
     func save(_ profile: DataBrokerProtectionProfile) async throws {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
 
-        if try vault.fetchProfile(with: Self.profileId) != nil {
-            try await updateProfile(profile, vault: vault)
-        } else {
-            try await saveNewProfile(profile, vault: vault)
+            if try vault.fetchProfile(with: Self.profileId) != nil {
+                try await updateProfile(profile, vault: vault)
+            } else {
+                try await saveNewProfile(profile, vault: vault)
+            }
+        } catch {
+            os_log("Database error: save profile, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
         }
     }
 
     public func fetchProfile() throws -> DataBrokerProtectionProfile? {
-        let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        return try vault.fetchProfile(with: Self.profileId)
+        do {
+            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            return try vault.fetchProfile(with: Self.profileId)
+        } catch {
+            os_log("Database error: fetchProfile, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     public func deleteProfileData() throws {
-        let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        try vault.deleteProfileData()
+        do {
+            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            try vault.deleteProfileData()
+        } catch {
+            os_log("Database error: deleteProfileData, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func fetchChildBrokers(for parentBroker: String) throws -> [DataBroker] {
-        let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        return try vault.fetchChildBrokers(for: parentBroker)
+        do {
+            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            return try vault.fetchChildBrokers(for: parentBroker)
+        } catch {
+            os_log("Database error: fetchChildBrokers, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func save(_ extractedProfile: ExtractedProfile, brokerId: Int64, profileQueryId: Int64) throws -> Int64 {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
 
-        return try vault.save(extractedProfile: extractedProfile, brokerId: brokerId, profileQueryId: profileQueryId)
+            return try vault.save(extractedProfile: extractedProfile, brokerId: brokerId, profileQueryId: profileQueryId)
+        } catch {
+            os_log("Database error: extractedProfile, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func brokerProfileQueryData(for brokerId: Int64, and profileQueryId: Int64) throws -> BrokerProfileQueryData? {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        guard let broker = try vault.fetchBroker(with: brokerId),
-              let profileQuery = try vault.fetchProfileQuery(with: profileQueryId),
-              let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else {
-            // TODO perhaps this should error if we query for things that don't exist?
-            return nil
-        }
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            guard let broker = try vault.fetchBroker(with: brokerId),
+                  let profileQuery = try vault.fetchProfileQuery(with: profileQueryId),
+                  let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else {
+                // TODO perhaps this should error if we query for things that don't exist?
+                return nil
+            }
 
-        let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)
+            let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)
 
-        return BrokerProfileQueryData(
-            dataBroker: broker,
-            profileQuery: profileQuery,
-            scanOperationData: scanOperation,
-            optOutOperationsData: optOutOperations
-        )
+            return BrokerProfileQueryData(
+                dataBroker: broker,
+                profileQuery: profileQuery,
+                scanOperationData: scanOperation,
+                optOutOperationsData: optOutOperations
+            )
+        } catch {
+            os_log("Database error: brokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func fetchExtractedProfiles(for brokerId: Int64) throws -> [ExtractedProfile] {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        return try vault.fetchExtractedProfiles(for: brokerId)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            return try vault.fetchExtractedProfiles(for: brokerId)
+        } catch {
+            os_log("Database error: fetchExtractedProfiles, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) throws {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        try vault.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            try vault.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
+        } catch {
+            os_log("Database error: updatePreferredRunDate without extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
 
-        try vault.updatePreferredRunDate(
-            date,
-            brokerId: brokerId,
-            profileQueryId: profileQueryId,
-            extractedProfileId: extractedProfileId)
+            try vault.updatePreferredRunDate(
+                date,
+                brokerId: brokerId,
+                profileQueryId: profileQueryId,
+                extractedProfileId: extractedProfileId)
+        } catch {
+            os_log("Database error: updatePreferredRunDate with extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) throws {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        try vault.updateLastRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            try vault.updateLastRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
+        } catch {
+            os_log("Database error: updateLastRunDate without extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-
-        try vault.updateLastRunDate(
-            date,
-            brokerId: brokerId,
-            profileQueryId: profileQueryId,
-            extractedProfileId: extractedProfileId
-        )
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+
+            try vault.updateLastRunDate(
+                date,
+                brokerId: brokerId,
+                profileQueryId: profileQueryId,
+                extractedProfileId: extractedProfileId
+            )
+        } catch {
+            os_log("Database error: updateLastRunDate with extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func updateRemovedDate(_ date: Date?, on extractedProfileId: Int64) throws {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        try vault.updateRemovedDate(for: extractedProfileId, with: date)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            try vault.updateRemovedDate(for: extractedProfileId, with: date)
+        } catch {
+            os_log("Database error: updateRemovedDate, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func add(_ historyEvent: HistoryEvent) throws {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
 
-        if  let extractedProfileId = historyEvent.extractedProfileId {
-            try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId, extractedProfileId: extractedProfileId)
-        } else {
-            try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId)
+            if  let extractedProfileId = historyEvent.extractedProfileId {
+                try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId, extractedProfileId: extractedProfileId)
+            } else {
+                try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId)
+            }
+        } catch {
+            os_log("Database error: add historyEvent, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
         }
     }
 
     func fetchAllBrokerProfileQueryData() throws -> [BrokerProfileQueryData] {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        let brokers = try vault.fetchAllBrokers()
-        let profileQueries = try vault.fetchAllProfileQueries(for: Self.profileId)
-        var brokerProfileQueryDataList = [BrokerProfileQueryData]()
-
-        for broker in brokers {
-            for profileQuery in profileQueries {
-                if let brokerId = broker.id, let profileQueryId = profileQuery.id {
-                    guard let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else { continue }
-                    let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)
-
-                    let brokerProfileQueryData = BrokerProfileQueryData(
-                        dataBroker: broker,
-                        profileQuery: profileQuery,
-                        scanOperationData: scanOperation,
-                        optOutOperationsData: optOutOperations
-                    )
-
-                    brokerProfileQueryDataList.append(brokerProfileQueryData)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let brokers = try vault.fetchAllBrokers()
+            let profileQueries = try vault.fetchAllProfileQueries(for: Self.profileId)
+            var brokerProfileQueryDataList = [BrokerProfileQueryData]()
+
+            for broker in brokers {
+                for profileQuery in profileQueries {
+                    if let brokerId = broker.id, let profileQueryId = profileQuery.id {
+                        guard let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else { continue }
+                        let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)
+
+                        let brokerProfileQueryData = BrokerProfileQueryData(
+                            dataBroker: broker,
+                            profileQuery: profileQuery,
+                            scanOperationData: scanOperation,
+                            optOutOperationsData: optOutOperations
+                        )
+
+                        brokerProfileQueryDataList.append(brokerProfileQueryData)
+                    }
                 }
             }
-        }
 
-        return brokerProfileQueryDataList
+            return brokerProfileQueryDataList
+        } catch {
+            os_log("Database error: fetchAllBrokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func saveOptOutOperation(optOut: OptOutOperationData, extractedProfile: ExtractedProfile) throws {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
 
-        try vault.save(brokerId: optOut.brokerId,
-                       profileQueryId: optOut.profileQueryId,
-                       extractedProfile: extractedProfile,
-                       lastRunDate: optOut.lastRunDate,
-                       preferredRunDate: optOut.preferredRunDate)
+            try vault.save(brokerId: optOut.brokerId,
+                           profileQueryId: optOut.profileQueryId,
+                           extractedProfile: extractedProfile,
+                           lastRunDate: optOut.lastRunDate,
+                           preferredRunDate: optOut.preferredRunDate)
+        } catch {
+            os_log("Database error: saveOptOutOperation, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func fetchLastEvent(brokerId: Int64, profileQueryId: Int64) throws -> HistoryEvent? {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        let events = try vault.fetchEvents(brokerId: brokerId, profileQueryId: profileQueryId)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let events = try vault.fetchEvents(brokerId: brokerId, profileQueryId: profileQueryId)
 
-        return events.max(by: { $0.date < $1.date })
+            return events.max(by: { $0.date < $1.date })
+        } catch {
+            os_log("Database error: fetchLastEvent, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func hasMatches() throws -> Bool {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        return try vault.hasMatches()
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            return try vault.hasMatches()
+        } catch {
+            os_log("Database error: hasMatches, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 
     func fetchAttemptInformation(for extractedProfileId: Int64) throws -> AttemptInformation? {
@@ -213,17 +298,22 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return try vault.fetchAttemptInformation(for: extractedProfileId)
         } catch {
             os_log("Database error: fetchAttemptInformation, error: %{public}@", log: .error, error.localizedDescription)
-            return nil
+            throw error
         }
     }
 
     func addAttempt(extractedProfileId: Int64, attemptUUID: UUID, dataBroker: String, lastStageDate: Date, startTime: Date) throws {
-        let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-        try vault.save(extractedProfileId: extractedProfileId,
-                       attemptUUID: attemptUUID,
-                       dataBroker: dataBroker,
-                       lastStageDate: lastStageDate,
-                       startTime: startTime)
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            try vault.save(extractedProfileId: extractedProfileId,
+                           attemptUUID: attemptUUID,
+                           dataBroker: dataBroker,
+                           lastStageDate: lastStageDate,
+                           startTime: startTime)
+        } catch {
+            os_log("Database error: addAttempt, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 }
 

From edb95e9435a9dd3db1508203f2461e66bea16508 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 20:27:25 +0000
Subject: [PATCH 08/28] Add inert SecureVault error reporter to DBP database

---
 .../DataBrokerProtectionDatabase.swift        | 45 ++++++++++---------
 ...erProtectionSecureVaultErrorReporter.swift | 44 ++++++++++++++++++
 2 files changed, 69 insertions(+), 20 deletions(-)
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
index 873d3e9ca0..bf9505cd7f 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import Common
+import SecureStorage
 
 protocol DataBrokerProtectionRepository {
     func save(_ profile: DataBrokerProtectionProfile) async throws
@@ -51,15 +52,19 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     private let fakeBrokerFlag: DataBrokerDebugFlag
     private let vault: (any DataBrokerProtectionSecureVault)?
+    private let secureVaultErrorReporter: SecureVaultErrorReporting?
 
-    init(fakeBrokerFlag: DataBrokerDebugFlag = DataBrokerDebugFlagFakeBroker(), vault: (any DataBrokerProtectionSecureVault)? = nil) {
+    init(fakeBrokerFlag: DataBrokerDebugFlag = DataBrokerDebugFlagFakeBroker(),
+         vault: (any DataBrokerProtectionSecureVault)? = nil,
+         secureVaultErrorReporter: SecureVaultErrorReporting? = DataBrokerProtectionSecureVaultErrorReporter.shared) {
         self.fakeBrokerFlag = fakeBrokerFlag
         self.vault = vault
+        self.secureVaultErrorReporter = secureVaultErrorReporter
     }
 
     func save(_ profile: DataBrokerProtectionProfile) async throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
 
             if try vault.fetchProfile(with: Self.profileId) != nil {
                 try await updateProfile(profile, vault: vault)
@@ -74,7 +79,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     public func fetchProfile() throws -> DataBrokerProtectionProfile? {
         do {
-            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             return try vault.fetchProfile(with: Self.profileId)
         } catch {
             os_log("Database error: fetchProfile, error: %{public}@", log: .error, error.localizedDescription)
@@ -84,7 +89,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     public func deleteProfileData() throws {
         do {
-            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             try vault.deleteProfileData()
         } catch {
             os_log("Database error: deleteProfileData, error: %{public}@", log: .error, error.localizedDescription)
@@ -94,7 +99,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func fetchChildBrokers(for parentBroker: String) throws -> [DataBroker] {
         do {
-            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             return try vault.fetchChildBrokers(for: parentBroker)
         } catch {
             os_log("Database error: fetchChildBrokers, error: %{public}@", log: .error, error.localizedDescription)
@@ -104,7 +109,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func save(_ extractedProfile: ExtractedProfile, brokerId: Int64, profileQueryId: Int64) throws -> Int64 {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
 
             return try vault.save(extractedProfile: extractedProfile, brokerId: brokerId, profileQueryId: profileQueryId)
         } catch {
@@ -115,7 +120,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func brokerProfileQueryData(for brokerId: Int64, and profileQueryId: Int64) throws -> BrokerProfileQueryData? {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             guard let broker = try vault.fetchBroker(with: brokerId),
                   let profileQuery = try vault.fetchProfileQuery(with: profileQueryId),
                   let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else {
@@ -139,7 +144,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func fetchExtractedProfiles(for brokerId: Int64) throws -> [ExtractedProfile] {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             return try vault.fetchExtractedProfiles(for: brokerId)
         } catch {
             os_log("Database error: fetchExtractedProfiles, error: %{public}@", log: .error, error.localizedDescription)
@@ -149,7 +154,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             try vault.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
         } catch {
             os_log("Database error: updatePreferredRunDate without extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
@@ -159,7 +164,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
 
             try vault.updatePreferredRunDate(
                 date,
@@ -174,7 +179,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             try vault.updateLastRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
         } catch {
             os_log("Database error: updateLastRunDate without extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
@@ -184,7 +189,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
 
             try vault.updateLastRunDate(
                 date,
@@ -200,7 +205,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func updateRemovedDate(_ date: Date?, on extractedProfileId: Int64) throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             try vault.updateRemovedDate(for: extractedProfileId, with: date)
         } catch {
             os_log("Database error: updateRemovedDate, error: %{public}@", log: .error, error.localizedDescription)
@@ -210,7 +215,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func add(_ historyEvent: HistoryEvent) throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
 
             if  let extractedProfileId = historyEvent.extractedProfileId {
                 try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId, extractedProfileId: extractedProfileId)
@@ -225,7 +230,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func fetchAllBrokerProfileQueryData() throws -> [BrokerProfileQueryData] {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             let brokers = try vault.fetchAllBrokers()
             let profileQueries = try vault.fetchAllProfileQueries(for: Self.profileId)
             var brokerProfileQueryDataList = [BrokerProfileQueryData]()
@@ -257,7 +262,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func saveOptOutOperation(optOut: OptOutOperationData, extractedProfile: ExtractedProfile) throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
 
             try vault.save(brokerId: optOut.brokerId,
                            profileQueryId: optOut.profileQueryId,
@@ -272,7 +277,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func fetchLastEvent(brokerId: Int64, profileQueryId: Int64) throws -> HistoryEvent? {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             let events = try vault.fetchEvents(brokerId: brokerId, profileQueryId: profileQueryId)
 
             return events.max(by: { $0.date < $1.date })
@@ -284,7 +289,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func hasMatches() throws -> Bool {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             return try vault.hasMatches()
         } catch {
             os_log("Database error: hasMatches, error: %{public}@", log: .error, error.localizedDescription)
@@ -294,7 +299,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func fetchAttemptInformation(for extractedProfileId: Int64) throws -> AttemptInformation? {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             return try vault.fetchAttemptInformation(for: extractedProfileId)
         } catch {
             os_log("Database error: fetchAttemptInformation, error: %{public}@", log: .error, error.localizedDescription)
@@ -304,7 +309,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
 
     func addAttempt(extractedProfileId: Int64, attemptUUID: UUID, dataBroker: String, lastStageDate: Date, startTime: Date) throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: secureVaultErrorReporter)
             try vault.save(extractedProfileId: extractedProfileId,
                            attemptUUID: attemptUUID,
                            dataBroker: dataBroker,
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift
new file mode 100644
index 0000000000..7b08f19d42
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift
@@ -0,0 +1,44 @@
+//
+//  DataBrokerProtectionSecureVaultErrorReporter.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+
+import Foundation
+import BrowserServicesKit
+import SecureStorage
+import PixelKit
+import Common
+
+final class DataBrokerProtectionSecureVaultErrorReporter: SecureVaultErrorReporting {
+    static let shared = DataBrokerProtectionSecureVaultErrorReporter(pixelHandler: DataBrokerProtectionPixelsHandler())
+
+    let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    private init(pixelHandler: EventMapping<DataBrokerProtectionPixels>) {
+        self.pixelHandler = pixelHandler
+    }
+
+    func secureVaultInitFailed(_ error: SecureStorageError) {
+// Actual pixels to follow once privacy triage is done
+//        switch error {
+//        case .initFailed, .failedToOpenDatabase:
+//            pixelHandler.fire(.debug(event: .secureVaultInitError, error: error))
+//        default:
+//            Pixel.fire(.debug(event: .secureVaultError, error: error))
+//        }
+    }
+
+}

From 2a4d0cb68c001348160b309cd20f54b2db10350d Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 20:30:34 +0000
Subject: [PATCH 09/28] Fix rogue var

---
 .../Database/DataBrokerProtectionDatabase.swift                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
index bf9505cd7f..7611d18b0d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
@@ -373,7 +373,7 @@ extension DataBrokerProtectionDatabase {
         let databaseProfileQueries = databaseBrokerProfileQueryData.map { $0.profileQuery }
 
         // The queries we need to create are the one that exist on the new ones but not in the database
-        var profileQueriesToCreate = Set(newProfileQueries).subtracting(Set(databaseProfileQueries))
+        let profileQueriesToCreate = Set(newProfileQueries).subtracting(Set(databaseProfileQueries))
 
         // The queries that need update exist in both the new and the database
         // We assume updated queries will be not deprecated

From fa24c7ea32fa79e5a5c83b39a3116210f832cdb3 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 20:34:32 +0000
Subject: [PATCH 10/28] Remove TODO

---
 .../DebugUI/DataBrokerRunCustomJSONViewModel.swift              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
index 22c9c09fbc..5e3f3fae5a 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
@@ -76,7 +76,7 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
             captchaService: CaptchaService())
 
         let fileResources = FileResources()
-        self.brokers = (try? fileResources.fetchBrokerFromResourceFiles()) ?? [DataBroker]() // TODO not this
+        self.brokers = (try? fileResources.fetchBrokerFromResourceFiles()) ?? [DataBroker]()
     }
 
     func runJSON(jsonString: String) {

From 331988581e22c9dafc9b37a56c00bdc98c82e570 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 20:48:27 +0000
Subject: [PATCH 11/28] Add various os_log ing for errors

---
 .../Model/DBPUIViewModel.swift                   |  7 ++++++-
 .../DataBrokerProtection/Model/DataBroker.swift  | 16 +++++++++++-----
 .../DataBrokerProtectionBrokerUpdater.swift      | 14 ++++++++++----
 .../UI/DBPUICommunicationLayer.swift             |  2 ++
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
index 352cb93be8..5b055355f0 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
@@ -20,6 +20,7 @@ import Foundation
 import Combine
 import WebKit
 import BrowserServicesKit
+import Common
 
 protocol DBPUIScanOps: AnyObject {
     func startScan() -> Bool
@@ -77,6 +78,10 @@ extension DBPUIViewModel: DBPUIScanOps {
     }
 
     func updateCacheWithCurrentScans() async {
-        _ = try? await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
+        do {
+            _ = try await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
+        } catch {
+            os_log("DBPUIViewModel updateCacheWithCurrentScans, error: %{public}@", log: .error, error.localizedDescription)
+        }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
index e717d3f8b2..e6945bc220 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import Common
 
 struct DataBrokerScheduleConfig: Codable {
     let retryError: Int
@@ -168,11 +169,16 @@ struct DataBroker: Codable, Sendable {
     }
 
     static func initFromResource(_ url: URL) throws -> DataBroker {
-        let data = try Data(contentsOf: url)
-        let jsonDecoder = JSONDecoder()
-        jsonDecoder.dateDecodingStrategy = .millisecondsSince1970
-        let broker = try jsonDecoder.decode(DataBroker.self, from: data)
-        return broker
+        do {
+            let data = try Data(contentsOf: url)
+            let jsonDecoder = JSONDecoder()
+            jsonDecoder.dateDecodingStrategy = .millisecondsSince1970
+            let broker = try jsonDecoder.decode(DataBroker.self, from: data)
+            return broker
+        } catch {
+            os_log("DataBroker initFromResource, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 }
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
index ef0df8bc17..4797bbbb90 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
@@ -37,9 +37,8 @@ final class FileResources: ResourcesRepository {
 
     func fetchBrokerFromResourceFiles() throws -> [DataBroker]? {
         guard let resourceURL = Bundle.module.resourceURL else {
-            //TODO haven't decided the best course of action here. Something has gone horribly wrong. Pixel? Assert?
-            // I don't think we have the means to fire a pixel here :Sob:
-            // "This property may not contain a path for non-standard bundle formats or for some older bundle formats"
+            assertionFailure()
+            os_log("DataBrokerProtectionUpdater FileResources fetchBrokerFromResourceFiles, error: Bundle.module.resourceURL is nil", log: .error)
             throw FileResourcesError.bundleResourceURLNil
         }
 
@@ -120,7 +119,14 @@ public struct DataBrokerProtectionBrokerUpdater {
     }
 
     public func updateBrokers() {
-        guard let brokers = try? resources.fetchBrokerFromResourceFiles() else { return } //TODO not this
+        let brokers: [DataBroker]?
+        do {
+            brokers = try resources.fetchBrokerFromResourceFiles()
+        } catch {
+            os_log("DataBrokerProtectionBrokerUpdater updateBrokers, error: %{public}@", log: .error, error.localizedDescription)
+            return
+        }
+        guard let brokers = brokers else { return }
 
         for broker in brokers {
             do {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift
index 016129e10b..f99df1e614 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift
@@ -131,6 +131,7 @@ struct DBPUICommunicationLayer: Subfeature {
             try await delegate?.saveProfile()
             return DBPUIStandardResponse(version: Constants.version, success: true)
         } catch {
+            os_log("DBPUICommunicationLayer saveProfile, error: %{public}@", log: .error, error.localizedDescription)
             return DBPUIStandardResponse(version: Constants.version, success: false)
         }
     }
@@ -148,6 +149,7 @@ struct DBPUICommunicationLayer: Subfeature {
             try delegate?.deleteProfileData()
             return DBPUIStandardResponse(version: Constants.version, success: true)
         } catch {
+            os_log("DBPUICommunicationLayer deleteUserProfileData, error: %{public}@", log: .error, error.localizedDescription)
             return DBPUIStandardResponse(version: Constants.version, success: false)
         }
     }

From 6fb5b8a640e342c2486e6abc5fcfb539da4b775c Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 20:52:08 +0000
Subject: [PATCH 12/28] Add custom error for if data is not in DB

---
 .../CCF/DataBrokerProtectionErrors.swift                     | 3 +++
 .../Database/DataBrokerProtectionDatabase.swift              | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionErrors.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionErrors.swift
index 63ebe88d77..d48373aeb0 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionErrors.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionErrors.swift
@@ -38,6 +38,7 @@ public enum DataBrokerProtectionError: Error, Equatable, Codable {
     case solvingCaptchaWithCallbackError
     case cantCalculatePreferredRunDate
     case httpError(code: Int)
+    case dataNotInDatabase
 
     static func parse(params: Any) -> DataBrokerProtectionError {
         let errorDataResult = try? JSONSerialization.data(withJSONObject: params)
@@ -88,6 +89,8 @@ extension DataBrokerProtectionError {
             return "cantCalculatePreferredRunDate"
         case .httpError:
             return "httpError"
+        case .dataNotInDatabase:
+            return "dataNotInDatabase"
         }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
index 7611d18b0d..3f8ef335f5 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
@@ -124,8 +124,9 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             guard let broker = try vault.fetchBroker(with: brokerId),
                   let profileQuery = try vault.fetchProfileQuery(with: profileQueryId),
                   let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else {
-                // TODO perhaps this should error if we query for things that don't exist?
-                return nil
+                let error = DataBrokerProtectionError.dataNotInDatabase
+                os_log("Database error: brokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
+                throw error
             }
 
             let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)

From 40f3dfff2ad8a8ea80a7284ba77e2b3c5dce1714 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 21:14:53 +0000
Subject: [PATCH 13/28] Fix various linting issues

---
 .../Database/DataBrokerProtectionDataManager.swift          | 1 -
 .../DataBrokerProtectionSecureVaultErrorReporter.swift      | 2 --
 .../DataBrokerProtectionProfileTests.swift                  | 6 +++---
 .../Tests/DataBrokerProtectionTests/Mocks.swift             | 4 +---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
index 73a0e4919c..b7c731e20d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
@@ -63,7 +63,6 @@ public class DataBrokerProtectionDataManager: DataBrokerProtectionDataManaging {
             try await database.save(profile)
         } catch {
             // We should still invalidate the cache if the save fails
-            // TODO might be a good place to send a pixel
             cache.invalidate()
             throw error
         }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift
index 7b08f19d42..34694e848d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift
@@ -16,7 +16,6 @@
 //  limitations under the License.
 //
 
-
 import Foundation
 import BrowserServicesKit
 import SecureStorage
@@ -40,5 +39,4 @@ final class DataBrokerProtectionSecureVaultErrorReporter: SecureVaultErrorReport
 //            Pixel.fire(.debug(event: .secureVaultError, error: error))
 //        }
     }
-
 }
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
index 616e1a5fa9..cc61e72212 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
@@ -175,7 +175,7 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
             birthYear: 1980
         )
 
-        _=await database.save(profile)
+        _ = try? await database.save(profile)
         XCTAssertTrue(vault.wasSaveProfileQueryCalled)
         XCTAssertFalse(vault.wasUpdateProfileQueryCalled)
         XCTAssertFalse(vault.wasDeleteProfileQueryCalled)
@@ -217,7 +217,7 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
             birthYear: 1980
         )
 
-        _=await database.save(newProfile)
+        _ = try? await database.save(newProfile)
 
         XCTAssertTrue(vault.wasSaveProfileQueryCalled)
         XCTAssertTrue(vault.wasUpdateProfileQueryCalled)
@@ -259,7 +259,7 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
             birthYear: 1980
         )
 
-        _ = await database.save(newProfile)
+        _ = try? await database.save(newProfile)
 
         XCTAssertTrue(vault.wasSaveProfileQueryCalled)
         XCTAssertFalse(vault.wasUpdateProfileQueryCalled)
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
index 06839d4278..cd899b6f89 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
@@ -675,10 +675,8 @@ final class MockDatabase: DataBrokerProtectionRepository {
         callsList.filter { $0 }.count > 0 // If one value is true. The database was called
     }
 
-    func save(_ profile: DataBrokerProtectionProfile) -> Bool {
+    func save(_ profile: DataBrokerProtectionProfile) throws {
         wasSaveProfileCalled = true
-
-        return true
     }
 
     func fetchProfile() -> DataBrokerProtectionProfile? {

From 70a518ad7a507f47e208802a66d7363d5f537127 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 21:28:44 +0000
Subject: [PATCH 14/28] Fix weird db file issue

---
 .../DataBrokerProtectionDatabase.swift        | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
index 37dc97f2d1..ecccb6631e 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
@@ -481,43 +481,3 @@ extension DataBrokerProtectionDatabase {
         }
     }
 }
-        }
-
-        // Create
-        if !profileQueriesToCreate.isEmpty {
-            try initializeDatabaseForProfile(
-                profileId: Self.profileId,
-                vault: vault,
-                brokerIDs: brokerIDs,
-                profileQueries: Array(profileQueriesToCreate)
-            )
-        }
-    }
-
-    private func deleteProfileQueries(_ profileQueries: [ProfileQuery],
-                                      profileID: Int64,
-                                      vault: any DataBrokerProtectionSecureVault) throws {
-
-        for profile in profileQueries {
-            try vault.delete(profileQuery: profile, profileId: profileID)
-        }
-    }
-
-    private func updateProfileQueries(_ profileQueries: [ProfileQuery],
-                                      profileID: Int64,
-                                      brokerIDs: [Int64],
-                                      vault: any DataBrokerProtectionSecureVault) throws {
-
-        for profile in profileQueries {
-            let profileQueryID = try vault.update(profile,
-                                                  brokerIDs: brokerIDs,
-                                                  profileId: profileID)
-
-            if !profile.deprecated {
-                for brokerID in brokerIDs where !profile.deprecated {
-                    try updatePreferredRunDate(Date(), brokerId: brokerID, profileQueryId: profileQueryID)
-                }
-            }
-        }
-    }
-}

From 8dc1c2eb868713cc75511a1f82f3ec9fa4295d81 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 21:40:25 +0000
Subject: [PATCH 15/28] Add appropriate tries to new methods from merge

---
 .../Operations/DataBrokerOperationsCollection.swift   | 11 ++++++++++-
 .../DataBrokerProfileQueryOperationManager.swift      |  6 +++---
 .../OperationRetriesCalculatorUseCase.swift           |  8 ++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
index d77c7c7d6b..9bdbf236c9 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
@@ -126,8 +126,17 @@ final class DataBrokerOperationsCollection: Operation {
         return filteredAndSortedOperationsData
     }
 
+    // swiftlint:disable:next function_body_length
     private func runOperation() async {
-        let allBrokerProfileQueryData = database.fetchAllBrokerProfileQueryData()
+        let allBrokerProfileQueryData: [BrokerProfileQueryData]
+
+        do {
+            allBrokerProfileQueryData = try database.fetchAllBrokerProfileQueryData()
+        } catch {
+            os_log("DataBrokerOperationsCollection error: runOperation, error: %{public}@", log: .error, error.localizedDescription)
+            return
+        }
+
         let brokerProfileQueriesData = allBrokerProfileQueryData.filter { $0.dataBroker.id == dataBrokerID }
 
         let filteredAndSortedOperationsData = filterAndSortOperationsData(brokerProfileQueriesData: brokerProfileQueriesData,
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
index fa46504a01..d1c34903b6 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
@@ -320,7 +320,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                                     showWebView: showWebView,
                                     shouldRunNextStep: shouldRunNextStep)
 
-            let tries = retriesCalculatorUseCase.calculateForOptOut(database: database, brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
+            let tries = try retriesCalculatorUseCase.calculateForOptOut(database: database, brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
             stageDurationCalculator.fireOptOutValidate()
             stageDurationCalculator.fireOptOutSubmitSuccess(tries: tries)
 
@@ -335,8 +335,8 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                                 startTime: stageDurationCalculator.startTime)
             try database.add(.init(extractedProfileId: extractedProfileId, brokerId: brokerId, profileQueryId: profileQueryId, type: .optOutRequested))
         } catch {
-            let tries = retriesCalculatorUseCase.calculateForOptOut(database: database, brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
-            stageDurationCalculator.fireOptOutFailure(tries: tries)
+            let tries = try? retriesCalculatorUseCase.calculateForOptOut(database: database, brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
+            stageDurationCalculator.fireOptOutFailure(tries: tries ?? -1)
             handleOperationError(
                 origin: .optOut,
                 brokerId: brokerId,
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationRetriesCalculatorUseCase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationRetriesCalculatorUseCase.swift
index cca75f16b2..8035391f64 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationRetriesCalculatorUseCase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationRetriesCalculatorUseCase.swift
@@ -20,14 +20,14 @@ import Foundation
 
 struct OperationRetriesCalculatorUseCase {
 
-    func calculateForScan(database: DataBrokerProtectionRepository, brokerId: Int64, profileQueryId: Int64) -> Int {
-        let events = database.fetchScanHistoryEvents(brokerId: brokerId, profileQueryId: profileQueryId)
+    func calculateForScan(database: DataBrokerProtectionRepository, brokerId: Int64, profileQueryId: Int64) throws -> Int {
+        let events = try database.fetchScanHistoryEvents(brokerId: brokerId, profileQueryId: profileQueryId)
 
         return events.filter { $0.type == .scanStarted }.count
     }
 
-    func calculateForOptOut(database: DataBrokerProtectionRepository, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) -> Int {
-        let events = database.fetchOptOutHistoryEvents(brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
+    func calculateForOptOut(database: DataBrokerProtectionRepository, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws -> Int {
+        let events = try database.fetchOptOutHistoryEvents(brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
 
         return events.filter { $0.type == .optOutStarted }.count
     }

From 8a9f5266d53d44686ea0689bad64cbeb3df62968 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 21:45:41 +0000
Subject: [PATCH 16/28] Add throwing to fileResources

---
 .../DataBrokerProtectionBrokerUpdater.swift   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
index 4797bbbb90..be527ab91b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
@@ -38,21 +38,26 @@ final class FileResources: ResourcesRepository {
     func fetchBrokerFromResourceFiles() throws -> [DataBroker]? {
         guard let resourceURL = Bundle.module.resourceURL else {
             assertionFailure()
-            os_log("DataBrokerProtectionUpdater FileResources fetchBrokerFromResourceFiles, error: Bundle.module.resourceURL is nil", log: .error)
+            os_log("DataBrokerProtectionUpdater error FileResources fetchBrokerFromResourceFiles, error: Bundle.module.resourceURL is nil", log: .error)
             throw FileResourcesError.bundleResourceURLNil
         }
 
-        let fileURLs = try fileManager.contentsOfDirectory(
-            at: resourceURL,
-            includingPropertiesForKeys: nil,
-            options: [.skipsHiddenFiles]
-        )
+        do {
+            let fileURLs = try fileManager.contentsOfDirectory(
+                at: resourceURL,
+                includingPropertiesForKeys: nil,
+                options: [.skipsHiddenFiles]
+            )
+
+            let brokerJSONFiles = fileURLs.filter {
+                $0.isJSON && !$0.hasFakePrefix
+            }
 
-        let brokerJSONFiles = fileURLs.filter {
-            $0.isJSON && !$0.hasFakePrefix
+            return try brokerJSONFiles.map(DataBroker.initFromResource(_:))
+        } catch {
+            os_log("DataBrokerProtectionUpdater error FileResources error: fetchBrokerFromResourceFiles, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
         }
-
-        return try brokerJSONFiles.map(DataBroker.initFromResource(_:))
     }
 }
 

From 0022fc85915be4e7fbf365baa536fac855274fb6 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 21:52:46 +0000
Subject: [PATCH 17/28] Refine os_log messages

---
 .../DataBrokerProtection/Model/DBPUIViewModel.swift       | 2 +-
 .../Sources/DataBrokerProtection/Model/DataBroker.swift   | 2 +-
 .../Operations/DataBrokerProtectionBrokerUpdater.swift    | 4 ++--
 .../Operations/OperationPreferredDateUpdater.swift        | 4 ++--
 .../MismatchCalculatorUseCase.swift                       | 8 ++++++--
 .../Scheduler/DataBrokerProtectionProcessor.swift         | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
index 5b055355f0..37d5b71c94 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
@@ -81,7 +81,7 @@ extension DBPUIViewModel: DBPUIScanOps {
         do {
             _ = try await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
         } catch {
-            os_log("DBPUIViewModel updateCacheWithCurrentScans, error: %{public}@", log: .error, error.localizedDescription)
+            os_log("DBPUIViewModel error: updateCacheWithCurrentScans, error: %{public}@", log: .error, error.localizedDescription)
         }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
index 11ae939a20..41a5293846 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
@@ -181,7 +181,7 @@ struct DataBroker: Codable, Sendable {
             let broker = try jsonDecoder.decode(DataBroker.self, from: data)
             return broker
         } catch {
-            os_log("DataBroker initFromResource, error: %{public}@", log: .error, error.localizedDescription)
+            os_log("DataBroker error: initFromResource, error: %{public}@", log: .error, error.localizedDescription)
             throw error
         }
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
index be527ab91b..7f6749e786 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
@@ -38,7 +38,7 @@ final class FileResources: ResourcesRepository {
     func fetchBrokerFromResourceFiles() throws -> [DataBroker]? {
         guard let resourceURL = Bundle.module.resourceURL else {
             assertionFailure()
-            os_log("DataBrokerProtectionUpdater error FileResources fetchBrokerFromResourceFiles, error: Bundle.module.resourceURL is nil", log: .error)
+            os_log("DataBrokerProtectionUpdater: error FileResources fetchBrokerFromResourceFiles, error: Bundle.module.resourceURL is nil", log: .error)
             throw FileResourcesError.bundleResourceURLNil
         }
 
@@ -55,7 +55,7 @@ final class FileResources: ResourcesRepository {
 
             return try brokerJSONFiles.map(DataBroker.initFromResource(_:))
         } catch {
-            os_log("DataBrokerProtectionUpdater error FileResources error: fetchBrokerFromResourceFiles, error: %{public}@", log: .error, error.localizedDescription)
+            os_log("DataBrokerProtectionUpdater: error FileResources error: fetchBrokerFromResourceFiles, error: %{public}@", log: .error, error.localizedDescription)
             throw error
         }
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
index b0a1e00f84..d4a832482b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
@@ -84,7 +84,7 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
                 }
             }
         } catch {
-            os_log("Database error during updateChildrenBrokerForParentBroker", log: .dataBrokerProtection)
+            os_log("OperationPreferredDateUpdaterUseCase error: updateChildrenBrokerForParentBroker, error: %{public}@", log: .error, error.localizedDescription)
         }
     }
 
@@ -160,7 +160,7 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
                 try database.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
             }
         } catch {
-            os_log("Database error during updatePreferredRunDate", log: .dataBrokerProtection)
+            os_log("OperationPreferredDateUpdaterUseCase error: updatePreferredRunDate, error: %{public}@", log: .error, error.localizedDescription)
         }
 
         os_log("Updating preferredRunDate on operation with brokerId %{public}@ and profileQueryId %{public}@", log: .dataBrokerProtection, brokerId.description, profileQueryId.description)
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift
index 209cbb30b1..19cc9cccbd 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift
@@ -41,10 +41,14 @@ struct MismatchCalculatorUseCase {
     let pixelHandler: EventMapping<DataBrokerProtectionPixels>
 
     func calculateMismatches() {
-        guard let brokerProfileQueryData = try? database.fetchAllBrokerProfileQueryData() else {
-            os_log("Database error during MismatchCalculatorUseCase.calculateMismatches", log: .dataBrokerProtection)
+        let brokerProfileQueryData: [BrokerProfileQueryData]
+        do {
+            brokerProfileQueryData = try database.fetchAllBrokerProfileQueryData()
+        } catch {
+            os_log("MismatchCalculatorUseCase error: calculateMismatches, error: %{public}@", log: .error, error.localizedDescription)
             return
         }
+
         let parentBrokerProfileQueryData = brokerProfileQueryData.filter { $0.dataBroker.parent == nil }
 
         for parent in parentBrokerProfileQueryData {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
index 106bac342e..91b8cb5790 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
@@ -128,7 +128,7 @@ final class DataBrokerProtectionProcessor {
                 operationQueue.addOperation(collection)
             }
         } catch {
-            os_log("Database error during Processor.runOperations", log: .dataBrokerProtection)
+            os_log("DataBrokerProtectionProcessor error: runOperations, error: %{public}@", log: .error, error.localizedDescription)
         }
 
         operationQueue.addBarrierBlock {

From 827f0afe9b8ed092c3cd38106de272a971370b51 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Wed, 13 Mar 2024 21:54:37 +0000
Subject: [PATCH 18/28] Refine more os log messages

---
 DuckDuckGo/DBP/DBPHomeViewController.swift               | 2 +-
 DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DuckDuckGo/DBP/DBPHomeViewController.swift b/DuckDuckGo/DBP/DBPHomeViewController.swift
index a5b9a03c99..af30a4d7ce 100644
--- a/DuckDuckGo/DBP/DBPHomeViewController.swift
+++ b/DuckDuckGo/DBP/DBPHomeViewController.swift
@@ -89,7 +89,7 @@ final class DBPHomeViewController: NSViewController {
                 dbpDateStore.updateLastActiveDate()
             }
         } catch {
-            os_log("Database error during DBPHomeViewController.viewDidLoad", log: .dataBrokerProtection)
+            os_log("DBPHomeViewController error: viewDidLoad, error: %{public}@", log: .error, error.localizedDescription)
         }
     }
 
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift b/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
index 1afb5f7eeb..bf31c199b2 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
@@ -49,7 +49,7 @@ struct DataBrokerProtectionFeatureDisabler: DataBrokerProtectionFeatureDisabling
             do {
                 try dataManager.removeAllData()
             } catch {
-                os_log("Database error during DataBrokerProtectionFeatureDisabler.disableAndDelete", log: .dataBrokerProtection)
+                os_log("DataBrokerProtectionFeatureDisabler error: disableAndDelete, error: %{public}@", log: .error, error.localizedDescription)
             }
 
             DataBrokerProtectionLoginItemPixels.fire(pixel: .dataBrokerDisableAndDeleteDaily, frequency: .dailyOnly)

From 8b6bc30d8b2b5d5c48cd91a774c77266135af957 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Thu, 14 Mar 2024 13:26:35 +0000
Subject: [PATCH 19/28] Make DBP tests have same swift lint rules as other
 tests

---
 .../DataBrokerProtection/Tests/.swiftlint.yml   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 LocalPackages/DataBrokerProtection/Tests/.swiftlint.yml

diff --git a/LocalPackages/DataBrokerProtection/Tests/.swiftlint.yml b/LocalPackages/DataBrokerProtection/Tests/.swiftlint.yml
new file mode 100644
index 0000000000..bf8a5655d9
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Tests/.swiftlint.yml
@@ -0,0 +1,17 @@
+disabled_rules:
+  - file_length
+  - unused_closure_parameter
+  - type_name
+  - force_cast
+  - force_try
+  - function_body_length
+  - cyclomatic_complexity
+  - identifier_name
+  - blanket_disable_command
+  - type_body_length
+  - explicit_non_final_class
+  - enforce_os_log_wrapper
+
+large_tuple:
+  warning: 6
+  error: 10

From df2e53fe6ab1b9b731b88d8428cc274be93db1ec Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Thu, 14 Mar 2024 13:26:49 +0000
Subject: [PATCH 20/28] Change DBP tests to use try! instead of try?

---
 .../DataBrokerProtectionProfileTests.swift                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
index cc61e72212..85a9e62aa3 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
@@ -175,7 +175,7 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
             birthYear: 1980
         )
 
-        _ = try? await database.save(profile)
+        _ = try! await database.save(profile)
         XCTAssertTrue(vault.wasSaveProfileQueryCalled)
         XCTAssertFalse(vault.wasUpdateProfileQueryCalled)
         XCTAssertFalse(vault.wasDeleteProfileQueryCalled)
@@ -217,7 +217,7 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
             birthYear: 1980
         )
 
-        _ = try? await database.save(newProfile)
+        _ = try! await database.save(newProfile)
 
         XCTAssertTrue(vault.wasSaveProfileQueryCalled)
         XCTAssertTrue(vault.wasUpdateProfileQueryCalled)
@@ -259,7 +259,7 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
             birthYear: 1980
         )
 
-        _ = try? await database.save(newProfile)
+        _ = try! await database.save(newProfile)
 
         XCTAssertTrue(vault.wasSaveProfileQueryCalled)
         XCTAssertFalse(vault.wasUpdateProfileQueryCalled)

From 5cacc1fba68c8e947b92c12628dc7b09e97b7a0d Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Tue, 26 Mar 2024 18:32:09 +0000
Subject: [PATCH 21/28] Restore DBPFeature assertionFailure

---
 .../DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
index 7d33568aca..c596488888 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
@@ -126,7 +126,8 @@ struct DataBrokerProtectionFeature: Subfeature {
 
     func pushAction(method: CCFSubscribeActionName, webView: WKWebView, params: Encodable) {
         guard let broker = broker else {
-            fatalError("Cannot continue without broker instance")
+            assertionFailure("Cannot continue without broker instance")
+            return
         }
         os_log("Pushing into WebView: %@ params %@", log: .action, method.rawValue, String(describing: params))
 

From 676a402e4dff07a055368e18d28c9be90486384e Mon Sep 17 00:00:00 2001
From: Elle Sullivan <THISISDINOSAUR@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:46:41 +0100
Subject: [PATCH 22/28] Expand dbp error handling iteration 2: further up the
 stack + pixels (#2484)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task/Issue URL:
https://app.asana.com/0/1199230911884351/1206910398550646/f
Tech Design URL:
CC:

**Description**:
Adds additional error handling higher up the stack, as well as firing
pixels for DBP errors.
This should not be merged yet because privacy triage isn't complete

Note that this depends on iteration 1, and is set with that as the base

**Steps to test this PR**:
The main thing to test is error pixels are fired as expected. There are
two general cases to to test:
1. The secure vault error pixels, both from the background agent and
from the main app
2. The new "generalError" pixel (again both from the background agent
and from the main app). Pay special attention to making sure it always
has at least the following params: error code, error domain, and the
origin function. Special care is needed here with the origin function,
because if one uses pixel kit debug events it clobbers the original
params

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)

---------

Co-authored-by: Dominik Kapusta <dkapusta@duckduckgo.com>
Co-authored-by: Fernando Bunn <bunn@idevzilla.com>
Co-authored-by: Dax the Duck <dax@duckduckgo.com>
Co-authored-by: Dax Mobile <44842493+daxmobile@users.noreply.github.com>
Co-authored-by: Diego Rey Mendez <diegoreymendez@users.noreply.github.com>
Co-authored-by: Pete Smith <peadar81@gmail.com>
Co-authored-by: Sabrina Tardio <44158575+SabrinaTardio@users.noreply.github.com>
Co-authored-by: Anh Do <18567+quanganhdo@users.noreply.github.com>
Co-authored-by: Juan Manuel Pereira <juanmanuel.pereira1@gmail.com>
Co-authored-by: Christopher Brind <brindy@duckduckgo.com>
Co-authored-by: Michal Smaga <miasma13@gmail.com>
Co-authored-by: bwaresiak <bartek@duckduckgo.com>
Co-authored-by: Mariusz Śpiewak <dus7@users.noreply.github.com>
Co-authored-by: Daniel Bernal <dbernal@duckduckgo.com>
Co-authored-by: muodov <muodov@users.noreply.github.com>
Co-authored-by: Sam Symons <sam@samsymons.com>
Co-authored-by: Alessandro Boron <aboron@duckduckgo.com>
Co-authored-by: Federico Cappelli <fcappelli@duckduckgo.com>
Co-authored-by: Tom Strba <57389842+tomasstrba@users.noreply.github.com>
Co-authored-by: Graeme Arthur <graeme@graemearthur.com>
Co-authored-by: amddg44 <amallon@duckduckgo.com>
Co-authored-by: Brad Slayter <SlayterDev@users.noreply.github.com>
Co-authored-by: Halle <378795+Halle@users.noreply.github.com>
Co-authored-by: Diego Rey Mendez <dreymendez@duckduckgo.com>
---
 .../asana-create-action-item/action.yml       |    1 +
 .github/actions/asana-log-message/action.yml  |    1 +
 .github/workflows/bump_internal_release.yml   |   26 +-
 .github/workflows/publish_dmg_release.yml     |   14 +-
 .github/workflows/release.yml                 |   15 +-
 .../NetworkProtection/DuckDuckGoVPN.xcconfig  |    8 +-
 .../DuckDuckGoVPNAppStore.xcconfig            |    8 +-
 Configuration/AppStore.xcconfig               |    2 +-
 Configuration/BuildNumber.xcconfig            |    2 +-
 Configuration/Common.xcconfig                 |    2 +-
 Configuration/DeveloperID.xcconfig            |    2 +-
 .../NetworkProtectionSystemExtension.xcconfig |   10 +-
 Configuration/Global.xcconfig                 |    2 +-
 .../Tests/UnitTestsAppStore.xcconfig          |    2 +-
 Configuration/Version.xcconfig                |    2 +-
 DuckDuckGo.xcodeproj/project.pbxproj          |  747 +++++++--
 .../xcshareddata/swiftpm/Package.resolved     |   28 +-
 ...kDuckGo Privacy Browser App Store.xcscheme |   13 +
 .../DuckDuckGo Privacy Browser.xcscheme       |    3 +
 DuckDuckGo/Application/AppDelegate.swift      |   48 +-
 DuckDuckGo/Application/URLEventHandler.swift  |    9 +-
 .../Colors/AlertGreen.colorset/Contents.json  |   20 +
 .../Contents.json                             |    2 +-
 .../Images/Accessibility.imageset/Icon 18.pdf |  Bin 0 -> 6134 bytes
 .../AddBookmark.imageset/AddBookmark.svg      |    8 +
 .../Images/AddBookmark.imageset/Contents.json |    2 +-
 .../icon-16-bookmark-add.pdf                  |  Bin 3871 -> 0 bytes
 .../Images/AddFolder.imageset/AddFolder.svg   |    8 +
 .../Images/AddFolder.imageset/Contents.json   |    2 +-
 .../AddFolder.imageset/icon-16-folder-add.pdf |  Bin 3057 -> 0 bytes
 .../BookmarksFolder.svg                       |   10 +
 .../BookmarksFolder.imageset/Contents.json    |   12 +
 .../Chevron-Medium-Right-16.pdf}              |  Bin 1160 -> 1153 bytes
 .../Contents.json                             |   15 +
 .../Contents.json                             |   12 +
 .../CookieProtectionIcon.imageset/Icon 13.pdf |  Bin 0 -> 3835 bytes
 .../Contents.json                             |   12 +
 .../EmailProtectionIcon.imageset/Icon 12.pdf  |  Bin 0 -> 6306 bytes
 .../FireSettings.imageset/Contents.json       |   12 +
 .../Images/FireSettings.imageset/Icon 17.pdf  |  Bin 0 -> 33137 bytes
 .../Images/GeneralIcon.imageset/Contents.json |   12 +
 .../Images/GeneralIcon.imageset/Icon 16.pdf   |  Bin 0 -> 7715 bytes
 .../Images/HomePage/Contents.json             |    6 +
 .../HomePage/Rocket.imageset/rocket.pdf       |  Bin 6315 -> 0 bytes
 .../Images/ITR-Icon.imageset/ITR-Icon.pdf     |  Bin 4129 -> 3919 bytes
 .../Gift-96.imageset/Contents.json            |    5 +-
 .../Gift-96.imageset/Gift-96.pdf              |  Bin 9684 -> 0 bytes
 .../Gift-96.imageset/Gift-New-96x96.pdf       |  Bin 0 -> 7383 bytes
 .../Contents.json                             |    0
 .../DownloadsPreferences.pdf                  |  Bin
 .../Images/Privacy.imageset/Contents.json     |    2 +-
 .../Privacy.imageset/Privacy (Color).pdf      |  Bin 2879 -> 0 bytes
 .../Images/Privacy.imageset/Privacy.pdf       |  Bin 0 -> 4997 bytes
 .../PrivateSearchIcon.imageset/Contents.json  |   12 +
 .../PrivateSearchIcon.imageset/Icon 10.pdf    |  Bin 0 -> 3482 bytes
 .../Images/QandA-128.imageset/Contents.json   |   12 +
 .../Images/QandA-128.imageset/QandA-128.svg   |    9 +
 .../SubscriptionIcon.pdf                      |  Bin 2646 -> 4808 bytes
 .../Contents.json                             |    2 +-
 .../Images/Trash.imageset/Trash.svg           |    9 +
 .../Contents.json                             |   12 +
 .../Icon 11.pdf                               |  Bin 0 -> 4673 bytes
 .../Autoconsent/AutoconsentUserScript.swift   |    6 +-
 DuckDuckGo/Autoconsent/autoconsent-bundle.js  |    2 +-
 .../ContentOverlayViewController.swift        |    4 +-
 .../Bookmarks/Extensions/Bookmarks+Tab.swift  |   41 +
 DuckDuckGo/Bookmarks/Model/Bookmark.swift     |  105 +-
 .../Bookmarks/Model/BookmarkFolderInfo.swift  |   32 +
 DuckDuckGo/Bookmarks/Model/BookmarkList.swift |   32 +-
 .../Bookmarks/Model/BookmarkManager.swift     |   25 +
 DuckDuckGo/Bookmarks/Model/BookmarkNode.swift |   21 +-
 .../Model/BookmarkOutlineViewDataSource.swift |   20 +-
 .../Model/BookmarkSidebarTreeController.swift |   10 +-
 .../Bookmarks/Model/PasteboardFolder.swift    |   25 +-
 DuckDuckGo/Bookmarks/Model/PseudoFolder.swift |    2 +-
 .../Bookmarks/Services/BookmarkStore.swift    |    1 +
 .../Services/BookmarkStoreMock.swift          |   34 +
 .../Bookmarks/Services/ContextualMenu.swift   |  225 ++-
 .../Services/LocalBookmarkStore.swift         |  100 +-
 .../Services/MenuItemSelectors.swift          |   14 +-
 .../View/AddBookmarkFolderModalView.swift     |   67 -
 .../View/AddBookmarkFolderPopoverView.swift   |   76 +-
 .../Bookmarks/View/AddBookmarkModalView.swift |   77 -
 .../View/AddBookmarkPopoverView.swift         |  103 +-
 .../Bookmarks/View/BookmarkFolderPicker.swift |    2 +-
 .../View/BookmarkListViewController.swift     |  110 +-
 ...okmarkManagementDetailViewController.swift |  426 ++---
 ...kmarkManagementSidebarViewController.swift |   59 +-
 .../View/BookmarkOutlineCellView.swift        |   95 +-
 .../View/BookmarkTableCellView.swift          |  252 +--
 .../Bookmarks/View/BookmarkTableRowView.swift |    8 +-
 .../Dialog/AddEditBookmarkDialogView.swift    |  123 ++
 .../AddEditBookmarkFolderDialogView.swift     |  107 ++
 .../Dialog/AddEditBookmarkFolderView.swift    |  132 ++
 .../View/Dialog/AddEditBookmarkView.swift     |  113 ++
 .../Dialog/BookmarkDialogButtonsView.swift    |  186 +++
 .../Dialog/BookmarkDialogContainerView.swift  |   50 +
 .../BookmarkDialogFolderManagementView.swift  |   76 +
 .../BookmarkDialogStackedContentView.swift    |  111 ++
 .../View/Dialog/BookmarkFavoriteView.swift    |   47 +
 .../Dialog/BookmarksDialogViewFactory.swift   |   93 ++
 .../AddBookmarkFolderModalViewModel.swift     |   79 -
 .../AddBookmarkFolderPopoverViewModel.swift   |   23 +-
 .../ViewModel/AddBookmarkModalViewModel.swift |  127 --
 .../AddBookmarkPopoverViewModel.swift         |   31 +-
 ...itBookmarkDialogCoordinatorViewModel.swift |   74 +
 .../AddEditBookmarkDialogViewModel.swift      |  216 +++
 ...AddEditBookmarkFolderDialogViewModel.swift |  181 ++
 .../ViewModel/BookmarksDialogViewModel.swift  |   35 +
 .../View/BookmarksBarCollectionViewItem.swift |  108 +-
 .../View/BookmarksBarMenuFactory.swift        |    7 +
 .../View/BookmarksBarViewController.swift     |   99 +-
 .../View/BookmarksBarViewModel.swift          |   16 +-
 .../Common/Extensions/BundleExtension.swift   |   23 +-
 .../Common/Extensions/NSAlertExtension.swift  |   12 +-
 .../Common/Extensions/NSMenuExtension.swift   |   10 +
 .../Extensions/NSMenuItemExtension.swift      |    6 +
 .../Common/Extensions/URLExtension.swift      |   11 +-
 .../UserText+NetworkProtection.swift          |  192 ++-
 DuckDuckGo/Common/Localizables/UserText.swift |   64 +-
 DuckDuckGo/Common/Logging/Logging.swift       |    2 +-
 .../Utilities/UserDefaultsWrapper.swift       |    9 +-
 .../AppPrivacyConfigurationDataProvider.swift |    4 +-
 .../ContentBlocker/ContentBlocking.swift      |    2 +-
 .../ScriptSourceProviding.swift               |   10 +-
 DuckDuckGo/ContentBlocker/macos-config.json   |  494 ++++--
 DuckDuckGo/DBP/DBPHomeViewController.swift    |   18 +-
 .../DBP/DataBrokerProtectionAppEvents.swift   |   12 +-
 .../DBP/DataBrokerProtectionDebugMenu.swift   |   38 +-
 .../DataBrokerProtectionFeatureDisabler.swift |    2 +-
 ...ataBrokerProtectionFeatureVisibility.swift |   55 +-
 ...taBrokerProtectionLoginItemScheduler.swift |    9 +-
 .../DBP/DataBrokerProtectionManager.swift     |    2 +-
 ...erProtectionSubscriptionEventHandler.swift |    2 +-
 .../Chromium/ChromiumKeychainPrompt.swift     |    4 +
 .../Logins/Chromium/ChromiumLoginReader.swift |    6 +-
 .../Model/DataImportViewModel.swift           |    2 +-
 DuckDuckGo/DuckDuckGo.entitlements            |    3 +-
 DuckDuckGo/DuckDuckGoAppStore.entitlements    |   11 +-
 DuckDuckGo/DuckDuckGoAppStoreCI.entitlements  |    2 +
 DuckDuckGo/DuckDuckGoDebug.entitlements       |    3 +-
 DuckDuckGo/Email/EmailUrlExtensions.swift     |    5 +
 .../FindInPage/FindInPageViewController.swift |    8 +
 DuckDuckGo/Fire/View/FireViewController.swift |    3 +-
 .../Model/HomePageContinueSetUpModel.swift    |  165 +-
 .../Model/HomePageFavoritesModel.swift        |   15 +-
 DuckDuckGo/HomePage/View/FavoritesView.swift  |    3 +
 .../View/HomePageViewController.swift         |   40 +-
 DuckDuckGo/Info.plist                         |    2 +-
 DuckDuckGo/InfoPlist.xcstrings                |   18 +-
 DuckDuckGo/Localizable.xcstrings              | 1487 +++++++++++++----
 DuckDuckGo/LoginItems/LoginItemsManager.swift |   10 +-
 .../MainWindow/MainViewController.swift       |   59 +-
 DuckDuckGo/Menus/HistoryMenu.swift            |   35 +-
 DuckDuckGo/Menus/MainMenu.swift               |   79 +-
 DuckDuckGo/Menus/MainMenuActions.swift        |   81 +-
 DuckDuckGo/NavigationBar/PinningManager.swift |    3 +-
 .../View/AddressBarTextField.swift            |   13 +-
 .../View/AddressBarViewController.swift       |    1 +
 .../NavigationBar/View/MoreOptionsMenu.swift  |   72 +-
 .../View/NavigationBar.storyboard             |    2 +-
 .../View/NavigationBarPopovers.swift          |   72 +-
 .../View/NavigationBarViewController.swift    |   71 +-
 .../View/NetPPopoverManagerMock.swift         |   82 +
 .../AppLauncher.swift                         |    8 +-
 .../NetworkProtectionPixelEvent.swift         |  219 ++-
 .../EventMapping+NetworkProtectionError.swift |   15 +-
 ...rkProtection+ConvenienceInitializers.swift |   41 +-
 .../NetworkProtectionAppEvents.swift          |   44 +-
 .../NetworkProtectionDebugMenu.swift          |   23 +-
 .../NetworkProtectionDebugUtilities.swift     |    5 +-
 .../NetworkProtectionNavBarButtonModel.swift  |   58 +-
 ...etworkProtectionNavBarPopoverManager.swift |   66 +-
 .../NetworkProtectionOnboardingMenu.swift     |    2 +-
 ...NetworkProtectionSimulateFailureMenu.swift |    8 +-
 .../NetworkProtectionTunnelController.swift   |   41 +-
 ...tionWaitlistFeatureFlagOverridesMenu.swift |    6 +-
 .../VPNLocation/VPNLocationView.swift         |   15 -
 .../VPNLocation/VPNLocationViewModel.swift    |   12 -
 ...NetworkProtectionIPCTunnelController.swift |   44 +-
 .../NetworkProtectionRemoteMessaging.swift    |    8 +-
 ...rkProtectionSubscriptionEventHandler.swift |   72 +-
 ...rkProtectionUNNotificationsPresenter.swift |   13 +-
 ...UserText+NetworkProtectionExtensions.swift |   24 +-
 .../MacPacketTunnelProvider.swift             |   79 +-
 ...ore+SubscriptionTokenKeychainStorage.swift |   45 +
 ...NetworkProtectionAppExtension.entitlements |    2 +-
 DuckDuckGo/Preferences/Model/AboutModel.swift |    7 +-
 .../Model/AccessibilityPreferences.swift      |   69 +
 .../Model/AppearancePreferences.swift         |   47 +-
 .../CookiePopupProtectionPreferences.swift    |   52 +
 ...el.swift => DataClearingPreferences.swift} |   47 +-
 .../Model/DefaultBrowserPreferences.swift     |   28 +
 .../Model/PreferencesSection.swift            |  119 +-
 .../Model/PreferencesSidebarModel.swift       |   26 +-
 .../Model/PrivacyProtectionStatus.swift       |   77 +
 .../Model/PrivacySecurityPreferences.swift    |   41 -
 .../Preferences/Model/SearchPreferences.swift |   64 +
 .../Preferences/Model/SyncPreferences.swift   |   28 +
 .../Model/VPNPreferencesModel.swift           |    2 +-
 .../WebTrackingProtectionPreferences.swift    |   52 +
 .../View/PreferencesAboutView.swift           |    4 +-
 .../View/PreferencesAccessibilityView.swift   |   54 +
 .../View/PreferencesAppearanceView.swift      |   19 -
 ...PreferencesCookiePopupProtectionView.swift |   55 +
 .../View/PreferencesDataClearingView.swift    |   54 +
 .../View/PreferencesDefaultBrowserView.swift  |   69 +
 .../View/PreferencesDownloadsView.swift       |   65 -
 .../View/PreferencesEmailProtectionView.swift |   81 +
 .../View/PreferencesGeneralView.swift         |   61 +-
 .../View/PreferencesPrivacyView.swift         |   88 -
 .../View/PreferencesPrivateSearchView.swift   |   55 +
 .../View/PreferencesRootView.swift            |  140 +-
 .../Preferences/View/PreferencesSidebar.swift |   99 +-
 .../View/PreferencesSyncView.swift            |   52 +
 ...PreferencesWebTrackingProtectionView.swift |   61 +
 .../View/PrivacyDashboardViewController.swift |   58 +-
 .../View/AutofillPopoverPresenter.swift       |   84 +
 .../View/PasswordManagementPopover.swift      |   19 -
 .../View/SaveCredentialsViewController.swift  |    2 +-
 DuckDuckGo/Statistics/DailyPixel.swift        |    4 +
 DuckDuckGo/Statistics/Pixel.swift             |    3 +
 DuckDuckGo/Statistics/PixelEvent.swift        |   40 +-
 DuckDuckGo/Statistics/PixelParameters.swift   |   20 +-
 ...tureAvailability+DefaultInitializer.swift} |   11 +-
 .../Model/SuggestionContainer.swift           |    6 +-
 .../View/SuggestionViewController.swift       |    1 +
 .../SuggestionContainerViewModel.swift        |    2 +-
 .../ViewModel/SuggestionViewModel.swift       |    2 +-
 DuckDuckGo/Sync/SyncBookmarksAdapter.swift    |    3 +-
 DuckDuckGo/Sync/SyncCredentialsAdapter.swift  |    1 +
 DuckDuckGo/Sync/SyncDebugMenu.swift           |   25 +
 DuckDuckGo/Sync/SyncSettingsAdapter.swift     |    1 +
 DuckDuckGo/Tab/Model/Tab.swift                |   46 +-
 .../Tab/Model/UserContentUpdating.swift       |    6 +-
 .../TabExtensions/AutofillTabExtension.swift  |    3 +-
 .../NavigationProtectionTabExtension.swift    |    3 +-
 ...ntityTheftRestorationPagesUserScript.swift |    2 +-
 .../SubscriptionAppStoreRestorer.swift        |   69 +
 .../SubscriptionErrorReporter.swift           |   85 +
 .../SubscriptionPagesUserScript.swift         |  304 ++--
 DuckDuckGo/Tab/UserScripts/UserScripts.swift  |    7 +-
 .../Tab/View/BrowserTabViewController.swift   |   31 +-
 DuckDuckGo/Tab/ViewModel/TabViewModel.swift   |   12 +-
 .../VPNMetadataCollector.swift                |   34 +-
 .../NetworkProtectionFeatureDisabler.swift    |   56 +-
 .../NetworkProtectionFeatureVisibility.swift  |  125 +-
 .../Waitlist/UserDefaults+vpnLegacyUser.swift |   40 +
 .../WaitlistTermsAndConditionsView.swift      |    2 +-
 .../WaitlistThankYouPromptPresenter.swift     |  138 ++
 .../Waitlist/Views/WaitlistThankYouView.swift |  229 +++
 .../WaitlistViewControllerPresenter.swift     |    6 +
 DuckDuckGo/Waitlist/Waitlist.swift            |   33 +-
 .../View/WindowControllersManager.swift       |    2 +-
 DuckDuckGo/Windows/View/WindowsManager.swift  |   11 +-
 ...ataBrokerProtectionBackgroundManager.swift |   41 +-
 .../DuckDuckGoDBPBackgroundAgent.entitlements |   19 +-
 ...kDuckGoDBPBackgroundAgentAppDelegate.swift |    2 +-
 ...kGoDBPBackgroundAgentAppStore.entitlements |   27 +-
 .../IPCServiceManager.swift                   |   27 +-
 .../DuckDuckGoNotifications.entitlements      |    1 +
 .../DuckDuckGoNotificationsAppDelegate.swift  |   12 +
 DuckDuckGoNotifications/Logging.swift         |    6 +-
 DuckDuckGoVPN/DuckDuckGoVPN.entitlements      |    1 +
 DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift  |  126 +-
 .../DuckDuckGoVPNAppStore.entitlements        |    7 +-
 DuckDuckGoVPN/DuckDuckGoVPNDebug.entitlements |    1 +
 .../NetworkExtensionController.swift          |   11 +-
 ...tion+VPNAgentConvenienceInitializers.swift |   33 +
 DuckDuckGoVPN/NetworkProtectionBouncer.swift  |   25 +-
 DuckDuckGoVPN/UserText.swift                  |    1 +
 DuckDuckGoVPN/VPNAppEventsHandler.swift       |    8 +-
 DuckDuckGoVPN/VPNUninstaller.swift            |   60 +
 .../AutoconsentIntegrationTests.swift         |   17 +-
 .../Common/TestsURLExtension.swift            |    5 +-
 .../HTTPSUpgradeIntegrationTests.swift        |    4 +-
 .../History/HistoryIntegrationTests.swift     |    6 +-
 ...NavigationProtectionIntegrationTests.swift |   10 +-
 .../PrivacyDashboardIntegrationTests.swift    |    4 +-
 .../InputFilesChecker/InputFilesChecker.swift |    2 -
 .../DataBrokerProtection/Package.swift        |    2 +-
 .../Bundle/BundleExtension.swift              |    8 +-
 .../CCF/DataBrokerProtectionFeature.swift     |    4 +-
 .../CCF/WebViewHandler.swift                  |  110 +-
 .../DataBrokerProtectionDataManager.swift     |    7 +-
 .../DataBrokerProtectionDatabase.swift        |   25 +
 ...erProtectionSecureVaultErrorReporter.swift |   16 +-
 .../DataBrokerDatabaseBrowserViewModel.swift  |    2 +-
 .../DebugUI/DataBrokerRunCustomJSONView.swift |   60 +-
 .../DataBrokerRunCustomJSONViewModel.swift    |  433 ++++-
 .../DebugUI/DebugScanOperation.swift          |  198 +++
 .../DataBrokerForceOptOutViewModel.swift      |    3 +-
 .../IPC/DataBrokerProtectionIPCClient.swift   |   33 +-
 .../DataBrokerProtectionIPCScheduler.swift    |    9 +-
 .../IPC/DataBrokerProtectionIPCServer.swift   |   27 +-
 .../Model/Actions/Expectaction.swift          |    3 +-
 .../Model/DBPUICommunicationModel.swift       |    6 +-
 .../Model/DBPUIViewModel.swift                |    2 +
 .../Model/DataBrokerProtectionProfile.swift   |    2 +-
 .../Model/HistoryEvent.swift                  |   10 +
 .../Model/ProfileQuery.swift                  |   15 +
 .../Operations/DataBrokerOperation.swift      |  105 +-
 .../DataBrokerOperationRunner.swift           |    6 +-
 .../DataBrokerOperationsCollection.swift      |   19 +-
 ...taBrokerProfileQueryOperationManager.swift |    9 +-
 .../DataBrokerProtectionBrokerUpdater.swift   |    7 +-
 .../OperationPreferredDateCalculator.swift    |    5 +-
 .../OperationPreferredDateUpdater.swift       |   26 +-
 .../Operations/OptOutOperation.swift          |   15 +-
 .../Operations/ScanOperation.swift            |   14 +-
 .../DataBrokerProtectionEventPixels.swift     |  165 ++
 .../Pixels/DataBrokerProtectionPixels.swift   |   61 +-
 ...kerProtectionStageDurationCalculator.swift |   25 +-
 .../Resources/JSON/people-wizard.com.json     |   10 +-
 .../Resources/JSON/peopleswhizr.com.json      |    8 +-
 .../Resources/JSON/peopleswiz.com.json        |    8 +-
 .../Resources/JSON/peopleswizard.com.json     |    8 +-
 .../Resources/JSON/peoplewhiz.com.json        |   32 +-
 .../Resources/JSON/peoplewhiz.net.json        |   10 +-
 .../Resources/JSON/peoplewhized.com.json      |   10 +-
 .../Resources/JSON/peoplewhized.net.json      |   10 +-
 .../Resources/JSON/peoplewhizr.com.json       |   10 +-
 .../Resources/JSON/peoplewhizr.net.json       |   10 +-
 .../Resources/JSON/peoplewiz.com.json         |    8 +-
 .../Resources/JSON/peoplewizard.net.json      |   10 +-
 .../Resources/JSON/peoplewizr.com.json        |    8 +-
 .../Resources/JSON/spokeo.com.json            |   35 +-
 .../DataBrokerProtectionNoOpScheduler.swift   |    6 +-
 .../DataBrokerProtectionProcessor.swift       |   61 +-
 .../DataBrokerProtectionScheduler.swift       |  101 +-
 .../Services/CaptchaService.swift             |   30 +-
 .../Services/EmailService.swift               |   24 +-
 .../DataBrokerProtection/UI/UIMapper.swift    |  118 +-
 .../DataBrokerProtectionBundleExtension.swift |   10 +-
 .../CaptchaServiceTests.swift                 |   18 +-
 .../DataBrokerOperationActionTests.swift      |  144 +-
 ...kerProfileQueryOperationManagerTests.swift |   19 +-
 ...DataBrokerProtectionEventPixelsTests.swift |  396 +++++
 .../DataBrokerProtectionFeatureTests.swift    |    2 +-
 .../DataBrokerProtectionProfileTests.swift    |    9 +-
 ...otectionStageDurationCalculatorTests.swift |  141 ++
 .../EmailServiceTests.swift                   |   12 +-
 .../MapperToUITests.swift                     |   14 +-
 .../DataBrokerProtectionTests/Mocks.swift     |  108 +-
 .../OperationPreferredDateUpdaterTests.swift  |    4 +-
 .../Sources/LoginItems/LoginItem.swift        |    4 +
 .../NetworkProtectionMac/Package.swift        |    9 +-
 LocalPackages/NetworkProtectionMac/README.md  |    6 +-
 .../TransparentProxyProviderPixel.swift       |    2 +-
 .../AppLaunching/AppLaunching.swift           |   40 +
 ...serDefault+ShowVPNUninstalledMessage.swift |   44 +
 ...NetworkProtectionExpiredEntitlements.swift |   44 +
 .../UserText+NetworkProtectionUI.swift        |   21 +-
 .../Menu/NavigationBarIconProvider.swift      |    2 +-
 .../Menu/StatusBarMenu.swift                  |   11 +-
 .../NetworkProtectionPopover.swift            |    8 +-
 .../Pixels/VPNPrivacyProPixel.swift           |   52 +
 .../Icons/VPN-128.imageset/Contents.json      |    2 +-
 .../Network-Protetion-VPN-128.pdf             |  Bin 0 -> 14844 bytes
 .../Icons/VPN-128.imageset/VPN-128.pdf        |  Bin 11566 -> 0 bytes
 .../VPN-Disabled-128.imageset/Contents.json   |    2 +-
 .../Network-Protetion-VPN-Disabled-128.pdf    |  Bin 0 -> 14855 bytes
 .../VPN-Disabled-128.pdf                      |  Bin 11174 -> 0 bytes
 .../NetworkProtectionStatusView.swift         |    9 +-
 .../NetworkProtectionStatusViewModel.swift    |   41 +-
 .../SubscriptionExpiredView.swift             |   74 +
 .../TunnelControllerViewModel.swift           |   10 +-
 .../AppLaunching/MockAppLauncher.swift        |   30 +
 .../NetworkProtectionStatusBarMenuTests.swift |    8 +-
 .../Pixels/VPNPrivacyProPixelTests.swift      |   72 +
 .../TunnelControllerViewModelTests.swift      |   35 +-
 .../PixelKit/PixelKit+Parameters.swift        |   10 +-
 .../PixelKit/Sources/PixelKit/PixelKit.swift  |    4 +-
 .../Sources/PixelKit/PixelKitEvent.swift      |    4 +-
 .../Sources/PixelKit/PixelKitEventV2.swift    |    3 +-
 .../PixelFireExpectations.swift               |   28 +-
 .../ValidatePixel.swift                       |    2 +-
 .../XCTestCase+PixelKit.swift                 |   55 +-
 LocalPackages/SubscriptionUI/Package.swift    |    2 +-
 .../DebugMenu/SubscriptionDebugMenu.swift     |   12 +-
 .../SubscriptionUI/NSAlert+Subscription.swift |    8 -
 .../PreferencesSubscriptionModel.swift        |  172 +-
 .../PreferencesSubscriptionView.swift         |  351 ++--
 .../Contents.json                             |   12 +
 .../subscription-expired-icon.pdf             |  Bin 0 -> 2374 bytes
 .../Contents.json                             |   12 +
 .../Info-Color-16.pdf                         |  Bin 0 -> 1745 bytes
 .../ActivateSubscriptionAccessModel.swift     |    5 +-
 .../Model/ShareSubscriptionAccessModel.swift  |    2 +-
 .../SubscriptionAccessView.swift              |    1 +
 .../Sources/SubscriptionUI/UserText.swift     |   55 +-
 .../Sources/PreferencesViews/Constants.swift  |    1 +
 .../SwiftUIExtensions/ButtonStyles.swift      |   28 +
 .../{ => Dialogs}/Dialog.swift                |    0
 .../Dialogs/TieredDialogView.swift            |   70 +
 .../TwoColumnsListView.swift                  |   62 +
 .../View+ConditionalModifiers.swift           |   47 +
 .../SyncUI/Resources/Localizable.xcstrings    |   72 +
 .../ViewModels/ManagementViewModel.swift      |    3 +
 .../ManagementView/SyncEnabledView.swift      |   47 +
 .../Sources/SyncUI/internal/UserText.swift    |   41 +
 .../SystemExtensionManager.swift              |   31 +-
 .../Sources/XPCHelper/XPCServer.swift         |   20 +-
 .../InfoPlist.xcstrings                       |  186 +++
 ...rotectionAgentNotificationsPresenter.swift |    8 +-
 ...otectionSystemExtension_Debug.entitlements |    3 +-
 ...ectionSystemExtension_Release.entitlements |    3 +-
 SyncE2EUITests/CriticalPathsTests.swift       |   10 +-
 UITests/AutocompleteTests.swift               |  213 +++
 UITests/BrowsingHistoryTests.swift            |  168 ++
 UITests/Common/UITests.swift                  |   51 +
 UITests/Common/XCUIElementExtension.swift     |   42 +
 UITests/FindInPageTests.swift                 |  539 ++++++
 UITests/TabBarTests.swift                     |   29 +-
 .../AutoconsentMessageProtocolTests.swift     |    4 +-
 .../Extensions/Bookmarks+TabTests.swift       |   61 +
 .../BookmarksBarMenuFactoryTests.swift        |   59 +
 .../Model/BaseBookmarkEntityTests.swift       |  247 +++
 .../Bookmarks/Model/BookmarkListTests.swift   |   59 +-
 .../Bookmarks/Model/BookmarkNodeTests.swift   |  170 ++
 .../BookmarkOutlineViewDataSourceTests.swift  |   58 +-
 .../BookmarkSidebarTreeControllerTests.swift  |   34 +-
 UnitTests/Bookmarks/Model/BookmarkTests.swift |    2 +-
 .../Bookmarks/Model/ContextualMenuTests.swift |  267 +++
 .../Model/LocalBookmarkManagerTests.swift     |   21 +
 .../Services/LocalBookmarkStoreTests.swift    |  158 +-
 ...kmarkDialogCoordinatorViewModelTests.swift |  170 ++
 .../AddEditBookmarkDialogViewModelTests.swift |  745 +++++++++
 ...itBookmarkFolderDialogViewModelTests.swift |  425 +++++
 .../BookmarksBarViewModelTests.swift          |  214 +++
 .../ContentBlockingUpdatingTests.swift        |    6 +-
 .../DataBrokerProtectionVisibilityTests.swift |  149 ++
 UnitTests/DataExport/MockSecureVault.swift    |   20 +
 .../DataImport/ChromiumLoginReaderTests.swift |   34 +
 .../TestChromeData/Legacy Excluded/Login Data |  Bin 0 -> 40960 bytes
 .../TestChromeData/Legacy/Login Data          |  Bin 40960 -> 40960 bytes
 .../TestChromeData/v32 Excluded/Login Data    |  Bin 0 -> 40960 bytes
 .../v32 Excluded/Login Data for Account       |  Bin 0 -> 40960 bytes
 .../TestChromeData/v32/Login Data             |  Bin 40960 -> 40960 bytes
 .../Geolocation/CLLocationManagerMock.swift   |   17 +
 .../Geolocation/GeolocationServiceTests.swift |   14 +-
 .../HomePage/ContinueSetUpModelTests.swift    |  172 +-
 .../HomePage/Mocks/MockBookmarkManager.swift  |    4 +
 UnitTests/Menus/MoreOptionsMenuTests.swift    |   65 +-
 .../Mocks/MockAutofillPopoverPresenter.swift  |   53 +
 .../View/NavigationBarPopoversTests.swift     |  104 ++
 .../NetworkProtectionPixelEventTests.swift    |  325 ++++
 ...etworkProtectionRemoteMessagingTests.swift |   16 +-
 .../AccessibilityPreferencesTests.swift       |   44 +
 .../AppearancePreferencesTests.swift          |   26 -
 .../AutofillPreferencesModelTests.swift       |   20 +-
 ...ookiePopupProtectionPreferencesTests.swift |   44 +
 .../DataClearingPreferencesTests.swift        |   43 +
 .../PreferencesSidebarModelTests.swift        |    6 +-
 .../PrivacyProtectionStatusTests.swift        |   67 +
 .../Preferences/SearchPreferencesTests.swift  |   44 +
 ...ebTrackingProtectionPreferencesTests.swift |   44 +
 .../BrokenSiteReportingReferenceTests.swift   |    4 +
 .../Model/SuggestionContainerTests.swift      |    2 +-
 .../Model/SuggestionLoadingMock.swift         |    2 +-
 .../SuggestionContainerViewModelTests.swift   |    2 +-
 .../ViewModel/SuggestionViewModelTests.swift  |    2 +-
 UnitTests/Sync/SyncPreferencesTests.swift     |    3 +
 .../Tab/ViewModel/TabViewModelTests.swift     |    6 +-
 UnitTests/Tab/WebViewTests.swift              |    4 +-
 ...wModelTests+WithoutPinnedTabsManager.swift |    4 +-
 .../TabCollectionViewModelTests.swift         |    4 +-
 .../VPNFeedbackFormViewModelTests.swift       |    3 +-
 .../WebsiteBreakageReportTests.swift          |    8 +
 .../VPNProxyExtension.entitlements            |   16 +-
 fastlane/metadata/en-US/description.txt       |   52 +-
 fastlane/metadata/en-US/keywords.txt          |    2 +-
 package-lock.json                             |    8 +-
 package.json                                  |    2 +-
 474 files changed, 18305 insertions(+), 4525 deletions(-)
 create mode 100644 DuckDuckGo/Assets.xcassets/Colors/AlertGreen.colorset/Contents.json
 rename DuckDuckGo/Assets.xcassets/Images/{HomePage/Rocket.imageset => Accessibility.imageset}/Contents.json (78%)
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/Accessibility.imageset/Icon 18.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/AddBookmark.svg
 delete mode 100644 DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/icon-16-bookmark-add.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/AddFolder.svg
 delete mode 100644 DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/icon-16-folder-add.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/BookmarksFolder.imageset/BookmarksFolder.svg
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/BookmarksFolder.imageset/Contents.json
 rename DuckDuckGo/Assets.xcassets/Images/{Chevron-Next-16.imageset/Chevron-Next-16.pdf => Chevron-Medium-Right-16.imageset/Chevron-Medium-Right-16.pdf} (53%)
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/Chevron-Medium-Right-16.imageset/Contents.json
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/CookieProtectionIcon.imageset/Contents.json
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/CookieProtectionIcon.imageset/Icon 13.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/EmailProtectionIcon.imageset/Contents.json
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/EmailProtectionIcon.imageset/Icon 12.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/FireSettings.imageset/Contents.json
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/FireSettings.imageset/Icon 17.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/GeneralIcon.imageset/Contents.json
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/GeneralIcon.imageset/Icon 16.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/HomePage/Contents.json
 delete mode 100644 DuckDuckGo/Assets.xcassets/Images/HomePage/Rocket.imageset/rocket.pdf
 delete mode 100644 DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Gift-96.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Gift-New-96x96.pdf
 rename DuckDuckGo/Assets.xcassets/Images/{DownloadsPreferences.imageset => OtherPlatformsPreferences.imageset}/Contents.json (100%)
 rename DuckDuckGo/Assets.xcassets/Images/{DownloadsPreferences.imageset => OtherPlatformsPreferences.imageset}/DownloadsPreferences.pdf (100%)
 delete mode 100644 DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Privacy (Color).pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Privacy.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/PrivateSearchIcon.imageset/Contents.json
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/PrivateSearchIcon.imageset/Icon 10.pdf
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/Contents.json
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/QandA-128.svg
 rename DuckDuckGo/Assets.xcassets/Images/{Chevron-Next-16.imageset => Trash.imageset}/Contents.json (82%)
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/Trash.imageset/Trash.svg
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/WebTrackingProtectionIcon.imageset/Contents.json
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/WebTrackingProtectionIcon.imageset/Icon 11.pdf
 create mode 100644 DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift
 create mode 100644 DuckDuckGo/Bookmarks/Model/BookmarkFolderInfo.swift
 delete mode 100644 DuckDuckGo/Bookmarks/View/AddBookmarkFolderModalView.swift
 delete mode 100644 DuckDuckGo/Bookmarks/View/AddBookmarkModalView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkFolderDialogView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkFolderView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogButtonsView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogContainerView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogFolderManagementView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogStackedContentView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/BookmarkFavoriteView.swift
 create mode 100644 DuckDuckGo/Bookmarks/View/Dialog/BookmarksDialogViewFactory.swift
 delete mode 100644 DuckDuckGo/Bookmarks/ViewModel/AddBookmarkFolderModalViewModel.swift
 delete mode 100644 DuckDuckGo/Bookmarks/ViewModel/AddBookmarkModalViewModel.swift
 create mode 100644 DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkDialogCoordinatorViewModel.swift
 create mode 100644 DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkDialogViewModel.swift
 create mode 100644 DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkFolderDialogViewModel.swift
 create mode 100644 DuckDuckGo/Bookmarks/ViewModel/BookmarksDialogViewModel.swift
 create mode 100644 DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
 create mode 100644 DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift
 create mode 100644 DuckDuckGo/Preferences/Model/AccessibilityPreferences.swift
 create mode 100644 DuckDuckGo/Preferences/Model/CookiePopupProtectionPreferences.swift
 rename DuckDuckGo/Preferences/Model/{PrivacyPreferencesModel.swift => DataClearingPreferences.swift} (51%)
 create mode 100644 DuckDuckGo/Preferences/Model/PrivacyProtectionStatus.swift
 delete mode 100644 DuckDuckGo/Preferences/Model/PrivacySecurityPreferences.swift
 create mode 100644 DuckDuckGo/Preferences/Model/SearchPreferences.swift
 create mode 100644 DuckDuckGo/Preferences/Model/WebTrackingProtectionPreferences.swift
 create mode 100644 DuckDuckGo/Preferences/View/PreferencesAccessibilityView.swift
 create mode 100644 DuckDuckGo/Preferences/View/PreferencesCookiePopupProtectionView.swift
 create mode 100644 DuckDuckGo/Preferences/View/PreferencesDataClearingView.swift
 create mode 100644 DuckDuckGo/Preferences/View/PreferencesDefaultBrowserView.swift
 delete mode 100644 DuckDuckGo/Preferences/View/PreferencesDownloadsView.swift
 create mode 100644 DuckDuckGo/Preferences/View/PreferencesEmailProtectionView.swift
 delete mode 100644 DuckDuckGo/Preferences/View/PreferencesPrivacyView.swift
 create mode 100644 DuckDuckGo/Preferences/View/PreferencesPrivateSearchView.swift
 create mode 100644 DuckDuckGo/Preferences/View/PreferencesSyncView.swift
 create mode 100644 DuckDuckGo/Preferences/View/PreferencesWebTrackingProtectionView.swift
 create mode 100644 DuckDuckGo/SecureVault/View/AutofillPopoverPresenter.swift
 rename DuckDuckGo/Subscription/{AccountManagerExtension.swift => DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift} (67%)
 create mode 100644 DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift
 create mode 100644 DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift
 rename DuckDuckGo/Tab/UserScripts/{ => Subscription}/SubscriptionPagesUserScript.swift (64%)
 create mode 100644 DuckDuckGo/Waitlist/UserDefaults+vpnLegacyUser.swift
 create mode 100644 DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift
 create mode 100644 DuckDuckGo/Waitlist/Views/WaitlistThankYouView.swift
 create mode 100644 DuckDuckGoVPN/NetworkProtection+VPNAgentConvenienceInitializers.swift
 create mode 100644 DuckDuckGoVPN/VPNUninstaller.swift
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift
 create mode 100644 LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionEventPixelsTests.swift
 create mode 100644 LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift
 create mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/AppLaunching/AppLaunching.swift
 create mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserDefault+ShowVPNUninstalledMessage.swift
 create mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserDefaults+NetworkProtectionExpiredEntitlements.swift
 create mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Pixels/VPNPrivacyProPixel.swift
 create mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Network-Protetion-VPN-128.pdf
 delete mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/VPN-128.pdf
 create mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Network-Protetion-VPN-Disabled-128.pdf
 delete mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/VPN-Disabled-128.pdf
 create mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/SubscriptionExpiredView/SubscriptionExpiredView.swift
 create mode 100644 LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/AppLaunching/MockAppLauncher.swift
 create mode 100644 LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/Pixels/VPNPrivacyProPixelTests.swift
 create mode 100644 LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/Contents.json
 create mode 100644 LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/subscription-expired-icon.pdf
 create mode 100644 LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Contents.json
 create mode 100644 LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Info-Color-16.pdf
 rename LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/{ => Dialogs}/Dialog.swift (100%)
 create mode 100644 LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/Dialogs/TieredDialogView.swift
 create mode 100644 LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/TwoColumnsListView.swift
 create mode 100644 LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/View+ConditionalModifiers.swift
 create mode 100644 NetworkProtectionAppExtension/InfoPlist.xcstrings
 create mode 100644 UITests/AutocompleteTests.swift
 create mode 100644 UITests/BrowsingHistoryTests.swift
 create mode 100644 UITests/Common/UITests.swift
 create mode 100644 UITests/Common/XCUIElementExtension.swift
 create mode 100644 UITests/FindInPageTests.swift
 create mode 100644 UnitTests/Bookmarks/Extensions/Bookmarks+TabTests.swift
 create mode 100644 UnitTests/Bookmarks/Factory/BookmarksBarMenuFactoryTests.swift
 create mode 100644 UnitTests/Bookmarks/Model/BaseBookmarkEntityTests.swift
 create mode 100644 UnitTests/Bookmarks/Model/ContextualMenuTests.swift
 create mode 100644 UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogCoordinatorViewModelTests.swift
 create mode 100644 UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogViewModelTests.swift
 create mode 100644 UnitTests/Bookmarks/ViewModels/AddEditBookmarkFolderDialogViewModelTests.swift
 create mode 100644 UnitTests/DBP/DataBrokerProtectionVisibilityTests.swift
 create mode 100644 UnitTests/DataImport/DataImportResources/TestChromeData/Legacy Excluded/Login Data
 create mode 100644 UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data
 create mode 100644 UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data for Account
 create mode 100644 UnitTests/NavigationBar/Mocks/MockAutofillPopoverPresenter.swift
 create mode 100644 UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift
 create mode 100644 UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
 create mode 100644 UnitTests/Preferences/AccessibilityPreferencesTests.swift
 create mode 100644 UnitTests/Preferences/CookiePopupProtectionPreferencesTests.swift
 create mode 100644 UnitTests/Preferences/DataClearingPreferencesTests.swift
 create mode 100644 UnitTests/Preferences/PrivacyProtectionStatusTests.swift
 create mode 100644 UnitTests/Preferences/SearchPreferencesTests.swift
 create mode 100644 UnitTests/Preferences/WebTrackingProtectionPreferencesTests.swift

diff --git a/.github/actions/asana-create-action-item/action.yml b/.github/actions/asana-create-action-item/action.yml
index e235d9d511..7f4ee3f3c2 100644
--- a/.github/actions/asana-create-action-item/action.yml
+++ b/.github/actions/asana-create-action-item/action.yml
@@ -44,6 +44,7 @@ runs:
         task-url: ${{ inputs.release-task-url }}
 
     - id: get-asana-user-id
+      if: github.event_name != 'schedule'
       uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}
diff --git a/.github/actions/asana-log-message/action.yml b/.github/actions/asana-log-message/action.yml
index 7ab78fdd4b..288fd832ba 100644
--- a/.github/actions/asana-log-message/action.yml
+++ b/.github/actions/asana-log-message/action.yml
@@ -30,6 +30,7 @@ runs:
         task-url: ${{ inputs.task-url }}
 
     - id: get-asana-user-id
+      if: github.event_name != 'schedule'
       uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}
diff --git a/.github/workflows/bump_internal_release.yml b/.github/workflows/bump_internal_release.yml
index 43e0f88084..4d0d9f440a 100644
--- a/.github/workflows/bump_internal_release.yml
+++ b/.github/workflows/bump_internal_release.yml
@@ -2,7 +2,7 @@ name: Bump Internal Release
 
 on:
   schedule:
-    - cron: '0 7 * * 2-5' # Run at 07:00 UTC, Tuesday through Friday
+    - cron: '0 5 * * 2-5' # Run at 05:00 UTC, Tuesday through Friday
   workflow_dispatch:
     inputs:
       asana-task-url:
@@ -13,6 +13,10 @@ on:
         description: "Base branch (defaults to main, only override for testing)"
         required: false
         type: string
+      skip-appstore:
+        description: "Skip App Store release and only make a DMG build"
+        default: false
+        type: boolean
 
 jobs:
 
@@ -29,6 +33,7 @@ jobs:
       skip-release: ${{ steps.check-for-changes.outputs.skip-release }}
       asana-task-url: ${{ steps.set-parameters.outputs.asana-task-url }}
       release-branch: ${{ steps.set-parameters.outputs.release-branch }}
+      skip-appstore: ${{ steps.set-parameters.outputs.skip-appstore }}
 
     steps:
 
@@ -63,13 +68,21 @@ jobs:
             echo "skip-release=false" >> $GITHUB_OUTPUT
           else
             latest_tag="$(git describe --tags --abbrev=0)"
-            changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}" | grep -v -E '.github|scripts')"
+            latest_tag_sha="$(git rev-parse "$latest_tag")"
+            release_branch_sha="$(git rev-parse "origin/${release_branch}")"
 
-            if [[ ${#changed_files} == 0 ]]; then
-              echo "::warning::No changes to the release branch (or only scripts and workflows). Skipping automatic release."
+            if [[ "${latest_tag_sha}" == "${release_branch_sha}" ]]; then
+              echo "::warning::Release branch's HEAD is already tagged. Skipping automatic release."
               echo "skip-release=true" >> $GITHUB_OUTPUT
             else
-              echo "skip-release=false" >> $GITHUB_OUTPUT
+              changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}")"
+              if grep -q -v -e '.github' -e 'scripts' <<< "$changed_files"; then
+                echo "::warning::New code changes found in the release branch since the last release. Will bump internal release now."
+                echo "skip-release=false" >> $GITHUB_OUTPUT
+              else
+                echo "::warning::No changes to the release branch (or only changes to scripts and workflows). Skipping automatic release."
+                echo "skip-release=true" >> $GITHUB_OUTPUT
+              fi
             fi
           fi
 
@@ -86,6 +99,7 @@ jobs:
           ASANA_TASK_URL: ${{ steps.find-asana-task.outputs.task-url || github.event.inputs.asana-task-url }}
           RELEASE_BRANCH: ${{ steps.find-asana-task.outputs.release-branch || github.ref_name }}
           TASK_ID: ${{ steps.find-asana-task.outputs.task-id || steps.task-id.outputs.task-id }}
+          SKIP_APPSTORE: ${{ github.event.inputs.skip-appstore || false }} # make sure this is set to false on scheduled runs
         run: |
           if [[ "${RELEASE_BRANCH}" == "main" ]]; then
             echo "::error::Workflow run from main branch and release branch wasn't found. Please re-run the workflow and specify a release branch."
@@ -94,6 +108,7 @@ jobs:
           echo "release-branch=${RELEASE_BRANCH}" >> $GITHUB_OUTPUT
           echo "task-id=${TASK_ID}" >> $GITHUB_OUTPUT
           echo "asana-task-url=${ASANA_TASK_URL}" >> $GITHUB_OUTPUT
+          echo "skip-appstore=${SKIP_APPSTORE}" >> $GITHUB_OUTPUT
 
       - name: Validate release notes
         env:
@@ -178,6 +193,7 @@ jobs:
     with:
       asana-task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }}
       branch: ${{ needs.validate_input_conditions.outputs.release-branch }}
+      skip-appstore: ${{ needs.validate_input_conditions.outputs.skip-appstore == 'true' }}
     secrets:
       BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
       P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
diff --git a/.github/workflows/publish_dmg_release.yml b/.github/workflows/publish_dmg_release.yml
index fa4d06d4ce..8daecea7be 100644
--- a/.github/workflows/publish_dmg_release.yml
+++ b/.github/workflows/publish_dmg_release.yml
@@ -110,12 +110,24 @@ jobs:
           fi
           echo "release-version=${TAG//-/.}" >> $GITHUB_OUTPUT
 
+      # Always check out main first, because the release branch might have been deleted (for public releases)
       - name: Check out the code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch all history and tags in order to extract Asana task URLs from git log
           submodules: recursive
-          ref: ${{ inputs.branch || github.ref_name }}
+          ref: main
+
+      - name: Check out the branch if it exists
+        env:
+          branch: ${{ inputs.branch || github.ref_name }}
+        run: |
+          if [[ -z "${branch}" ]] || git ls-remote --exit-code --heads origin "${branch}"; then
+            echo "::notice::Checking out ${branch} branch."
+            git checkout "${branch}"
+          else
+            echo "::notice::Branch ${branch} doesn't exist on the remote repository, staying on main."
+          fi
 
       - name: Select Xcode
         run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 276e195e31..96ed1647c5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,6 +7,10 @@ on:
         description: "Asana release task URL"
         required: true
         type: string
+      skip-appstore:
+        description: "Skip App Store release and only make a DMG build"
+        default: false
+        type: boolean
   workflow_call:
     inputs:
       asana-task-url:
@@ -17,6 +21,10 @@ on:
         description: "Branch name"
         required: false
         type: string
+      skip-appstore:
+        description: "Skip App Store release and only make a DMG build"
+        default: false
+        type: boolean
     secrets:
       BUILD_CERTIFICATE_BASE64:
         required: true
@@ -77,7 +85,7 @@ jobs:
     with:
       release-type: release
       create-dmg: true
-      asana-task-url: ${{ github.event.inputs.asana-task-url || inputs.asana-task-url }}
+      asana-task-url: ${{ inputs.asana-task-url }}
       branch: ${{ inputs.branch }}
     secrets:
       BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@@ -106,10 +114,13 @@ jobs:
 
   appstore-release:
     name: Prepare AppStore Release
+
+    if: inputs.skip-appstore != 'true'
+
     uses: ./.github/workflows/build_appstore.yml
     with:
       destination: appstore
-      asana-task-url: ${{ github.event.inputs.asana-task-url || inputs.asana-task-url }}
+      asana-task-url: ${{ inputs.asana-task-url }}
       branch: ${{ inputs.branch }}
     secrets:
       SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }}
diff --git a/Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig b/Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig
index 662be4ddeb..b3b7f7ef35 100644
--- a/Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig
+++ b/Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig
@@ -49,10 +49,10 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = macOS NetP VPN App - Review (XPC)
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = macOS NetP VPN App - Release (XPC)
 
-FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
+FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
 
 SWIFT_OBJC_BRIDGING_HEADER =
 SKIP_INSTALL = YES
diff --git a/Configuration/App/NetworkProtection/DuckDuckGoVPNAppStore.xcconfig b/Configuration/App/NetworkProtection/DuckDuckGoVPNAppStore.xcconfig
index afdb43aa1d..cad39a4d7e 100644
--- a/Configuration/App/NetworkProtection/DuckDuckGoVPNAppStore.xcconfig
+++ b/Configuration/App/NetworkProtection/DuckDuckGoVPNAppStore.xcconfig
@@ -50,10 +50,10 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.vpn.agent macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.vpn.agent.review macos
 
-FEATURE_FLAGS[arch=*][sdk=*] = NETWORK_PROTECTION
-FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETWORK_PROTECTION
-FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETWORK_PROTECTION
-FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETWORK_PROTECTION
+FEATURE_FLAGS[arch=*][sdk=*] = NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETWORK_PROTECTION SUBSCRIPTION
 
 ENABLE_APP_SANDBOX = YES
 SWIFT_OBJC_BRIDGING_HEADER =
diff --git a/Configuration/AppStore.xcconfig b/Configuration/AppStore.xcconfig
index 7095b66b0b..1fbb567afd 100644
--- a/Configuration/AppStore.xcconfig
+++ b/Configuration/AppStore.xcconfig
@@ -41,7 +41,7 @@ NETP_APP_GROUP[config=Review][sdk=macos*] = $(NETP_BASE_APP_GROUP).review
 NETP_APP_GROUP[config=Debug][sdk=macos*] = $(NETP_BASE_APP_GROUP).debug
 NETP_APP_GROUP[config=Release][sdk=macos*] = $(NETP_BASE_APP_GROUP)
 
-SUBSCRIPTION_BASE_APP_GROUP = $(DEVELOPMENT_TEAM).com.duckduckgo.macos.browser.subscription
+SUBSCRIPTION_BASE_APP_GROUP = $(DEVELOPMENT_TEAM).$(MAIN_BUNDLE_IDENTIFIER_PREFIX).subscription
 SUBSCRIPTION_APP_GROUP[config=CI][sdk=*] = $(SUBSCRIPTION_BASE_APP_GROUP).debug
 SUBSCRIPTION_APP_GROUP[config=Review][sdk=*] = $(SUBSCRIPTION_BASE_APP_GROUP).review
 SUBSCRIPTION_APP_GROUP[config=Debug][sdk=*] = $(SUBSCRIPTION_BASE_APP_GROUP).debug
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
index 7bd323987a..de781aa25c 100644
--- a/Configuration/BuildNumber.xcconfig
+++ b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 141
+CURRENT_PROJECT_VERSION = 149
diff --git a/Configuration/Common.xcconfig b/Configuration/Common.xcconfig
index 5c38d4e8e4..392d63d532 100644
--- a/Configuration/Common.xcconfig
+++ b/Configuration/Common.xcconfig
@@ -21,7 +21,7 @@ COMBINE_HIDPI_IMAGES = YES
 DEVELOPMENT_TEAM = HKE973VLUW
 DEVELOPMENT_TEAM[config=CI][sdk=*] =
 
-FEATURE_FLAGS = FEEDBACK DBP NETWORK_PROTECTION
+FEATURE_FLAGS = FEEDBACK DBP NETWORK_PROTECTION SUBSCRIPTION
 
 GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = DEBUG=1 CI=1 $(inherited)
 GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = DEBUG=1 $(inherited)
diff --git a/Configuration/DeveloperID.xcconfig b/Configuration/DeveloperID.xcconfig
index e5d9ed5daa..0dc8de0485 100644
--- a/Configuration/DeveloperID.xcconfig
+++ b/Configuration/DeveloperID.xcconfig
@@ -45,7 +45,7 @@ NETP_APP_GROUP[config=Review][sdk=*] = $(NETP_BASE_APP_GROUP).review
 NETP_APP_GROUP[config=Debug][sdk=*] = $(NETP_BASE_APP_GROUP).debug
 NETP_APP_GROUP[config=Release][sdk=*] = $(NETP_BASE_APP_GROUP)
 
-SUBSCRIPTION_BASE_APP_GROUP = $(DEVELOPMENT_TEAM).com.duckduckgo.macos.browser.subscription
+SUBSCRIPTION_BASE_APP_GROUP = $(DEVELOPMENT_TEAM).$(MAIN_BUNDLE_IDENTIFIER_PREFIX).subscription
 SUBSCRIPTION_APP_GROUP[config=CI][sdk=*] = $(SUBSCRIPTION_BASE_APP_GROUP).debug
 SUBSCRIPTION_APP_GROUP[config=Review][sdk=*] = $(SUBSCRIPTION_BASE_APP_GROUP).review
 SUBSCRIPTION_APP_GROUP[config=Debug][sdk=*] = $(SUBSCRIPTION_BASE_APP_GROUP).debug
diff --git a/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig b/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig
index c6b581e569..325f9024b7 100644
--- a/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig
+++ b/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig
@@ -29,12 +29,12 @@ CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development
 GENERATE_INFOPLIST_FILE = YES
 INFOPLIST_FILE = NetworkProtectionSystemExtension/Info.plist
 INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023 DuckDuckGo. All rights reserved.
-INFOPLIST_KEY_NSSystemExtensionUsageDescription = Network Protection
+INFOPLIST_KEY_NSSystemExtensionUsageDescription = DuckDuckGo VPN
 
-FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
+FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
 
 PRODUCT_BUNDLE_IDENTIFIER[sdk=*] = $(SYSEX_BUNDLE_ID)
 PRODUCT_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(SYSEX_BUNDLE_ID)
diff --git a/Configuration/Global.xcconfig b/Configuration/Global.xcconfig
index 39c875ee65..37ab4747ad 100644
--- a/Configuration/Global.xcconfig
+++ b/Configuration/Global.xcconfig
@@ -91,7 +91,7 @@ SWIFT_COMPILATION_MODE = wholemodule
 SWIFT_COMPILATION_MODE[config=CI][arch=*][sdk=*] =
 SWIFT_COMPILATION_MODE[config=Debug][arch=*][sdk=*] =
 
-// This is temporarily set back to its default value, as a part of merging Network Protection. There are a small number of warnings introduced in
+// This is temporarily set back to its default value, as a part of merging the VPN. There are a small number of warnings introduced in
 // that feature, and more time is needed to address them. To avoid bothering other developers, this is being disabled and a task to fix it will be
 // prioritized.
 SWIFT_STRICT_CONCURRENCY = minimal;
diff --git a/Configuration/Tests/UnitTestsAppStore.xcconfig b/Configuration/Tests/UnitTestsAppStore.xcconfig
index a885a868ed..b31177d987 100644
--- a/Configuration/Tests/UnitTestsAppStore.xcconfig
+++ b/Configuration/Tests/UnitTestsAppStore.xcconfig
@@ -16,7 +16,7 @@
 #include "UnitTests.xcconfig"
 #include "../AppStore.xcconfig"
 
-FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION DBP
+FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION DBP SUBSCRIPTION
 
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.mobile.ios.DuckDuckGoTests
 
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
index da3c8e7045..b42954dcf7 100644
--- a/Configuration/Version.xcconfig
+++ b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.79.0
+MARKETING_VERSION = 1.81.0
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index ebc0323dd8..7e472b8d99 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -17,6 +17,15 @@
 		14505A08256084EF00272CC6 /* UserAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14505A07256084EF00272CC6 /* UserAgent.swift */; };
 		1456D6E124EFCBC300775049 /* TabBarCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1456D6E024EFCBC300775049 /* TabBarCollectionView.swift */; };
 		14D9B8FB24F7E089000D4D13 /* AddressBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14D9B8F924F7E089000D4D13 /* AddressBarViewController.swift */; };
+		1D01A3D02B88CEC600FE8150 /* PreferencesAccessibilityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D01A3CF2B88CEC600FE8150 /* PreferencesAccessibilityView.swift */; };
+		1D01A3D12B88CEC600FE8150 /* PreferencesAccessibilityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D01A3CF2B88CEC600FE8150 /* PreferencesAccessibilityView.swift */; };
+		1D01A3D22B88CEC600FE8150 /* PreferencesAccessibilityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D01A3CF2B88CEC600FE8150 /* PreferencesAccessibilityView.swift */; };
+		1D01A3D42B88CF7700FE8150 /* AccessibilityPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D01A3D32B88CF7700FE8150 /* AccessibilityPreferences.swift */; };
+		1D01A3D52B88CF7700FE8150 /* AccessibilityPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D01A3D32B88CF7700FE8150 /* AccessibilityPreferences.swift */; };
+		1D01A3D62B88CF7700FE8150 /* AccessibilityPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D01A3D32B88CF7700FE8150 /* AccessibilityPreferences.swift */; };
+		1D01A3D82B88DF8B00FE8150 /* PreferencesSyncView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D01A3D72B88DF8B00FE8150 /* PreferencesSyncView.swift */; };
+		1D01A3D92B88DF8B00FE8150 /* PreferencesSyncView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D01A3D72B88DF8B00FE8150 /* PreferencesSyncView.swift */; };
+		1D01A3DA2B88DF8B00FE8150 /* PreferencesSyncView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D01A3D72B88DF8B00FE8150 /* PreferencesSyncView.swift */; };
 		1D02633628D8A9A9005CBB41 /* BWEncryption.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D02633528D8A9A9005CBB41 /* BWEncryption.m */; settings = {COMPILER_FLAGS = "-Wno-deprecated -Wno-strict-prototypes"; }; };
 		1D074B272909A433006E4AC3 /* PasswordManagerCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D074B262909A433006E4AC3 /* PasswordManagerCoordinator.swift */; };
 		1D12F2E2298BC660009A65FD /* InternalUserDeciderStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D12F2E1298BC660009A65FD /* InternalUserDeciderStoreMock.swift */; };
@@ -26,6 +35,12 @@
 		1D1C36E429FAE8DA001FA40C /* FaviconManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1C36E229FAE8DA001FA40C /* FaviconManagerTests.swift */; };
 		1D1C36E629FB019C001FA40C /* HistoryTabExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1C36E529FB019C001FA40C /* HistoryTabExtensionTests.swift */; };
 		1D1C36E729FB019C001FA40C /* HistoryTabExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1C36E529FB019C001FA40C /* HistoryTabExtensionTests.swift */; };
+		1D220BF82B86192200F8BBC6 /* PreferencesEmailProtectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D220BF72B86192200F8BBC6 /* PreferencesEmailProtectionView.swift */; };
+		1D220BF92B86192200F8BBC6 /* PreferencesEmailProtectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D220BF72B86192200F8BBC6 /* PreferencesEmailProtectionView.swift */; };
+		1D220BFA2B86192200F8BBC6 /* PreferencesEmailProtectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D220BF72B86192200F8BBC6 /* PreferencesEmailProtectionView.swift */; };
+		1D220BFC2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D220BFB2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift */; };
+		1D220BFD2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D220BFB2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift */; };
+		1D220BFE2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D220BFB2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift */; };
 		1D26EBAC2B74BECB0002A93F /* NSImageSendable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D26EBAB2B74BECB0002A93F /* NSImageSendable.swift */; };
 		1D26EBAD2B74BECB0002A93F /* NSImageSendable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D26EBAB2B74BECB0002A93F /* NSImageSendable.swift */; };
 		1D26EBAE2B74BECB0002A93F /* NSImageSendable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D26EBAB2B74BECB0002A93F /* NSImageSendable.swift */; };
@@ -62,6 +77,7 @@
 		1D77921A28FDC79800BE0210 /* FaviconStoringMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D77921928FDC79800BE0210 /* FaviconStoringMock.swift */; };
 		1D8057C82A83CAEE00F4FED6 /* SupportedOsChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D8057C72A83CAEE00F4FED6 /* SupportedOsChecker.swift */; };
 		1D8057C92A83CB3C00F4FED6 /* SupportedOsChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D8057C72A83CAEE00F4FED6 /* SupportedOsChecker.swift */; };
+		1D85BCCA2BA982FC0065BA04 /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 1D85BCC92BA982FC0065BA04 /* InfoPlist.xcstrings */; };
 		1D8B7D6A2A38BF050045C6F6 /* FireproofDomainsStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BBF1712744CE36004F850E /* FireproofDomainsStoreMock.swift */; };
 		1D8B7D6B2A38BF060045C6F6 /* FireproofDomainsStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BBF1712744CE36004F850E /* FireproofDomainsStoreMock.swift */; };
 		1D8C2FE52B70F4C4005E4BBD /* TabSnapshotExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D8C2FE42B70F4C4005E4BBD /* TabSnapshotExtensionTests.swift */; };
@@ -75,6 +91,18 @@
 		1D9A4E5A2B43213B00F449E2 /* TabSnapshotExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9A4E592B43213B00F449E2 /* TabSnapshotExtension.swift */; };
 		1D9A4E5B2B43213B00F449E2 /* TabSnapshotExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9A4E592B43213B00F449E2 /* TabSnapshotExtension.swift */; };
 		1D9A4E5C2B43213B00F449E2 /* TabSnapshotExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9A4E592B43213B00F449E2 /* TabSnapshotExtension.swift */; };
+		1D9FDEB72B9B5D150040B78C /* SearchPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEB62B9B5D150040B78C /* SearchPreferencesTests.swift */; };
+		1D9FDEB82B9B5D150040B78C /* SearchPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEB62B9B5D150040B78C /* SearchPreferencesTests.swift */; };
+		1D9FDEBA2B9B5E090040B78C /* WebTrackingProtectionPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEB92B9B5E090040B78C /* WebTrackingProtectionPreferencesTests.swift */; };
+		1D9FDEBB2B9B5E090040B78C /* WebTrackingProtectionPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEB92B9B5E090040B78C /* WebTrackingProtectionPreferencesTests.swift */; };
+		1D9FDEBD2B9B5F0F0040B78C /* CookiePopupProtectionPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEBC2B9B5F0F0040B78C /* CookiePopupProtectionPreferencesTests.swift */; };
+		1D9FDEBE2B9B5F0F0040B78C /* CookiePopupProtectionPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEBC2B9B5F0F0040B78C /* CookiePopupProtectionPreferencesTests.swift */; };
+		1D9FDEC02B9B5FEA0040B78C /* AccessibilityPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEBF2B9B5FEA0040B78C /* AccessibilityPreferencesTests.swift */; };
+		1D9FDEC12B9B5FEA0040B78C /* AccessibilityPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEBF2B9B5FEA0040B78C /* AccessibilityPreferencesTests.swift */; };
+		1D9FDEC32B9B63C90040B78C /* DataClearingPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEC22B9B63C90040B78C /* DataClearingPreferencesTests.swift */; };
+		1D9FDEC42B9B63C90040B78C /* DataClearingPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEC22B9B63C90040B78C /* DataClearingPreferencesTests.swift */; };
+		1D9FDEC62B9B64DB0040B78C /* PrivacyProtectionStatusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEC52B9B64DB0040B78C /* PrivacyProtectionStatusTests.swift */; };
+		1D9FDEC72B9B64DB0040B78C /* PrivacyProtectionStatusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FDEC52B9B64DB0040B78C /* PrivacyProtectionStatusTests.swift */; };
 		1DA6D0FD2A1FF9A100540406 /* HTTPCookie.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DA6D0FC2A1FF9A100540406 /* HTTPCookie.swift */; };
 		1DA6D0FE2A1FF9A100540406 /* HTTPCookie.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DA6D0FC2A1FF9A100540406 /* HTTPCookie.swift */; };
 		1DA6D1022A1FFA3700540406 /* HTTPCookieTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DA6D0FF2A1FF9DC00540406 /* HTTPCookieTests.swift */; };
@@ -94,6 +122,27 @@
 		1DC669722B6CF0D700AA0645 /* TabSnapshotStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DC6696F2B6CF0D700AA0645 /* TabSnapshotStore.swift */; };
 		1DCFBC8A29ADF32B00313531 /* BurnerHomePageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DCFBC8929ADF32B00313531 /* BurnerHomePageView.swift */; };
 		1DCFBC8B29ADF32B00313531 /* BurnerHomePageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DCFBC8929ADF32B00313531 /* BurnerHomePageView.swift */; };
+		1DDC84F72B83558F00670238 /* PreferencesPrivateSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC84F62B83558F00670238 /* PreferencesPrivateSearchView.swift */; };
+		1DDC84F82B83558F00670238 /* PreferencesPrivateSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC84F62B83558F00670238 /* PreferencesPrivateSearchView.swift */; };
+		1DDC84F92B83558F00670238 /* PreferencesPrivateSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC84F62B83558F00670238 /* PreferencesPrivateSearchView.swift */; };
+		1DDC84FB2B8356CE00670238 /* PreferencesDefaultBrowserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC84FA2B8356CE00670238 /* PreferencesDefaultBrowserView.swift */; };
+		1DDC84FC2B8356CE00670238 /* PreferencesDefaultBrowserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC84FA2B8356CE00670238 /* PreferencesDefaultBrowserView.swift */; };
+		1DDC84FD2B8356CE00670238 /* PreferencesDefaultBrowserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC84FA2B8356CE00670238 /* PreferencesDefaultBrowserView.swift */; };
+		1DDC84FF2B835BC000670238 /* SearchPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC84FE2B835BC000670238 /* SearchPreferences.swift */; };
+		1DDC85002B835BC000670238 /* SearchPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC84FE2B835BC000670238 /* SearchPreferences.swift */; };
+		1DDC85012B835BC000670238 /* SearchPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC84FE2B835BC000670238 /* SearchPreferences.swift */; };
+		1DDC85032B83903E00670238 /* PreferencesWebTrackingProtectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC85022B83903E00670238 /* PreferencesWebTrackingProtectionView.swift */; };
+		1DDC85042B83903E00670238 /* PreferencesWebTrackingProtectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC85022B83903E00670238 /* PreferencesWebTrackingProtectionView.swift */; };
+		1DDC85052B83903E00670238 /* PreferencesWebTrackingProtectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDC85022B83903E00670238 /* PreferencesWebTrackingProtectionView.swift */; };
+		1DDD3EBC2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDD3EBB2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift */; };
+		1DDD3EBD2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDD3EBB2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift */; };
+		1DDD3EBE2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDD3EBB2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift */; };
+		1DDD3EC02B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDD3EBF2B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift */; };
+		1DDD3EC12B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDD3EBF2B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift */; };
+		1DDD3EC22B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDD3EBF2B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift */; };
+		1DDD3EC42B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDD3EC32B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift */; };
+		1DDD3EC52B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDD3EC32B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift */; };
+		1DDD3EC62B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDD3EC32B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift */; };
 		1DDF076328F815AD00EDFBE3 /* BWCommunicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF075D28F815AD00EDFBE3 /* BWCommunicator.swift */; };
 		1DDF076428F815AD00EDFBE3 /* BWManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF075E28F815AD00EDFBE3 /* BWManager.swift */; };
 		1DE03425298BC7F000CAB3D7 /* InternalUserDeciderStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D12F2E1298BC660009A65FD /* InternalUserDeciderStoreMock.swift */; };
@@ -116,9 +165,6 @@
 		1E950E432912A10D0051A99B /* UserScript in Frameworks */ = {isa = PBXBuildFile; productRef = 1E950E422912A10D0051A99B /* UserScript */; };
 		1EA7B8D32B7E078C000330A4 /* SubscriptionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 1EA7B8D22B7E078C000330A4 /* SubscriptionUI */; };
 		1EA7B8D52B7E078C000330A4 /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 1EA7B8D42B7E078C000330A4 /* Subscription */; };
-		1EA7B8D82B7E1283000330A4 /* SubscriptionFeatureAvailability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA7B8D72B7E1283000330A4 /* SubscriptionFeatureAvailability.swift */; };
-		1EA7B8D92B7E1283000330A4 /* SubscriptionFeatureAvailability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA7B8D72B7E1283000330A4 /* SubscriptionFeatureAvailability.swift */; };
-		1EA7B8DA2B7E1283000330A4 /* SubscriptionFeatureAvailability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA7B8D72B7E1283000330A4 /* SubscriptionFeatureAvailability.swift */; };
 		1ED910D52B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */; };
 		1ED910D62B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */; };
 		1ED910D72B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */; };
@@ -161,6 +207,8 @@
 		317295D52AF058D3002C3206 /* MockWaitlistFeatureSetupHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 317295D12AF058D3002C3206 /* MockWaitlistFeatureSetupHandler.swift */; };
 		3184AC6D288F29D800C35E4B /* BadgeNotificationAnimationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3184AC6C288F29D800C35E4B /* BadgeNotificationAnimationModel.swift */; };
 		3184AC6F288F2A1100C35E4B /* CookieNotificationAnimationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3184AC6E288F2A1100C35E4B /* CookieNotificationAnimationModel.swift */; };
+		31A2FD172BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A2FD162BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift */; };
+		31A2FD182BAB43BA00D0E741 /* DataBrokerProtectionVisibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A2FD162BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift */; };
 		31A3A4E32B0C115F0021063C /* DataBrokerProtection in Frameworks */ = {isa = PBXBuildFile; productRef = 31A3A4E22B0C115F0021063C /* DataBrokerProtection */; };
 		31AA6B972B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31AA6B962B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift */; };
 		31AA6B982B960BA50025014E /* DataBrokerProtectionLoginItemPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31AA6B962B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift */; };
@@ -268,7 +316,6 @@
 		3706FADC293F65D500E42796 /* FirefoxLoginReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8AC93826B48A5100879451 /* FirefoxLoginReader.swift */; };
 		3706FADD293F65D500E42796 /* AtbParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50382726A12400758A2B /* AtbParser.swift */; };
 		3706FADE293F65D500E42796 /* PreferencesDuckPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37F19A6428E1B3FB00740DC6 /* PreferencesDuckPlayerView.swift */; };
-		3706FADF293F65D500E42796 /* AddBookmarkFolderModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CA2667123700AD2C21 /* AddBookmarkFolderModalView.swift */; };
 		3706FAE0293F65D500E42796 /* BookmarkSidebarTreeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929426670D2A00AD2C21 /* BookmarkSidebarTreeController.swift */; };
 		3706FAE1293F65D500E42796 /* HomePageFavoritesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85589E8627BBB8F20038AD11 /* HomePageFavoritesModel.swift */; };
 		3706FAE2293F65D500E42796 /* SequenceExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB88B4925B7B690006F6B06 /* SequenceExtensions.swift */; };
@@ -319,7 +366,7 @@
 		3706FB1A293F65D500E42796 /* OutlineSeparatorViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92928626670D1600AD2C21 /* OutlineSeparatorViewCell.swift */; };
 		3706FB1B293F65D500E42796 /* SafariDataImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CFD26FE191E001E4761 /* SafariDataImporter.swift */; };
 		3706FB1D293F65D500E42796 /* StatisticsLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50342726A11F00758A2B /* StatisticsLoader.swift */; };
-		3706FB1F293F65D500E42796 /* PrivacyPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C127F2FDD100F1F7B9 /* PrivacyPreferencesModel.swift */; };
+		3706FB1F293F65D500E42796 /* DataClearingPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C127F2FDD100F1F7B9 /* DataClearingPreferences.swift */; };
 		3706FB20293F65D500E42796 /* LocalUnprotectedDomains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336B39E22726B4B700C417D3 /* LocalUnprotectedDomains.swift */; };
 		3706FB21293F65D500E42796 /* NavigationBarBadgeAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31CF3431288B0B1B0087244B /* NavigationBarBadgeAnimator.swift */; };
 		3706FB22293F65D500E42796 /* NSTextViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 858A798426A8BB5D00A75A42 /* NSTextViewExtension.swift */; };
@@ -387,7 +434,6 @@
 		3706FB6D293F65D500E42796 /* SuggestionListCharacteristics.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB8203B26B2DE0D00788AC3 /* SuggestionListCharacteristics.swift */; };
 		3706FB6F293F65D500E42796 /* BookmarkListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CC2667123700AD2C21 /* BookmarkListViewController.swift */; };
 		3706FB70293F65D500E42796 /* SecureVaultLoginImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DF326B0002B00E14D75 /* SecureVaultLoginImporter.swift */; };
-		3706FB71293F65D500E42796 /* AddBookmarkModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CB2667123700AD2C21 /* AddBookmarkModalView.swift */; };
 		3706FB72293F65D500E42796 /* RecentlyClosedCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C1DD4285C780C0089850C /* RecentlyClosedCoordinator.swift */; };
 		3706FB74293F65D500E42796 /* FaviconHostReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6197C5276B3168008396F0 /* FaviconHostReference.swift */; };
 		3706FB76293F65D500E42796 /* ASN1Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8AC93A26B48ADF00879451 /* ASN1Parser.swift */; };
@@ -402,7 +448,6 @@
 		3706FB83293F65D500E42796 /* NSApplicationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C8F622591021700748EB7 /* NSApplicationExtension.swift */; };
 		3706FB84293F65D500E42796 /* NSWindowExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9E9A5525A3AE8400D1959D /* NSWindowExtension.swift */; };
 		3706FB85293F65D500E42796 /* AddBookmarkPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4C425D6A6E8007F5990 /* AddBookmarkPopover.swift */; };
-		3706FB86293F65D500E42796 /* PreferencesDownloadsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EF27E8D1440028713D /* PreferencesDownloadsView.swift */; };
 		3706FB87293F65D500E42796 /* ProcessExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C2FB127706E6A00BF2C7D /* ProcessExtension.swift */; };
 		3706FB88293F65D500E42796 /* PermissionAuthorizationQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106BA526A7BEC80013B453 /* PermissionAuthorizationQuery.swift */; };
 		3706FB89293F65D500E42796 /* BadgeAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6B9288984D00068632A /* BadgeAnimationView.swift */; };
@@ -420,7 +465,6 @@
 		3706FB95293F65D500E42796 /* PermissionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106BAA26A7BF1D0013B453 /* PermissionType.swift */; };
 		3706FB96293F65D500E42796 /* RecentlyClosedWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC6881A28626C1900D54247 /* RecentlyClosedWindow.swift */; };
 		3706FB97293F65D500E42796 /* ActionSpeech.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85707F29276A35FE00DC0649 /* ActionSpeech.swift */; };
-		3706FB99293F65D500E42796 /* PrivacySecurityPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511A6262CAA5A00F6079C /* PrivacySecurityPreferences.swift */; };
 		3706FB9A293F65D500E42796 /* FireproofDomainsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6830962274CDEC7004B46BB /* FireproofDomainsStore.swift */; };
 		3706FB9B293F65D500E42796 /* PrivacyDashboardPermissionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7E2E932902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift */; };
 		3706FB9C293F65D500E42796 /* TabCollectionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9FF95E24A1FB680039E328 /* TabCollectionViewModel.swift */; };
@@ -511,7 +555,7 @@
 		3706FC01293F65D500E42796 /* ChromiumBookmarksReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CF926FE191E001E4761 /* ChromiumBookmarksReader.swift */; };
 		3706FC02293F65D500E42796 /* Downloads.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6C0B23226E71BCD0031CB7F /* Downloads.xcdatamodeld */; };
 		3706FC03293F65D500E42796 /* TabPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE8B10F258A456C00E81239 /* TabPreviewViewController.swift */; };
-		3706FC04293F65D500E42796 /* PreferencesPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EB27E8A4D10028713D /* PreferencesPrivacyView.swift */; };
+		3706FC04293F65D500E42796 /* PreferencesDataClearingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EB27E8A4D10028713D /* PreferencesDataClearingView.swift */; };
 		3706FC05293F65D500E42796 /* NSPasteboardExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0135CD2729F1AA00D54834 /* NSPasteboardExtension.swift */; };
 		3706FC06293F65D500E42796 /* OnboardingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85707F30276A7DCA00DC0649 /* OnboardingViewModel.swift */; };
 		3706FC07293F65D500E42796 /* ScriptSourceProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85AC3B0425D6B1D800C7D2AA /* ScriptSourceProviding.swift */; };
@@ -1024,15 +1068,14 @@
 		37BF3F22286F0A7A00BD9014 /* PinnedTabsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BF3F1F286F0A7A00BD9014 /* PinnedTabsView.swift */; };
 		37CBCA9A2A8966E60050218F /* SyncSettingsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CBCA992A8966E60050218F /* SyncSettingsAdapter.swift */; };
 		37CBCA9B2A8966E60050218F /* SyncSettingsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CBCA992A8966E60050218F /* SyncSettingsAdapter.swift */; };
-		37CC53EC27E8A4D10028713D /* PreferencesPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EB27E8A4D10028713D /* PreferencesPrivacyView.swift */; };
-		37CC53F027E8D1440028713D /* PreferencesDownloadsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EF27E8D1440028713D /* PreferencesDownloadsView.swift */; };
+		37CC53EC27E8A4D10028713D /* PreferencesDataClearingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EB27E8A4D10028713D /* PreferencesDataClearingView.swift */; };
 		37CC53F427E8D4620028713D /* NSPathControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53F327E8D4620028713D /* NSPathControlView.swift */; };
 		37CD54B527F1AC1300F1F7B9 /* PreferencesSidebarModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54B427F1AC1300F1F7B9 /* PreferencesSidebarModelTests.swift */; };
 		37CD54B727F1B28A00F1F7B9 /* DefaultBrowserPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54B627F1B28A00F1F7B9 /* DefaultBrowserPreferencesTests.swift */; };
 		37CD54B927F1F8AC00F1F7B9 /* AppearancePreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54B827F1F8AC00F1F7B9 /* AppearancePreferencesTests.swift */; };
 		37CD54BB27F25A4000F1F7B9 /* DownloadsPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54BA27F25A4000F1F7B9 /* DownloadsPreferencesTests.swift */; };
 		37CD54BD27F2ECAE00F1F7B9 /* AutofillPreferencesModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54BC27F2ECAE00F1F7B9 /* AutofillPreferencesModelTests.swift */; };
-		37CD54C927F2FDD100F1F7B9 /* PrivacyPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C127F2FDD100F1F7B9 /* PrivacyPreferencesModel.swift */; };
+		37CD54C927F2FDD100F1F7B9 /* DataClearingPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C127F2FDD100F1F7B9 /* DataClearingPreferences.swift */; };
 		37CD54CA27F2FDD100F1F7B9 /* AutofillPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C227F2FDD100F1F7B9 /* AutofillPreferencesModel.swift */; };
 		37CD54CB27F2FDD100F1F7B9 /* DownloadsPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C327F2FDD100F1F7B9 /* DownloadsPreferences.swift */; };
 		37CD54CC27F2FDD100F1F7B9 /* PreferencesSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C427F2FDD100F1F7B9 /* PreferencesSection.swift */; };
@@ -1062,7 +1105,6 @@
 		4B02198A25E05FAC00ED7DEA /* FireproofDomains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B02198125E05FAC00ED7DEA /* FireproofDomains.swift */; };
 		4B02199C25E063DE00ED7DEA /* FireproofDomainsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B02199925E063DE00ED7DEA /* FireproofDomainsTests.swift */; };
 		4B0219A825E0646500ED7DEA /* WebsiteDataStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0219A725E0646500ED7DEA /* WebsiteDataStoreTests.swift */; };
-		4B0511BD262CAA5A00F6079C /* PrivacySecurityPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511A6262CAA5A00F6079C /* PrivacySecurityPreferences.swift */; };
 		4B0511C3262CAA5A00F6079C /* FireproofDomains.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B0511AD262CAA5A00F6079C /* FireproofDomains.storyboard */; };
 		4B0511CA262CAA5A00F6079C /* FireproofDomainsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511B4262CAA5A00F6079C /* FireproofDomainsViewController.swift */; };
 		4B0511E1262CAA8600F6079C /* NSOpenPanelExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511DF262CAA8600F6079C /* NSOpenPanelExtensions.swift */; };
@@ -1203,6 +1245,9 @@
 		4B4D60E22A0C883A00BCD287 /* AppMain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60E12A0C883A00BCD287 /* AppMain.swift */; };
 		4B4D60E32A0C883A00BCD287 /* AppMain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60E12A0C883A00BCD287 /* AppMain.swift */; };
 		4B4F72EC266B2ED300814C60 /* CollectionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4F72EB266B2ED300814C60 /* CollectionExtension.swift */; };
+		4B520F632BA5573A006405C7 /* WaitlistThankYouView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B520F622BA5573A006405C7 /* WaitlistThankYouView.swift */; };
+		4B520F642BA5573A006405C7 /* WaitlistThankYouView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B520F622BA5573A006405C7 /* WaitlistThankYouView.swift */; };
+		4B520F652BA5573A006405C7 /* WaitlistThankYouView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B520F622BA5573A006405C7 /* WaitlistThankYouView.swift */; };
 		4B59023E26B35F3600489384 /* ChromiumLoginReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B59023926B35F3600489384 /* ChromiumLoginReader.swift */; };
 		4B59024026B35F3600489384 /* ChromiumDataImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B59023B26B35F3600489384 /* ChromiumDataImporter.swift */; };
 		4B59024826B3673600489384 /* ThirdPartyBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B59024726B3673600489384 /* ThirdPartyBrowser.swift */; };
@@ -1222,6 +1267,9 @@
 		4B67854A2AA8DE75008A5004 /* NetworkProtectionFeatureVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD8679A2A9E9E000063B9F7 /* NetworkProtectionFeatureVisibility.swift */; };
 		4B67854B2AA8DE76008A5004 /* NetworkProtectionFeatureVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD8679A2A9E9E000063B9F7 /* NetworkProtectionFeatureVisibility.swift */; };
 		4B68DDFF2ACBA14100FB0973 /* FileLineError.swift in Sources */ = {isa = PBXBuildFile; fileRef = B696AFFA2AC5924800C93203 /* FileLineError.swift */; };
+		4B6B64842BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6B64832BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift */; };
+		4B6B64852BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6B64832BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift */; };
+		4B6B64862BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6B64832BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift */; };
 		4B70C00127B0793D000386ED /* DuckDuckGo-ExampleCrash.ips in Resources */ = {isa = PBXBuildFile; fileRef = 4B70BFFF27B0793D000386ED /* DuckDuckGo-ExampleCrash.ips */; };
 		4B70C00227B0793D000386ED /* CrashReportTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B70C00027B0793D000386ED /* CrashReportTests.swift */; };
 		4B723E0526B0003E00E14D75 /* DataImportMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DFF26B0003E00E14D75 /* DataImportMocks.swift */; };
@@ -1279,8 +1327,6 @@
 		4B9292CF2667123700AD2C21 /* BookmarkManagementSidebarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C72667123700AD2C21 /* BookmarkManagementSidebarViewController.swift */; };
 		4B9292D02667123700AD2C21 /* BookmarkManagementSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C82667123700AD2C21 /* BookmarkManagementSplitViewController.swift */; };
 		4B9292D12667123700AD2C21 /* BookmarkTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C92667123700AD2C21 /* BookmarkTableRowView.swift */; };
-		4B9292D22667123700AD2C21 /* AddBookmarkFolderModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CA2667123700AD2C21 /* AddBookmarkFolderModalView.swift */; };
-		4B9292D32667123700AD2C21 /* AddBookmarkModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CB2667123700AD2C21 /* AddBookmarkModalView.swift */; };
 		4B9292D42667123700AD2C21 /* BookmarkListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CC2667123700AD2C21 /* BookmarkListViewController.swift */; };
 		4B9292D52667123700AD2C21 /* BookmarkManagementDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CD2667123700AD2C21 /* BookmarkManagementDetailViewController.swift */; };
 		4B9292D92667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292D82667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift */; };
@@ -1391,7 +1437,6 @@
 		4B9579B52AC7AE700062CA31 /* FirefoxLoginReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8AC93826B48A5100879451 /* FirefoxLoginReader.swift */; };
 		4B9579B62AC7AE700062CA31 /* AtbParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50382726A12400758A2B /* AtbParser.swift */; };
 		4B9579B72AC7AE700062CA31 /* PreferencesDuckPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37F19A6428E1B3FB00740DC6 /* PreferencesDuckPlayerView.swift */; };
-		4B9579B82AC7AE700062CA31 /* AddBookmarkFolderModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CA2667123700AD2C21 /* AddBookmarkFolderModalView.swift */; };
 		4B9579B92AC7AE700062CA31 /* BookmarkSidebarTreeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929426670D2A00AD2C21 /* BookmarkSidebarTreeController.swift */; };
 		4B9579BA2AC7AE700062CA31 /* HomePageFavoritesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85589E8627BBB8F20038AD11 /* HomePageFavoritesModel.swift */; };
 		4B9579BB2AC7AE700062CA31 /* SequenceExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB88B4925B7B690006F6B06 /* SequenceExtensions.swift */; };
@@ -1465,7 +1510,7 @@
 		4B957A032AC7AE700062CA31 /* LocalBookmarkStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 987799F829999973005D8EB6 /* LocalBookmarkStore.swift */; };
 		4B957A042AC7AE700062CA31 /* BWEncryption.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D02633528D8A9A9005CBB41 /* BWEncryption.m */; settings = {COMPILER_FLAGS = "-Wno-deprecated -Wno-strict-prototypes"; }; };
 		4B957A052AC7AE700062CA31 /* StatisticsLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50342726A11F00758A2B /* StatisticsLoader.swift */; };
-		4B957A072AC7AE700062CA31 /* PrivacyPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C127F2FDD100F1F7B9 /* PrivacyPreferencesModel.swift */; };
+		4B957A072AC7AE700062CA31 /* DataClearingPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C127F2FDD100F1F7B9 /* DataClearingPreferences.swift */; };
 		4B957A082AC7AE700062CA31 /* LocalUnprotectedDomains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336B39E22726B4B700C417D3 /* LocalUnprotectedDomains.swift */; };
 		4B957A092AC7AE700062CA31 /* InternalUserDeciderStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D36E657298AA3BA00AA485D /* InternalUserDeciderStore.swift */; };
 		4B957A0A2AC7AE700062CA31 /* NewWindowPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B634DBE4293C944700C3C99E /* NewWindowPolicy.swift */; };
@@ -1561,7 +1606,6 @@
 		4B957A692AC7AE700062CA31 /* BookmarkListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CC2667123700AD2C21 /* BookmarkListViewController.swift */; };
 		4B957A6A2AC7AE700062CA31 /* SecureVaultLoginImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DF326B0002B00E14D75 /* SecureVaultLoginImporter.swift */; };
 		4B957A6B2AC7AE700062CA31 /* WKProcessPoolExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B645D8F529FA95440024461F /* WKProcessPoolExtension.swift */; };
-		4B957A6C2AC7AE700062CA31 /* AddBookmarkModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CB2667123700AD2C21 /* AddBookmarkModalView.swift */; };
 		4B957A6D2AC7AE700062CA31 /* LoginItemsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D9AE86A2AA76CF90026E7DC /* LoginItemsManager.swift */; };
 		4B957A6E2AC7AE700062CA31 /* PixelExperiment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 857E5AF42A79045800FC0FB4 /* PixelExperiment.swift */; };
 		4B957A6F2AC7AE700062CA31 /* DuckPlayerTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C416A6294A4AE500C4F2E7 /* DuckPlayerTabExtension.swift */; };
@@ -1584,7 +1628,6 @@
 		4B957A812AC7AE700062CA31 /* KeychainType+ClientDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD3AF5C2A8E7AF1006F9F56 /* KeychainType+ClientDefault.swift */; };
 		4B957A822AC7AE700062CA31 /* SyncDebugMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370A34B02AB24E3700C77F7C /* SyncDebugMenu.swift */; };
 		4B957A832AC7AE700062CA31 /* AddBookmarkPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4C425D6A6E8007F5990 /* AddBookmarkPopover.swift */; };
-		4B957A842AC7AE700062CA31 /* PreferencesDownloadsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EF27E8D1440028713D /* PreferencesDownloadsView.swift */; };
 		4B957A852AC7AE700062CA31 /* QRSharingService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F7127D29F6779000594A45 /* QRSharingService.swift */; };
 		4B957A862AC7AE700062CA31 /* ProcessExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C2FB127706E6A00BF2C7D /* ProcessExtension.swift */; };
 		4B957A872AC7AE700062CA31 /* PermissionAuthorizationQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106BA526A7BEC80013B453 /* PermissionAuthorizationQuery.swift */; };
@@ -1605,7 +1648,6 @@
 		4B957A962AC7AE700062CA31 /* PermissionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106BAA26A7BF1D0013B453 /* PermissionType.swift */; };
 		4B957A982AC7AE700062CA31 /* RecentlyClosedWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC6881A28626C1900D54247 /* RecentlyClosedWindow.swift */; };
 		4B957A992AC7AE700062CA31 /* ActionSpeech.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85707F29276A35FE00DC0649 /* ActionSpeech.swift */; };
-		4B957A9A2AC7AE700062CA31 /* PrivacySecurityPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511A6262CAA5A00F6079C /* PrivacySecurityPreferences.swift */; };
 		4B957A9B2AC7AE700062CA31 /* ModalSheetCancellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BE9FA9293F7955006363C6 /* ModalSheetCancellable.swift */; };
 		4B957A9C2AC7AE700062CA31 /* FireproofDomainsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6830962274CDEC7004B46BB /* FireproofDomainsStore.swift */; };
 		4B957A9D2AC7AE700062CA31 /* NetworkProtectionSimulateFailureMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */; };
@@ -1725,7 +1767,7 @@
 		4B957B152AC7AE700062CA31 /* ChromiumBookmarksReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CF926FE191E001E4761 /* ChromiumBookmarksReader.swift */; };
 		4B957B162AC7AE700062CA31 /* Downloads.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6C0B23226E71BCD0031CB7F /* Downloads.xcdatamodeld */; };
 		4B957B172AC7AE700062CA31 /* TabPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE8B10F258A456C00E81239 /* TabPreviewViewController.swift */; };
-		4B957B182AC7AE700062CA31 /* PreferencesPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EB27E8A4D10028713D /* PreferencesPrivacyView.swift */; };
+		4B957B182AC7AE700062CA31 /* PreferencesDataClearingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EB27E8A4D10028713D /* PreferencesDataClearingView.swift */; };
 		4B957B192AC7AE700062CA31 /* NSPasteboardExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0135CD2729F1AA00D54834 /* NSPasteboardExtension.swift */; };
 		4B957B1A2AC7AE700062CA31 /* OnboardingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85707F30276A7DCA00DC0649 /* OnboardingViewModel.swift */; };
 		4B957B1B2AC7AE700062CA31 /* ScriptSourceProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85AC3B0425D6B1D800C7D2AA /* ScriptSourceProviding.swift */; };
@@ -2068,6 +2110,11 @@
 		4BBF09232830812900EE1418 /* FileSystemDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBF09222830812900EE1418 /* FileSystemDSL.swift */; };
 		4BBF0925283083EC00EE1418 /* FileSystemDSLTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBF0924283083EC00EE1418 /* FileSystemDSLTests.swift */; };
 		4BC2621D293996410087A482 /* PixelEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC2621C293996410087A482 /* PixelEventTests.swift */; };
+		4BCBE4552BA7E16600FC75A1 /* NetworkProtectionSubscriptionEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2F565B2B38F93E001214C0 /* NetworkProtectionSubscriptionEventHandler.swift */; };
+		4BCBE4562BA7E16900FC75A1 /* DataBrokerProtectionSubscriptionEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5789712B2CA70F0009DFE2 /* DataBrokerProtectionSubscriptionEventHandler.swift */; };
+		4BCBE4582BA7E17800FC75A1 /* SubscriptionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4BCBE4572BA7E17800FC75A1 /* SubscriptionUI */; };
+		4BCBE45A2BA7E17800FC75A1 /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 4BCBE4592BA7E17800FC75A1 /* Subscription */; };
+		4BCBE45C2BA7E18500FC75A1 /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 4BCBE45B2BA7E18500FC75A1 /* Subscription */; };
 		4BCF15D72ABB8A110083F6DF /* NetworkProtectionRemoteMessaging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF15D62ABB8A110083F6DF /* NetworkProtectionRemoteMessaging.swift */; };
 		4BCF15D92ABB8A7F0083F6DF /* NetworkProtectionRemoteMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF15D82ABB8A7F0083F6DF /* NetworkProtectionRemoteMessage.swift */; };
 		4BCF15EC2ABB9AF80083F6DF /* NetworkProtectionRemoteMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF15E42ABB98990083F6DF /* NetworkProtectionRemoteMessageTests.swift */; };
@@ -2171,12 +2218,16 @@
 		7B00997F2B6508C200FE7C31 /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7B00997E2B6508C200FE7C31 /* NetworkProtectionProxy */; };
 		7B0099822B65C6B300FE7C31 /* MacTransparentProxyProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0099802B65C6B300FE7C31 /* MacTransparentProxyProvider.swift */; };
 		7B0694982B6E980F00FA4DBA /* VPNProxyLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */; };
+		7B09CBA92BA4BE8100CF245B /* NetworkProtectionPixelEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */; };
+		7B09CBAA2BA4BE8200CF245B /* NetworkProtectionPixelEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */; };
 		7B1459542B7D437200047F2C /* BrowserWindowManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0099782B65013800FE7C31 /* BrowserWindowManager.swift */; };
 		7B1459552B7D438F00047F2C /* VPNProxyLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */; };
 		7B1459572B7D43E500047F2C /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7B1459562B7D43E500047F2C /* NetworkProtectionProxy */; };
 		7B1E819E27C8874900FF0E60 /* ContentOverlayPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1E819B27C8874900FF0E60 /* ContentOverlayPopover.swift */; };
 		7B1E819F27C8874900FF0E60 /* ContentOverlay.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B1E819C27C8874900FF0E60 /* ContentOverlay.storyboard */; };
 		7B1E81A027C8874900FF0E60 /* ContentOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1E819D27C8874900FF0E60 /* ContentOverlayViewController.swift */; };
+		7B25856C2BA2F2D000D49F79 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
+		7B25856E2BA2F2ED00D49F79 /* NetworkProtectionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 7B25856D2BA2F2ED00D49F79 /* NetworkProtectionUI */; };
 		7B2DDCF82A93A8BB0039D884 /* NetworkProtectionAppEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2DDCF72A93A8BB0039D884 /* NetworkProtectionAppEvents.swift */; };
 		7B2DDCFA2A93B25F0039D884 /* KeychainType+ClientDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD3AF5C2A8E7AF1006F9F56 /* KeychainType+ClientDefault.swift */; };
 		7B2DDCFB2A93B25F0039D884 /* KeychainType+ClientDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD3AF5C2A8E7AF1006F9F56 /* KeychainType+ClientDefault.swift */; };
@@ -2185,13 +2236,18 @@
 		7B31FD902AD1257B0086AA24 /* NetworkProtectionIPC in Frameworks */ = {isa = PBXBuildFile; productRef = 7B31FD8F2AD1257B0086AA24 /* NetworkProtectionIPC */; };
 		7B3618C22ADE75C8000D6154 /* NetworkProtectionNavBarPopoverManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B3618C12ADE75C8000D6154 /* NetworkProtectionNavBarPopoverManager.swift */; };
 		7B3618C52ADE77D3000D6154 /* NetworkProtectionNavBarPopoverManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B3618C12ADE75C8000D6154 /* NetworkProtectionNavBarPopoverManager.swift */; };
+		7B37C7A52BAA32A50062546A /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 7B37C7A42BAA32A50062546A /* Subscription */; };
 		7B430EA12A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */; };
 		7B430EA22A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */; };
 		7B4CE8E726F02135009134B1 /* TabBarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4CE8E626F02134009134B1 /* TabBarTests.swift */; };
 		7B5DD69A2AE51FFA001DE99C /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7B5DD6992AE51FFA001DE99C /* PixelKit */; };
 		7B5F9A752AE2BE4E002AEBC0 /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7B5F9A742AE2BE4E002AEBC0 /* PixelKit */; };
+		7B624F172BA25C1F00A6C544 /* NetworkProtectionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 7B624F162BA25C1F00A6C544 /* NetworkProtectionUI */; };
 		7B7DFB202B7E736B009EA1A3 /* MacPacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF12E6D2A2111880023E6BF /* MacPacketTunnelProvider.swift */; };
 		7B7DFB222B7E7473009EA1A3 /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = 7B7DFB212B7E7473009EA1A3 /* Networking */; };
+		7B7FCD0F2BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B7FCD0E2BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift */; };
+		7B7FCD102BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B7FCD0E2BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift */; };
+		7B7FCD112BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B7FCD0E2BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift */; };
 		7B8C083C2AE1268E00F4C67F /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7B8C083B2AE1268E00F4C67F /* PixelKit */; };
 		7B8DB31A2B504D7500EC16DA /* VPNAppEventsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B8DB3192B504D7500EC16DA /* VPNAppEventsHandler.swift */; };
 		7B934C412A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
@@ -2230,8 +2286,6 @@
 		7BA7CC562AD11FFB0042E5CE /* NetworkProtectionOptionKeyExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605F2A0B29FA00BCD287 /* NetworkProtectionOptionKeyExtension.swift */; };
 		7BA7CC582AD1203A0042E5CE /* UserText+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60D22A0C84F700BCD287 /* UserText+NetworkProtection.swift */; };
 		7BA7CC592AD1203B0042E5CE /* UserText+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60D22A0C84F700BCD287 /* UserText+NetworkProtection.swift */; };
-		7BA7CC5A2AD120640042E5CE /* NetworkProtection+ConvenienceInitializers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60692A0B29FA00BCD287 /* NetworkProtection+ConvenienceInitializers.swift */; };
-		7BA7CC5B2AD120640042E5CE /* NetworkProtection+ConvenienceInitializers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60692A0B29FA00BCD287 /* NetworkProtection+ConvenienceInitializers.swift */; };
 		7BA7CC5C2AD120C30042E5CE /* EventMapping+NetworkProtectionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60722A0B29FA00BCD287 /* EventMapping+NetworkProtectionError.swift */; };
 		7BA7CC5D2AD120C30042E5CE /* EventMapping+NetworkProtectionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60722A0B29FA00BCD287 /* EventMapping+NetworkProtectionError.swift */; };
 		7BA7CC5F2AD1210C0042E5CE /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = 7BA7CC5E2AD1210C0042E5CE /* Networking */; };
@@ -2240,6 +2294,9 @@
 		7BAF9E4C2A8A3CCA002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
 		7BAF9E4D2A8A3CCB002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
 		7BB108592A43375D000AB95F /* PFMoveApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BB108582A43375D000AB95F /* PFMoveApplication.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+		7BBA7CE62BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBA7CE52BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift */; };
+		7BBA7CE72BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBA7CE52BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift */; };
+		7BBA7CEA2BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBA7CE52BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift */; };
 		7BBD44282AD730A400D0A064 /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7BBD44272AD730A400D0A064 /* PixelKit */; };
 		7BBD45B12A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD45B02A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift */; };
 		7BBD45B22A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD45B02A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift */; };
@@ -2353,6 +2410,9 @@
 		85D0327D2B8E3D090041D1FB /* HistoryCoordinatorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D0327A2B8E3D090041D1FB /* HistoryCoordinatorExtension.swift */; };
 		85D33F1225C82EB3002B91A6 /* ConfigurationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D33F1125C82EB3002B91A6 /* ConfigurationManager.swift */; };
 		85D438B6256E7C9E00F3BAF8 /* ContextMenuUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D438B5256E7C9E00F3BAF8 /* ContextMenuUserScript.swift */; };
+		85D44B862BA08D29001B4AB5 /* Suggestions in Frameworks */ = {isa = PBXBuildFile; productRef = 85D44B852BA08D29001B4AB5 /* Suggestions */; };
+		85D44B882BA08D30001B4AB5 /* Suggestions in Frameworks */ = {isa = PBXBuildFile; productRef = 85D44B872BA08D30001B4AB5 /* Suggestions */; };
+		85D44B8A2BA08D3B001B4AB5 /* Suggestions in Frameworks */ = {isa = PBXBuildFile; productRef = 85D44B892BA08D3B001B4AB5 /* Suggestions */; };
 		85D885B026A590A90077C374 /* NSNotificationName+PasswordManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D885AF26A590A90077C374 /* NSNotificationName+PasswordManager.swift */; };
 		85D885B326A5A9DE0077C374 /* NSAlert+PasswordManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D885B226A5A9DE0077C374 /* NSAlert+PasswordManager.swift */; };
 		85E2BBCE2B8F534000DBEC7A /* History in Frameworks */ = {isa = PBXBuildFile; productRef = 85E2BBCD2B8F534000DBEC7A /* History */; };
@@ -2409,14 +2469,76 @@
 		9DB6E7242AA0DC5800A17F3C /* LoginItems in Frameworks */ = {isa = PBXBuildFile; productRef = 9DB6E7232AA0DC5800A17F3C /* LoginItems */; };
 		9DC70B1A2AA1FA5B005A844B /* LoginItems in Frameworks */ = {isa = PBXBuildFile; productRef = 9DC70B192AA1FA5B005A844B /* LoginItems */; };
 		9DEF97E12B06C4EE00764F03 /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = 9DEF97E02B06C4EE00764F03 /* Networking */; };
+		9F0A2CF82B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0A2CF72B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift */; };
+		9F0A2CF92B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0A2CF72B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift */; };
 		9F180D0F2B69C553000D695F /* Tab+WKUIDelegateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F180D0E2B69C553000D695F /* Tab+WKUIDelegateTests.swift */; };
 		9F180D102B69C553000D695F /* Tab+WKUIDelegateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F180D0E2B69C553000D695F /* Tab+WKUIDelegateTests.swift */; };
 		9F180D122B69C665000D695F /* DownloadsTabExtensionMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F180D112B69C665000D695F /* DownloadsTabExtensionMock.swift */; };
 		9F180D132B69C665000D695F /* DownloadsTabExtensionMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F180D112B69C665000D695F /* DownloadsTabExtensionMock.swift */; };
+		9F26060B2B85C20A00819292 /* AddEditBookmarkDialogViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2606092B85C20400819292 /* AddEditBookmarkDialogViewModelTests.swift */; };
+		9F26060C2B85C20B00819292 /* AddEditBookmarkDialogViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2606092B85C20400819292 /* AddEditBookmarkDialogViewModelTests.swift */; };
+		9F26060E2B85E17D00819292 /* AddEditBookmarkDialogCoordinatorViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F26060D2B85E17D00819292 /* AddEditBookmarkDialogCoordinatorViewModelTests.swift */; };
+		9F26060F2B85E17D00819292 /* AddEditBookmarkDialogCoordinatorViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F26060D2B85E17D00819292 /* AddEditBookmarkDialogCoordinatorViewModelTests.swift */; };
 		9F3910622B68C35600CB5112 /* DownloadsTabExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3910612B68C35600CB5112 /* DownloadsTabExtensionTests.swift */; };
 		9F3910632B68C35600CB5112 /* DownloadsTabExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3910612B68C35600CB5112 /* DownloadsTabExtensionTests.swift */; };
 		9F3910692B68D87B00CB5112 /* ProgressExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3910682B68D87B00CB5112 /* ProgressExtensionTests.swift */; };
 		9F39106A2B68D87B00CB5112 /* ProgressExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3910682B68D87B00CB5112 /* ProgressExtensionTests.swift */; };
+		9F514F912B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F514F902B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift */; };
+		9F514F922B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F514F902B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift */; };
+		9F514F932B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F514F902B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift */; };
+		9F56CFA92B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F56CFA82B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift */; };
+		9F56CFAA2B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F56CFA82B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift */; };
+		9F56CFAB2B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F56CFA82B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift */; };
+		9F56CFAD2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F56CFAC2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift */; };
+		9F56CFAE2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F56CFAC2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift */; };
+		9F56CFAF2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F56CFAC2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift */; };
+		9F56CFB12B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F56CFB02B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift */; };
+		9F56CFB22B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F56CFB02B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift */; };
+		9F56CFB32B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F56CFB02B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift */; };
+		9F872D982B8DA9F800138637 /* Bookmarks+Tab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872D972B8DA9F800138637 /* Bookmarks+Tab.swift */; };
+		9F872D992B8DA9F800138637 /* Bookmarks+Tab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872D972B8DA9F800138637 /* Bookmarks+Tab.swift */; };
+		9F872D9A2B8DA9F800138637 /* Bookmarks+Tab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872D972B8DA9F800138637 /* Bookmarks+Tab.swift */; };
+		9F872D9D2B9058D000138637 /* Bookmarks+TabTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872D9C2B9058D000138637 /* Bookmarks+TabTests.swift */; };
+		9F872D9E2B9058D000138637 /* Bookmarks+TabTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872D9C2B9058D000138637 /* Bookmarks+TabTests.swift */; };
+		9F872DA02B90644800138637 /* ContextualMenuTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872D9F2B90644800138637 /* ContextualMenuTests.swift */; };
+		9F872DA12B90644800138637 /* ContextualMenuTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872D9F2B90644800138637 /* ContextualMenuTests.swift */; };
+		9F872DA32B90920F00138637 /* BookmarkFolderInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872DA22B90920F00138637 /* BookmarkFolderInfo.swift */; };
+		9F872DA42B90920F00138637 /* BookmarkFolderInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872DA22B90920F00138637 /* BookmarkFolderInfo.swift */; };
+		9F872DA52B90920F00138637 /* BookmarkFolderInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F872DA22B90920F00138637 /* BookmarkFolderInfo.swift */; };
+		9F982F0D2B8224BF00231028 /* AddEditBookmarkFolderDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F982F0C2B8224BE00231028 /* AddEditBookmarkFolderDialogViewModel.swift */; };
+		9F982F0E2B8224BF00231028 /* AddEditBookmarkFolderDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F982F0C2B8224BE00231028 /* AddEditBookmarkFolderDialogViewModel.swift */; };
+		9F982F0F2B8224BF00231028 /* AddEditBookmarkFolderDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F982F0C2B8224BE00231028 /* AddEditBookmarkFolderDialogViewModel.swift */; };
+		9F982F132B822B7B00231028 /* AddEditBookmarkFolderDialogViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F982F112B82268F00231028 /* AddEditBookmarkFolderDialogViewModelTests.swift */; };
+		9F982F142B822C7400231028 /* AddEditBookmarkFolderDialogViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F982F112B82268F00231028 /* AddEditBookmarkFolderDialogViewModelTests.swift */; };
+		9FA173DA2B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173D92B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift */; };
+		9FA173DB2B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173D92B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift */; };
+		9FA173DC2B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173D92B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift */; };
+		9FA173DF2B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173DE2B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift */; };
+		9FA173E02B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173DE2B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift */; };
+		9FA173E12B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173DE2B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift */; };
+		9FA173E32B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173E22B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift */; };
+		9FA173E42B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173E22B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift */; };
+		9FA173E52B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173E22B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift */; };
+		9FA173E72B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173E62B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift */; };
+		9FA173E82B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173E62B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift */; };
+		9FA173E92B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173E62B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift */; };
+		9FA173EB2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173EA2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift */; };
+		9FA173EC2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173EA2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift */; };
+		9FA173ED2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA173EA2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift */; };
+		9FA75A3E2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA75A3D2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift */; };
+		9FA75A3F2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA75A3D2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift */; };
+		9FDA6C212B79A59D00E099A9 /* BookmarkFavoriteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FDA6C202B79A59D00E099A9 /* BookmarkFavoriteView.swift */; };
+		9FDA6C222B79A59D00E099A9 /* BookmarkFavoriteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FDA6C202B79A59D00E099A9 /* BookmarkFavoriteView.swift */; };
+		9FDA6C232B79A59D00E099A9 /* BookmarkFavoriteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FDA6C202B79A59D00E099A9 /* BookmarkFavoriteView.swift */; };
+		9FEE98652B846870002E44E8 /* AddEditBookmarkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FEE98642B846870002E44E8 /* AddEditBookmarkView.swift */; };
+		9FEE98662B846870002E44E8 /* AddEditBookmarkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FEE98642B846870002E44E8 /* AddEditBookmarkView.swift */; };
+		9FEE98672B846870002E44E8 /* AddEditBookmarkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FEE98642B846870002E44E8 /* AddEditBookmarkView.swift */; };
+		9FEE98692B85B869002E44E8 /* BookmarksDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FEE98682B85B869002E44E8 /* BookmarksDialogViewModel.swift */; };
+		9FEE986A2B85B869002E44E8 /* BookmarksDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FEE98682B85B869002E44E8 /* BookmarksDialogViewModel.swift */; };
+		9FEE986B2B85B869002E44E8 /* BookmarksDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FEE98682B85B869002E44E8 /* BookmarksDialogViewModel.swift */; };
+		9FEE986D2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FEE986C2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift */; };
+		9FEE986E2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FEE986C2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift */; };
+		9FEE986F2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FEE986C2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift */; };
 		AA06B6B72672AF8100F541C5 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = AA06B6B62672AF8100F541C5 /* Sparkle */; };
 		AA0877B826D5160D00B05660 /* SafariVersionReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0877B726D5160D00B05660 /* SafariVersionReaderTests.swift */; };
 		AA0877BA26D5161D00B05660 /* WebKitVersionProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0877B926D5161D00B05660 /* WebKitVersionProviderTests.swift */; };
@@ -2578,6 +2700,9 @@
 		B31055C427A1BA1D001AC618 /* AutoconsentUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = B31055BC27A1BA1D001AC618 /* AutoconsentUserScript.swift */; };
 		B31055C627A1BA1D001AC618 /* userscript.js in Resources */ = {isa = PBXBuildFile; fileRef = B31055BE27A1BA1D001AC618 /* userscript.js */; };
 		B31055CB27A1BA1D001AC618 /* autoconsent-bundle.js in Resources */ = {isa = PBXBuildFile; fileRef = B31055C327A1BA1D001AC618 /* autoconsent-bundle.js */; };
+		B60293E62BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */; };
+		B60293E72BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */; };
+		B60293E82BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */; };
 		B602E7CF2A93A5FF00F12201 /* WKBackForwardListExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B602E7CE2A93A5FF00F12201 /* WKBackForwardListExtension.swift */; };
 		B602E7D02A93A5FF00F12201 /* WKBackForwardListExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B602E7CE2A93A5FF00F12201 /* WKBackForwardListExtension.swift */; };
 		B602E8162A1E2570006D261F /* URL+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B602E8152A1E2570006D261F /* URL+NetworkProtection.swift */; };
@@ -3041,15 +3166,9 @@
 		B6F92BA32A691583002ABA6B /* UserDefaultsWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C6A29525CC1FFD00EEB5F1 /* UserDefaultsWrapper.swift */; };
 		B6F92BAC2A6937B3002ABA6B /* OptionalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B637273C26CCF0C200C8CB02 /* OptionalExtension.swift */; };
 		B6F92BAD2A6937B5002ABA6B /* OptionalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B637273C26CCF0C200C8CB02 /* OptionalExtension.swift */; };
-		B6F9BDD82B45B7D900677B33 /* AddBookmarkModalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDD72B45B7D900677B33 /* AddBookmarkModalViewModel.swift */; };
-		B6F9BDD92B45B7D900677B33 /* AddBookmarkModalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDD72B45B7D900677B33 /* AddBookmarkModalViewModel.swift */; };
-		B6F9BDDA2B45B7D900677B33 /* AddBookmarkModalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDD72B45B7D900677B33 /* AddBookmarkModalViewModel.swift */; };
 		B6F9BDDC2B45B7EE00677B33 /* WebsiteInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDDB2B45B7EE00677B33 /* WebsiteInfo.swift */; };
 		B6F9BDDD2B45B7EE00677B33 /* WebsiteInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDDB2B45B7EE00677B33 /* WebsiteInfo.swift */; };
 		B6F9BDDE2B45B7EE00677B33 /* WebsiteInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDDB2B45B7EE00677B33 /* WebsiteInfo.swift */; };
-		B6F9BDE02B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDDF2B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift */; };
-		B6F9BDE12B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDDF2B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift */; };
-		B6F9BDE22B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDDF2B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift */; };
 		B6F9BDE42B45CD1900677B33 /* ModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDE32B45CD1900677B33 /* ModalView.swift */; };
 		B6F9BDE52B45CD1900677B33 /* ModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDE32B45CD1900677B33 /* ModalView.swift */; };
 		B6F9BDE62B45CD1900677B33 /* ModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDE32B45CD1900677B33 /* ModalView.swift */; };
@@ -3072,6 +3191,13 @@
 		C168B9AC2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C168B9AB2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift */; };
 		C168B9AD2B31DC7F001AFAD9 /* AutofillNeverPromptWebsitesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C168B9AB2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift */; };
 		C168B9AE2B31DC7F001AFAD9 /* AutofillNeverPromptWebsitesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C168B9AB2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift */; };
+		C17CA7AD2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17CA7AC2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift */; };
+		C17CA7AE2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17CA7AC2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift */; };
+		C17CA7B22B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17CA7B12B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift */; };
+		C17CA7B32B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17CA7B12B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift */; };
+		C1DAF3B52B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */; };
+		C1DAF3B62B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */; };
+		C1DAF3B72B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */; };
 		C1E961EB2B879E79001760E1 /* MockAutofillActionPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961E72B879E4D001760E1 /* MockAutofillActionPresenter.swift */; };
 		C1E961ED2B879ED9001760E1 /* MockAutofillActionExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961EC2B879ED9001760E1 /* MockAutofillActionExecutor.swift */; };
 		C1E961EF2B87AA29001760E1 /* AutofillActionBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961EE2B87AA29001760E1 /* AutofillActionBuilder.swift */; };
@@ -3099,27 +3225,32 @@
 		EAC80DE0271F6C0100BBF02D /* fb-sdk.js in Resources */ = {isa = PBXBuildFile; fileRef = EAC80DDF271F6C0100BBF02D /* fb-sdk.js */; };
 		EAE42800275D47FA00DAC26B /* ClickToLoadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE427FF275D47FA00DAC26B /* ClickToLoadModel.swift */; };
 		EAFAD6CA2728BD1200F9DF00 /* clickToLoad.js in Resources */ = {isa = PBXBuildFile; fileRef = EAFAD6C92728BD1200F9DF00 /* clickToLoad.js */; };
-		EE0629722B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0629712B90EE8C00D868B4 /* AccountManagerExtension.swift */; };
-		EE0629732B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0629712B90EE8C00D868B4 /* AccountManagerExtension.swift */; };
-		EE0629742B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0629712B90EE8C00D868B4 /* AccountManagerExtension.swift */; };
-		EE0629752B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0629712B90EE8C00D868B4 /* AccountManagerExtension.swift */; };
-		EE0629762B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0629712B90EE8C00D868B4 /* AccountManagerExtension.swift */; };
+		EE02D41A2BB4609900DBE6B3 /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE02D4192BB4609900DBE6B3 /* UITests.swift */; };
+		EE02D41C2BB460A600DBE6B3 /* BrowsingHistoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE02D41B2BB460A600DBE6B3 /* BrowsingHistoryTests.swift */; };
+		EE02D4202BB460C000DBE6B3 /* BrowserServicesKit in Frameworks */ = {isa = PBXBuildFile; productRef = EE02D41F2BB460C000DBE6B3 /* BrowserServicesKit */; };
+		EE02D4212BB460FE00DBE6B3 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8EDF2624923EC70071C2E8 /* StringExtension.swift */; };
+		EE02D4222BB4611A00DBE6B3 /* TestsURLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6EC37FB29B83E99001ACE79 /* TestsURLExtension.swift */; };
+		EE0429E02BA31D2F009EB20F /* FindInPageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0429DF2BA31D2F009EB20F /* FindInPageTests.swift */; };
 		EE2F9C5B2B90F2FF00D45FC9 /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = EE2F9C5A2B90F2FF00D45FC9 /* Subscription */; };
 		EE339228291BDEFD009F62C1 /* JSAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE339227291BDEFD009F62C1 /* JSAlertController.swift */; };
+		EE3424602BA0853900173B1B /* VPNUninstaller.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE34245D2BA0853900173B1B /* VPNUninstaller.swift */; };
+		EE3424612BA0853900173B1B /* VPNUninstaller.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE34245D2BA0853900173B1B /* VPNUninstaller.swift */; };
+		EE66418C2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE66418B2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift */; };
+		EE66418D2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE66418B2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift */; };
 		EE66666F2B56EDE4001D898D /* VPNLocationsHostingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE66666E2B56EDE4001D898D /* VPNLocationsHostingViewController.swift */; };
 		EE6666702B56EDE4001D898D /* VPNLocationsHostingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE66666E2B56EDE4001D898D /* VPNLocationsHostingViewController.swift */; };
 		EE6666712B56EDE4001D898D /* VPNLocationsHostingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE66666E2B56EDE4001D898D /* VPNLocationsHostingViewController.swift */; };
 		EE7295E32A545B9A008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295E22A545B9A008C0991 /* NetworkProtection */; };
 		EE7295E72A545BBB008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295E62A545BBB008C0991 /* NetworkProtection */; };
 		EE7295E92A545BC4008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295E82A545BC4008C0991 /* NetworkProtection */; };
-		EE7295EB2A545BFC008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295EA2A545BFC008C0991 /* NetworkProtection */; };
 		EE7295ED2A545C0A008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295EC2A545C0A008C0991 /* NetworkProtection */; };
 		EE7295EF2A545C12008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295EE2A545C12008C0991 /* NetworkProtection */; };
 		EEA3EEB12B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */; };
 		EEA3EEB32B24EC0600E8333A /* VPNLocationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB22B24EC0600E8333A /* VPNLocationViewModel.swift */; };
-		EEAD7A7A2A1D3E20002A24E7 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
-		EEAD7A7B2A1D3E20002A24E7 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
 		EEAD7A7C2A1D3E20002A24E7 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
+		EEBCE6822BA444FA00B9DF00 /* XCUIElementExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBCE6812BA444FA00B9DF00 /* XCUIElementExtension.swift */; };
+		EEBCE6832BA463DD00B9DF00 /* NSImageExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B139AFC26B60BD800894F82 /* NSImageExtensions.swift */; };
+		EEBCE6842BA4643200B9DF00 /* NSSizeExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4E325D6BA9C007F5990 /* NSSizeExtension.swift */; };
 		EEC111E4294D06020086524F /* JSAlert.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EEC111E3294D06020086524F /* JSAlert.storyboard */; };
 		EEC111E6294D06290086524F /* JSAlertViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC111E5294D06290086524F /* JSAlertViewModel.swift */; };
 		EEC4A65E2B277E8D00F7C0AA /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */; };
@@ -3144,8 +3275,17 @@
 		EEC8EB402982CD550065AA39 /* JSAlertViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF53E172950CED5002D78F4 /* JSAlertViewModelTests.swift */; };
 		EECE10E529DD77E60044D027 /* FeatureFlag.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECE10E429DD77E60044D027 /* FeatureFlag.swift */; };
 		EECE10E629DD77E60044D027 /* FeatureFlag.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECE10E429DD77E60044D027 /* FeatureFlag.swift */; };
+		EED735362BB46B6000F173D6 /* AutocompleteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED735352BB46B6000F173D6 /* AutocompleteTests.swift */; };
+		EEDE50112BA360C80017F3C4 /* NetworkProtection+VPNAgentConvenienceInitializers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEDE50102BA360C80017F3C4 /* NetworkProtection+VPNAgentConvenienceInitializers.swift */; };
+		EEDE50122BA360C80017F3C4 /* NetworkProtection+VPNAgentConvenienceInitializers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEDE50102BA360C80017F3C4 /* NetworkProtection+VPNAgentConvenienceInitializers.swift */; };
 		EEF12E6F2A2111880023E6BF /* MacPacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF12E6D2A2111880023E6BF /* MacPacketTunnelProvider.swift */; };
 		EEF53E182950CED5002D78F4 /* JSAlertViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF53E172950CED5002D78F4 /* JSAlertViewModelTests.swift */; };
+		F1B33DF22BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B33DF12BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift */; };
+		F1B33DF32BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B33DF12BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift */; };
+		F1B33DF42BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B33DF12BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift */; };
+		F1B33DF62BAD970E001128B3 /* SubscriptionErrorReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B33DF52BAD970E001128B3 /* SubscriptionErrorReporter.swift */; };
+		F1B33DF72BAD970E001128B3 /* SubscriptionErrorReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B33DF52BAD970E001128B3 /* SubscriptionErrorReporter.swift */; };
+		F1B33DF82BAD970E001128B3 /* SubscriptionErrorReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B33DF52BAD970E001128B3 /* SubscriptionErrorReporter.swift */; };
 		F1D43AEE2B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1D43AED2B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift */; };
 		F1D43AEF2B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1D43AED2B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift */; };
 		F1D43AF02B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1D43AED2B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift */; };
@@ -3265,6 +3405,13 @@
 			remoteGlobalIDString = B6EC37E729B5DA2A001ACE79;
 			remoteInfo = "tests-server";
 		};
+		EE02D41D2BB460B500DBE6B3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = AA585D76248FD31100E9A3E2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = B6EC37E729B5DA2A001ACE79;
+			remoteInfo = "tests-server";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -3326,6 +3473,9 @@
 		14505A07256084EF00272CC6 /* UserAgent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAgent.swift; sourceTree = "<group>"; };
 		1456D6E024EFCBC300775049 /* TabBarCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarCollectionView.swift; sourceTree = "<group>"; };
 		14D9B8F924F7E089000D4D13 /* AddressBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressBarViewController.swift; sourceTree = "<group>"; };
+		1D01A3CF2B88CEC600FE8150 /* PreferencesAccessibilityView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferencesAccessibilityView.swift; sourceTree = "<group>"; };
+		1D01A3D32B88CF7700FE8150 /* AccessibilityPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccessibilityPreferences.swift; sourceTree = "<group>"; };
+		1D01A3D72B88DF8B00FE8150 /* PreferencesSyncView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesSyncView.swift; sourceTree = "<group>"; };
 		1D02633428D8A9A9005CBB41 /* BWEncryption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BWEncryption.h; sourceTree = "<group>"; };
 		1D02633528D8A9A9005CBB41 /* BWEncryption.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BWEncryption.m; sourceTree = "<group>"; };
 		1D074B262909A433006E4AC3 /* PasswordManagerCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordManagerCoordinator.swift; sourceTree = "<group>"; };
@@ -3333,6 +3483,8 @@
 		1D1A33482A6FEB170080ACED /* BurnerMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BurnerMode.swift; sourceTree = "<group>"; };
 		1D1C36E229FAE8DA001FA40C /* FaviconManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaviconManagerTests.swift; sourceTree = "<group>"; };
 		1D1C36E529FB019C001FA40C /* HistoryTabExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryTabExtensionTests.swift; sourceTree = "<group>"; };
+		1D220BF72B86192200F8BBC6 /* PreferencesEmailProtectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferencesEmailProtectionView.swift; sourceTree = "<group>"; };
+		1D220BFB2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyProtectionStatus.swift; sourceTree = "<group>"; };
 		1D26EBAB2B74BECB0002A93F /* NSImageSendable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSImageSendable.swift; sourceTree = "<group>"; };
 		1D26EBAF2B74DB600002A93F /* TabSnapshotCleanupService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabSnapshotCleanupService.swift; sourceTree = "<group>"; };
 		1D36E657298AA3BA00AA485D /* InternalUserDeciderStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InternalUserDeciderStore.swift; sourceTree = "<group>"; };
@@ -3357,11 +3509,18 @@
 		1D77921928FDC79800BE0210 /* FaviconStoringMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaviconStoringMock.swift; sourceTree = "<group>"; };
 		1D77921C28FFF27C00BE0210 /* RunningApplicationCheck.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunningApplicationCheck.swift; sourceTree = "<group>"; };
 		1D8057C72A83CAEE00F4FED6 /* SupportedOsChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportedOsChecker.swift; sourceTree = "<group>"; };
+		1D85BCC92BA982FC0065BA04 /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
 		1D8C2FE42B70F4C4005E4BBD /* TabSnapshotExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabSnapshotExtensionTests.swift; sourceTree = "<group>"; };
 		1D8C2FE92B70F5A7005E4BBD /* MockWebViewSnapshotRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockWebViewSnapshotRenderer.swift; sourceTree = "<group>"; };
 		1D8C2FEC2B70F5D0005E4BBD /* MockViewSnapshotRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockViewSnapshotRenderer.swift; sourceTree = "<group>"; };
 		1D8C2FEF2B70F751005E4BBD /* MockTabSnapshotStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockTabSnapshotStore.swift; sourceTree = "<group>"; };
 		1D9A4E592B43213B00F449E2 /* TabSnapshotExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabSnapshotExtension.swift; sourceTree = "<group>"; };
+		1D9FDEB62B9B5D150040B78C /* SearchPreferencesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchPreferencesTests.swift; sourceTree = "<group>"; };
+		1D9FDEB92B9B5E090040B78C /* WebTrackingProtectionPreferencesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebTrackingProtectionPreferencesTests.swift; sourceTree = "<group>"; };
+		1D9FDEBC2B9B5F0F0040B78C /* CookiePopupProtectionPreferencesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CookiePopupProtectionPreferencesTests.swift; sourceTree = "<group>"; };
+		1D9FDEBF2B9B5FEA0040B78C /* AccessibilityPreferencesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccessibilityPreferencesTests.swift; sourceTree = "<group>"; };
+		1D9FDEC22B9B63C90040B78C /* DataClearingPreferencesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataClearingPreferencesTests.swift; sourceTree = "<group>"; };
+		1D9FDEC52B9B64DB0040B78C /* PrivacyProtectionStatusTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacyProtectionStatusTests.swift; sourceTree = "<group>"; };
 		1DA6D0FC2A1FF9A100540406 /* HTTPCookie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPCookie.swift; sourceTree = "<group>"; };
 		1DA6D0FF2A1FF9DC00540406 /* HTTPCookieTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPCookieTests.swift; sourceTree = "<group>"; };
 		1DB67F282B6FE4A6003DF243 /* WebViewSnapshotRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewSnapshotRenderer.swift; sourceTree = "<group>"; };
@@ -3370,6 +3529,13 @@
 		1DB9617F29F67F3E00CF5568 /* FaviconNullStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaviconNullStore.swift; sourceTree = "<group>"; };
 		1DC6696F2B6CF0D700AA0645 /* TabSnapshotStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabSnapshotStore.swift; sourceTree = "<group>"; };
 		1DCFBC8929ADF32B00313531 /* BurnerHomePageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BurnerHomePageView.swift; sourceTree = "<group>"; };
+		1DDC84F62B83558F00670238 /* PreferencesPrivateSearchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferencesPrivateSearchView.swift; sourceTree = "<group>"; };
+		1DDC84FA2B8356CE00670238 /* PreferencesDefaultBrowserView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferencesDefaultBrowserView.swift; sourceTree = "<group>"; };
+		1DDC84FE2B835BC000670238 /* SearchPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchPreferences.swift; sourceTree = "<group>"; };
+		1DDC85022B83903E00670238 /* PreferencesWebTrackingProtectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferencesWebTrackingProtectionView.swift; sourceTree = "<group>"; };
+		1DDD3EBB2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebTrackingProtectionPreferences.swift; sourceTree = "<group>"; };
+		1DDD3EBF2B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferencesCookiePopupProtectionView.swift; sourceTree = "<group>"; };
+		1DDD3EC32B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CookiePopupProtectionPreferences.swift; sourceTree = "<group>"; };
 		1DDF075C28F815AD00EDFBE3 /* BWCredential.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BWCredential.swift; sourceTree = "<group>"; };
 		1DDF075D28F815AD00EDFBE3 /* BWCommunicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BWCommunicator.swift; sourceTree = "<group>"; };
 		1DDF075E28F815AD00EDFBE3 /* BWManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BWManager.swift; sourceTree = "<group>"; };
@@ -3382,7 +3548,6 @@
 		1E7E2E8F29029A2A00C01B54 /* ContentBlockingRulesUpdateObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentBlockingRulesUpdateObserver.swift; sourceTree = "<group>"; };
 		1E7E2E932902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyDashboardPermissionHandler.swift; sourceTree = "<group>"; };
 		1E862A882A9FC01200F84D4B /* SubscriptionUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = SubscriptionUI; sourceTree = "<group>"; };
-		1EA7B8D72B7E1283000330A4 /* SubscriptionFeatureAvailability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionFeatureAvailability.swift; sourceTree = "<group>"; };
 		1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityTheftRestorationPagesUserScript.swift; sourceTree = "<group>"; };
 		310E79BE294A19A8007C49E8 /* FireproofingReferenceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FireproofingReferenceTests.swift; sourceTree = "<group>"; };
 		311B262628E73E0A00FD181A /* TabShadowConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabShadowConfig.swift; sourceTree = "<group>"; };
@@ -3402,6 +3567,7 @@
 		3192EC872A4DCF21001E97A5 /* DBPHomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DBPHomeViewController.swift; sourceTree = "<group>"; };
 		3199C6F82AF94F5B002A7BA1 /* DataBrokerProtectionFeatureDisabler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionFeatureDisabler.swift; sourceTree = "<group>"; };
 		3199C6FC2AF97367002A7BA1 /* DataBrokerProtectionAppEvents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionAppEvents.swift; sourceTree = "<group>"; };
+		31A2FD162BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionVisibilityTests.swift; sourceTree = "<group>"; };
 		31AA6B962B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionLoginItemPixels.swift; sourceTree = "<group>"; };
 		31B4AF522901A4F20013585E /* NSEventExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSEventExtension.swift; sourceTree = "<group>"; };
 		31C3CE0128EDC1E70002C24A /* CustomRoundedCornersShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomRoundedCornersShape.swift; sourceTree = "<group>"; };
@@ -3494,15 +3660,14 @@
 		37BF3F1E286F0A7A00BD9014 /* PinnedTabsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PinnedTabsViewModel.swift; sourceTree = "<group>"; };
 		37BF3F1F286F0A7A00BD9014 /* PinnedTabsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PinnedTabsView.swift; sourceTree = "<group>"; };
 		37CBCA992A8966E60050218F /* SyncSettingsAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncSettingsAdapter.swift; sourceTree = "<group>"; };
-		37CC53EB27E8A4D10028713D /* PreferencesPrivacyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesPrivacyView.swift; sourceTree = "<group>"; };
-		37CC53EF27E8D1440028713D /* PreferencesDownloadsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesDownloadsView.swift; sourceTree = "<group>"; };
+		37CC53EB27E8A4D10028713D /* PreferencesDataClearingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesDataClearingView.swift; sourceTree = "<group>"; };
 		37CC53F327E8D4620028713D /* NSPathControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSPathControlView.swift; sourceTree = "<group>"; };
 		37CD54B427F1AC1300F1F7B9 /* PreferencesSidebarModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesSidebarModelTests.swift; sourceTree = "<group>"; };
 		37CD54B627F1B28A00F1F7B9 /* DefaultBrowserPreferencesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultBrowserPreferencesTests.swift; sourceTree = "<group>"; };
 		37CD54B827F1F8AC00F1F7B9 /* AppearancePreferencesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearancePreferencesTests.swift; sourceTree = "<group>"; };
 		37CD54BA27F25A4000F1F7B9 /* DownloadsPreferencesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadsPreferencesTests.swift; sourceTree = "<group>"; };
 		37CD54BC27F2ECAE00F1F7B9 /* AutofillPreferencesModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillPreferencesModelTests.swift; sourceTree = "<group>"; };
-		37CD54C127F2FDD100F1F7B9 /* PrivacyPreferencesModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacyPreferencesModel.swift; sourceTree = "<group>"; };
+		37CD54C127F2FDD100F1F7B9 /* DataClearingPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataClearingPreferences.swift; sourceTree = "<group>"; };
 		37CD54C227F2FDD100F1F7B9 /* AutofillPreferencesModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutofillPreferencesModel.swift; sourceTree = "<group>"; };
 		37CD54C327F2FDD100F1F7B9 /* DownloadsPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadsPreferences.swift; sourceTree = "<group>"; };
 		37CD54C427F2FDD100F1F7B9 /* PreferencesSection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferencesSection.swift; sourceTree = "<group>"; };
@@ -3531,7 +3696,6 @@
 		4B02198125E05FAC00ED7DEA /* FireproofDomains.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FireproofDomains.swift; sourceTree = "<group>"; };
 		4B02199925E063DE00ED7DEA /* FireproofDomainsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FireproofDomainsTests.swift; sourceTree = "<group>"; };
 		4B0219A725E0646500ED7DEA /* WebsiteDataStoreTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebsiteDataStoreTests.swift; sourceTree = "<group>"; };
-		4B0511A6262CAA5A00F6079C /* PrivacySecurityPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacySecurityPreferences.swift; sourceTree = "<group>"; };
 		4B0511AD262CAA5A00F6079C /* FireproofDomains.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = FireproofDomains.storyboard; sourceTree = "<group>"; };
 		4B0511B3262CAA5A00F6079C /* RoundedSelectionRowView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoundedSelectionRowView.swift; sourceTree = "<group>"; };
 		4B0511B4262CAA5A00F6079C /* FireproofDomainsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FireproofDomainsViewController.swift; sourceTree = "<group>"; };
@@ -3615,6 +3779,7 @@
 		4B4D60D22A0C84F700BCD287 /* UserText+NetworkProtection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UserText+NetworkProtection.swift"; sourceTree = "<group>"; };
 		4B4D60E12A0C883A00BCD287 /* AppMain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppMain.swift; sourceTree = "<group>"; };
 		4B4F72EB266B2ED300814C60 /* CollectionExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionExtension.swift; sourceTree = "<group>"; };
+		4B520F622BA5573A006405C7 /* WaitlistThankYouView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistThankYouView.swift; sourceTree = "<group>"; };
 		4B59023926B35F3600489384 /* ChromiumLoginReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChromiumLoginReader.swift; sourceTree = "<group>"; };
 		4B59023B26B35F3600489384 /* ChromiumDataImporter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChromiumDataImporter.swift; sourceTree = "<group>"; };
 		4B59024726B3673600489384 /* ThirdPartyBrowser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThirdPartyBrowser.swift; sourceTree = "<group>"; };
@@ -3633,6 +3798,7 @@
 		4B677454255DC18000025BD8 /* Bridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bridging.h; sourceTree = "<group>"; };
 		4B67853E2AA7C726008A5004 /* DailyPixel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyPixel.swift; sourceTree = "<group>"; };
 		4B6785432AA8DE1F008A5004 /* NetworkProtectionFeatureDisabler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionFeatureDisabler.swift; sourceTree = "<group>"; };
+		4B6B64832BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistThankYouPromptPresenter.swift; sourceTree = "<group>"; };
 		4B70BFFF27B0793D000386ED /* DuckDuckGo-ExampleCrash.ips */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "DuckDuckGo-ExampleCrash.ips"; sourceTree = "<group>"; };
 		4B70C00027B0793D000386ED /* CrashReportTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrashReportTests.swift; sourceTree = "<group>"; };
 		4B723DEB26B0002B00E14D75 /* DataImport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataImport.swift; sourceTree = "<group>"; };
@@ -3688,8 +3854,6 @@
 		4B9292C72667123700AD2C21 /* BookmarkManagementSidebarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkManagementSidebarViewController.swift; sourceTree = "<group>"; };
 		4B9292C82667123700AD2C21 /* BookmarkManagementSplitViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkManagementSplitViewController.swift; sourceTree = "<group>"; };
 		4B9292C92667123700AD2C21 /* BookmarkTableRowView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkTableRowView.swift; sourceTree = "<group>"; };
-		4B9292CA2667123700AD2C21 /* AddBookmarkFolderModalView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddBookmarkFolderModalView.swift; sourceTree = "<group>"; };
-		4B9292CB2667123700AD2C21 /* AddBookmarkModalView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddBookmarkModalView.swift; sourceTree = "<group>"; };
 		4B9292CC2667123700AD2C21 /* BookmarkListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkListViewController.swift; sourceTree = "<group>"; };
 		4B9292CD2667123700AD2C21 /* BookmarkManagementDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkManagementDetailViewController.swift; sourceTree = "<group>"; };
 		4B9292D82667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkListTreeControllerDataSource.swift; sourceTree = "<group>"; };
@@ -3823,6 +3987,7 @@
 		7B0099802B65C6B300FE7C31 /* MacTransparentProxyProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacTransparentProxyProvider.swift; sourceTree = "<group>"; };
 		7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionOnboardingMenu.swift; sourceTree = "<group>"; };
 		7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNProxyLauncher.swift; sourceTree = "<group>"; };
+		7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionPixelEventTests.swift; sourceTree = "<group>"; };
 		7B1E819B27C8874900FF0E60 /* ContentOverlayPopover.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentOverlayPopover.swift; sourceTree = "<group>"; };
 		7B1E819C27C8874900FF0E60 /* ContentOverlay.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = ContentOverlay.storyboard; sourceTree = "<group>"; };
 		7B1E819D27C8874900FF0E60 /* ContentOverlayViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentOverlayViewController.swift; sourceTree = "<group>"; };
@@ -3839,6 +4004,7 @@
 		7B6EC5E42AE2D8AF004FE6DF /* DuckDuckGoDBPAgentAppStore.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DuckDuckGoDBPAgentAppStore.xcconfig; sourceTree = "<group>"; };
 		7B6EC5E52AE2D8AF004FE6DF /* DuckDuckGoDBPAgent.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DuckDuckGoDBPAgent.xcconfig; sourceTree = "<group>"; };
 		7B76E6852AD5D77600186A84 /* XPCHelper */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = XPCHelper; sourceTree = "<group>"; };
+		7B7FCD0E2BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+vpnLegacyUser.swift"; sourceTree = "<group>"; };
 		7B8DB3192B504D7500EC16DA /* VPNAppEventsHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNAppEventsHandler.swift; sourceTree = "<group>"; };
 		7B934C3D2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionOnboardingMenu.swift; sourceTree = "<group>"; };
 		7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UserDefaults+NetworkProtectionShared.swift"; sourceTree = "<group>"; };
@@ -3858,6 +4024,7 @@
 		7BA7CC4D2AD11F6F0042E5CE /* NetworkProtectionIPCTunnelController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionIPCTunnelController.swift; sourceTree = "<group>"; };
 		7BB108572A43375D000AB95F /* PFMoveApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFMoveApplication.h; sourceTree = "<group>"; };
 		7BB108582A43375D000AB95F /* PFMoveApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFMoveApplication.m; sourceTree = "<group>"; };
+		7BBA7CE52BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift"; sourceTree = "<group>"; };
 		7BBD45B02A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionDebugUtilities.swift; sourceTree = "<group>"; };
 		7BD01C182AD8319C0088B32E /* IPCServiceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPCServiceManager.swift; sourceTree = "<group>"; };
 		7BD1688D2AD4A4C400D24876 /* NetworkExtensionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkExtensionController.swift; sourceTree = "<group>"; };
@@ -3988,10 +4155,33 @@
 		9D9AE9282AAA43EB0026E7DC /* DataBrokerProtectionBackgroundManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionBackgroundManager.swift; sourceTree = "<group>"; };
 		9D9AE92B2AAB84FF0026E7DC /* DBPMocks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DBPMocks.swift; sourceTree = "<group>"; };
 		9DB6E7222AA0DA7A00A17F3C /* LoginItems */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = LoginItems; sourceTree = "<group>"; };
+		9F0A2CF72B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseBookmarkEntityTests.swift; sourceTree = "<group>"; };
 		9F180D0E2B69C553000D695F /* Tab+WKUIDelegateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Tab+WKUIDelegateTests.swift"; sourceTree = "<group>"; };
 		9F180D112B69C665000D695F /* DownloadsTabExtensionMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadsTabExtensionMock.swift; sourceTree = "<group>"; };
+		9F2606092B85C20400819292 /* AddEditBookmarkDialogViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkDialogViewModelTests.swift; sourceTree = "<group>"; };
+		9F26060D2B85E17D00819292 /* AddEditBookmarkDialogCoordinatorViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkDialogCoordinatorViewModelTests.swift; sourceTree = "<group>"; };
 		9F3910612B68C35600CB5112 /* DownloadsTabExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadsTabExtensionTests.swift; sourceTree = "<group>"; };
 		9F3910682B68D87B00CB5112 /* ProgressExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressExtensionTests.swift; sourceTree = "<group>"; };
+		9F514F902B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkFolderDialogView.swift; sourceTree = "<group>"; };
+		9F56CFA82B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkFolderView.swift; sourceTree = "<group>"; };
+		9F56CFAC2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkDialogViewModel.swift; sourceTree = "<group>"; };
+		9F56CFB02B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksDialogViewFactory.swift; sourceTree = "<group>"; };
+		9F872D972B8DA9F800138637 /* Bookmarks+Tab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bookmarks+Tab.swift"; sourceTree = "<group>"; };
+		9F872D9C2B9058D000138637 /* Bookmarks+TabTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bookmarks+TabTests.swift"; sourceTree = "<group>"; };
+		9F872D9F2B90644800138637 /* ContextualMenuTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextualMenuTests.swift; sourceTree = "<group>"; };
+		9F872DA22B90920F00138637 /* BookmarkFolderInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkFolderInfo.swift; sourceTree = "<group>"; };
+		9F982F0C2B8224BE00231028 /* AddEditBookmarkFolderDialogViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkFolderDialogViewModel.swift; sourceTree = "<group>"; };
+		9F982F112B82268F00231028 /* AddEditBookmarkFolderDialogViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkFolderDialogViewModelTests.swift; sourceTree = "<group>"; };
+		9FA173D92B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkDialogContainerView.swift; sourceTree = "<group>"; };
+		9FA173DE2B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkDialogButtonsView.swift; sourceTree = "<group>"; };
+		9FA173E22B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkDialogFolderManagementView.swift; sourceTree = "<group>"; };
+		9FA173E62B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkDialogStackedContentView.swift; sourceTree = "<group>"; };
+		9FA173EA2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkDialogView.swift; sourceTree = "<group>"; };
+		9FA75A3D2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksBarMenuFactoryTests.swift; sourceTree = "<group>"; };
+		9FDA6C202B79A59D00E099A9 /* BookmarkFavoriteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkFavoriteView.swift; sourceTree = "<group>"; };
+		9FEE98642B846870002E44E8 /* AddEditBookmarkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkView.swift; sourceTree = "<group>"; };
+		9FEE98682B85B869002E44E8 /* BookmarksDialogViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksDialogViewModel.swift; sourceTree = "<group>"; };
+		9FEE986C2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkDialogCoordinatorViewModel.swift; sourceTree = "<group>"; };
 		AA0877B726D5160D00B05660 /* SafariVersionReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariVersionReaderTests.swift; sourceTree = "<group>"; };
 		AA0877B926D5161D00B05660 /* WebKitVersionProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebKitVersionProviderTests.swift; sourceTree = "<group>"; };
 		AA0F3DB6261A566C0077F2D9 /* SuggestionLoadingMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuggestionLoadingMock.swift; sourceTree = "<group>"; };
@@ -4161,6 +4351,7 @@
 		B31055BC27A1BA1D001AC618 /* AutoconsentUserScript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoconsentUserScript.swift; sourceTree = "<group>"; };
 		B31055BE27A1BA1D001AC618 /* userscript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = userscript.js; sourceTree = "<group>"; };
 		B31055C327A1BA1D001AC618 /* autoconsent-bundle.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "autoconsent-bundle.js"; sourceTree = "<group>"; };
+		B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetPPopoverManagerMock.swift; sourceTree = "<group>"; };
 		B602E7CE2A93A5FF00F12201 /* WKBackForwardListExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKBackForwardListExtension.swift; sourceTree = "<group>"; };
 		B602E8152A1E2570006D261F /* URL+NetworkProtection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URL+NetworkProtection.swift"; sourceTree = "<group>"; };
 		B602E81C2A1E25B0006D261F /* NEOnDemandRuleExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NEOnDemandRuleExtension.swift; sourceTree = "<group>"; };
@@ -4447,9 +4638,7 @@
 		B6F56566299A414300A04298 /* WKWebViewMockingExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WKWebViewMockingExtension.swift; sourceTree = "<group>"; };
 		B6F7127D29F6779000594A45 /* QRSharingService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRSharingService.swift; sourceTree = "<group>"; };
 		B6F7128029F681EB00594A45 /* QuickLookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLookUI.framework; path = System/Library/Frameworks/QuickLookUI.framework; sourceTree = SDKROOT; };
-		B6F9BDD72B45B7D900677B33 /* AddBookmarkModalViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddBookmarkModalViewModel.swift; sourceTree = "<group>"; };
 		B6F9BDDB2B45B7EE00677B33 /* WebsiteInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsiteInfo.swift; sourceTree = "<group>"; };
-		B6F9BDDF2B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddBookmarkFolderModalViewModel.swift; sourceTree = "<group>"; };
 		B6F9BDE32B45CD1900677B33 /* ModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalView.swift; sourceTree = "<group>"; };
 		B6FA893C269C423100588ECD /* PrivacyDashboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = PrivacyDashboard.storyboard; sourceTree = "<group>"; };
 		B6FA893E269C424500588ECD /* PrivacyDashboardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyDashboardViewController.swift; sourceTree = "<group>"; };
@@ -4460,6 +4649,9 @@
 		C13909F32B85FD79001626ED /* AutofillDeleteAllPasswordsExecutorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillDeleteAllPasswordsExecutorTests.swift; sourceTree = "<group>"; };
 		C13909FA2B861039001626ED /* AutofillActionPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillActionPresenter.swift; sourceTree = "<group>"; };
 		C168B9AB2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutofillNeverPromptWebsitesManager.swift; sourceTree = "<group>"; };
+		C17CA7AC2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarPopoversTests.swift; sourceTree = "<group>"; };
+		C17CA7B12B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAutofillPopoverPresenter.swift; sourceTree = "<group>"; };
+		C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillPopoverPresenter.swift; sourceTree = "<group>"; };
 		C1E961E72B879E4D001760E1 /* MockAutofillActionPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAutofillActionPresenter.swift; sourceTree = "<group>"; };
 		C1E961EC2B879ED9001760E1 /* MockAutofillActionExecutor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAutofillActionExecutor.swift; sourceTree = "<group>"; };
 		C1E961EE2B87AA29001760E1 /* AutofillActionBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillActionBuilder.swift; sourceTree = "<group>"; };
@@ -4478,20 +4670,29 @@
 		EAC80DDF271F6C0100BBF02D /* fb-sdk.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "fb-sdk.js"; sourceTree = "<group>"; };
 		EAE427FF275D47FA00DAC26B /* ClickToLoadModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClickToLoadModel.swift; sourceTree = "<group>"; };
 		EAFAD6C92728BD1200F9DF00 /* clickToLoad.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = clickToLoad.js; sourceTree = "<group>"; };
-		EE0629712B90EE8C00D868B4 /* AccountManagerExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountManagerExtension.swift; sourceTree = "<group>"; };
+		EE02D4192BB4609900DBE6B3 /* UITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITests.swift; sourceTree = "<group>"; };
+		EE02D41B2BB460A600DBE6B3 /* BrowsingHistoryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrowsingHistoryTests.swift; sourceTree = "<group>"; };
+		EE0429DF2BA31D2F009EB20F /* FindInPageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FindInPageTests.swift; sourceTree = "<group>"; };
 		EE339227291BDEFD009F62C1 /* JSAlertController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSAlertController.swift; sourceTree = "<group>"; };
+		EE34245D2BA0853900173B1B /* VPNUninstaller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNUninstaller.swift; sourceTree = "<group>"; };
+		EE66418B2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift"; sourceTree = "<group>"; };
 		EE66666E2B56EDE4001D898D /* VPNLocationsHostingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNLocationsHostingViewController.swift; sourceTree = "<group>"; };
 		EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionVPNCountryLabelsModel.swift; sourceTree = "<group>"; };
 		EEA3EEB22B24EC0600E8333A /* VPNLocationViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VPNLocationViewModel.swift; sourceTree = "<group>"; };
 		EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppLauncher.swift; sourceTree = "<group>"; };
+		EEBCE6812BA444FA00B9DF00 /* XCUIElementExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCUIElementExtension.swift; sourceTree = "<group>"; };
 		EEC111E3294D06020086524F /* JSAlert.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = JSAlert.storyboard; sourceTree = "<group>"; };
 		EEC111E5294D06290086524F /* JSAlertViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSAlertViewModel.swift; sourceTree = "<group>"; };
 		EEC4A6682B2C87D300F7C0AA /* VPNLocationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNLocationView.swift; sourceTree = "<group>"; };
 		EEC4A66C2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNLocationPreferenceItemModel.swift; sourceTree = "<group>"; };
 		EEC4A6702B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNLocationPreferenceItem.swift; sourceTree = "<group>"; };
 		EECE10E429DD77E60044D027 /* FeatureFlag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlag.swift; sourceTree = "<group>"; };
+		EED735352BB46B6000F173D6 /* AutocompleteTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutocompleteTests.swift; sourceTree = "<group>"; };
+		EEDE50102BA360C80017F3C4 /* NetworkProtection+VPNAgentConvenienceInitializers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NetworkProtection+VPNAgentConvenienceInitializers.swift"; sourceTree = "<group>"; };
 		EEF12E6D2A2111880023E6BF /* MacPacketTunnelProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacPacketTunnelProvider.swift; sourceTree = "<group>"; };
 		EEF53E172950CED5002D78F4 /* JSAlertViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSAlertViewModelTests.swift; sourceTree = "<group>"; };
+		F1B33DF12BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionAppStoreRestorer.swift; sourceTree = "<group>"; };
+		F1B33DF52BAD970E001128B3 /* SubscriptionErrorReporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionErrorReporter.swift; sourceTree = "<group>"; };
 		F1D43AED2B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "MainMenuActions+VanillaBrowser.swift"; sourceTree = "<group>"; };
 		F41D174025CB131900472416 /* NSColorExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSColorExtension.swift; sourceTree = "<group>"; };
 		F44C130125C2DA0400426E3E /* NSAppearanceExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSAppearanceExtension.swift; sourceTree = "<group>"; };
@@ -4518,9 +4719,12 @@
 				378F44E629B4BDEE00899924 /* SwiftUIExtensions in Frameworks */,
 				3706FCA7293F65D500E42796 /* BrowserServicesKit in Frameworks */,
 				3129788A2B64131200B67619 /* DataBrokerProtection in Frameworks */,
+				4BCBE4582BA7E17800FC75A1 /* SubscriptionUI in Frameworks */,
 				3706FCA9293F65D500E42796 /* ContentBlocking in Frameworks */,
+				85D44B882BA08D30001B4AB5 /* Suggestions in Frameworks */,
 				4BF97AD12B43C43F00EB4240 /* NetworkProtectionIPC in Frameworks */,
 				37F44A5F298C17830025E7FE /* Navigation in Frameworks */,
+				4BCBE45A2BA7E17800FC75A1 /* Subscription in Frameworks */,
 				B6EC37FF29B8D915001ACE79 /* Configuration in Frameworks */,
 				372217822B33380700B8E9C2 /* TestUtils in Frameworks */,
 				3706FCAA293F65D500E42796 /* UserScript in Frameworks */,
@@ -4578,6 +4782,7 @@
 				37269F012B332FC8005E8E46 /* Common in Frameworks */,
 				EE7295E92A545BC4008C0991 /* NetworkProtection in Frameworks */,
 				4B2537772A11BFE100610219 /* PixelKit in Frameworks */,
+				7B37C7A52BAA32A50062546A /* Subscription in Frameworks */,
 				7BBE2B7B2B61663C00697445 /* NetworkProtectionProxy in Frameworks */,
 				4B2D062C2A11C0E100DE1F49 /* Networking in Frameworks */,
 				4B25375B2A11BE7300610219 /* NetworkExtension.framework in Frameworks */,
@@ -4605,6 +4810,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				7BFCB7502ADE7E2300DA3EA7 /* PixelKit in Frameworks */,
+				4BCBE45C2BA7E18500FC75A1 /* Subscription in Frameworks */,
 				7BA7CC612AD1211C0042E5CE /* Networking in Frameworks */,
 				7BEEA5142AD1236300A9E72B /* NetworkProtectionIPC in Frameworks */,
 				7B00997F2B6508C200FE7C31 /* NetworkProtectionProxy in Frameworks */,
@@ -4618,7 +4824,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EE7295EB2A545BFC008C0991 /* NetworkProtection in Frameworks */,
+				7B624F172BA25C1F00A6C544 /* NetworkProtectionUI in Frameworks */,
 				37269F052B3332C2005E8E46 /* Common in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4631,6 +4837,7 @@
 				EE7295E72A545BBB008C0991 /* NetworkProtection in Frameworks */,
 				4B4D60982A0B2A5C00BCD287 /* PixelKit in Frameworks */,
 				4B4D60AF2A0C837F00BCD287 /* Networking in Frameworks */,
+				7B25856E2BA2F2ED00D49F79 /* NetworkProtectionUI in Frameworks */,
 				4B4D603F2A0B290200BCD287 /* NetworkExtension.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4664,6 +4871,7 @@
 				85E2BBD22B8F536F00DBEC7A /* History in Frameworks */,
 				4B957BE62AC7AE700062CA31 /* PrivacyDashboard in Frameworks */,
 				7B8C083C2AE1268E00F4C67F /* PixelKit in Frameworks */,
+				85D44B8A2BA08D3B001B4AB5 /* Suggestions in Frameworks */,
 				4B957BE72AC7AE700062CA31 /* SyncDataProviders in Frameworks */,
 				37269F032B332FD8005E8E46 /* Common in Frameworks */,
 				4B957BE82AC7AE700062CA31 /* SyncUI in Frameworks */,
@@ -4684,6 +4892,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				EE02D4202BB460C000DBE6B3 /* BrowserServicesKit in Frameworks */,
 				B64E42872B908501006C1346 /* SnapshotTesting in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4749,6 +4958,7 @@
 				7BA59C9B2AE18B49009A97B1 /* SystemExtensionManager in Frameworks */,
 				371D00E129D8509400EC8598 /* OpenSSL in Frameworks */,
 				1E950E412912A10D0051A99B /* PrivacyDashboard in Frameworks */,
+				85D44B862BA08D29001B4AB5 /* Suggestions in Frameworks */,
 				37DF000529F9C056002B7D3E /* SyncDataProviders in Frameworks */,
 				37BA812D29B3CD690053F1A3 /* SyncUI in Frameworks */,
 				372217802B3337FE00B8E9C2 /* TestUtils in Frameworks */,
@@ -4956,8 +5166,7 @@
 		1EA7B8D62B7E124E000330A4 /* Subscription */ = {
 			isa = PBXGroup;
 			children = (
-				EE0629712B90EE8C00D868B4 /* AccountManagerExtension.swift */,
-				1EA7B8D72B7E1283000330A4 /* SubscriptionFeatureAvailability.swift */,
+				7BBA7CE52BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift */,
 			);
 			path = Subscription;
 			sourceTree = "<group>";
@@ -5000,6 +5209,14 @@
 			path = DBP;
 			sourceTree = "<group>";
 		};
+		31A2FD152BAB419400D0E741 /* DBP */ = {
+			isa = PBXGroup;
+			children = (
+				31A2FD162BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift */,
+			);
+			path = DBP;
+			sourceTree = "<group>";
+		};
 		31E163BB293A577200963C10 /* PrivacyReferenceTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -5214,18 +5431,22 @@
 			children = (
 				37CD54C427F2FDD100F1F7B9 /* PreferencesSection.swift */,
 				37CD54C627F2FDD100F1F7B9 /* PreferencesSidebarModel.swift */,
-				37A4CEB9282E992F00D75B89 /* StartupPreferences.swift */,
 				37CD54C827F2FDD100F1F7B9 /* DefaultBrowserPreferences.swift */,
+				1DDC84FE2B835BC000670238 /* SearchPreferences.swift */,
+				1DDD3EBB2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift */,
+				1DDD3EC32B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift */,
+				4B41EDA22B1543B9001EEDF4 /* VPNPreferencesModel.swift */,
+				37A4CEB9282E992F00D75B89 /* StartupPreferences.swift */,
+				37CD54C327F2FDD100F1F7B9 /* DownloadsPreferences.swift */,
 				3775912C29AAC72700E26367 /* SyncPreferences.swift */,
 				37CD54C727F2FDD100F1F7B9 /* AppearancePreferences.swift */,
-				37CD54C127F2FDD100F1F7B9 /* PrivacyPreferencesModel.swift */,
-				4B0511A6262CAA5A00F6079C /* PrivacySecurityPreferences.swift */,
-				37F19A6628E1B43200740DC6 /* DuckPlayerPreferences.swift */,
 				37CD54C227F2FDD100F1F7B9 /* AutofillPreferencesModel.swift */,
 				3776582E27F82E62009A6B35 /* AutofillPreferences.swift */,
-				37CD54C327F2FDD100F1F7B9 /* DownloadsPreferences.swift */,
+				1D01A3D32B88CF7700FE8150 /* AccessibilityPreferences.swift */,
+				37CD54C127F2FDD100F1F7B9 /* DataClearingPreferences.swift */,
+				37F19A6628E1B43200740DC6 /* DuckPlayerPreferences.swift */,
 				37CD54C527F2FDD100F1F7B9 /* AboutModel.swift */,
-				4B41EDA22B1543B9001EEDF4 /* VPNPreferencesModel.swift */,
+				1D220BFB2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -5303,13 +5524,19 @@
 				37AFCE8627DA334800471A10 /* PreferencesRootView.swift */,
 				37AFCE8427DA2D3900471A10 /* PreferencesSidebar.swift */,
 				37AFCE8A27DB69BC00471A10 /* PreferencesGeneralView.swift */,
+				1D01A3D72B88DF8B00FE8150 /* PreferencesSyncView.swift */,
+				1DDC84FA2B8356CE00670238 /* PreferencesDefaultBrowserView.swift */,
+				1DDC84F62B83558F00670238 /* PreferencesPrivateSearchView.swift */,
+				1DDC85022B83903E00670238 /* PreferencesWebTrackingProtectionView.swift */,
+				1DDD3EBF2B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift */,
+				1D220BF72B86192200F8BBC6 /* PreferencesEmailProtectionView.swift */,
+				4B41EDA62B1543C9001EEDF4 /* PreferencesVPNView.swift */,
 				37D2771427E870D4003365FD /* PreferencesAppearanceView.swift */,
-				37CC53EB27E8A4D10028713D /* PreferencesPrivacyView.swift */,
-				37F19A6428E1B3FB00740DC6 /* PreferencesDuckPlayerView.swift */,
 				379DE4BC27EA31AC002CC3DE /* PreferencesAutofillView.swift */,
-				37CC53EF27E8D1440028713D /* PreferencesDownloadsView.swift */,
+				1D01A3CF2B88CEC600FE8150 /* PreferencesAccessibilityView.swift */,
+				37CC53EB27E8A4D10028713D /* PreferencesDataClearingView.swift */,
+				37F19A6428E1B3FB00740DC6 /* PreferencesDuckPlayerView.swift */,
 				37AFCE9127DB8CAD00471A10 /* PreferencesAboutView.swift */,
-				4B41EDA62B1543C9001EEDF4 /* PreferencesVPNView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -5319,12 +5546,18 @@
 			children = (
 				37CD54B427F1AC1300F1F7B9 /* PreferencesSidebarModelTests.swift */,
 				37CD54B627F1B28A00F1F7B9 /* DefaultBrowserPreferencesTests.swift */,
-				37CD54B827F1F8AC00F1F7B9 /* AppearancePreferencesTests.swift */,
+				378205F7283BC6A600D1D4AA /* StartupPreferencesTests.swift */,
+				1D9FDEB62B9B5D150040B78C /* SearchPreferencesTests.swift */,
+				1D9FDEB92B9B5E090040B78C /* WebTrackingProtectionPreferencesTests.swift */,
+				1D9FDEBC2B9B5F0F0040B78C /* CookiePopupProtectionPreferencesTests.swift */,
 				37CD54BA27F25A4000F1F7B9 /* DownloadsPreferencesTests.swift */,
+				37CD54B827F1F8AC00F1F7B9 /* AppearancePreferencesTests.swift */,
 				3776583027F8325B009A6B35 /* AutofillPreferencesTests.swift */,
 				37CD54BC27F2ECAE00F1F7B9 /* AutofillPreferencesModelTests.swift */,
-				378205F7283BC6A600D1D4AA /* StartupPreferencesTests.swift */,
+				1D9FDEBF2B9B5FEA0040B78C /* AccessibilityPreferencesTests.swift */,
+				1D9FDEC22B9B63C90040B78C /* DataClearingPreferencesTests.swift */,
 				3714B1E628EDB7FA0056C57A /* DuckPlayerPreferencesTests.swift */,
+				1D9FDEC52B9B64DB0040B78C /* PrivacyProtectionStatusTests.swift */,
 			);
 			path = Preferences;
 			sourceTree = "<group>";
@@ -5584,6 +5817,7 @@
 				4B41ED9F2B15437A001EEDF4 /* NetworkProtectionNotificationsPresenterFactory.swift */,
 				EEF12E6D2A2111880023E6BF /* MacPacketTunnelProvider.swift */,
 				7B0099802B65C6B300FE7C31 /* MacTransparentProxyProvider.swift */,
+				EE66418B2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift */,
 			);
 			path = NetworkExtensionTargets;
 			sourceTree = "<group>";
@@ -5610,6 +5844,7 @@
 		4B5F14F72A148B230060320F /* NetworkProtectionAppExtension */ = {
 			isa = PBXGroup;
 			children = (
+				1D85BCC92BA982FC0065BA04 /* InfoPlist.xcstrings */,
 				4B5F14F82A148B230060320F /* Info.plist */,
 			);
 			path = NetworkProtectionAppExtension;
@@ -5827,6 +6062,7 @@
 			children = (
 				4B9292AE26670F5300AD2C21 /* NSOutlineViewExtensions.swift */,
 				B6C0BB6629AEFF8100AE8E3C /* BookmarkExtension.swift */,
+				9F872D972B8DA9F800138637 /* Bookmarks+Tab.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -5836,6 +6072,7 @@
 			children = (
 				7BD8679A2A9E9E000063B9F7 /* NetworkProtectionFeatureVisibility.swift */,
 				4B6785432AA8DE1F008A5004 /* NetworkProtectionFeatureDisabler.swift */,
+				7B7FCD0E2BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift */,
 				31F2D1FE2AF026D800BF0144 /* WaitlistTermsAndConditionsActionHandler.swift */,
 				31C9ADE42AF0564500CEF57D /* WaitlistFeatureSetupHandler.swift */,
 				4B9DB0072A983B23000927DB /* Waitlist.swift */,
@@ -5883,6 +6120,8 @@
 				4B9DB0192A983B24000927DB /* WaitlistModalViewController.swift */,
 				3168506C2AF3AD1C009A2828 /* WaitlistViewControllerPresenter.swift */,
 				4B9DB01A2A983B24000927DB /* WaitlistRootView.swift */,
+				4B520F622BA5573A006405C7 /* WaitlistThankYouView.swift */,
+				4B6B64832BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -6080,6 +6319,7 @@
 				4BCF15E62ABB98A20083F6DF /* Resources */,
 				4BCF15E42ABB98990083F6DF /* NetworkProtectionRemoteMessageTests.swift */,
 				4BD57C032AC112DF00B580EE /* NetworkProtectionRemoteMessagingTests.swift */,
+				7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */,
 			);
 			path = NetworkProtection;
 			sourceTree = "<group>";
@@ -6204,6 +6444,10 @@
 		7B4CE8DB26F02108009134B1 /* UITests */ = {
 			isa = PBXGroup;
 			children = (
+				EEBCE6802BA444FA00B9DF00 /* Common */,
+				EED735352BB46B6000F173D6 /* AutocompleteTests.swift */,
+				EE02D41B2BB460A600DBE6B3 /* BrowsingHistoryTests.swift */,
+				EE0429DF2BA31D2F009EB20F /* FindInPageTests.swift */,
 				7B4CE8E626F02134009134B1 /* TabBarTests.swift */,
 			);
 			path = UITests;
@@ -6232,9 +6476,11 @@
 				7BA7CC132AD11DC80042E5CE /* AppLauncher+DefaultInitializer.swift */,
 				7BA7CC0E2AD11DC80042E5CE /* DuckDuckGoVPNAppDelegate.swift */,
 				7BD1688D2AD4A4C400D24876 /* NetworkExtensionController.swift */,
+				EEDE50102BA360C80017F3C4 /* NetworkProtection+VPNAgentConvenienceInitializers.swift */,
 				7BA7CC152AD11DC80042E5CE /* NetworkProtectionBouncer.swift */,
 				7B8DB3192B504D7500EC16DA /* VPNAppEventsHandler.swift */,
 				7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */,
+				EE34245D2BA0853900173B1B /* VPNUninstaller.swift */,
 				7BA7CC112AD11DC80042E5CE /* TunnelControllerIPCService.swift */,
 				7BA7CC172AD11DC80042E5CE /* UserText.swift */,
 				7BA7CC122AD11DC80042E5CE /* Assets.xcassets */,
@@ -6538,6 +6784,7 @@
 				4B8A4DFE27C83B29005F40E8 /* SaveIdentityViewController.swift */,
 				4BE4005227CF3DC3007D3161 /* SavePaymentMethodPopover.swift */,
 				4BE4005427CF3F19007D3161 /* SavePaymentMethodViewController.swift */,
+				C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -6648,6 +6895,49 @@
 			path = DuckDuckGoDBPBackgroundAgent;
 			sourceTree = "<group>";
 		};
+		9F872D9B2B9058B000138637 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				9F872D9C2B9058D000138637 /* Bookmarks+TabTests.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
+		9F982F102B82264400231028 /* ViewModels */ = {
+			isa = PBXGroup;
+			children = (
+				9F982F112B82268F00231028 /* AddEditBookmarkFolderDialogViewModelTests.swift */,
+				9F2606092B85C20400819292 /* AddEditBookmarkDialogViewModelTests.swift */,
+				9F26060D2B85E17D00819292 /* AddEditBookmarkDialogCoordinatorViewModelTests.swift */,
+			);
+			path = ViewModels;
+			sourceTree = "<group>";
+		};
+		9FA173DD2B7A0ECE00EE4E6E /* Dialog */ = {
+			isa = PBXGroup;
+			children = (
+				9FA173D92B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift */,
+				9FA173E62B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift */,
+				9FA173DE2B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift */,
+				9FDA6C202B79A59D00E099A9 /* BookmarkFavoriteView.swift */,
+				9FA173E22B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift */,
+				9FA173EA2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift */,
+				9F514F902B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift */,
+				9F56CFA82B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift */,
+				9FEE98642B846870002E44E8 /* AddEditBookmarkView.swift */,
+				9F56CFB02B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift */,
+			);
+			path = Dialog;
+			sourceTree = "<group>";
+		};
+		9FA75A3C2BA00DF500DA5FA6 /* Factory */ = {
+			isa = PBXGroup;
+			children = (
+				9FA75A3D2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift */,
+			);
+			path = Factory;
+			sourceTree = "<group>";
+		};
 		AA0877B626D515EE00B05660 /* UserAgent */ = {
 			isa = PBXGroup;
 			children = (
@@ -6887,6 +7177,7 @@
 				85AC3B1525D9BBFA00C7D2AA /* Configuration */,
 				4B82E9B725B6A04B00656FE7 /* ContentBlocker */,
 				4B70BFFD27B0793D000386ED /* CrashReports */,
+				31A2FD152BAB419400D0E741 /* DBP */,
 				4B723E0226B0003E00E14D75 /* DataExport */,
 				4B723DFE26B0003E00E14D75 /* DataImport */,
 				4BBC16A327C488B900E00A38 /* DeviceAuthentication */,
@@ -6995,6 +7286,9 @@
 		AA652CAB25DD820D009059CC /* Bookmarks */ = {
 			isa = PBXGroup;
 			children = (
+				9F872D9B2B9058B000138637 /* Extensions */,
+				9FA75A3C2BA00DF500DA5FA6 /* Factory */,
+				9F982F102B82264400231028 /* ViewModels */,
 				AA652CAE25DD8228009059CC /* Model */,
 				AA652CAF25DD822C009059CC /* Services */,
 			);
@@ -7016,6 +7310,8 @@
 				AA652CCD25DD9071009059CC /* BookmarkListTests.swift */,
 				AA652CD225DDA6E9009059CC /* LocalBookmarkManagerTests.swift */,
 				98A95D87299A2DF900B9B81A /* BookmarkMigrationTests.swift */,
+				9F872D9F2B90644800138637 /* ContextualMenuTests.swift */,
+				9F0A2CF72B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -7219,6 +7515,7 @@
 				AAA0CC32252F181A0079BC96 /* NavigationButtonMenuDelegate.swift */,
 				85012B0129133F9F003D0DCC /* NavigationBarPopovers.swift */,
 				AA68C3D22490ED62001B8783 /* NavigationBarViewController.swift */,
+				B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */,
 				D64A5FF72AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift */,
 			);
 			path = View;
@@ -7291,9 +7588,11 @@
 		AA91F83627076ED100771A0D /* NavigationBar */ = {
 			isa = PBXGroup;
 			children = (
+				C17CA7B02B9B52FF008EC3C1 /* Mocks */,
 				AA91F83727076EEE00771A0D /* ViewModel */,
 				4BF6961F28BEEE8B00D402D4 /* LocalPinningManagerTests.swift */,
 				56B234BE2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift */,
+				C17CA7AF2B9B52EB008EC3C1 /* View */,
 			);
 			path = NavigationBar;
 			sourceTree = "<group>";
@@ -7401,8 +7700,10 @@
 				B69A14F12B4D6FE800B9417D /* AddBookmarkFolderPopoverViewModel.swift */,
 				B69A14F52B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift */,
 				AAB549DE25DAB8F80058460B /* BookmarkViewModel.swift */,
-				B6F9BDD72B45B7D900677B33 /* AddBookmarkModalViewModel.swift */,
-				B6F9BDDF2B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift */,
+				9F982F0C2B8224BE00231028 /* AddEditBookmarkFolderDialogViewModel.swift */,
+				9F56CFAC2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift */,
+				9FEE98682B85B869002E44E8 /* BookmarksDialogViewModel.swift */,
+				9FEE986C2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -7473,9 +7774,8 @@
 		AAC5E4C125D6A6C3007F5990 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				4B9292CA2667123700AD2C21 /* AddBookmarkFolderModalView.swift */,
+				9FA173DD2B7A0ECE00EE4E6E /* Dialog */,
 				7BEC20412B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift */,
-				4B9292CB2667123700AD2C21 /* AddBookmarkModalView.swift */,
 				AAC5E4C425D6A6E8007F5990 /* AddBookmarkPopover.swift */,
 				7BEC20402B0F505F00243D3E /* AddBookmarkPopoverView.swift */,
 				B69A14F92B4D705D00B9417D /* BookmarkFolderPicker.swift */,
@@ -7513,6 +7813,7 @@
 				AAC5E4CE25D6A709007F5990 /* BookmarkManager.swift */,
 				379E877529E98729001C8BB0 /* BookmarksCleanupErrorHandling.swift */,
 				B6F9BDDB2B45B7EE00677B33 /* WebsiteInfo.swift */,
+				9F872DA22B90920F00138637 /* BookmarkFolderInfo.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -8169,7 +8470,7 @@
 				4BB88B4425B7B55C006F6B06 /* DebugUserScript.swift */,
 				856CADEF271710F400E79BB0 /* HoverUserScript.swift */,
 				4B2E7D6226FF9D6500D2DB17 /* PrintingUserScript.swift */,
-				1E0C72052ABC63BD00802009 /* SubscriptionPagesUserScript.swift */,
+				F1B33DF92BAD9C83001128B3 /* Subscription */,
 				1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */,
 				85AC3AEE25D5CE9800C7D2AA /* UserScripts.swift */,
 			);
@@ -8299,6 +8600,22 @@
 			path = Tests;
 			sourceTree = "<group>";
 		};
+		C17CA7AF2B9B52EB008EC3C1 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				C17CA7AC2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		C17CA7B02B9B52FF008EC3C1 /* Mocks */ = {
+			isa = PBXGroup;
+			children = (
+				C17CA7B12B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift */,
+			);
+			path = Mocks;
+			sourceTree = "<group>";
+		};
 		C1E961E62B879E2A001760E1 /* Mocks */ = {
 			isa = PBXGroup;
 			children = (
@@ -8357,6 +8674,15 @@
 			path = JSAlert;
 			sourceTree = "<group>";
 		};
+		EEBCE6802BA444FA00B9DF00 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				EE02D4192BB4609900DBE6B3 /* UITests.swift */,
+				EEBCE6812BA444FA00B9DF00 /* XCUIElementExtension.swift */,
+			);
+			path = Common;
+			sourceTree = "<group>";
+		};
 		EEC589D62A4F1B1F00BCD60C /* AppAndExtensionAndAgentTargets */ = {
 			isa = PBXGroup;
 			children = (
@@ -8376,6 +8702,16 @@
 			path = JSAlert;
 			sourceTree = "<group>";
 		};
+		F1B33DF92BAD9C83001128B3 /* Subscription */ = {
+			isa = PBXGroup;
+			children = (
+				1E0C72052ABC63BD00802009 /* SubscriptionPagesUserScript.swift */,
+				F1B33DF12BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift */,
+				F1B33DF52BAD970E001128B3 /* SubscriptionErrorReporter.swift */,
+			);
+			path = Subscription;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -8427,6 +8763,9 @@
 				7B1459562B7D43E500047F2C /* NetworkProtectionProxy */,
 				85E2BBCF2B8F534A00DBEC7A /* History */,
 				F1D43AF42B98E48900BAB743 /* BareBonesBrowserKit */,
+				4BCBE4572BA7E17800FC75A1 /* SubscriptionUI */,
+				85D44B872BA08D30001B4AB5 /* Suggestions */,
+				4BCBE4592BA7E17800FC75A1 /* Subscription */,
 			);
 			productName = DuckDuckGo;
 			productReference = 3706FD05293F65D500E42796 /* DuckDuckGo App Store.app */;
@@ -8547,6 +8886,7 @@
 				EE7295E82A545BC4008C0991 /* NetworkProtection */,
 				37269F002B332FC8005E8E46 /* Common */,
 				7BBE2B7A2B61663C00697445 /* NetworkProtectionProxy */,
+				7B37C7A42BAA32A50062546A /* Subscription */,
 			);
 			productName = NetworkProtectionSystemExtension;
 			productReference = 4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debug.systemextension */;
@@ -8611,6 +8951,7 @@
 				7BFCB74F2ADE7E2300DA3EA7 /* PixelKit */,
 				7B00997E2B6508C200FE7C31 /* NetworkProtectionProxy */,
 				4BA7C4DC2B3F64E500AFE511 /* LoginItems */,
+				4BCBE45B2BA7E18500FC75A1 /* Subscription */,
 			);
 			productName = DuckDuckGoAgentAppStore;
 			productReference = 4B2D06692A13318400DE1F49 /* DuckDuckGo VPN App Store.app */;
@@ -8632,8 +8973,8 @@
 			);
 			name = DuckDuckGoNotifications;
 			packageProductDependencies = (
-				EE7295EA2A545BFC008C0991 /* NetworkProtection */,
 				37269F042B3332C2005E8E46 /* Common */,
+				7B624F162BA25C1F00A6C544 /* NetworkProtectionUI */,
 			);
 			productName = DuckDuckGoNotifications;
 			productReference = 4B4BEC202A11B4E2001D9AC5 /* DuckDuckGo Notifications.app */;
@@ -8659,6 +9000,7 @@
 				4B4D60AE2A0C837F00BCD287 /* Networking */,
 				EE7295E62A545BBB008C0991 /* NetworkProtection */,
 				37269EFE2B332FBB005E8E46 /* Common */,
+				7B25856D2BA2F2ED00D49F79 /* NetworkProtectionUI */,
 			);
 			productName = NetworkProtectionAppExtension;
 			productReference = 4B4D603D2A0B290200BCD287 /* NetworkProtectionAppExtension.appex */;
@@ -8713,6 +9055,7 @@
 				7B94E1642B7ED95100E32B96 /* NetworkProtectionProxy */,
 				85E2BBD12B8F536F00DBEC7A /* History */,
 				F1D43AF62B98E48F00BAB743 /* BareBonesBrowserKit */,
+				85D44B892BA08D3B001B4AB5 /* Suggestions */,
 			);
 			productName = DuckDuckGo;
 			productReference = 4B957C412AC7AE700062CA31 /* DuckDuckGo Privacy Pro.app */;
@@ -8749,11 +9092,13 @@
 			buildRules = (
 			);
 			dependencies = (
+				EE02D41E2BB460B500DBE6B3 /* PBXTargetDependency */,
 				B6F997BD2B8F35EF00476735 /* PBXTargetDependency */,
 			);
 			name = "UI Tests";
 			packageProductDependencies = (
 				B65CD8D22B316E1700A595BB /* SnapshotTesting */,
+				EE02D41F2BB460C000DBE6B3 /* BrowserServicesKit */,
 			);
 			productName = "UI Tests";
 			productReference = 7B4CE8DA26F02108009134B1 /* UI Tests.xctest */;
@@ -8882,6 +9227,7 @@
 				1EA7B8D22B7E078C000330A4 /* SubscriptionUI */,
 				1EA7B8D42B7E078C000330A4 /* Subscription */,
 				F1D43AF22B98E47800BAB743 /* BareBonesBrowserKit */,
+				85D44B852BA08D29001B4AB5 /* Suggestions */,
 			);
 			productName = DuckDuckGo;
 			productReference = AA585D7E248FD31100E9A3E2 /* DuckDuckGo.app */;
@@ -9253,6 +9599,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1D85BCCA2BA982FC0065BA04 /* InfoPlist.xcstrings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9729,7 +10076,9 @@
 				4B41EDA82B1543C9001EEDF4 /* PreferencesVPNView.swift in Sources */,
 				3706FA7B293F65D500E42796 /* FaviconUserScript.swift in Sources */,
 				3706FA7E293F65D500E42796 /* LottieAnimationCache.swift in Sources */,
+				9F982F0E2B8224BF00231028 /* AddEditBookmarkFolderDialogViewModel.swift in Sources */,
 				3706FA7F293F65D500E42796 /* TabIndex.swift in Sources */,
+				4B520F642BA5573A006405C7 /* WaitlistThankYouView.swift in Sources */,
 				3706FA80293F65D500E42796 /* TabLazyLoaderDataSource.swift in Sources */,
 				3706FA81293F65D500E42796 /* LoginImport.swift in Sources */,
 				C13909FC2B861039001626ED /* AutofillActionPresenter.swift in Sources */,
@@ -9744,6 +10093,7 @@
 				3706FA89293F65D500E42796 /* CrashReportPromptPresenter.swift in Sources */,
 				3706FA8B293F65D500E42796 /* PreferencesRootView.swift in Sources */,
 				3706FA8C293F65D500E42796 /* AppStateChangedPublisher.swift in Sources */,
+				9FEE986E2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift in Sources */,
 				3706FA8D293F65D500E42796 /* BookmarkTableCellView.swift in Sources */,
 				3706FA8E293F65D500E42796 /* BookmarkManagementSidebarViewController.swift in Sources */,
 				3706FA8F293F65D500E42796 /* NSStackViewExtension.swift in Sources */,
@@ -9754,6 +10104,7 @@
 				3706FA94293F65D500E42796 /* TabShadowConfig.swift in Sources */,
 				3706FA97293F65D500E42796 /* WindowDraggingView.swift in Sources */,
 				B60D644A2AAF1B7C00B26F50 /* AddressBarTextSelectionNavigation.swift in Sources */,
+				1D01A3D52B88CF7700FE8150 /* AccessibilityPreferences.swift in Sources */,
 				3706FA98293F65D500E42796 /* SecureVaultSorting.swift in Sources */,
 				3706FA99293F65D500E42796 /* PreferencesSidebarModel.swift in Sources */,
 				3706FA9A293F65D500E42796 /* DuckPlayerURLExtension.swift in Sources */,
@@ -9794,6 +10145,8 @@
 				4B9DB0332A983B24000927DB /* EnableWaitlistFeatureView.swift in Sources */,
 				3706FABA293F65D500E42796 /* BookmarkOutlineViewDataSource.swift in Sources */,
 				3706FABB293F65D500E42796 /* PasswordManagementBitwardenItemView.swift in Sources */,
+				1D220BF92B86192200F8BBC6 /* PreferencesEmailProtectionView.swift in Sources */,
+				9FA173E42B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift in Sources */,
 				3706FABD293F65D500E42796 /* NSNotificationName+PasswordManager.swift in Sources */,
 				3706FABE293F65D500E42796 /* RulesCompilationMonitor.swift in Sources */,
 				3706FABF293F65D500E42796 /* CrashReportReader.swift in Sources */,
@@ -9805,10 +10158,12 @@
 				F1D43AEF2B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift in Sources */,
 				B6E1491129A5C30A00AAFBE8 /* FBProtectionTabExtension.swift in Sources */,
 				3706FAC4293F65D500E42796 /* PrintingUserScript.swift in Sources */,
+				1D01A3D92B88DF8B00FE8150 /* PreferencesSyncView.swift in Sources */,
 				9D9AE86C2AA76D1B0026E7DC /* LoginItemsManager.swift in Sources */,
 				4B9DB0392A983B24000927DB /* JoinedWaitlistView.swift in Sources */,
 				3706FEBF293F6EFF00E42796 /* BWError.swift in Sources */,
 				3706FAC6293F65D500E42796 /* ConnectBitwardenViewController.swift in Sources */,
+				1DDC84FC2B8356CE00670238 /* PreferencesDefaultBrowserView.swift in Sources */,
 				EEC589DA2A4F1CE400BCD60C /* AppLauncher.swift in Sources */,
 				3706FAC8293F65D500E42796 /* AppTrackerDataSetProvider.swift in Sources */,
 				3706FAC9293F65D500E42796 /* EncryptionKeyGeneration.swift in Sources */,
@@ -9835,7 +10190,7 @@
 				3706FADE293F65D500E42796 /* PreferencesDuckPlayerView.swift in Sources */,
 				EEC4A65E2B277E8D00F7C0AA /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */,
 				B66260E729ACAE4B00E9E3EE /* NavigationHotkeyHandler.swift in Sources */,
-				3706FADF293F65D500E42796 /* AddBookmarkFolderModalView.swift in Sources */,
+				1DDD3EC52B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift in Sources */,
 				3706FAE0293F65D500E42796 /* BookmarkSidebarTreeController.swift in Sources */,
 				3706FAE1293F65D500E42796 /* HomePageFavoritesModel.swift in Sources */,
 				3706FAE2293F65D500E42796 /* SequenceExtensions.swift in Sources */,
@@ -9855,6 +10210,7 @@
 				3706FAF1293F65D500E42796 /* PreferencesAboutView.swift in Sources */,
 				3706FAF2293F65D500E42796 /* ContentBlocking.swift in Sources */,
 				31F2D2002AF026D800BF0144 /* WaitlistTermsAndConditionsActionHandler.swift in Sources */,
+				9FA173E02B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift in Sources */,
 				3706FAF3293F65D500E42796 /* LocalAuthenticationService.swift in Sources */,
 				1D36E659298AA3BA00AA485D /* InternalUserDeciderStore.swift in Sources */,
 				B6BCC5242AFCDABB002C5499 /* DataImportSourceViewModel.swift in Sources */,
@@ -9865,6 +10221,7 @@
 				B65211262B29A42E00B30633 /* BookmarkStoreMock.swift in Sources */,
 				3706FAF5293F65D500E42796 /* SafariVersionReader.swift in Sources */,
 				3706FAF6293F65D500E42796 /* LoginFaviconView.swift in Sources */,
+				F1B33DF72BAD970E001128B3 /* SubscriptionErrorReporter.swift in Sources */,
 				3706FEC0293F6EFF00E42796 /* BWRequest.swift in Sources */,
 				3706FAF7293F65D500E42796 /* FireproofDomainsViewController.swift in Sources */,
 				4BF0E5062AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */,
@@ -9891,6 +10248,7 @@
 				3706FB07293F65D500E42796 /* Publisher.asVoid.swift in Sources */,
 				3706FB08293F65D500E42796 /* NavigationButtonMenuDelegate.swift in Sources */,
 				4BF97ADB2B43C5E000EB4240 /* VPNMetadataCollector.swift in Sources */,
+				1DDC84F82B83558F00670238 /* PreferencesPrivateSearchView.swift in Sources */,
 				3706FB09293F65D500E42796 /* CrashReport.swift in Sources */,
 				1E0C72072ABC63BD00802009 /* SubscriptionPagesUserScript.swift in Sources */,
 				3706FB0A293F65D500E42796 /* NSPathControlView.swift in Sources */,
@@ -9917,7 +10275,8 @@
 				3793FDD829535EBA00A2E28F /* Assertions.swift in Sources */,
 				B62B48572ADE730D000DECE5 /* FileImportView.swift in Sources */,
 				B6676BE22AA986A700525A21 /* AddressBarTextEditor.swift in Sources */,
-				3706FB1F293F65D500E42796 /* PrivacyPreferencesModel.swift in Sources */,
+				3706FB1F293F65D500E42796 /* DataClearingPreferences.swift in Sources */,
+				1D01A3D12B88CEC600FE8150 /* PreferencesAccessibilityView.swift in Sources */,
 				3706FB20293F65D500E42796 /* LocalUnprotectedDomains.swift in Sources */,
 				3707C719294B5D0F00682A9F /* HoveredLinkTabExtension.swift in Sources */,
 				3706FB21293F65D500E42796 /* NavigationBarBadgeAnimator.swift in Sources */,
@@ -9996,7 +10355,6 @@
 				3706FB5E293F65D500E42796 /* EncryptionKeyStore.swift in Sources */,
 				3706FB60293F65D500E42796 /* PasswordManagementIdentityItemView.swift in Sources */,
 				3706FB61293F65D500E42796 /* ProgressExtension.swift in Sources */,
-				B6F9BDD92B45B7D900677B33 /* AddBookmarkModalViewModel.swift in Sources */,
 				3706FB62293F65D500E42796 /* CSVParser.swift in Sources */,
 				3706FB64293F65D500E42796 /* PixelDataModel.xcdatamodeld in Sources */,
 				B626A75B29921FAA00053070 /* NavigationActionPolicyExtension.swift in Sources */,
@@ -10009,15 +10367,16 @@
 				3706FB69293F65D500E42796 /* NavigationBarBadgeAnimationView.swift in Sources */,
 				1D1A334A2A6FEB170080ACED /* BurnerMode.swift in Sources */,
 				B603971B29BA084C00902A34 /* JSAlertController.swift in Sources */,
+				9FEE986A2B85B869002E44E8 /* BookmarksDialogViewModel.swift in Sources */,
 				3706FB6A293F65D500E42796 /* AddressBarButton.swift in Sources */,
 				4B41EDA42B1543B9001EEDF4 /* VPNPreferencesModel.swift in Sources */,
+				7B7FCD102BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift in Sources */,
 				3706FB6C293F65D500E42796 /* FaviconStore.swift in Sources */,
 				3706FB6D293F65D500E42796 /* SuggestionListCharacteristics.swift in Sources */,
 				377D801F2AB48191002AF251 /* FavoritesDisplayModeSyncHandler.swift in Sources */,
 				4B4D60C62A0C849600BCD287 /* NetworkProtectionInviteCodeViewModel.swift in Sources */,
 				3706FB6F293F65D500E42796 /* BookmarkListViewController.swift in Sources */,
 				3706FB70293F65D500E42796 /* SecureVaultLoginImporter.swift in Sources */,
-				3706FB71293F65D500E42796 /* AddBookmarkModalView.swift in Sources */,
 				3706FB72293F65D500E42796 /* RecentlyClosedCoordinator.swift in Sources */,
 				3706FB74293F65D500E42796 /* FaviconHostReference.swift in Sources */,
 				B69A14F32B4D6FE800B9417D /* AddBookmarkFolderPopoverViewModel.swift in Sources */,
@@ -10026,6 +10385,7 @@
 				37CBCA9B2A8966E60050218F /* SyncSettingsAdapter.swift in Sources */,
 				3707C72A294B5D2900682A9F /* URLExtension.swift in Sources */,
 				3706FB76293F65D500E42796 /* ASN1Parser.swift in Sources */,
+				9F56CFAA2B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift in Sources */,
 				37FD78122A29EBD100B36DB1 /* SyncErrorHandler.swift in Sources */,
 				987799F42999993C005D8EB6 /* LegacyBookmarksStoreMigration.swift in Sources */,
 				3706FB7A293F65D500E42796 /* FileDownloadManager.swift in Sources */,
@@ -10054,7 +10414,6 @@
 				37197EA42942441D00394917 /* NewWindowPolicy.swift in Sources */,
 				3706FB84293F65D500E42796 /* NSWindowExtension.swift in Sources */,
 				3706FB85293F65D500E42796 /* AddBookmarkPopover.swift in Sources */,
-				3706FB86293F65D500E42796 /* PreferencesDownloadsView.swift in Sources */,
 				7BBD45B22A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift in Sources */,
 				3706FB87293F65D500E42796 /* ProcessExtension.swift in Sources */,
 				3706FB88293F65D500E42796 /* PermissionAuthorizationQuery.swift in Sources */,
@@ -10083,9 +10442,7 @@
 				B690152D2ACBF4DA00AD0BAB /* MenuPreview.swift in Sources */,
 				1D36F4252A3B85C50052B527 /* TabCleanupPreparer.swift in Sources */,
 				3706FB97293F65D500E42796 /* ActionSpeech.swift in Sources */,
-				3706FB99293F65D500E42796 /* PrivacySecurityPreferences.swift in Sources */,
 				B6AFE6BD29A5D621002FF962 /* HTTPSUpgradeTabExtension.swift in Sources */,
-				B6F9BDE12B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift in Sources */,
 				3706FB9A293F65D500E42796 /* FireproofDomainsStore.swift in Sources */,
 				3706FB9B293F65D500E42796 /* PrivacyDashboardPermissionHandler.swift in Sources */,
 				3706FB9C293F65D500E42796 /* TabCollectionViewModel.swift in Sources */,
@@ -10098,10 +10455,12 @@
 				3706FB9E293F65D500E42796 /* AboutModel.swift in Sources */,
 				3706FB9F293F65D500E42796 /* PasswordManagementCreditCardItemView.swift in Sources */,
 				3706FBA0293F65D500E42796 /* NSTextFieldExtension.swift in Sources */,
+				9FA173E82B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift in Sources */,
 				3706FBA1293F65D500E42796 /* FireproofDomainsContainer.swift in Sources */,
 				3706FBA2293F65D500E42796 /* GeolocationService.swift in Sources */,
 				4B4D60C42A0C849600BCD287 /* NetworkProtectionInvitePresenter.swift in Sources */,
 				3706FBA3293F65D500E42796 /* FireproofingURLExtensions.swift in Sources */,
+				1DDD3EC12B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift in Sources */,
 				3706FBA4293F65D500E42796 /* ContentOverlayPopover.swift in Sources */,
 				3706FBA5293F65D500E42796 /* TabShadowView.swift in Sources */,
 				3706FBA7293F65D500E42796 /* EncryptedValueTransformer.swift in Sources */,
@@ -10112,7 +10471,6 @@
 				B66260E829ACD0C900E9E3EE /* DuckPlayerTabExtension.swift in Sources */,
 				3706FBAA293F65D500E42796 /* HoverUserScript.swift in Sources */,
 				3706FBAC293F65D500E42796 /* MainMenuActions.swift in Sources */,
-				1EA7B8D92B7E1283000330A4 /* SubscriptionFeatureAvailability.swift in Sources */,
 				4BF97AD92B43C5C000EB4240 /* Bundle+VPN.swift in Sources */,
 				3706FBAE293F65D500E42796 /* DataImport.swift in Sources */,
 				3706FBAF293F65D500E42796 /* FireproofDomains.xcdatamodeld in Sources */,
@@ -10154,6 +10512,7 @@
 				3706FBCC293F65D500E42796 /* CustomRoundedCornersShape.swift in Sources */,
 				3706FBCD293F65D500E42796 /* LocaleExtension.swift in Sources */,
 				3706FBCE293F65D500E42796 /* SavePaymentMethodViewController.swift in Sources */,
+				1DDC85002B835BC000670238 /* SearchPreferences.swift in Sources */,
 				3706FBD0293F65D500E42796 /* WebKitVersionProvider.swift in Sources */,
 				3706FBD1293F65D500E42796 /* NSCoderExtensions.swift in Sources */,
 				B6D6A5DD2982A4CE001F5F11 /* Tab+Navigation.swift in Sources */,
@@ -10161,7 +10520,6 @@
 				B684121D2B6A1D880092F66A /* ErrorPageHTMLTemplate.swift in Sources */,
 				3706FBD2293F65D500E42796 /* RunningApplicationCheck.swift in Sources */,
 				3706FBD3293F65D500E42796 /* StatePersistenceService.swift in Sources */,
-				EE0629732B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */,
 				3706FBD4293F65D500E42796 /* WindowManager+StateRestoration.swift in Sources */,
 				7B430EA22A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift in Sources */,
 				3706FBD5293F65D500E42796 /* TabCollection+NSSecureCoding.swift in Sources */,
@@ -10173,6 +10531,7 @@
 				3706FBD9293F65D500E42796 /* NSAppearanceExtension.swift in Sources */,
 				3706FBDA293F65D500E42796 /* PermissionManager.swift in Sources */,
 				3706FBDB293F65D500E42796 /* DefaultBrowserPreferences.swift in Sources */,
+				9FEE98662B846870002E44E8 /* AddEditBookmarkView.swift in Sources */,
 				3706FBDC293F65D500E42796 /* Permissions.xcdatamodeld in Sources */,
 				4B41EDB52B168C55001EEDF4 /* VPNFeedbackFormViewModel.swift in Sources */,
 				3706FBDD293F65D500E42796 /* PaddedImageButton.swift in Sources */,
@@ -10187,6 +10546,7 @@
 				EEC4A6722B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift in Sources */,
 				3706FBE0293F65D500E42796 /* NSException+Catch.m in Sources */,
 				3706FBE1293F65D500E42796 /* AppStateRestorationManager.swift in Sources */,
+				9FA173EC2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift in Sources */,
 				3706FBE2293F65D500E42796 /* ClickToLoadUserScript.swift in Sources */,
 				3706FBE3293F65D500E42796 /* WindowControllersManager.swift in Sources */,
 				37197EAA2942443D00394917 /* ModalSheetCancellable.swift in Sources */,
@@ -10208,9 +10568,11 @@
 				3706FBF0293F65D500E42796 /* PasswordManagementItemModel.swift in Sources */,
 				3706FBF2293F65D500E42796 /* FindInPageModel.swift in Sources */,
 				1D9A4E5B2B43213B00F449E2 /* TabSnapshotExtension.swift in Sources */,
+				9F56CFAE2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift in Sources */,
 				3706FBF3293F65D500E42796 /* PseudoFolder.swift in Sources */,
 				1D26EBAD2B74BECB0002A93F /* NSImageSendable.swift in Sources */,
 				3706FBF5293F65D500E42796 /* PixelDataStore.swift in Sources */,
+				1D220BFD2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift in Sources */,
 				3706FBF6293F65D500E42796 /* Pixel.swift in Sources */,
 				3706FBF7293F65D500E42796 /* PixelEvent.swift in Sources */,
 				3706FBF8293F65D500E42796 /* TabBarFooter.swift in Sources */,
@@ -10229,10 +10591,11 @@
 				3706FC01293F65D500E42796 /* ChromiumBookmarksReader.swift in Sources */,
 				3706FC02293F65D500E42796 /* Downloads.xcdatamodeld in Sources */,
 				B60C6F7829B0E286007BFAA8 /* SearchNonexistentDomainNavigationResponder.swift in Sources */,
+				9F56CFB22B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift in Sources */,
 				3707C720294B5D2900682A9F /* WKWebsiteDataStoreExtension.swift in Sources */,
 				3706FC03293F65D500E42796 /* TabPreviewViewController.swift in Sources */,
 				4B9754EC2984300100D7B834 /* EmailManagerExtension.swift in Sources */,
-				3706FC04293F65D500E42796 /* PreferencesPrivacyView.swift in Sources */,
+				3706FC04293F65D500E42796 /* PreferencesDataClearingView.swift in Sources */,
 				3706FC05293F65D500E42796 /* NSPasteboardExtension.swift in Sources */,
 				1DCFBC8B29ADF32B00313531 /* BurnerHomePageView.swift in Sources */,
 				3706FC06293F65D500E42796 /* OnboardingViewModel.swift in Sources */,
@@ -10250,7 +10613,10 @@
 				4B9DB0452A983B24000927DB /* WaitlistModalViewController.swift in Sources */,
 				B66CA41F2AD910B300447CF0 /* DataImportView.swift in Sources */,
 				3706FC0C293F65D500E42796 /* NSAttributedStringExtension.swift in Sources */,
+				4B6B64852BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift in Sources */,
+				C1DAF3B62B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */,
 				3706FC0D293F65D500E42796 /* AnimationView.swift in Sources */,
+				9FA173DB2B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift in Sources */,
 				3706FC0E293F65D500E42796 /* NSRectExtension.swift in Sources */,
 				3706FC0F293F65D500E42796 /* YoutubeOverlayUserScript.swift in Sources */,
 				3775913729AB9A1C00E26367 /* SyncManagementDialogViewController.swift in Sources */,
@@ -10268,14 +10634,18 @@
 				3706FC19293F65D500E42796 /* NSNotificationName+Favicons.swift in Sources */,
 				3706FC1A293F65D500E42796 /* PinningManager.swift in Sources */,
 				4B37EE782B4CFF3900A89A61 /* DataBrokerProtectionRemoteMessage.swift in Sources */,
+				7BBA7CE72BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift in Sources */,
 				3706FC1B293F65D500E42796 /* TabCollectionViewModel+NSSecureCoding.swift in Sources */,
 				3706FC1D293F65D500E42796 /* EmailManagerRequestDelegate.swift in Sources */,
 				3706FC1E293F65D500E42796 /* ApplicationVersionReader.swift in Sources */,
+				F1B33DF32BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift in Sources */,
 				3706FC1F293F65D500E42796 /* BookmarksBarViewController.swift in Sources */,
+				1DDC85042B83903E00670238 /* PreferencesWebTrackingProtectionView.swift in Sources */,
 				3706FC20293F65D500E42796 /* PreferencesAutofillView.swift in Sources */,
 				3706FC21293F65D500E42796 /* UserText+PasswordManager.swift in Sources */,
 				3706FC22293F65D500E42796 /* LoadingProgressView.swift in Sources */,
 				3706FC23293F65D500E42796 /* StatisticsStore.swift in Sources */,
+				1DDD3EBD2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift in Sources */,
 				3706FC25293F65D500E42796 /* ColorView.swift in Sources */,
 				3706FC26293F65D500E42796 /* RecentlyClosedCacheItem.swift in Sources */,
 				3706FC27293F65D500E42796 /* PopupBlockedPopover.swift in Sources */,
@@ -10319,6 +10689,7 @@
 				3706FC43293F65D500E42796 /* PinnedTabsViewModel.swift in Sources */,
 				85D0327C2B8E3D090041D1FB /* HistoryCoordinatorExtension.swift in Sources */,
 				B6685E4329A61C470043D2EE /* DownloadsTabExtension.swift in Sources */,
+				4BCBE4562BA7E16900FC75A1 /* DataBrokerProtectionSubscriptionEventHandler.swift in Sources */,
 				3706FC44293F65D500E42796 /* BookmarkList.swift in Sources */,
 				3706FC45293F65D500E42796 /* BookmarkTableRowView.swift in Sources */,
 				7BEC20462B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift in Sources */,
@@ -10335,11 +10706,14 @@
 				3706FC50293F65D500E42796 /* FeedbackWindow.swift in Sources */,
 				3706FC51293F65D500E42796 /* RecentlyVisitedView.swift in Sources */,
 				B645D8F729FA95440024461F /* WKProcessPoolExtension.swift in Sources */,
+				9F514F922B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift in Sources */,
 				3706FC52293F65D500E42796 /* MouseOverAnimationButton.swift in Sources */,
+				B60293E72BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */,
 				3706FC53293F65D500E42796 /* TabBarScrollView.swift in Sources */,
 				3706FC54293F65D500E42796 /* BookmarkListTreeControllerDataSource.swift in Sources */,
 				3706FC55293F65D500E42796 /* AddressBarViewController.swift in Sources */,
 				3706FC56293F65D500E42796 /* Permissions.swift in Sources */,
+				9F872D992B8DA9F800138637 /* Bookmarks+Tab.swift in Sources */,
 				B6B4D1D02B0E0DD000C26286 /* DataImportNoDataView.swift in Sources */,
 				3706FC57293F65D500E42796 /* TabPreviewWindowController.swift in Sources */,
 				3706FC58293F65D500E42796 /* NSSizeExtension.swift in Sources */,
@@ -10364,6 +10738,7 @@
 				3706FC65293F65D500E42796 /* HomePageViewController.swift in Sources */,
 				3706FC67293F65D500E42796 /* OperatingSystemVersionExtension.swift in Sources */,
 				B6F9BDE52B45CD1900677B33 /* ModalView.swift in Sources */,
+				9F872DA42B90920F00138637 /* BookmarkFolderInfo.swift in Sources */,
 				B677FC502B06376B0099EB04 /* ReportFeedbackView.swift in Sources */,
 				3706FC68293F65D500E42796 /* ToggleableScrollView.swift in Sources */,
 				3706FC69293F65D500E42796 /* UserScripts.swift in Sources */,
@@ -10381,6 +10756,7 @@
 				3706FC73293F65D500E42796 /* AddressBarButtonsViewController.swift in Sources */,
 				3706FC76293F65D500E42796 /* PixelDataRecord.swift in Sources */,
 				7BFE955A2A9DF4550081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift in Sources */,
+				9FDA6C222B79A59D00E099A9 /* BookmarkFavoriteView.swift in Sources */,
 				3706FC77293F65D500E42796 /* PageObserverUserScript.swift in Sources */,
 				4BF0E5132AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */,
 				3706FC78293F65D500E42796 /* SecureVaultErrorReporter.swift in Sources */,
@@ -10396,6 +10772,7 @@
 				3706FC81293F65D500E42796 /* DispatchQueueExtensions.swift in Sources */,
 				C13909F02B85FD4E001626ED /* AutofillActionExecutor.swift in Sources */,
 				3706FC82293F65D500E42796 /* PermissionAuthorizationPopover.swift in Sources */,
+				4BCBE4552BA7E16600FC75A1 /* NetworkProtectionSubscriptionEventHandler.swift in Sources */,
 				3706FC83293F65D500E42796 /* PopoverMessageViewController.swift in Sources */,
 				4BF97ADA2B43C5DC00EB4240 /* VPNFeedbackCategory.swift in Sources */,
 				9D9AE86E2AA76D1F0026E7DC /* LoginItem+NetworkProtection.swift in Sources */,
@@ -10457,6 +10834,7 @@
 				3706FDDE293F661700E42796 /* SuggestionViewModelTests.swift in Sources */,
 				3706FDDF293F661700E42796 /* BookmarkSidebarTreeControllerTests.swift in Sources */,
 				3706FDE0293F661700E42796 /* TabIndexTests.swift in Sources */,
+				9F26060F2B85E17D00819292 /* AddEditBookmarkDialogCoordinatorViewModelTests.swift in Sources */,
 				3706FDE1293F661700E42796 /* AdjacentItemEnumeratorTests.swift in Sources */,
 				3706FDE2293F661700E42796 /* PixelArgumentsTests.swift in Sources */,
 				4B9DB0572A983B55000927DB /* MockNotificationService.swift in Sources */,
@@ -10476,6 +10854,7 @@
 				3706FDF0293F661700E42796 /* WebKitVersionProviderTests.swift in Sources */,
 				3706FDF1293F661700E42796 /* AtbAndVariantCleanupTests.swift in Sources */,
 				1D1C36E729FB019C001FA40C /* HistoryTabExtensionTests.swift in Sources */,
+				1D9FDEBB2B9B5E090040B78C /* WebTrackingProtectionPreferencesTests.swift in Sources */,
 				3706FDF3293F661700E42796 /* ChromiumLoginReaderTests.swift in Sources */,
 				3706FDF4293F661700E42796 /* TabCollectionTests.swift in Sources */,
 				3706FDF5293F661700E42796 /* StartupPreferencesTests.swift in Sources */,
@@ -10485,6 +10864,7 @@
 				3706FDF8293F661700E42796 /* FileStoreTests.swift in Sources */,
 				5603D90729B7B746007F9F01 /* MockTabViewItemDelegate.swift in Sources */,
 				3706FDF9293F661700E42796 /* TabViewModelTests.swift in Sources */,
+				9F872DA12B90644800138637 /* ContextualMenuTests.swift in Sources */,
 				3706FDFA293F661700E42796 /* DefaultBrowserPreferencesTests.swift in Sources */,
 				3706FDFB293F661700E42796 /* DispatchQueueExtensionsTests.swift in Sources */,
 				9F180D102B69C553000D695F /* Tab+WKUIDelegateTests.swift in Sources */,
@@ -10498,6 +10878,7 @@
 				3706FE01293F661700E42796 /* PixelStoreMock.swift in Sources */,
 				3706FE02293F661700E42796 /* BookmarksBarViewModelTests.swift in Sources */,
 				3706FE03293F661700E42796 /* CoreDataStoreTests.swift in Sources */,
+				1D9FDEC42B9B63C90040B78C /* DataClearingPreferencesTests.swift in Sources */,
 				3706FE04293F661700E42796 /* TreeControllerTests.swift in Sources */,
 				3706FE05293F661700E42796 /* DownloadsWebViewMock.m in Sources */,
 				3706FE06293F661700E42796 /* CoreDataEncryptionTesting.xcdatamodeld in Sources */,
@@ -10512,6 +10893,7 @@
 				3706FE0E293F661700E42796 /* FirefoxDataImporterTests.swift in Sources */,
 				3706FE0F293F661700E42796 /* CSVLoginExporterTests.swift in Sources */,
 				3706FE10293F661700E42796 /* TestNavigationDelegate.swift in Sources */,
+				1D9FDEC12B9B5FEA0040B78C /* AccessibilityPreferencesTests.swift in Sources */,
 				3706FE11293F661700E42796 /* URLSuggestedFilenameTests.swift in Sources */,
 				4BE344EF2B23786F003FC223 /* VPNFeedbackFormViewModelTests.swift in Sources */,
 				B6F56569299A414300A04298 /* WKWebViewMockingExtension.swift in Sources */,
@@ -10529,6 +10911,7 @@
 				3706FE1C293F661700E42796 /* ConnectBitwardenViewModelTests.swift in Sources */,
 				4B9DB0552A983B55000927DB /* MockWaitlistStorage.swift in Sources */,
 				3706FE1D293F661700E42796 /* PixelStoreTests.swift in Sources */,
+				1D9FDEC72B9B64DB0040B78C /* PrivacyProtectionStatusTests.swift in Sources */,
 				C13909F52B85FD79001626ED /* AutofillDeleteAllPasswordsExecutorTests.swift in Sources */,
 				857E44642A9F70F200ED77A7 /* CampaignVariantTests.swift in Sources */,
 				3706FE1E293F661700E42796 /* GeolocationProviderTests.swift in Sources */,
@@ -10539,6 +10922,7 @@
 				B6619EF72B10DFF700CD9186 /* InstructionsFormatParserTests.swift in Sources */,
 				3706FE21293F661700E42796 /* DownloadsPreferencesTests.swift in Sources */,
 				3706FE22293F661700E42796 /* FireproofDomainsTests.swift in Sources */,
+				C17CA7AE2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift in Sources */,
 				3706FE23293F661700E42796 /* SuggestionLoadingMock.swift in Sources */,
 				3706FE24293F661700E42796 /* PasteboardFolderTests.swift in Sources */,
 				B603971229B9D67E00902A34 /* PublishersExtensions.swift in Sources */,
@@ -10547,6 +10931,7 @@
 				3706FE26293F661700E42796 /* TemporaryFileCreator.swift in Sources */,
 				3706FE27293F661700E42796 /* AppPrivacyConfigurationTests.swift in Sources */,
 				B626A7652992506A00053070 /* SerpHeadersNavigationResponderTests.swift in Sources */,
+				9F26060C2B85C20B00819292 /* AddEditBookmarkDialogViewModelTests.swift in Sources */,
 				3706FE28293F661700E42796 /* BookmarkTests.swift in Sources */,
 				3706FE29293F661700E42796 /* SuggestionContainerViewModelTests.swift in Sources */,
 				1D8C2FEB2B70F5A7005E4BBD /* MockWebViewSnapshotRenderer.swift in Sources */,
@@ -10576,6 +10961,7 @@
 				3706FE3C293F661700E42796 /* FireproofDomainsStoreMock.swift in Sources */,
 				3706FE3D293F661700E42796 /* DataEncryptionTests.swift in Sources */,
 				3706FE3E293F661700E42796 /* ClickToLoadModelTests.swift in Sources */,
+				C17CA7B32B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift in Sources */,
 				3706FE3F293F661700E42796 /* FileStoreMock.swift in Sources */,
 				B6619F042B17123200CD9186 /* DataImportViewModelTests.swift in Sources */,
 				1D8C2FE62B70F4C4005E4BBD /* TabSnapshotExtensionTests.swift in Sources */,
@@ -10587,6 +10973,7 @@
 				3706FE44293F661700E42796 /* GeolocationServiceTests.swift in Sources */,
 				1DA6D1032A1FFA3B00540406 /* HTTPCookieTests.swift in Sources */,
 				3706FE45293F661700E42796 /* ProgressEstimationTests.swift in Sources */,
+				31A2FD182BAB43BA00D0E741 /* DataBrokerProtectionVisibilityTests.swift in Sources */,
 				B6619F072B17138D00CD9186 /* DataImportSourceViewModelTests.swift in Sources */,
 				3706FE46293F661700E42796 /* EncryptedValueTransformerTests.swift in Sources */,
 				9F3910632B68C35600CB5112 /* DownloadsTabExtensionTests.swift in Sources */,
@@ -10599,6 +10986,7 @@
 				3706FE4A293F661700E42796 /* BookmarkManagedObjectTests.swift in Sources */,
 				EEC8EB402982CD550065AA39 /* JSAlertViewModelTests.swift in Sources */,
 				3706FE4B293F661700E42796 /* BookmarksHTMLImporterTests.swift in Sources */,
+				9FA75A3F2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift in Sources */,
 				56D145E929E6BB6300E3488A /* CapturingDataImportProvider.swift in Sources */,
 				3706FE4C293F661700E42796 /* CSVParserTests.swift in Sources */,
 				3706FE4D293F661700E42796 /* OnboardingTests.swift in Sources */,
@@ -10612,6 +11000,7 @@
 				3706FE54293F661700E42796 /* PasteboardBookmarkTests.swift in Sources */,
 				3706FE55293F661700E42796 /* CBRCompileTimeReporterTests.swift in Sources */,
 				566B196429CDB824007E38F4 /* MoreOptionsMenuTests.swift in Sources */,
+				9F0A2CF92B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift in Sources */,
 				3706FE56293F661700E42796 /* FaviconManagerMock.swift in Sources */,
 				3706FE57293F661700E42796 /* LocalPinningManagerTests.swift in Sources */,
 				3706FE58293F661700E42796 /* HistoryStoreTests.swift in Sources */,
@@ -10623,6 +11012,7 @@
 				37716D8029707E5D00A9FC6D /* FireproofingReferenceTests.swift in Sources */,
 				B6AA64742994B43300D99CD6 /* FutureExtensionTests.swift in Sources */,
 				3706FE5C293F661700E42796 /* DuckPlayerPreferencesTests.swift in Sources */,
+				1D9FDEB82B9B5D150040B78C /* SearchPreferencesTests.swift in Sources */,
 				3706FE5D293F661700E42796 /* FileSystemDSL.swift in Sources */,
 				3706FE5E293F661700E42796 /* DataImportMocks.swift in Sources */,
 				3706FE5F293F661700E42796 /* CrashReportTests.swift in Sources */,
@@ -10635,6 +11025,7 @@
 				3706FE64293F661700E42796 /* DownloadListStoreTests.swift in Sources */,
 				3706FE65293F661700E42796 /* ContentBlockingUpdatingTests.swift in Sources */,
 				3706FE67293F661700E42796 /* EncryptionMocks.swift in Sources */,
+				9F872D9E2B9058D000138637 /* Bookmarks+TabTests.swift in Sources */,
 				3706FE68293F661700E42796 /* DuckPlayerURLExtensionTests.swift in Sources */,
 				3706FE6A293F661700E42796 /* FirefoxKeyReaderTests.swift in Sources */,
 				3706FE6B293F661700E42796 /* AppKitPrivateMethodsAvailabilityTests.swift in Sources */,
@@ -10642,6 +11033,7 @@
 				C1E961F42B87B276001760E1 /* MockAutofillActionPresenter.swift in Sources */,
 				3706FE6E293F661700E42796 /* FirefoxBookmarksReaderTests.swift in Sources */,
 				4B9DB05B2A983B55000927DB /* MockWaitlistRequest.swift in Sources */,
+				1D9FDEBE2B9B5F0F0040B78C /* CookiePopupProtectionPreferencesTests.swift in Sources */,
 				028904212A7B25770028369C /* AppConfigurationURLProviderTests.swift in Sources */,
 				3706FE6F293F661700E42796 /* LocalStatisticsStoreTests.swift in Sources */,
 				3706FE70293F661700E42796 /* HistoryCoordinatorTests.swift in Sources */,
@@ -10662,9 +11054,11 @@
 				3706FE78293F661700E42796 /* HistoryCoordinatingMock.swift in Sources */,
 				3706FE79293F661700E42796 /* AppearancePreferencesTests.swift in Sources */,
 				3706FE7A293F661700E42796 /* FirePopoverViewModelTests.swift in Sources */,
+				7B09CBAA2BA4BE8200CF245B /* NetworkProtectionPixelEventTests.swift in Sources */,
 				3706FE7B293F661700E42796 /* HistoryStoringMock.swift in Sources */,
 				562984702AC4610100AC20EB /* SyncPreferencesTests.swift in Sources */,
 				3706FE7C293F661700E42796 /* LocalBookmarkStoreTests.swift in Sources */,
+				9F982F142B822C7400231028 /* AddEditBookmarkFolderDialogViewModelTests.swift in Sources */,
 				B6CA4825298CE4B70067ECCE /* AdClickAttributionTabExtensionTests.swift in Sources */,
 				3707C72D294B5D4100682A9F /* EmptyAttributionRulesProver.swift in Sources */,
 				376E2D2629428353001CD31B /* PrivacyReferenceTestHelper.swift in Sources */,
@@ -10767,10 +11161,10 @@
 			files = (
 				4B25377A2A11C01700610219 /* UserText+NetworkProtectionExtensions.swift in Sources */,
 				B65DA5F42A77D3FA00CBEE8D /* BundleExtension.swift in Sources */,
+				EE66418D2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift in Sources */,
 				4B2D062D2A11C12300DE1F49 /* Logging.swift in Sources */,
 				7B2E52252A5FEC09000C6D39 /* NetworkProtectionAgentNotificationsPresenter.swift in Sources */,
 				B602E8232A1E260E006D261F /* Bundle+NetworkProtectionExtensions.swift in Sources */,
-				EEAD7A7B2A1D3E20002A24E7 /* AppLauncher.swift in Sources */,
 				4B2D062A2A11C0C900DE1F49 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
 				B602E8192A1E2570006D261F /* URL+NetworkProtection.swift in Sources */,
 				4B2D06322A11C1D300DE1F49 /* NSApplicationExtension.swift in Sources */,
@@ -10791,10 +11185,10 @@
 			files = (
 				B6F92BA22A691580002ABA6B /* UserDefaultsWrapper.swift in Sources */,
 				4B2D065B2A11D1FF00DE1F49 /* Logging.swift in Sources */,
-				7BA7CC5B2AD120640042E5CE /* NetworkProtection+ConvenienceInitializers.swift in Sources */,
 				7BA7CC3A2AD11E2D0042E5CE /* DuckDuckGoVPNAppDelegate.swift in Sources */,
 				7BAF9E4C2A8A3CCA002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */,
 				7BA7CC592AD1203B0042E5CE /* UserText+NetworkProtection.swift in Sources */,
+				EEDE50112BA360C80017F3C4 /* NetworkProtection+VPNAgentConvenienceInitializers.swift in Sources */,
 				7BA7CC562AD11FFB0042E5CE /* NetworkProtectionOptionKeyExtension.swift in Sources */,
 				7B2DDCFA2A93B25F0039D884 /* KeychainType+ClientDefault.swift in Sources */,
 				7BA7CC4C2AD11EC70042E5CE /* NetworkProtectionControllerErrorStore.swift in Sources */,
@@ -10802,9 +11196,9 @@
 				7B8DB31A2B504D7500EC16DA /* VPNAppEventsHandler.swift in Sources */,
 				7BA7CC532AD11FCE0042E5CE /* Bundle+VPN.swift in Sources */,
 				7BFE95562A9DF29B0081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift in Sources */,
-				EE0629742B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */,
 				7BA7CC5D2AD120C30042E5CE /* EventMapping+NetworkProtectionError.swift in Sources */,
 				7BA7CC4A2AD11EA00042E5CE /* NetworkProtectionTunnelController.swift in Sources */,
+				EE3424602BA0853900173B1B /* VPNUninstaller.swift in Sources */,
 				7BD1688E2AD4A4C400D24876 /* NetworkExtensionController.swift in Sources */,
 				7BA7CC3E2AD11E380042E5CE /* TunnelControllerIPCService.swift in Sources */,
 				7BA7CC402AD11E3D0042E5CE /* AppLauncher+DefaultInitializer.swift in Sources */,
@@ -10828,17 +11222,17 @@
 				4BA7C4DB2B3F63AE00AFE511 /* NetworkExtensionController.swift in Sources */,
 				4B2D067C2A13340900DE1F49 /* Logging.swift in Sources */,
 				7B1459552B7D438F00047F2C /* VPNProxyLauncher.swift in Sources */,
+				EEDE50122BA360C80017F3C4 /* NetworkProtection+VPNAgentConvenienceInitializers.swift in Sources */,
 				B6F92BAD2A6937B5002ABA6B /* OptionalExtension.swift in Sources */,
 				4BA7C4D92B3F61FB00AFE511 /* BundleExtension.swift in Sources */,
-				7BA7CC5A2AD120640042E5CE /* NetworkProtection+ConvenienceInitializers.swift in Sources */,
 				EEC589DC2A4F1CE800BCD60C /* AppLauncher.swift in Sources */,
 				7BA7CC3F2AD11E3D0042E5CE /* AppLauncher+DefaultInitializer.swift in Sources */,
 				4B0EF7292B5780EB009D6481 /* VPNAppEventsHandler.swift in Sources */,
 				7BA7CC412AD11E420042E5CE /* NetworkProtectionBouncer.swift in Sources */,
 				4BF0E5082AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */,
-				EE0629752B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */,
 				7BA7CC582AD1203A0042E5CE /* UserText+NetworkProtection.swift in Sources */,
 				7BA7CC4B2AD11EC60042E5CE /* NetworkProtectionControllerErrorStore.swift in Sources */,
+				EE3424612BA0853900173B1B /* VPNUninstaller.swift in Sources */,
 				4BF0E5152AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */,
 				7BFE95592A9DF2AF0081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift in Sources */,
 				7BA7CC5C2AD120C30042E5CE /* EventMapping+NetworkProtectionError.swift in Sources */,
@@ -10874,7 +11268,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				4B41EDA02B15437A001EEDF4 /* NetworkProtectionNotificationsPresenterFactory.swift in Sources */,
+				7B25856C2BA2F2D000D49F79 /* AppLauncher.swift in Sources */,
 				4B4D609F2A0B2C7300BCD287 /* Logging.swift in Sources */,
+				EE66418C2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift in Sources */,
 				7B7DFB202B7E736B009EA1A3 /* MacPacketTunnelProvider.swift in Sources */,
 				4B4D60A12A0B2D6100BCD287 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
 				B602E8182A1E2570006D261F /* URL+NetworkProtection.swift in Sources */,
@@ -10886,7 +11282,6 @@
 				4BF0E50C2AD2552300FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */,
 				4B4D60AC2A0C804B00BCD287 /* OptionalExtension.swift in Sources */,
 				B65DA5F22A77D3C600CBEE8D /* UserDefaultsWrapper.swift in Sources */,
-				EEAD7A7A2A1D3E20002A24E7 /* AppLauncher.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -10914,7 +11309,9 @@
 				4B9579542AC7AE700062CA31 /* DownloadListStore.swift in Sources */,
 				4B9579552AC7AE700062CA31 /* Logging.swift in Sources */,
 				4B9579562AC7AE700062CA31 /* CrashReportPromptPresenter.swift in Sources */,
+				1DDC84F92B83558F00670238 /* PreferencesPrivateSearchView.swift in Sources */,
 				B6B4D1CD2B0C8C9200C26286 /* FirefoxCompatibilityPreferences.swift in Sources */,
+				9FA173ED2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift in Sources */,
 				4B9579572AC7AE700062CA31 /* BWCredential.swift in Sources */,
 				4B9579582AC7AE700062CA31 /* PreferencesRootView.swift in Sources */,
 				4B9579592AC7AE700062CA31 /* AppStateChangedPublisher.swift in Sources */,
@@ -10924,6 +11321,7 @@
 				4B95795D2AC7AE700062CA31 /* OptionalExtension.swift in Sources */,
 				4B95795E2AC7AE700062CA31 /* PasswordManagementLoginItemView.swift in Sources */,
 				4B95795F2AC7AE700062CA31 /* UserText.swift in Sources */,
+				9F872D9A2B8DA9F800138637 /* Bookmarks+Tab.swift in Sources */,
 				4B9579602AC7AE700062CA31 /* WKWebView+Download.swift in Sources */,
 				4B9579612AC7AE700062CA31 /* TabShadowConfig.swift in Sources */,
 				4B9579622AC7AE700062CA31 /* URLSessionExtension.swift in Sources */,
@@ -10944,6 +11342,8 @@
 				4B95796E2AC7AE700062CA31 /* LegacyBookmarkStore.swift in Sources */,
 				4B95796F2AC7AE700062CA31 /* NSAlert+DataImport.swift in Sources */,
 				4B9579702AC7AE700062CA31 /* MainWindow.swift in Sources */,
+				9F872DA52B90920F00138637 /* BookmarkFolderInfo.swift in Sources */,
+				9FEE986B2B85B869002E44E8 /* BookmarksDialogViewModel.swift in Sources */,
 				4B9579712AC7AE700062CA31 /* CrashReportPromptViewController.swift in Sources */,
 				4B9579722AC7AE700062CA31 /* BookmarksCleanupErrorHandling.swift in Sources */,
 				4B9579732AC7AE700062CA31 /* ContextMenuManager.swift in Sources */,
@@ -10956,8 +11356,10 @@
 				4B9579792AC7AE700062CA31 /* BWRequest.swift in Sources */,
 				4B95797A2AC7AE700062CA31 /* WKWebViewConfigurationExtensions.swift in Sources */,
 				4B95797B2AC7AE700062CA31 /* HomePageDefaultBrowserModel.swift in Sources */,
+				9F514F932B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift in Sources */,
 				4B95797C2AC7AE700062CA31 /* CrashReporter.swift in Sources */,
 				4B95797D2AC7AE700062CA31 /* AddressBarTextSelectionNavigation.swift in Sources */,
+				1D01A3DA2B88DF8B00FE8150 /* PreferencesSyncView.swift in Sources */,
 				4B37EE7D2B4CFF8300A89A61 /* SurveyURLBuilder.swift in Sources */,
 				4B95797E2AC7AE700062CA31 /* BadgeNotificationAnimationModel.swift in Sources */,
 				4B95797F2AC7AE700062CA31 /* HyperLink.swift in Sources */,
@@ -10994,6 +11396,7 @@
 				4B95799E2AC7AE700062CA31 /* EncryptionKeyGeneration.swift in Sources */,
 				4B95799F2AC7AE700062CA31 /* TabLazyLoader.swift in Sources */,
 				B690152F2ACBF4DA00AD0BAB /* MenuPreview.swift in Sources */,
+				1D01A3D22B88CEC600FE8150 /* PreferencesAccessibilityView.swift in Sources */,
 				4B9579A02AC7AE700062CA31 /* InvitedToWaitlistView.swift in Sources */,
 				4B9579A22AC7AE700062CA31 /* SaveCredentialsViewController.swift in Sources */,
 				4B9579A32AC7AE700062CA31 /* PopUpButton.swift in Sources */,
@@ -11016,7 +11419,6 @@
 				4B9579B52AC7AE700062CA31 /* FirefoxLoginReader.swift in Sources */,
 				4B9579B62AC7AE700062CA31 /* AtbParser.swift in Sources */,
 				4B9579B72AC7AE700062CA31 /* PreferencesDuckPlayerView.swift in Sources */,
-				4B9579B82AC7AE700062CA31 /* AddBookmarkFolderModalView.swift in Sources */,
 				4B41EDB62B169883001EEDF4 /* VPNFeedbackFormViewController.swift in Sources */,
 				4B9579B92AC7AE700062CA31 /* BookmarkSidebarTreeController.swift in Sources */,
 				4B9579BA2AC7AE700062CA31 /* HomePageFavoritesModel.swift in Sources */,
@@ -11025,6 +11427,7 @@
 				4B9579BD2AC7AE700062CA31 /* ChromiumDataImporter.swift in Sources */,
 				4B9579BE2AC7AE700062CA31 /* BackForwardListItemViewModel.swift in Sources */,
 				4B9579BF2AC7AE700062CA31 /* BWNotRespondingAlert.swift in Sources */,
+				1DDC85052B83903E00670238 /* PreferencesWebTrackingProtectionView.swift in Sources */,
 				4B9579C02AC7AE700062CA31 /* DebugUserScript.swift in Sources */,
 				1DC669722B6CF0D700AA0645 /* TabSnapshotStore.swift in Sources */,
 				4B9579C12AC7AE700062CA31 /* RecentlyClosedTab.swift in Sources */,
@@ -11043,6 +11446,7 @@
 				4B9579CE2AC7AE700062CA31 /* CredentialsCleanupErrorHandling.swift in Sources */,
 				4B9579CF2AC7AE700062CA31 /* SafariBookmarksReader.swift in Sources */,
 				4B9579D02AC7AE700062CA31 /* HTTPCookie.swift in Sources */,
+				1DDD3EC62B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift in Sources */,
 				4B9579D12AC7AE700062CA31 /* SafariVersionReader.swift in Sources */,
 				4B9579D22AC7AE700062CA31 /* LoginFaviconView.swift in Sources */,
 				4B9579D32AC7AE700062CA31 /* FireproofDomainsViewController.swift in Sources */,
@@ -11064,12 +11468,14 @@
 				4B9579E02AC7AE700062CA31 /* BookmarkExtension.swift in Sources */,
 				4B9579E12AC7AE700062CA31 /* PasswordManagementCreditCardModel.swift in Sources */,
 				B677FC522B06376B0099EB04 /* ReportFeedbackView.swift in Sources */,
+				1D220BFE2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift in Sources */,
 				4B9579E22AC7AE700062CA31 /* NSEventExtension.swift in Sources */,
 				1D26EBB22B74DB600002A93F /* TabSnapshotCleanupService.swift in Sources */,
 				4B9579E32AC7AE700062CA31 /* Onboarding.swift in Sources */,
 				4B9579E42AC7AE700062CA31 /* PopUpWindow.swift in Sources */,
 				4B9579E52AC7AE700062CA31 /* Favicons.xcdatamodeld in Sources */,
 				4B9579E62AC7AE700062CA31 /* Publisher.asVoid.swift in Sources */,
+				9FEE986F2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift in Sources */,
 				4B9579E72AC7AE700062CA31 /* Waitlist.swift in Sources */,
 				3158B1582B0BF76000AF130C /* DataBrokerProtectionFeatureVisibility.swift in Sources */,
 				4B9579E82AC7AE700062CA31 /* NavigationButtonMenuDelegate.swift in Sources */,
@@ -11104,7 +11510,7 @@
 				4B957A032AC7AE700062CA31 /* LocalBookmarkStore.swift in Sources */,
 				4B957A042AC7AE700062CA31 /* BWEncryption.m in Sources */,
 				4B957A052AC7AE700062CA31 /* StatisticsLoader.swift in Sources */,
-				4B957A072AC7AE700062CA31 /* PrivacyPreferencesModel.swift in Sources */,
+				4B957A072AC7AE700062CA31 /* DataClearingPreferences.swift in Sources */,
 				4B957A082AC7AE700062CA31 /* LocalUnprotectedDomains.swift in Sources */,
 				4B957A092AC7AE700062CA31 /* InternalUserDeciderStore.swift in Sources */,
 				4B957A0A2AC7AE700062CA31 /* NewWindowPolicy.swift in Sources */,
@@ -11114,6 +11520,7 @@
 				4B957A0E2AC7AE700062CA31 /* UserDialogRequest.swift in Sources */,
 				4B957A0F2AC7AE700062CA31 /* DownloadsCellView.swift in Sources */,
 				4B957A112AC7AE700062CA31 /* PublishedAfter.swift in Sources */,
+				1DDC85012B835BC000670238 /* SearchPreferences.swift in Sources */,
 				B6B5F58C2B03673B008DB58A /* BrowserImportMoreInfoView.swift in Sources */,
 				4B957A122AC7AE700062CA31 /* FirefoxBerkeleyDatabaseReader.swift in Sources */,
 				4B957A132AC7AE700062CA31 /* WebViewSnapshotView.swift in Sources */,
@@ -11133,6 +11540,7 @@
 				4B957A202AC7AE700062CA31 /* CancellableExtension.swift in Sources */,
 				4B957A212AC7AE700062CA31 /* PinnedTabsHostingView.swift in Sources */,
 				4B957A222AC7AE700062CA31 /* FirefoxBookmarksReader.swift in Sources */,
+				9F982F0F2B8224BF00231028 /* AddEditBookmarkFolderDialogViewModel.swift in Sources */,
 				4B0526622B1D55320054955A /* VPNFeedbackSender.swift in Sources */,
 				4B957A232AC7AE700062CA31 /* DeviceIdleStateDetector.swift in Sources */,
 				85D0327D2B8E3D090041D1FB /* HistoryCoordinatorExtension.swift in Sources */,
@@ -11156,6 +11564,7 @@
 				4B957A332AC7AE700062CA31 /* Favicon.swift in Sources */,
 				1E2AE4CA2ACB21A000684E0A /* NetworkProtectionRemoteMessage.swift in Sources */,
 				4B957A342AC7AE700062CA31 /* SuggestionContainerViewModel.swift in Sources */,
+				9F56CFAF2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift in Sources */,
 				4B957A352AC7AE700062CA31 /* FirePopoverWrapperViewController.swift in Sources */,
 				4B957A362AC7AE700062CA31 /* NSPasteboardItemExtension.swift in Sources */,
 				4B957A372AC7AE700062CA31 /* AutofillPreferencesModel.swift in Sources */,
@@ -11168,6 +11577,7 @@
 				4B957A3E2AC7AE700062CA31 /* EnableWaitlistFeatureView.swift in Sources */,
 				4B957A3F2AC7AE700062CA31 /* GrammarFeaturesManager.swift in Sources */,
 				4B957A402AC7AE700062CA31 /* WaitlistModalViewController.swift in Sources */,
+				B60293E82BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */,
 				B6BCC53E2AFD15DF002C5499 /* DataImportProfilePicker.swift in Sources */,
 				4B957A412AC7AE700062CA31 /* WKMenuItemIdentifier.swift in Sources */,
 				4B957A422AC7AE700062CA31 /* SafariFaviconsReader.swift in Sources */,
@@ -11192,6 +11602,7 @@
 				4B957A542AC7AE700062CA31 /* VisitMenuItem.swift in Sources */,
 				4B957A552AC7AE700062CA31 /* EncryptionKeyStore.swift in Sources */,
 				4B957A562AC7AE700062CA31 /* TabExtensionsBuilder.swift in Sources */,
+				9F56CFB32B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift in Sources */,
 				1E2AE4C82ACB216B00684E0A /* HoverTrackingArea.swift in Sources */,
 				4B957A582AC7AE700062CA31 /* PasswordManagementIdentityItemView.swift in Sources */,
 				4B957A592AC7AE700062CA31 /* ProgressExtension.swift in Sources */,
@@ -11213,10 +11624,10 @@
 				4B957A662AC7AE700062CA31 /* SuggestionListCharacteristics.swift in Sources */,
 				4B957A672AC7AE700062CA31 /* TimeIntervalExtension.swift in Sources */,
 				4B957A682AC7AE700062CA31 /* NetworkProtectionFeatureDisabler.swift in Sources */,
+				7BBA7CEA2BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift in Sources */,
 				4B957A692AC7AE700062CA31 /* BookmarkListViewController.swift in Sources */,
 				4B957A6A2AC7AE700062CA31 /* SecureVaultLoginImporter.swift in Sources */,
 				4B957A6B2AC7AE700062CA31 /* WKProcessPoolExtension.swift in Sources */,
-				4B957A6C2AC7AE700062CA31 /* AddBookmarkModalView.swift in Sources */,
 				4B957A6D2AC7AE700062CA31 /* LoginItemsManager.swift in Sources */,
 				4B957A6E2AC7AE700062CA31 /* PixelExperiment.swift in Sources */,
 				4B957A6F2AC7AE700062CA31 /* DuckPlayerTabExtension.swift in Sources */,
@@ -11225,6 +11636,7 @@
 				B6080BC82B21E78100B418EF /* DataImportErrorView.swift in Sources */,
 				4B957A722AC7AE700062CA31 /* FaviconHostReference.swift in Sources */,
 				4B957A732AC7AE700062CA31 /* DownloadsTabExtension.swift in Sources */,
+				1D220BFA2B86192200F8BBC6 /* PreferencesEmailProtectionView.swift in Sources */,
 				4B957A752AC7AE700062CA31 /* ASN1Parser.swift in Sources */,
 				4B957A762AC7AE700062CA31 /* FileDownloadManager.swift in Sources */,
 				4B957A772AC7AE700062CA31 /* BookmarkImport.swift in Sources */,
@@ -11246,7 +11658,6 @@
 				4B41EDA52B1543B9001EEDF4 /* VPNPreferencesModel.swift in Sources */,
 				4B957A822AC7AE700062CA31 /* SyncDebugMenu.swift in Sources */,
 				4B957A832AC7AE700062CA31 /* AddBookmarkPopover.swift in Sources */,
-				4B957A842AC7AE700062CA31 /* PreferencesDownloadsView.swift in Sources */,
 				4B957A852AC7AE700062CA31 /* QRSharingService.swift in Sources */,
 				4B957A862AC7AE700062CA31 /* ProcessExtension.swift in Sources */,
 				B68412162B694BA10092F66A /* NSObject+performSelector.m in Sources */,
@@ -11264,18 +11675,19 @@
 				4B957A902AC7AE700062CA31 /* BookmarkManagementSplitViewController.swift in Sources */,
 				4B957A912AC7AE700062CA31 /* CookieManagedNotificationContainerView.swift in Sources */,
 				4B957A922AC7AE700062CA31 /* FileManagerExtension.swift in Sources */,
+				1DDD3EBE2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift in Sources */,
 				4B957A932AC7AE700062CA31 /* PermissionModel.swift in Sources */,
 				4B957A942AC7AE700062CA31 /* PasteboardFolder.swift in Sources */,
 				4B957A952AC7AE700062CA31 /* CookieManagedNotificationView.swift in Sources */,
 				4B957A962AC7AE700062CA31 /* PermissionType.swift in Sources */,
 				4B957A982AC7AE700062CA31 /* RecentlyClosedWindow.swift in Sources */,
 				4B957A992AC7AE700062CA31 /* ActionSpeech.swift in Sources */,
-				4B957A9A2AC7AE700062CA31 /* PrivacySecurityPreferences.swift in Sources */,
 				4B957A9B2AC7AE700062CA31 /* ModalSheetCancellable.swift in Sources */,
 				4B957A9C2AC7AE700062CA31 /* FireproofDomainsStore.swift in Sources */,
 				4B957A9D2AC7AE700062CA31 /* NetworkProtectionSimulateFailureMenu.swift in Sources */,
 				4B957A9E2AC7AE700062CA31 /* PrivacyDashboardPermissionHandler.swift in Sources */,
 				4B957A9F2AC7AE700062CA31 /* TabCollectionViewModel.swift in Sources */,
+				4B520F652BA5573A006405C7 /* WaitlistThankYouView.swift in Sources */,
 				4B957AA02AC7AE700062CA31 /* BookmarkManager.swift in Sources */,
 				4B957AA12AC7AE700062CA31 /* AboutModel.swift in Sources */,
 				4B957AA22AC7AE700062CA31 /* PasswordManagementCreditCardItemView.swift in Sources */,
@@ -11295,6 +11707,7 @@
 				4B957AAD2AC7AE700062CA31 /* Tab+Dialogs.swift in Sources */,
 				4B957AAE2AC7AE700062CA31 /* PasteboardBookmark.swift in Sources */,
 				4B957AAF2AC7AE700062CA31 /* PinnedTabsManager.swift in Sources */,
+				1D01A3D62B88CF7700FE8150 /* AccessibilityPreferences.swift in Sources */,
 				4B957AB02AC7AE700062CA31 /* HoverUserScript.swift in Sources */,
 				4B957AB12AC7AE700062CA31 /* MainMenuActions.swift in Sources */,
 				4B957AB22AC7AE700062CA31 /* WKWebView+SessionState.swift in Sources */,
@@ -11305,10 +11718,10 @@
 				4B957AB62AC7AE700062CA31 /* FireproofDomains.xcdatamodeld in Sources */,
 				3158B14F2B0BF74F00AF130C /* DataBrokerProtectionManager.swift in Sources */,
 				4B957AB82AC7AE700062CA31 /* HomePageView.swift in Sources */,
+				9FEE98672B846870002E44E8 /* AddEditBookmarkView.swift in Sources */,
 				4B957AB92AC7AE700062CA31 /* SerpHeadersNavigationResponder.swift in Sources */,
 				4B957ABA2AC7AE700062CA31 /* HomePageContinueSetUpModel.swift in Sources */,
 				4B957ABB2AC7AE700062CA31 /* WebKitDownloadTask.swift in Sources */,
-				EE0629762B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */,
 				4B957ABC2AC7AE700062CA31 /* ChromiumLoginReader.swift in Sources */,
 				B6BCC5522AFE4F7D002C5499 /* DataImportTypePicker.swift in Sources */,
 				4B957ABD2AC7AE700062CA31 /* NSAlert+PasswordManager.swift in Sources */,
@@ -11321,12 +11734,12 @@
 				4B957AC42AC7AE700062CA31 /* BWVault.swift in Sources */,
 				4B957AC52AC7AE700062CA31 /* NSViewExtension.swift in Sources */,
 				BBDFDC5C2B2B8D7000F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift in Sources */,
+				9FA173E52B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift in Sources */,
 				4B957AC72AC7AE700062CA31 /* DownloadListViewModel.swift in Sources */,
 				4B957AC82AC7AE700062CA31 /* BookmarkManagementDetailViewController.swift in Sources */,
 				4B957AC92AC7AE700062CA31 /* CSVImporter.swift in Sources */,
 				4B957ACA2AC7AE700062CA31 /* StartupPreferences.swift in Sources */,
 				4B957ACB2AC7AE700062CA31 /* UserDefaults+NetworkProtectionWaitlist.swift in Sources */,
-				B6F9BDE22B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift in Sources */,
 				4B957ACC2AC7AE700062CA31 /* MainMenu.swift in Sources */,
 				4B957ACE2AC7AE700062CA31 /* BrowserTabViewController.swift in Sources */,
 				4B957ACF2AC7AE700062CA31 /* CallToAction.swift in Sources */,
@@ -11341,6 +11754,7 @@
 				4B957AD72AC7AE700062CA31 /* CustomRoundedCornersShape.swift in Sources */,
 				4B957AD82AC7AE700062CA31 /* LocaleExtension.swift in Sources */,
 				4B957AD92AC7AE700062CA31 /* SavePaymentMethodViewController.swift in Sources */,
+				9FA173E92B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift in Sources */,
 				4B957ADA2AC7AE700062CA31 /* BWStatus.swift in Sources */,
 				4B957ADB2AC7AE700062CA31 /* WebKitVersionProvider.swift in Sources */,
 				B6BCC54D2AFDF24B002C5499 /* TaskWithProgress.swift in Sources */,
@@ -11368,8 +11782,8 @@
 				4B957AF02AC7AE700062CA31 /* NSException+Catch.m in Sources */,
 				4B957AF12AC7AE700062CA31 /* AppStateRestorationManager.swift in Sources */,
 				4B957AF22AC7AE700062CA31 /* DailyPixel.swift in Sources */,
+				9FDA6C232B79A59D00E099A9 /* BookmarkFavoriteView.swift in Sources */,
 				4B957AF32AC7AE700062CA31 /* NavigationHotkeyHandler.swift in Sources */,
-				1EA7B8DA2B7E1283000330A4 /* SubscriptionFeatureAvailability.swift in Sources */,
 				4B957AF42AC7AE700062CA31 /* ClickToLoadUserScript.swift in Sources */,
 				4B957AF52AC7AE700062CA31 /* WindowControllersManager.swift in Sources */,
 				4B957AF62AC7AE700062CA31 /* FireAnimationView.swift in Sources */,
@@ -11408,10 +11822,11 @@
 				B66CA4212AD910B300447CF0 /* DataImportView.swift in Sources */,
 				4B957B162AC7AE700062CA31 /* Downloads.xcdatamodeld in Sources */,
 				4B957B172AC7AE700062CA31 /* TabPreviewViewController.swift in Sources */,
-				B6F9BDDA2B45B7D900677B33 /* AddBookmarkModalViewModel.swift in Sources */,
-				4B957B182AC7AE700062CA31 /* PreferencesPrivacyView.swift in Sources */,
+				4B957B182AC7AE700062CA31 /* PreferencesDataClearingView.swift in Sources */,
+				4B957B182AC7AE700062CA31 /* PreferencesDataClearingView.swift in Sources */,
 				4B957B192AC7AE700062CA31 /* NSPasteboardExtension.swift in Sources */,
 				4B957B1A2AC7AE700062CA31 /* OnboardingViewModel.swift in Sources */,
+				F1B33DF42BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift in Sources */,
 				4B957B1B2AC7AE700062CA31 /* ScriptSourceProviding.swift in Sources */,
 				4B957B1C2AC7AE700062CA31 /* CoreDataBookmarkImporter.swift in Sources */,
 				4B957B1D2AC7AE700062CA31 /* SuggestionViewModel.swift in Sources */,
@@ -11461,6 +11876,7 @@
 				4B957B462AC7AE700062CA31 /* Tab+NSSecureCoding.swift in Sources */,
 				4B957B472AC7AE700062CA31 /* NSNotificationName+EmailManager.swift in Sources */,
 				B6619EFE2B111CCC00CD9186 /* InstructionsFormatParser.swift in Sources */,
+				1DDD3EC22B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift in Sources */,
 				4B957B482AC7AE700062CA31 /* MouseOverButton.swift in Sources */,
 				4B957B492AC7AE700062CA31 /* FireInfoViewController.swift in Sources */,
 				4B957B4A2AC7AE700062CA31 /* LoginItem+NetworkProtection.swift in Sources */,
@@ -11494,6 +11910,7 @@
 				4B957B612AC7AE700062CA31 /* HomePage.swift in Sources */,
 				4B957B622AC7AE700062CA31 /* RoundedSelectionRowView.swift in Sources */,
 				B6A22B652B1E29D000ECD2BA /* DataImportSummaryViewModel.swift in Sources */,
+				9FA173E12B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift in Sources */,
 				4B957B632AC7AE700062CA31 /* LocalStatisticsStore.swift in Sources */,
 				4B957B642AC7AE700062CA31 /* BackForwardListItem.swift in Sources */,
 				4B957B672AC7AE700062CA31 /* AtbAndVariantCleanup.swift in Sources */,
@@ -11510,6 +11927,7 @@
 				4B957B712AC7AE700062CA31 /* TabPreviewWindowController.swift in Sources */,
 				4B957B722AC7AE700062CA31 /* NSSizeExtension.swift in Sources */,
 				4B957B732AC7AE700062CA31 /* Fire.swift in Sources */,
+				1DDC84FD2B8356CE00670238 /* PreferencesDefaultBrowserView.swift in Sources */,
 				4B957B742AC7AE700062CA31 /* SyncBookmarksAdapter.swift in Sources */,
 				B6ABC5982B4861D4008343B9 /* FocusableTextField.swift in Sources */,
 				4B957B752AC7AE700062CA31 /* RandomAccessCollectionExtension.swift in Sources */,
@@ -11522,12 +11940,15 @@
 				4B957B7B2AC7AE700062CA31 /* DeviceAuthenticator.swift in Sources */,
 				4B957B7C2AC7AE700062CA31 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift in Sources */,
 				4B957B7D2AC7AE700062CA31 /* TabBarCollectionView.swift in Sources */,
+				C1DAF3B72B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */,
 				4B957B7E2AC7AE700062CA31 /* NetworkProtection+ConvenienceInitializers.swift in Sources */,
 				7BA7CC502AD11F6F0042E5CE /* NetworkProtectionIPCTunnelController.swift in Sources */,
 				4B957B7F2AC7AE700062CA31 /* NavigationActionExtension.swift in Sources */,
+				F1B33DF82BAD970E001128B3 /* SubscriptionErrorReporter.swift in Sources */,
 				4B957B802AC7AE700062CA31 /* NSAlertExtension.swift in Sources */,
 				4B957B812AC7AE700062CA31 /* ThirdPartyBrowser.swift in Sources */,
 				4B957B822AC7AE700062CA31 /* SearchNonexistentDomainNavigationResponder.swift in Sources */,
+				4B6B64862BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift in Sources */,
 				B6B71C5A2B23379600487131 /* NSLayoutConstraintExtension.swift in Sources */,
 				B65211272B29A43000B30633 /* BookmarkStoreMock.swift in Sources */,
 				4B957B832AC7AE700062CA31 /* CircularProgressView.swift in Sources */,
@@ -11568,6 +11989,8 @@
 				4B957BA12AC7AE700062CA31 /* UserDefaults+NetworkProtectionShared.swift in Sources */,
 				4B957BA22AC7AE700062CA31 /* NavigationActionPolicyExtension.swift in Sources */,
 				4B957BA32AC7AE700062CA31 /* CIImageExtension.swift in Sources */,
+				9F56CFAB2B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift in Sources */,
+				9FA173DC2B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift in Sources */,
 				4B957BA42AC7AE700062CA31 /* NSMenuExtension.swift in Sources */,
 				4B957BA52AC7AE700062CA31 /* MainWindowController.swift in Sources */,
 				4B957BA62AC7AE700062CA31 /* Tab.swift in Sources */,
@@ -11613,6 +12036,7 @@
 				4B957BCB2AC7AE700062CA31 /* PreferencesAppearanceView.swift in Sources */,
 				4B957BCC2AC7AE700062CA31 /* NSMenuItemExtension.swift in Sources */,
 				4B957BCD2AC7AE700062CA31 /* ContiguousBytesExtension.swift in Sources */,
+				7B7FCD112BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift in Sources */,
 				4B957BCE2AC7AE700062CA31 /* AdjacentItemEnumerator.swift in Sources */,
 				4B957BCF2AC7AE700062CA31 /* BookmarkDatabase.swift in Sources */,
 				4B957BD02AC7AE700062CA31 /* ChromiumKeychainPrompt.swift in Sources */,
@@ -11633,7 +12057,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				EEBCE6842BA4643200B9DF00 /* NSSizeExtension.swift in Sources */,
+				EE02D41C2BB460A600DBE6B3 /* BrowsingHistoryTests.swift in Sources */,
+				EE02D41A2BB4609900DBE6B3 /* UITests.swift in Sources */,
+				EE0429E02BA31D2F009EB20F /* FindInPageTests.swift in Sources */,
+				EE02D4212BB460FE00DBE6B3 /* StringExtension.swift in Sources */,
+				EE02D4222BB4611A00DBE6B3 /* TestsURLExtension.swift in Sources */,
 				7B4CE8E726F02135009134B1 /* TabBarTests.swift in Sources */,
+				EEBCE6832BA463DD00B9DF00 /* NSImageExtensions.swift in Sources */,
+				EEBCE6822BA444FA00B9DF00 /* XCUIElementExtension.swift in Sources */,
+				EED735362BB46B6000F173D6 /* AutocompleteTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -11728,7 +12161,7 @@
 				1D1A33492A6FEB170080ACED /* BurnerMode.swift in Sources */,
 				14505A08256084EF00272CC6 /* UserAgent.swift in Sources */,
 				987799F12999993C005D8EB6 /* LegacyBookmarkStore.swift in Sources */,
-				B6F9BDE02B45C1A800677B33 /* AddBookmarkFolderModalViewModel.swift in Sources */,
+				1D220BF82B86192200F8BBC6 /* PreferencesEmailProtectionView.swift in Sources */,
 				4B8AC93526B3B2FD00879451 /* NSAlert+DataImport.swift in Sources */,
 				AA7412BD24D2BEEE00D22FE0 /* MainWindow.swift in Sources */,
 				AAD6D8882696DF6D002393B3 /* CrashReportPromptViewController.swift in Sources */,
@@ -11746,6 +12179,7 @@
 				B65C7DFB2B886CF0001E2D5C /* WKPDFHUDViewWrapper.swift in Sources */,
 				B68458CD25C7EB9000DC17B6 /* WKWebViewConfigurationExtensions.swift in Sources */,
 				85AC7ADD27BEB6EE00FFB69B /* HomePageDefaultBrowserModel.swift in Sources */,
+				1D01A3D82B88DF8B00FE8150 /* PreferencesSyncView.swift in Sources */,
 				B6619EFB2B111CC500CD9186 /* InstructionsFormatParser.swift in Sources */,
 				1DC669702B6CF0D700AA0645 /* TabSnapshotStore.swift in Sources */,
 				AAC30A26268DFEE200D2D9CD /* CrashReporter.swift in Sources */,
@@ -11807,7 +12241,6 @@
 				4B8AC93926B48A5100879451 /* FirefoxLoginReader.swift in Sources */,
 				B69B503E2726A12500758A2B /* AtbParser.swift in Sources */,
 				37F19A6528E1B3FB00740DC6 /* PreferencesDuckPlayerView.swift in Sources */,
-				4B9292D22667123700AD2C21 /* AddBookmarkFolderModalView.swift in Sources */,
 				4B92929E26670D2A00AD2C21 /* BookmarkSidebarTreeController.swift in Sources */,
 				EEC4A6712B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift in Sources */,
 				85589E8727BBB8F20038AD11 /* HomePageFavoritesModel.swift in Sources */,
@@ -11816,6 +12249,7 @@
 				4B59024026B35F3600489384 /* ChromiumDataImporter.swift in Sources */,
 				B62B48562ADE730D000DECE5 /* FileImportView.swift in Sources */,
 				AAA0CC3C25337FAB0079BC96 /* BackForwardListItemViewModel.swift in Sources */,
+				9F982F0D2B8224BF00231028 /* AddEditBookmarkFolderDialogViewModel.swift in Sources */,
 				1D43EB3429297D760065E5D6 /* BWNotRespondingAlert.swift in Sources */,
 				4BB88B4525B7B55C006F6B06 /* DebugUserScript.swift in Sources */,
 				AAC6881928626BF800D54247 /* RecentlyClosedTab.swift in Sources */,
@@ -11842,6 +12276,7 @@
 				AA92127725ADA07900600CD4 /* WKWebViewExtension.swift in Sources */,
 				AAAB9114288EB1D600A057A9 /* CleanThisHistoryMenuItem.swift in Sources */,
 				B6C0B23626E732000031CB7F /* DownloadListItem.swift in Sources */,
+				9F872DA32B90920F00138637 /* BookmarkFolderInfo.swift in Sources */,
 				4B9DB0232A983B24000927DB /* WaitlistRequest.swift in Sources */,
 				B6B1E87E26D5DA0E0062C350 /* DownloadsPopover.swift in Sources */,
 				85774AFF2A713D3B00DE0561 /* BookmarksBarMenuFactory.swift in Sources */,
@@ -11854,6 +12289,7 @@
 				B68C92C1274E3EF4002AC6B0 /* PopUpWindow.swift in Sources */,
 				AA5FA6A0275F948900DCE9C9 /* Favicons.xcdatamodeld in Sources */,
 				3158B1502B0BF75200AF130C /* DataBrokerProtectionLoginItemScheduler.swift in Sources */,
+				7BBA7CE62BAB03C1007579A3 /* DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift in Sources */,
 				B684592225C93BE000DC17B6 /* Publisher.asVoid.swift in Sources */,
 				4B9DB01D2A983B24000927DB /* Waitlist.swift in Sources */,
 				BBDFDC5A2B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift in Sources */,
@@ -11868,6 +12304,7 @@
 				98779A0029999B64005D8EB6 /* Bookmark.xcdatamodeld in Sources */,
 				85589E9E27BFE4500038AD11 /* DefaultBrowserPromptView.swift in Sources */,
 				4B4032842AAAC24400CCA602 /* WaitlistActivationDateStore.swift in Sources */,
+				1D220BFC2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift in Sources */,
 				AA512D1424D99D9800230283 /* FaviconManager.swift in Sources */,
 				7BB108592A43375D000AB95F /* PFMoveApplication.m in Sources */,
 				4B0AACAC28BC63ED001038AC /* ChromiumFaviconsReader.swift in Sources */,
@@ -11888,7 +12325,7 @@
 				1D02633628D8A9A9005CBB41 /* BWEncryption.m in Sources */,
 				B6B5F5892B03673B008DB58A /* BrowserImportMoreInfoView.swift in Sources */,
 				B69B503A2726A12500758A2B /* StatisticsLoader.swift in Sources */,
-				37CD54C927F2FDD100F1F7B9 /* PrivacyPreferencesModel.swift in Sources */,
+				37CD54C927F2FDD100F1F7B9 /* DataClearingPreferences.swift in Sources */,
 				B6F1C80B2761C45400334924 /* LocalUnprotectedDomains.swift in Sources */,
 				B69A14FA2B4D705D00B9417D /* BookmarkFolderPicker.swift in Sources */,
 				1D36E658298AA3BA00AA485D /* InternalUserDeciderStore.swift in Sources */,
@@ -11913,6 +12350,7 @@
 				85C6A29625CC1FFD00EEB5F1 /* UserDefaultsWrapper.swift in Sources */,
 				85625998269C9C5F00EE44BC /* PasswordManagementPopover.swift in Sources */,
 				1DDF076328F815AD00EDFBE3 /* BWCommunicator.swift in Sources */,
+				9FEE98652B846870002E44E8 /* AddEditBookmarkView.swift in Sources */,
 				85589E9127BFB9810038AD11 /* HomePageRecentlyVisitedModel.swift in Sources */,
 				85012B0229133F9F003D0DCC /* NavigationBarPopovers.swift in Sources */,
 				B626A7602992407D00053070 /* CancellableExtension.swift in Sources */,
@@ -11954,6 +12392,7 @@
 				4B9DB0442A983B24000927DB /* WaitlistModalViewController.swift in Sources */,
 				B6DA06E8291401D700225DE2 /* WKMenuItemIdentifier.swift in Sources */,
 				4B0AACAE28BC6FD0001038AC /* SafariFaviconsReader.swift in Sources */,
+				B60293E62BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */,
 				B6B3E0E12657EA7A0040E0A2 /* NSScreenExtension.swift in Sources */,
 				B65E6BA026D9F10600095F96 /* NSBezierPathExtension.swift in Sources */,
 				4B4D60E02A0C875F00BCD287 /* Bundle+VPN.swift in Sources */,
@@ -11997,9 +12436,9 @@
 				4B6785472AA8DE68008A5004 /* NetworkProtectionFeatureDisabler.swift in Sources */,
 				4B0526642B1D55D80054955A /* VPNFeedbackCategory.swift in Sources */,
 				4B9292D42667123700AD2C21 /* BookmarkListViewController.swift in Sources */,
+				9F56CFB12B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift in Sources */,
 				4B723E0D26B0006100E14D75 /* SecureVaultLoginImporter.swift in Sources */,
 				B645D8F629FA95440024461F /* WKProcessPoolExtension.swift in Sources */,
-				4B9292D32667123700AD2C21 /* AddBookmarkModalView.swift in Sources */,
 				9D9AE86B2AA76CF90026E7DC /* LoginItemsManager.swift in Sources */,
 				857E5AF52A79045800FC0FB4 /* PixelExperiment.swift in Sources */,
 				B6C416A7294A4AE500C4F2E7 /* DuckPlayerTabExtension.swift in Sources */,
@@ -12026,14 +12465,15 @@
 				AA9E9A5625A3AE8400D1959D /* NSWindowExtension.swift in Sources */,
 				7BD3AF5D2A8E7AF1006F9F56 /* KeychainType+ClientDefault.swift in Sources */,
 				370A34B12AB24E3700C77F7C /* SyncDebugMenu.swift in Sources */,
+				9FDA6C212B79A59D00E099A9 /* BookmarkFavoriteView.swift in Sources */,
 				AAC5E4C725D6A6E8007F5990 /* AddBookmarkPopover.swift in Sources */,
-				37CC53F027E8D1440028713D /* PreferencesDownloadsView.swift in Sources */,
 				B6F7127E29F6779000594A45 /* QRSharingService.swift in Sources */,
 				B68C2FB227706E6A00BF2C7D /* ProcessExtension.swift in Sources */,
 				B6106BA726A7BECC0013B453 /* PermissionAuthorizationQuery.swift in Sources */,
 				3171D6BA288984D00068632A /* BadgeAnimationView.swift in Sources */,
 				1DB67F292B6FE4A6003DF243 /* WebViewSnapshotRenderer.swift in Sources */,
 				4B9292CE2667123700AD2C21 /* BrowserTabSelectionDelegate.swift in Sources */,
+				9FEE986D2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift in Sources */,
 				B6BCC53B2AFD15DF002C5499 /* DataImportProfilePicker.swift in Sources */,
 				3158B1562B0BF75D00AF130C /* DataBrokerProtectionFeatureVisibility.swift in Sources */,
 				56D6A3D629DB2BAB0055215A /* ContinueSetUpView.swift in Sources */,
@@ -12056,12 +12496,12 @@
 				B6106BAB26A7BF1D0013B453 /* PermissionType.swift in Sources */,
 				AAC6881B28626C1900D54247 /* RecentlyClosedWindow.swift in Sources */,
 				85707F2A276A35FE00DC0649 /* ActionSpeech.swift in Sources */,
-				4B0511BD262CAA5A00F6079C /* PrivacySecurityPreferences.swift in Sources */,
 				B6BE9FAA293F7955006363C6 /* ModalSheetCancellable.swift in Sources */,
 				B6830963274CDEC7004B46BB /* FireproofDomainsStore.swift in Sources */,
 				7B430EA12A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift in Sources */,
 				1E7E2E942902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift in Sources */,
 				AA9FF95F24A1FB690039E328 /* TabCollectionViewModel.swift in Sources */,
+				4B520F632BA5573A006405C7 /* WaitlistThankYouView.swift in Sources */,
 				4BF0E5052AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */,
 				AAC5E4D125D6A709007F5990 /* BookmarkManager.swift in Sources */,
 				37CD54CD27F2FDD100F1F7B9 /* AboutModel.swift in Sources */,
@@ -12086,12 +12526,10 @@
 				AA6EF9B525081B4C004754E6 /* MainMenuActions.swift in Sources */,
 				B63D466925BEB6C200874977 /* WKWebView+SessionState.swift in Sources */,
 				4B4D60C02A0C848D00BCD287 /* NetworkProtectionControllerErrorStore.swift in Sources */,
-				B6F9BDD82B45B7D900677B33 /* AddBookmarkModalViewModel.swift in Sources */,
 				4B723E1226B0006E00E14D75 /* DataImport.swift in Sources */,
 				7BE146072A6A83C700C313B8 /* NetworkProtectionDebugMenu.swift in Sources */,
 				B6085D092743AAB600A9C456 /* FireproofDomains.xcdatamodeld in Sources */,
 				85589E8227BBB8630038AD11 /* HomePageView.swift in Sources */,
-				EE0629722B90EE8C00D868B4 /* AccountManagerExtension.swift in Sources */,
 				B6BF5D932947199A006742B1 /* SerpHeadersNavigationResponder.swift in Sources */,
 				569277C129DDCBB500B633EF /* HomePageContinueSetUpModel.swift in Sources */,
 				B68D21CF2ACBC9FC002DA3C2 /* ContentBlockerRulesManagerMock.swift in Sources */,
@@ -12099,6 +12537,7 @@
 				1DB67F2D2B6FEFDB003DF243 /* ViewSnapshotRenderer.swift in Sources */,
 				4B44FEF32B1FEF5A000619D8 /* FocusableTextEditor.swift in Sources */,
 				4B59023E26B35F3600489384 /* ChromiumLoginReader.swift in Sources */,
+				9F872D982B8DA9F800138637 /* Bookmarks+Tab.swift in Sources */,
 				85D885B326A5A9DE0077C374 /* NSAlert+PasswordManager.swift in Sources */,
 				983DFB2528B67036006B7E34 /* UserContentUpdating.swift in Sources */,
 				1D9A4E5A2B43213B00F449E2 /* TabSnapshotExtension.swift in Sources */,
@@ -12132,6 +12571,7 @@
 				4BE4005527CF3F19007D3161 /* SavePaymentMethodViewController.swift in Sources */,
 				1D2DC009290167A0008083A1 /* BWStatus.swift in Sources */,
 				AAFE068326C7082D005434CC /* WebKitVersionProvider.swift in Sources */,
+				9FEE98692B85B869002E44E8 /* BookmarksDialogViewModel.swift in Sources */,
 				B63D467A25BFC3E100874977 /* NSCoderExtensions.swift in Sources */,
 				1D2DC00B290167EC008083A1 /* RunningApplicationCheck.swift in Sources */,
 				B6A5A27125B9377300AA7ADA /* StatePersistenceService.swift in Sources */,
@@ -12141,6 +12581,7 @@
 				4BB88B5B25B7BA50006F6B06 /* Instruments.swift in Sources */,
 				9812D895276CEDA5004B6181 /* ContentBlockerRulesLists.swift in Sources */,
 				4B0511E2262CAA8600F6079C /* NSViewControllerExtension.swift in Sources */,
+				9FA173DF2B7A0EFE00EE4E6E /* BookmarkDialogButtonsView.swift in Sources */,
 				F44C130225C2DA0400426E3E /* NSAppearanceExtension.swift in Sources */,
 				4B3B8490297A0E1000A384BD /* EmailManagerExtension.swift in Sources */,
 				B64C84F1269310120048FEBE /* PermissionManager.swift in Sources */,
@@ -12149,6 +12590,7 @@
 				EE339228291BDEFD009F62C1 /* JSAlertController.swift in Sources */,
 				4B9DB04A2A983B24000927DB /* NotificationService.swift in Sources */,
 				3775912D29AAC72700E26367 /* SyncPreferences.swift in Sources */,
+				F1B33DF22BAD929D001128B3 /* SubscriptionAppStoreRestorer.swift in Sources */,
 				1DB9618329F67F6200CF5568 /* FaviconNullStore.swift in Sources */,
 				BB5789722B2CA70F0009DFE2 /* DataBrokerProtectionSubscriptionEventHandler.swift in Sources */,
 				B693954F26F04BEB0015B914 /* PaddedImageButton.swift in Sources */,
@@ -12181,6 +12623,7 @@
 				85A0118225AF60E700FA6A0C /* FindInPageModel.swift in Sources */,
 				7BA7CC4E2AD11F6F0042E5CE /* NetworkProtectionIPCTunnelController.swift in Sources */,
 				4B9292A226670D2A00AD2C21 /* PseudoFolder.swift in Sources */,
+				1DDD3EC42B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift in Sources */,
 				4BCF15D92ABB8A7F0083F6DF /* NetworkProtectionRemoteMessage.swift in Sources */,
 				4B05265E2B1AE5C70054955A /* VPNMetadataCollector.swift in Sources */,
 				B6DA44022616B28300DD1EC2 /* PixelDataStore.swift in Sources */,
@@ -12200,13 +12643,14 @@
 				AAE8B110258A456C00E81239 /* TabPreviewViewController.swift in Sources */,
 				B6C8CAA72AD010DD0060E1CD /* YandexDataImporter.swift in Sources */,
 				EE66666F2B56EDE4001D898D /* VPNLocationsHostingViewController.swift in Sources */,
-				37CC53EC27E8A4D10028713D /* PreferencesPrivacyView.swift in Sources */,
+				37CC53EC27E8A4D10028713D /* PreferencesDataClearingView.swift in Sources */,
 				4B0135CE2729F1AA00D54834 /* NSPasteboardExtension.swift in Sources */,
 				85707F31276A7DCA00DC0649 /* OnboardingViewModel.swift in Sources */,
 				85AC3B0525D6B1D800C7D2AA /* ScriptSourceProviding.swift in Sources */,
 				4BB99D0026FE191E001E4761 /* CoreDataBookmarkImporter.swift in Sources */,
 				4BCF15D72ABB8A110083F6DF /* NetworkProtectionRemoteMessaging.swift in Sources */,
 				C168B9AC2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift in Sources */,
+				9FA173E72B7B122E00EE4E6E /* BookmarkDialogStackedContentView.swift in Sources */,
 				D64A5FF82AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift in Sources */,
 				37A6A8F62AFCCA59008580A3 /* FaviconsFetcherOnboardingViewController.swift in Sources */,
 				AA3F895324C18AD500628DDE /* SuggestionViewModel.swift in Sources */,
@@ -12253,12 +12697,15 @@
 				987799F32999993C005D8EB6 /* LegacyBookmarksStoreMigration.swift in Sources */,
 				4B379C1527BD91E3008A968E /* QuartzIdleStateProvider.swift in Sources */,
 				37F19A6728E1B43200740DC6 /* DuckPlayerPreferences.swift in Sources */,
+				1D01A3D42B88CF7700FE8150 /* AccessibilityPreferences.swift in Sources */,
 				B6C0B22E26E61CE70031CB7F /* DownloadViewModel.swift in Sources */,
 				4B41EDA72B1543C9001EEDF4 /* PreferencesVPNView.swift in Sources */,
+				9FA173DA2B79BD8A00EE4E6E /* BookmarkDialogContainerView.swift in Sources */,
 				373A1AA8283ED1B900586521 /* BookmarkHTMLReader.swift in Sources */,
 				B68458B825C7E8B200DC17B6 /* Tab+NSSecureCoding.swift in Sources */,
 				4B37EE612B4CFC3C00A89A61 /* SurveyURLBuilder.swift in Sources */,
 				85378DA0274E6F42007C5CBF /* NSNotificationName+EmailManager.swift in Sources */,
+				1DDC84FF2B835BC000670238 /* SearchPreferences.swift in Sources */,
 				B693955726F04BEC0015B914 /* MouseOverButton.swift in Sources */,
 				AA61C0D02722159B00E6B681 /* FireInfoViewController.swift in Sources */,
 				9D9AE8692AA76CDC0026E7DC /* LoginItem+NetworkProtection.swift in Sources */,
@@ -12275,9 +12722,12 @@
 				B69B503D2726A12500758A2B /* VariantManager.swift in Sources */,
 				AA97BF4625135DD30014931A /* ApplicationDockMenu.swift in Sources */,
 				4B8A4DFF27C83B29005F40E8 /* SaveIdentityViewController.swift in Sources */,
+				1DDC84FB2B8356CE00670238 /* PreferencesDefaultBrowserView.swift in Sources */,
+				F1B33DF62BAD970E001128B3 /* SubscriptionErrorReporter.swift in Sources */,
 				EEC589D92A4F1CE300BCD60C /* AppLauncher.swift in Sources */,
 				4BA1A69B258B076900F6F690 /* FileStore.swift in Sources */,
 				B6A9E47F26146A800067D1B9 /* PixelArguments.swift in Sources */,
+				1D01A3D02B88CEC600FE8150 /* PreferencesAccessibilityView.swift in Sources */,
 				37BF3F21286F0A7A00BD9014 /* PinnedTabsViewModel.swift in Sources */,
 				EEC4A6692B2C87D300F7C0AA /* VPNLocationView.swift in Sources */,
 				AAC5E4D225D6A709007F5990 /* BookmarkList.swift in Sources */,
@@ -12302,20 +12752,25 @@
 				AAC5E4E425D6BA9C007F5990 /* NSSizeExtension.swift in Sources */,
 				AA6820EB25503D6A005ED0D5 /* Fire.swift in Sources */,
 				3158B1492B0BF73000AF130C /* DBPHomeViewController.swift in Sources */,
+				9F56CFA92B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift in Sources */,
 				37445F9C2A1569F00029F789 /* SyncBookmarksAdapter.swift in Sources */,
 				C1E961EF2B87AA29001760E1 /* AutofillActionBuilder.swift in Sources */,
 				B6AAAC3E26048F690029438D /* RandomAccessCollectionExtension.swift in Sources */,
 				4B9292AF26670F5300AD2C21 /* NSOutlineViewExtensions.swift in Sources */,
+				9F56CFAD2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift in Sources */,
 				AA585D82248FD31100E9A3E2 /* AppDelegate.swift in Sources */,
 				7B1E81A027C8874900FF0E60 /* ContentOverlayViewController.swift in Sources */,
+				C1DAF3B52B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */,
 				B687B7CA2947A029001DEA6F /* ContentBlockingTabExtension.swift in Sources */,
 				85B7184C27677C6500B4277F /* OnboardingViewController.swift in Sources */,
 				4B379C1E27BDB7FF008A968E /* DeviceAuthenticator.swift in Sources */,
 				7BFE95522A9DF1CE0081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift in Sources */,
 				1456D6E124EFCBC300775049 /* TabBarCollectionView.swift in Sources */,
 				4B4D60BF2A0C848A00BCD287 /* NetworkProtection+ConvenienceInitializers.swift in Sources */,
+				4B6B64842BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift in Sources */,
 				3158B1592B0BF76400AF130C /* DataBrokerProtectionFeatureDisabler.swift in Sources */,
 				B655124829A79465009BFE1C /* NavigationActionExtension.swift in Sources */,
+				9FA173EB2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift in Sources */,
 				85308E25267FC9F2001ABD76 /* NSAlertExtension.swift in Sources */,
 				B69A14F62B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift in Sources */,
 				4B59024826B3673600489384 /* ThirdPartyBrowser.swift in Sources */,
@@ -12336,6 +12791,7 @@
 				85707F28276A34D900DC0649 /* DaxSpeech.swift in Sources */,
 				31F28C5328C8EECA00119F70 /* DuckURLSchemeHandler.swift in Sources */,
 				AA13DCB4271480B0006D48D3 /* FirePopoverViewModel.swift in Sources */,
+				1DDC84F72B83558F00670238 /* PreferencesPrivateSearchView.swift in Sources */,
 				1D43EB38292B636E0065E5D6 /* BWCommand.swift in Sources */,
 				F41D174125CB131900472416 /* NSColorExtension.swift in Sources */,
 				AAC5E4F625D6BF2C007F5990 /* AddressBarButtonsViewController.swift in Sources */,
@@ -12352,6 +12808,7 @@
 				4BB99D0226FE191E001E4761 /* ImportedBookmarks.swift in Sources */,
 				7B934C412A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift in Sources */,
 				B626A75A29921FAA00053070 /* NavigationActionPolicyExtension.swift in Sources */,
+				1DDD3EBC2B84DCB9004CBF2B /* WebTrackingProtectionPreferences.swift in Sources */,
 				B603FD9E2A02712E00F3FCA9 /* CIImageExtension.swift in Sources */,
 				AA6EF9B3250785D5004754E6 /* NSMenuExtension.swift in Sources */,
 				AA7412B524D1536B00D22FE0 /* MainWindowController.swift in Sources */,
@@ -12362,6 +12819,7 @@
 				B64C84EB2692DD650048FEBE /* PermissionAuthorizationPopover.swift in Sources */,
 				85378D9E274E664C007C5CBF /* PopoverMessageViewController.swift in Sources */,
 				AA6FFB4624DC3B5A0028F4D0 /* WebView.swift in Sources */,
+				1DDD3EC02B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift in Sources */,
 				B693955026F04BEB0015B914 /* ShadowView.swift in Sources */,
 				AA3D531D27A2F58F00074EC1 /* FeedbackSender.swift in Sources */,
 				B6BDDA012942389000F68088 /* TabExtensions.swift in Sources */,
@@ -12382,6 +12840,7 @@
 				37AFCE8127DA2CA600471A10 /* PreferencesViewController.swift in Sources */,
 				4B02198A25E05FAC00ED7DEA /* FireproofDomains.swift in Sources */,
 				4B677442255DBEEA00025BD8 /* Database.swift in Sources */,
+				1DDC85032B83903E00670238 /* PreferencesWebTrackingProtectionView.swift in Sources */,
 				4BE5336E286915A10019DBFD /* HorizontallyCenteredLayout.swift in Sources */,
 				B6BCC5232AFCDABB002C5499 /* DataImportSourceViewModel.swift in Sources */,
 				4B92928B26670D1700AD2C21 /* BookmarksOutlineView.swift in Sources */,
@@ -12397,8 +12856,10 @@
 				AA72D5FE25FFF94E00C77619 /* NSMenuItemExtension.swift in Sources */,
 				4BA1A6C2258B0A1300F6F690 /* ContiguousBytesExtension.swift in Sources */,
 				B6A22B622B1E29D000ECD2BA /* DataImportSummaryViewModel.swift in Sources */,
+				9F514F912B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift in Sources */,
+				9FA173E32B7A12B600EE4E6E /* BookmarkDialogFolderManagementView.swift in Sources */,
 				37534CA8281198CD002621E7 /* AdjacentItemEnumerator.swift in Sources */,
-				1EA7B8D82B7E1283000330A4 /* SubscriptionFeatureAvailability.swift in Sources */,
+				7B7FCD0F2BA33B2700C04FBE /* UserDefaults+vpnLegacyUser.swift in Sources */,
 				987799F62999996B005D8EB6 /* BookmarkDatabase.swift in Sources */,
 				4BE53374286E39F10019DBFD /* ChromiumKeychainPrompt.swift in Sources */,
 				B6553692268440D700085A79 /* WKProcessPool+GeolocationProvider.swift in Sources */,
@@ -12428,12 +12889,15 @@
 				37534C9E28104D9B002621E7 /* TabLazyLoaderTests.swift in Sources */,
 				B6619EF62B10DFF700CD9186 /* InstructionsFormatParserTests.swift in Sources */,
 				569277C429DEE09D00B633EF /* ContinueSetUpModelTests.swift in Sources */,
+				31A2FD172BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift in Sources */,
 				85F1B0C925EF9759004792B6 /* URLEventHandlerTests.swift in Sources */,
 				4B9292BD2667103100AD2C21 /* BookmarkOutlineViewDataSourceTests.swift in Sources */,
+				C17CA7B22B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift in Sources */,
 				4BF6961D28BE911100D402D4 /* RecentlyVisitedSiteModelTests.swift in Sources */,
 				B6619F062B17138D00CD9186 /* DataImportSourceViewModelTests.swift in Sources */,
 				4BBF0917282DD6EF00EE1418 /* TemporaryFileHandlerTests.swift in Sources */,
 				B6A5A27925B93FFF00AA7ADA /* StateRestorationManagerTests.swift in Sources */,
+				9F982F132B822B7B00231028 /* AddEditBookmarkFolderDialogViewModelTests.swift in Sources */,
 				B630E7FE29C887ED00363609 /* NSErrorAdditionalInfo.swift in Sources */,
 				4B9292BB2667103100AD2C21 /* BookmarkNodeTests.swift in Sources */,
 				4B0219A825E0646500ED7DEA /* WebsiteDataStoreTests.swift in Sources */,
@@ -12441,9 +12905,11 @@
 				B662D3DE275613BB0035D4D6 /* EncryptionKeyStoreMock.swift in Sources */,
 				1D3B1ABF29369FC8006F4388 /* BWEncryptionTests.swift in Sources */,
 				B6F56567299A414300A04298 /* WKWebViewMockingExtension.swift in Sources */,
+				1D9FDEC62B9B64DB0040B78C /* PrivacyProtectionStatusTests.swift in Sources */,
 				B6656E122B29E3BE008798A1 /* DownloadListStoreMock.swift in Sources */,
 				37D23780287EFEE200BCE03B /* PinnedTabsManagerTests.swift in Sources */,
 				AA0877BA26D5161D00B05660 /* WebKitVersionProviderTests.swift in Sources */,
+				9FA75A3E2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift in Sources */,
 				B69B50462726C5C200758A2B /* AtbAndVariantCleanupTests.swift in Sources */,
 				567DA94529E95C3F008AC5EE /* YoutubeOverlayUserScriptTests.swift in Sources */,
 				4B59024C26B38BB800489384 /* ChromiumLoginReaderTests.swift in Sources */,
@@ -12465,6 +12931,8 @@
 				FD23FD2B28816606007F6985 /* AutoconsentMessageProtocolTests.swift in Sources */,
 				1D77921A28FDC79800BE0210 /* FaviconStoringMock.swift in Sources */,
 				1D1C36E629FB019C001FA40C /* HistoryTabExtensionTests.swift in Sources */,
+				1D9FDEBD2B9B5F0F0040B78C /* CookiePopupProtectionPreferencesTests.swift in Sources */,
+				7B09CBA92BA4BE8100CF245B /* NetworkProtectionPixelEventTests.swift in Sources */,
 				B6DA441E2616C84600DD1EC2 /* PixelStoreMock.swift in Sources */,
 				4B434690285ED7A100177407 /* BookmarksBarViewModelTests.swift in Sources */,
 				B6BBF1702744CDE1004F850E /* CoreDataStoreTests.swift in Sources */,
@@ -12476,6 +12944,7 @@
 				4B8AD0B127A86D9200AE44D6 /* WKWebsiteDataStoreExtensionTests.swift in Sources */,
 				B69B50472726C5C200758A2B /* VariantManagerTests.swift in Sources */,
 				8546DE6225C03056000CA5E1 /* UserAgentTests.swift in Sources */,
+				9F26060B2B85C20A00819292 /* AddEditBookmarkDialogViewModelTests.swift in Sources */,
 				B63ED0DE26AFD9A300A9DAD1 /* AVCaptureDeviceMock.swift in Sources */,
 				98A95D88299A2DF900B9B81A /* BookmarkMigrationTests.swift in Sources */,
 				B63ED0E026AFE32F00A9DAD1 /* GeolocationProviderMock.swift in Sources */,
@@ -12503,16 +12972,19 @@
 				B63ED0E326B3E7FA00A9DAD1 /* CLLocationManagerMock.swift in Sources */,
 				37CD54BB27F25A4000F1F7B9 /* DownloadsPreferencesTests.swift in Sources */,
 				4BE344EE2B2376DF003FC223 /* VPNFeedbackFormViewModelTests.swift in Sources */,
+				9F872D9D2B9058D000138637 /* Bookmarks+TabTests.swift in Sources */,
 				9F3910622B68C35600CB5112 /* DownloadsTabExtensionTests.swift in Sources */,
 				4B9DB0562A983B55000927DB /* MockNotificationService.swift in Sources */,
 				4B02199C25E063DE00ED7DEA /* FireproofDomainsTests.swift in Sources */,
 				AA0F3DB7261A566C0077F2D9 /* SuggestionLoadingMock.swift in Sources */,
 				B60C6F8129B1B4AD007BFAA8 /* TestRunHelper.swift in Sources */,
 				4B9DB0582A983B55000927DB /* MockNetworkProtectionCodeRedeemer.swift in Sources */,
+				9F872DA02B90644800138637 /* ContextualMenuTests.swift in Sources */,
 				4B9292BE2667103100AD2C21 /* PasteboardFolderTests.swift in Sources */,
 				4B9292C52667104B00AD2C21 /* CoreDataTestUtilities.swift in Sources */,
 				4B723E1926B000DC00E14D75 /* TemporaryFileCreator.swift in Sources */,
 				98EB5D1027516A4800681FE6 /* AppPrivacyConfigurationTests.swift in Sources */,
+				1D9FDEBA2B9B5E090040B78C /* WebTrackingProtectionPreferencesTests.swift in Sources */,
 				4B9292C22667103100AD2C21 /* BookmarkTests.swift in Sources */,
 				5601FECD29B7973D00068905 /* TabBarViewItemTests.swift in Sources */,
 				1D8C2FE52B70F4C4005E4BBD /* TabSnapshotExtensionTests.swift in Sources */,
@@ -12530,6 +13002,7 @@
 				B63ED0DC26AE7B1E00A9DAD1 /* WebViewMock.swift in Sources */,
 				4B4F72EC266B2ED300814C60 /* CollectionExtension.swift in Sources */,
 				AAE39D1B24F44885008EF28B /* TabCollectionViewModelDelegateMock.swift in Sources */,
+				9F0A2CF82B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift in Sources */,
 				373A1AAA283ED86C00586521 /* BookmarksHTMLReaderTests.swift in Sources */,
 				317295D42AF058D3002C3206 /* MockWaitlistFeatureSetupHandler.swift in Sources */,
 				AA9C363025518CA9004B1BA3 /* FireTests.swift in Sources */,
@@ -12557,6 +13030,7 @@
 				1D3B1AC22936B816006F4388 /* BWMessageIdGeneratorTests.swift in Sources */,
 				B6C2C9F62760B659005B7F0A /* TestDataModel.xcdatamodeld in Sources */,
 				1DA6D1022A1FFA3700540406 /* HTTPCookieTests.swift in Sources */,
+				1D9FDEC02B9B5FEA0040B78C /* AccessibilityPreferencesTests.swift in Sources */,
 				B68172AE269EB43F006D1092 /* GeolocationServiceTests.swift in Sources */,
 				B6AE74342609AFCE005B9B1A /* ProgressEstimationTests.swift in Sources */,
 				B6619F032B17123200CD9186 /* DataImportViewModelTests.swift in Sources */,
@@ -12579,6 +13053,7 @@
 				4BBF0925283083EC00EE1418 /* FileSystemDSLTests.swift in Sources */,
 				4B11060A25903EAC0039B979 /* CoreDataEncryptionTests.swift in Sources */,
 				B603971029B9D67E00902A34 /* PublishersExtensions.swift in Sources */,
+				9F26060E2B85E17D00819292 /* AddEditBookmarkDialogCoordinatorViewModelTests.swift in Sources */,
 				4B9292C32667103100AD2C21 /* PasteboardBookmarkTests.swift in Sources */,
 				B610F2E427A8F37A00FCEBE9 /* CBRCompileTimeReporterTests.swift in Sources */,
 				AABAF59C260A7D130085060C /* FaviconManagerMock.swift in Sources */,
@@ -12610,6 +13085,7 @@
 				56D145EE29E6DAD900E3488A /* DataImportProviderTests.swift in Sources */,
 				4BB99D0F26FE1A84001E4761 /* ChromiumBookmarksReaderTests.swift in Sources */,
 				4BC2621D293996410087A482 /* PixelEventTests.swift in Sources */,
+				1D9FDEB72B9B5D150040B78C /* SearchPreferencesTests.swift in Sources */,
 				1D12F2E2298BC660009A65FD /* InternalUserDeciderStoreMock.swift in Sources */,
 				4BB99D1026FE1A84001E4761 /* FirefoxBookmarksReaderTests.swift in Sources */,
 				4B117F7D276C0CB5002F3D8C /* LocalStatisticsStoreTests.swift in Sources */,
@@ -12623,6 +13099,7 @@
 				857E44652A9F70F300ED77A7 /* CampaignVariantTests.swift in Sources */,
 				3776582D27F71652009A6B35 /* WebsiteBreakageReportTests.swift in Sources */,
 				31E163BA293A56F400963C10 /* BrokenSiteReportingReferenceTests.swift in Sources */,
+				1D9FDEC32B9B63C90040B78C /* DataClearingPreferencesTests.swift in Sources */,
 				4B723E0826B0003E00E14D75 /* MockSecureVault.swift in Sources */,
 				37CD54B527F1AC1300F1F7B9 /* PreferencesSidebarModelTests.swift in Sources */,
 				B6CA4824298CDC2E0067ECCE /* AdClickAttributionTabExtensionTests.swift in Sources */,
@@ -12641,6 +13118,7 @@
 				B6C2C9EF276081AB005B7F0A /* DeallocationTests.swift in Sources */,
 				B63ED0D826AE729600A9DAD1 /* PermissionModelTests.swift in Sources */,
 				B69B504B2726CA2900758A2B /* MockStatisticsStore.swift in Sources */,
+				C17CA7AD2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift in Sources */,
 				37CD54BD27F2ECAE00F1F7B9 /* AutofillPreferencesModelTests.swift in Sources */,
 				C1E961ED2B879ED9001760E1 /* MockAutofillActionExecutor.swift in Sources */,
 				37D23789288009CF00BCE03B /* TabCollectionViewModelTests+PinnedTabs.swift in Sources */,
@@ -12819,6 +13297,11 @@
 			isa = PBXTargetDependency;
 			productRef = B6F997C02B8F35F800476735 /* SwiftLintPlugin */;
 		};
+		EE02D41E2BB460B500DBE6B3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = B6EC37E729B5DA2A001ACE79 /* tests-server */;
+			targetProxy = EE02D41D2BB460B500DBE6B3 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -13704,7 +14187,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 122.2.0;
+				version = "132.0.0-1";
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
@@ -13720,7 +14203,7 @@
 			repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing";
 			requirement = {
 				kind = exactVersion;
-				version = 1.15.3;
+				version = 1.15.4;
 			};
 		};
 		B6DA44152616C13800DD1EC2 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */ = {
@@ -14105,6 +14588,20 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = LoginItems;
 		};
+		4BCBE4572BA7E17800FC75A1 /* SubscriptionUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = SubscriptionUI;
+		};
+		4BCBE4592BA7E17800FC75A1 /* Subscription */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Subscription;
+		};
+		4BCBE45B2BA7E18500FC75A1 /* Subscription */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Subscription;
+		};
 		4BF97AD02B43C43F00EB4240 /* NetworkProtectionIPC */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionIPC;
@@ -14130,6 +14627,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionProxy;
 		};
+		7B25856D2BA2F2ED00D49F79 /* NetworkProtectionUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = NetworkProtectionUI;
+		};
 		7B31FD8B2AD125620086AA24 /* NetworkProtectionIPC */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionIPC;
@@ -14138,6 +14639,11 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionIPC;
 		};
+		7B37C7A42BAA32A50062546A /* Subscription */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Subscription;
+		};
 		7B5DD6992AE51FFA001DE99C /* PixelKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = PixelKit;
@@ -14146,6 +14652,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = PixelKit;
 		};
+		7B624F162BA25C1F00A6C544 /* NetworkProtectionUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = NetworkProtectionUI;
+		};
 		7B7DFB212B7E7473009EA1A3 /* Networking */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14222,6 +14732,21 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = PixelKit;
 		};
+		85D44B852BA08D29001B4AB5 /* Suggestions */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Suggestions;
+		};
+		85D44B872BA08D30001B4AB5 /* Suggestions */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Suggestions;
+		};
+		85D44B892BA08D3B001B4AB5 /* Suggestions */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Suggestions;
+		};
 		85E2BBCD2B8F534000DBEC7A /* History */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14376,6 +14901,11 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Configuration;
 		};
+		EE02D41F2BB460C000DBE6B3 /* BrowserServicesKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = BrowserServicesKit;
+		};
 		EE2F9C5A2B90F2FF00D45FC9 /* Subscription */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14396,11 +14926,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = NetworkProtection;
 		};
-		EE7295EA2A545BFC008C0991 /* NetworkProtection */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = NetworkProtection;
-		};
 		EE7295EC2A545C0A008C0991 /* NetworkProtection */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 9111ff4055..30c89eddd8 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "4e05a46f0a9ce56f6d6379b79a92dc7a0182e027",
-        "version" : "122.2.0"
+        "revision" : "f15a57645aa1d07a69df9b41f483ea1ef0b786f7",
+        "version" : "132.0.0-1"
       }
     },
     {
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "f6241631fc14cc2d0f47950bfdc4d6c30bf90130",
-        "version" : "5.4.0"
+        "revision" : "62d5dc3d02f6a8347dc5f0b52162a0107d38b74c",
+        "version" : "5.8.0"
       }
     },
     {
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/duckduckgo-autofill.git",
       "state" : {
-        "revision" : "03d3e3a959dd75afbe8c59b5a203ea676d37555d",
-        "version" : "10.1.0"
+        "revision" : "6493e296934bf09277c03df45f11f4619711cb24",
+        "version" : "10.2.0"
       }
     },
     {
@@ -95,8 +95,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/privacy-dashboard",
       "state" : {
-        "revision" : "43a6e1c1864846679a254e60c91332c3fbd922ee",
-        "version" : "3.3.0"
+        "revision" : "620921fea14569eb00745cb5a44890d5890d99ec",
+        "version" : "3.4.0"
       }
     },
     {
@@ -122,8 +122,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
-        "revision" : "c8ed701b513cf5177118a175d85fbbbcd707ab41",
-        "version" : "1.3.0"
+        "revision" : "46989693916f56d1186bd59ac15124caef896560",
+        "version" : "1.3.1"
       }
     },
     {
@@ -131,8 +131,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "e7b77228b34057041374ebef00c0fd7739d71a2b",
-        "version" : "1.15.3"
+        "revision" : "5b0c434778f2c1a4c9b5ebdb8682b28e84dd69bd",
+        "version" : "1.15.4"
       }
     },
     {
@@ -176,8 +176,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/wireguard-apple",
       "state" : {
-        "revision" : "2d8172c11478ab11b0f5ad49bdb4f93f4b3d5e0d",
-        "version" : "1.1.1"
+        "revision" : "13fd026384b1af11048451061cc1b21434990668",
+        "version" : "1.1.3"
       }
     }
   ],
diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme
index 29eecc0cc8..00cc0d9f02 100644
--- a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme	
+++ b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme	
@@ -106,6 +106,9 @@
                <Test
                   Identifier = "PixelStoreTests/testWhenValuesAreAddedThenCallbacksAreCalled()">
                </Test>
+               <Test
+                  Identifier = "PreferencesSidebarModelTests/testWhenResetTabSelectionIfNeededCalledThenPreferencesTabIsSelected()">
+               </Test>
                <Test
                   Identifier = "StatisticsLoaderTests/testWhenRefreshRetentionAtbIsPerformedForNavigationThenAppRetentionAtbRequested()">
                </Test>
@@ -164,6 +167,16 @@
                ReferencedContainer = "container:LocalPackages/PixelKit">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "NetworkProtectionUITests"
+               BuildableName = "NetworkProtectionUITests"
+               BlueprintName = "NetworkProtectionUITests"
+               ReferencedContainer = "container:LocalPackages/NetworkProtectionMac">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme
index 58557db074..0224eeaec8 100644
--- a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme	
+++ b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme	
@@ -120,6 +120,9 @@
                <Test
                   Identifier = "PixelStoreTests/testWhenValuesAreRemovedThenTheyAreNotInCache()">
                </Test>
+               <Test
+                  Identifier = "PreferencesSidebarModelTests/testWhenResetTabSelectionIfNeededCalledThenPreferencesTabIsSelected()">
+               </Test>
                <Test
                   Identifier = "StatisticsLoaderTests/testWhenRefreshRetentionAtbIsPerformedForNavigationThenAppRetentionAtbRequested()">
                </Test>
diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
index d0aa5916c6..a76b942094 100644
--- a/DuckDuckGo/Application/AppDelegate.swift
+++ b/DuckDuckGo/Application/AppDelegate.swift
@@ -82,7 +82,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
     var privacyDashboardWindow: NSWindow?
 
 #if NETWORK_PROTECTION && SUBSCRIPTION
-    private let networkProtectionSubscriptionEventHandler = NetworkProtectionSubscriptionEventHandler()
+    // Needs to be lazy as indirectly depends on AppDelegate
+    private lazy var networkProtectionSubscriptionEventHandler = NetworkProtectionSubscriptionEventHandler()
 #endif
 
 #if DBP && SUBSCRIPTION
@@ -182,6 +183,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
         featureFlagger = DefaultFeatureFlagger(internalUserDecider: internalUserDecider,
                                                privacyConfig: AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager.privacyConfig)
 
+#if SUBSCRIPTION
+    #if APPSTORE || !STRIPE
+        SubscriptionPurchaseEnvironment.current = .appStore
+    #else
+        SubscriptionPurchaseEnvironment.current = .stripe
+    #endif
+#endif
     }
 
     func applicationWillFinishLaunching(_ notification: Notification) {
@@ -246,27 +254,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
                                                      defaultValue: defaultEnvironment).wrappedValue
         SubscriptionPurchaseEnvironment.currentServiceEnvironment = currentEnvironment
 
-    #if APPSTORE || !STRIPE
-        SubscriptionPurchaseEnvironment.current = .appStore
-    #else
-        SubscriptionPurchaseEnvironment.current = .stripe
-    #endif
-
         Task {
-            let accountManager = AccountManager()
-            do {
-                try accountManager.migrateAccessTokenToNewStore()
-            } catch {
-                if let error = error as? AccountManager.MigrationError {
-                    switch error {
-                    case AccountManager.MigrationError.migrationFailed:
-                        os_log(.default, log: .subscription, "Access token migration failed")
-                    case AccountManager.MigrationError.noMigrationNeeded:
-                        os_log(.default, log: .subscription, "No access token migration needed")
-                    }
-                }
+            let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+            if let token = accountManager.accessToken {
+                _ = await SubscriptionService.getSubscription(accessToken: token, cachePolicy: .reloadIgnoringLocalCacheData)
+                _ = await accountManager.fetchEntitlements(cachePolicy: .reloadIgnoringLocalCacheData)
             }
-            await accountManager.checkSubscriptionState()
         }
 #endif
 
@@ -574,18 +567,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
 func updateSubscriptionStatus() {
 #if SUBSCRIPTION
     Task {
-        guard let token = AccountManager().accessToken else {
-            return
-        }
-        let result = await SubscriptionService.getSubscription(accessToken: token)
+        let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
 
-        switch result {
-        case .success(let success):
-            if success.isActive {
+        guard let token = accountManager.accessToken else { return }
+
+        if case .success(let subscription) = await SubscriptionService.getSubscription(accessToken: token, cachePolicy: .reloadIgnoringLocalCacheData) {
+            if subscription.isActive {
                 DailyPixel.fire(pixel: .privacyProSubscriptionActive, frequency: .dailyOnly)
             }
-        case .failure: break
         }
+
+        _ = await accountManager.fetchEntitlements(cachePolicy: .reloadIgnoringLocalCacheData)
     }
 #endif
 }
diff --git a/DuckDuckGo/Application/URLEventHandler.swift b/DuckDuckGo/Application/URLEventHandler.swift
index 3af3ef418f..610fe0f085 100644
--- a/DuckDuckGo/Application/URLEventHandler.swift
+++ b/DuckDuckGo/Application/URLEventHandler.swift
@@ -21,7 +21,7 @@ import Foundation
 import AppKit
 
 #if NETWORK_PROTECTION
-import NetworkProtection
+import NetworkProtectionUI
 #endif
 
 #if DBP
@@ -143,8 +143,13 @@ final class URLEventHandler {
         case AppLaunchCommand.showVPNLocations.launchURL:
             WindowControllersManager.shared.showPreferencesTab(withSelectedPane: .vpn)
             WindowControllersManager.shared.showLocationPickerSheet()
-        case AppLaunchCommand.moveAppToApplications.launchURL:
+#if SUBSCRIPTION
+        case AppLaunchCommand.showPrivacyPro.launchURL:
+            WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
+            Pixel.fire(.privacyProOfferScreenImpression)
+#endif
 #if !APPSTORE && !DEBUG
+        case AppLaunchCommand.moveAppToApplications.launchURL:
             // this should be run after NSApplication.shared is set
             PFMoveToApplicationsFolderIfNecessary(false)
 #endif
diff --git a/DuckDuckGo/Assets.xcassets/Colors/AlertGreen.colorset/Contents.json b/DuckDuckGo/Assets.xcassets/Colors/AlertGreen.colorset/Contents.json
new file mode 100644
index 0000000000..ba7383a80e
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Colors/AlertGreen.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0xC0",
+          "red" : "0x21"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/HomePage/Rocket.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Accessibility.imageset/Contents.json
similarity index 78%
rename from DuckDuckGo/Assets.xcassets/Images/HomePage/Rocket.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/Accessibility.imageset/Contents.json
index b899856ca3..313962dece 100644
--- a/DuckDuckGo/Assets.xcassets/Images/HomePage/Rocket.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/Accessibility.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "rocket.pdf",
+      "filename" : "Icon 18.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/Accessibility.imageset/Icon 18.pdf b/DuckDuckGo/Assets.xcassets/Images/Accessibility.imageset/Icon 18.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..1f47d51258708f01c2427fa6f1f5f45250c3a497
GIT binary patch
literal 6134
zcmbuDTW=*t6@}mXSM<wB3DUIdevzU`WQHIFh{544;=!CbGcoc7YzGB?J>ROXuI{l%
zpn#v+>(t)0uWRq_SMT0_``Rvfn(S=m`@j5kn&+>+n!o;fI^Vt5zmq%S7r#5-eSG?1
z_JEf<_4xE~zPg<*-k$$)eL7$M`kVR9cgO!ukJH~LyO{Pjo9*HCczXHU_~~>znI(j5
zVns5R;BDZcCZIGwp6>X$D=yoEL^@{O5^Qm~%pPHzottgiejEZjbecW`-b}li{pjIo
zT(V<B&1w1!h{j>XZrD&W%pY0?axidUH`CBDu<`Knr=j$;$7x_U(+|^!>2CVt|Cuu9
zT#AWI1#5FEN}12mn3l4U?{V$zULRqxJ{Xhd@$mBaK!~ngN{Y4md4M)<8QxV4Xk3Zt
z01rxbb>r6|vJ0H1&#2xF*p+OS3>_x|JpS3M;C9d94vr-5^*5lQ<B-LX>+$gN_(1Ug
zWx?%t4;4FfxN-+~C5NX`+(Tp+Pyjys;^&l@Uuvy1?@XF{UqcJy`Q?LXA?T<rD#0#u
z3l^gb8J63ymgDslB$I8N2Qt*2rUQloS0c69HMvdGxNjgQQi{@Q>^v~PS!Ja_nhwb3
z8*;<;Zq?8<EFbp`qy_eWifdd-P1U;jzlRkL&L(F?z|>-rpT)MW=3q+e*lY<RHick=
z!@Ekn)0%~7N(D*T7l`0AX#jW+l>^f8!81`78)GGFezBWiaMedI#1sqrpC-5D5`(S8
zRXOu^z5%PIK=Hz&uU;w?P_(-xg%V;uBGdsUqHCP8=ue(WAv*1n!a_{8NpewwWUTR~
zXr361$F6~_x?=WW$8;)tN9iJm`c*FZWIzaDAb>RD5`#Cv%&*;It1kqC39*2c;su6~
zY}QpVgy<TSgB8ItwreUl$*B^3vC>Dmh3ZT@S0Tr2h=E5*$?G}ioq~sJ3{*i7XsybL
zZxL;6<6|){wQ!VJV`>AK?Bt|G2NNk6%0Y++p_&6K%+lm6x}w~&v1}I<gR;1!NXDA4
z1z+$cE;X85t<K3@Zb}R0TjH>}mC=_lI0kADQ0}M5Iqb5oi7H4X0O6Kg=9Gd-6^gBy
z5Nl=>b@Fi2Fqab>LCcL(P1hPcDH%Bxl5&f4&-<#2N;{ldCk086oNixPM71X*QR6Kf
zqaIuJ#TJc$wHhswtTu+U)v*vqFVJ4S+LhtFwc+TB8?d6LQ?d5mfqfaJ1h)5=n=}4I
z<9i$CTAQxA^;~b(ykz6DGkZhlrFY?Id&R+cx=`Aa_1M^AYOJkPHyD8?05Cu)Hi`;%
zMB7_Cv&w0NJ*SnQy@*gd<f=wOo~tXCkT+`jPm73Xl~M_Ffv0?>Dm8~KeF6{E#nFC@
zokj;#BS>}y_S+E)_nEA+>rA3!j4997(>SZtnBf^_V?WnwrJWj(Dx11dukYuwIOtPt
zJ9M~pfU9v-T3WEWKw7H<gq|*mh9q}4qnfkGJ42=_UE-itvd1G7+a$fIEO7i-QpN=&
zv#)_*RPq@u(WR7Vug1qj!5T-!0Gf)nz_I9Epr_IT#Y+$kwzWIGt?f{3(~P$iC=`%$
zqH$ElIKE;Gg~*nFgRwqS$Bo7;?IglSAJp2KmGbq>7*3@Wpe)0Tan%LPq2@eQ4lDT-
z(#j&D9c*0(CrY^-*71$IXqPA?IeJ0uYih<cY+aXtkZHqc>1c6ukX?D43$kBrAvV{Y
zXhUu5M+R2Ev30U%T6qmh*+sEw2qX`G>y)fVmu0TH(l%Q>Bp4vrg#b2qn=}D?*^PKX
zf!NS0_7GQLXd~gU@reHoZAVO$-jO9{vSn=|!abF3bko1Yu4i1q;MAJlUKd*MOC_yp
zl3qLXp%SiI=oKbopEsQPT+{%Gi-27<nUQqM4Ab!7R!f~Rha4_2v6viWj5tJ^+$$H*
zJ_Sw7B}WU3Bw+#U$KPmN5&IL4P(5n`Y)pu$O0RLKVCxhwDB2eK*kH(-0BIu^Gz>GR
z0&#L0GfJ;8BU^>B+^q=4tO)bwrJQszL^CrvU^^t7C^Cj<sM4Mi>rZ2PR>IJAyR7uW
z{$O0)w0o9|6=A?N#No|~d@4uJ6Rbvu_yZwed&4Bqe8h1vgQDCK&)k10CwkJ%ru191
zv;ZWH?26JJQPBYtTV1`zy_GamBgTZ!Jv%BYrlV`Mtqd|ebcWvE@=TZLK6=*j<5~~A
zw99t(Nrn(uNyR~C8wPDQjMql&;uJ5ME8?4_&*c<TwgE9Dfio_)bxRlxqS5V4(C`yN
zwd!GTHxouQJ&;vb$&E$&srK@-HlH&EM#8E=X;e(0IOSu<2rko#u`PcFmRS*42tn8e
zco~M&V=kPcdo5OJMJhS6qBUJ$p5<=E+KnKI2(Ad>{hVCU)U8IeO?5jX`YPHY983(x
zhDYC35t@T*NFLjbD;gs;syA5_n3R;T<_R^e^_-<+l@md;6N>p=pm{70B#^cfV(53(
zcf*(v9c#xq716$);&ttFazuuGj{8`9sLr;xH!RW24NLsk5GF=H)#CSDu2H+Ez~v#m
zt>sjEDwJf1sW9kX?ZzgfraU5SZ3JY<wOxLV>F}{pZ)F|O{OyrouB=fW(bDTCZ7$ne
zOe3+;cdi7_gZ0SMZi=$}>Dl2mK`}K#)*OoOct2uOUbCNg{m@8Y;$WFDs>X|@j@8EN
z=n+v(5|Fm#ZR1$A%dBf7ZeUb6^Fz8=$QwDW`;ZW?TpxNxSls%qZB0UQpy}7HqZ5S?
z)Z7r-T%+;je9+V&w|zqz>(K2ERyd31Rrlf=@08T>XyYz85V^@bFwo1uWJp`UhNgiW
zx4t8onbLgg8oF2npI^B{D!Xpk4jz5#+Ky1ycKC#%Pqh8}>-Mo$-(}a2xCFqDZ@4TL
z`?uYTU*6r_KRwRh|Cw*S{9XL%pMN{g7w@h<o;&dS^ZV<oZ|;AZzu(pt?MH-!zr#1w
z{kzVl>GJ$||Kr2y{5b1t@?}@|=Kk*Ke8-LYl)QoOt{%W<)}RI*J~#^+AEGaQd;K0$
zXL)crZ}+^p{}EaH!v05)gC_QugC;rnI4;~Be{=P8b#wpmQ_-Iu&L1WkYg)Z-o@)@s
z8Myz!742!}Lv;UR41Eew#N<SO;}la7!#;&F)bb4CjebB+4_DVW=ZA?e^B2E)OE|uG
zyuUqvIe&5e{>wEe7nk?<PqQ3u0lxU|`d??PZ(r!I9-f*zk+<dP)vI6q;oE-$!@IhR

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/AddBookmark.svg b/DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/AddBookmark.svg
new file mode 100644
index 0000000000..624b357638
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/AddBookmark.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon">
+<g id="Shape">
+<path d="M5.125 0C3.9514 0 3 0.951395 3 2.125V14.3847C3 15.2504 3.93677 15.7917 4.68677 15.3594L8 13.4498L12.0629 15.7915C12.362 15.9639 12.7441 15.8612 12.9165 15.5621C13.0889 15.263 12.9862 14.8809 12.6871 14.7085L8.56177 12.3309C8.21407 12.1305 7.78593 12.1305 7.43823 12.3309L4.25 14.1684V2.125C4.25 1.64175 4.64175 1.25 5.125 1.25H10.875C11.3582 1.25 11.75 1.64175 11.75 2.125V3.375C11.75 3.72018 12.0298 4 12.375 4C12.7202 4 13 3.72018 13 3.375V2.125C13 0.951395 12.0486 0 10.875 0H5.125Z" fill="black" fill-opacity="0.84"/>
+<path d="M12.375 6.25C12.7202 6.25 13 6.52982 13 6.875V8.75H14.875C15.2202 8.75 15.5 9.02982 15.5 9.375C15.5 9.72018 15.2202 10 14.875 10H13V11.875C13 12.2202 12.7202 12.5 12.375 12.5C12.0298 12.5 11.75 12.2202 11.75 11.875V10H9.875C9.52982 10 9.25 9.72018 9.25 9.375C9.25 9.02982 9.52982 8.75 9.875 8.75H11.75V6.875C11.75 6.52982 12.0298 6.25 12.375 6.25Z" fill="black" fill-opacity="0.84"/>
+</g>
+</g>
+</svg>
diff --git a/DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/Contents.json
index fd82163d37..b3519a0b69 100644
--- a/DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon-16-bookmark-add.pdf",
+      "filename" : "AddBookmark.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/icon-16-bookmark-add.pdf b/DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/icon-16-bookmark-add.pdf
deleted file mode 100644
index 27e0c7b892a5446cbfb1350213f2e4b25779bb98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3871
zcmdT{TW{1x6n^)wm=`3d#O&NJ5{d)~L{*ER2@go94~t_$=w>(Fb*j)`-|vja$KGsO
zklL48h>Sm<%Xcm_bN12OlUGl*j7_735}S`-8X=xN6N?uwHh1EKP*Rm=TIeuB)9P0!
z;aQw@yUp#k?RLe)%e(&cykGX+@TSY3b_r8yuz7SO%D<|8e*3Zidee!;tIhVhVn285
z%l@-4;C5D_)9vQ=rr3H{q|5v8t*{uVoQuV~?Q*@lS#G;^`*rX8(NQ%u7<m8Y<Cm`O
zf#Jih-*(IEW^vN}an*Kbr!U0u`TVWjHNQ7{OaZ6oDX;jOk;=HNjKDW-lS^5&*A2@Z
zE_Us@F;W|k><A=RYwJ@Gq?5h2+0Q`M)?VshbVl_?QrgO#5~;S6J1w14F)Oi}FeSZp
zMkfKzI@(;QQfYJs6oU;p!>rdXL=R(5=2*xX8BMk!z?hd<C`5^HLkKDYLx%(%l!lQU
za|V$hjdjU-NNJ;Nv_N!9)+Qh(_>dy(Lob=AEHIya(h*WhJMAKn?2I>Az+Z}x7gk!O
zvLRl;067KB1s#KeRLW5~k_sBh(LiEwCRrfx;J|?Nf-W&ybY!%~m3WNF8g!gg5v2%N
zM5B^6BjT~JHo!Y<RlOE1QR;@m$q-X=2DT=QD>4V2bWu}MpyG7&$d{8Tl%h|4z);&n
znQC(|xM~vekkDu|<%AIFA*i?rVuF}T3)L!@r1s864bF^3B-K&FBuU{IBjDa!<)g?_
zc^7O1k`?kyxy;f;6Otz^p{FdQTu$0q7*J?`Yk;6_d`yJIsEjIl$vae!upAToWpsOC
zpCno(qm5>WMX=~G@>iv%ZePtn-W5qw1EP%6hMLmId#rtE<E@&{&8KGF{DK|7c&WwZ
z?)x@A(o>#kM}B+XTUlaOlg>5T6G_WCPFNf*Yv}`OXOZpdiw#hlRE!Pqf<Li1Bh<q8
zjq;Jg1{h%jduL2Fz?Kfh8EKJSKSpgw$`o~sL1X_g#utv2##kI|bSw-Rp0Su=)c{+<
zRvyIJA0u?A)sMVbO&BZeVa0wqNd~4f*R_g_v`r;l&a#m-)43li`y;(WUO2=vJ#-We
zw#s=zNht@`fZ@6rq;S*?1ZPMkNL6F0npGTEgC%y&{ur6@Vr(^WMd3$Y{CQ@U9aZ*R
zKE5=`ekIKq2U{(rDSY-ft0Oz6%c;_tVc63@lug}q>x+8ZV?~osLu1A;0vX(aBv4?>
z@P9KI@%-@*6Oa2JPCUG~dGYOok42|x^17MU(+Zu=yNZ?ehMC$_Gi=hB&hiJ!PPwjS
zw}z|k8KtV%A+gMz?{QO8d1zi7rp*UO-SgMW-EXr&m0tJe&}m%VUoB1rwOk!|_rD#y
zEimamU)_9Oe%tg&_rL}Li(we%NdC^;II+XnxIe;Prs~L!Yir2RcTLpweqA87CmY<j
z4^)W^4pnl2T_*;qNYB^nO}`T##@{1DNN<;yU9HpW?&50s?|#`(TZ}(NjyLPRTf-w|
zU<BXNFOFVdaxTy;PXrAS5ZRxuE<jaK1ZQGoe7w1ZuC8<^{yQKuOB#d1%+w%vyzG~&
z&1Kc4sCN&sxZ8H08q9{e88!_4FM{_NM1j|b9MB`y6*3m%_<aZ?_dO_KsJjp0F5ic&
zK2XH)eIR85b^$$1!a9pg??Zk@wcjqUR^7It^!|8)<UZbQuDd7V@zuqXA;pWc%?A0U
f^p$!o&aeLLC>KcXu3v8Zk{#=#Y92j$`R3JMbJ8YC

diff --git a/DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/AddFolder.svg b/DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/AddFolder.svg
new file mode 100644
index 0000000000..b9b806e64d
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/AddFolder.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon">
+<g id="Shape">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.665 1C1.19316 1 0 2.19316 0 3.665V12.335C0 13.8068 1.19316 15 2.665 15H8.25431C8.59949 15 8.87931 14.7202 8.87931 14.375C8.87931 14.0298 8.59949 13.75 8.25431 13.75H2.665C1.88352 13.75 1.25 13.1165 1.25 12.335V7.35H14.75V7.745C14.75 8.09018 15.0298 8.37 15.375 8.37C15.7202 8.37 16 8.09018 16 7.745V5.705C16 4.23316 14.8068 3.04 13.335 3.04H8.86901C8.75982 1.8953 7.79561 1 6.62231 1H2.665ZM14.75 6.1H1.25V3.665C1.25 2.88352 1.88352 2.25 2.665 2.25H6.62231C7.17846 2.25 7.62931 2.70085 7.62931 3.257C7.62931 3.82751 8.0918 4.29 8.66231 4.29H13.335C14.1165 4.29 14.75 4.92352 14.75 5.705V6.1Z" fill="black" fill-opacity="0.84"/>
+<path d="M12.375 8.5C12.7202 8.5 13 8.77982 13 9.125V11H14.875C15.2202 11 15.5 11.2798 15.5 11.625C15.5 11.9702 15.2202 12.25 14.875 12.25H13V14.125C13 14.4702 12.7202 14.75 12.375 14.75C12.0298 14.75 11.75 14.4702 11.75 14.125V12.25H9.875C9.52982 12.25 9.25 11.9702 9.25 11.625C9.25 11.2798 9.52982 11 9.875 11H11.75V9.125C11.75 8.77982 12.0298 8.5 12.375 8.5Z" fill="black" fill-opacity="0.84"/>
+</g>
+</g>
+</svg>
diff --git a/DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/Contents.json
index b75b5d095f..55db1eefb9 100644
--- a/DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon-16-folder-add.pdf",
+      "filename" : "AddFolder.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/icon-16-folder-add.pdf b/DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/icon-16-folder-add.pdf
deleted file mode 100644
index ba53443ad58c36c58052d6ce25d057f1946ee063..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3057
zcmai0+in{-5Pj!Y@Wnt<AQbNxAPCUdPEfQ(UAb>TAJp~6b|Fixq!ezyzGt}HS=tWT
zg<;cYhlex6GqZDcb@AbiQAr3RwcP*qyO8qjTe-S?Jbk=AZBFC#pQ(R_jnpb@dgQxz
z(~lT;H?&RIC;NXGcekfI=>V=_D2}JYxOot(i}A1fVO)QFFVC<0|AwRZQy5jbHBM=Z
zH@xcKSzol3Ky1)C$l*b-*~`Uo*e$P(Q4X7om)#y?RZ2cZqBJSk;G}V?1g(vgRz++;
zzzZ}8uc85*I&dq3ia9!yJ20vkoy&$G=S|L9CS_d634B)JP0CIVA}O0fDA;P1E-8lq
zyAXZwUc%*KvNjG72ucAPLxUjZ<{+b6VSEkAgOO1aYD^T0R>|8Gv0|(!TO6GNN(O^M
zI-HIYj2#$_38ijMF=uOKQ1H|ttFVf(BohEd@2$=gpEogt3^14CQXo6yoc2aWWvq7z
zj(U|5h;x7(Uiw5^5r@yX8v>(tCX!vM>HvfjQbayFC?FePo3>7NNtNUad_oke=8CT2
zB{p5PF}<BpIfiHvY+WFpi2_!OGAbz$y2uiIglyPqE3(ot21gWhIP9`A(HjfLNpCJ&
zLQ2ud5JVlZpx85s!n#B?=aL0!Mh@V11QLylb)U~VC)A$upsr%dDkKY`0JGKw<S{Fc
zLdhNoWu$sw1CH*HL2x{5Mfs`)LHune7ufVF&J>Up=WqC0!EMFelKwoW|Dj&-bWaRU
z`kg@5We-BYI#{n!s9x#pT|vf?lvwMeD+$KvYUb);a0?K5v98}uLW3Y{l^K(RFAy3!
zhO^KfRA5W?7S~g2!ytuJ$kYrX<ZTVSMq5Bf!2(ydbP9&LOfPnnYEl{rj4fHMfDonE
zD4bcqaHVxJNPPyo4Bm;)--w;~8EtiSY2@t@RyCvl-CfHIqyO)&PEmt|09YFj$PN-#
z3W>L!id5GJA%uwRP(N!36VNR+j0t$buh^UsO2KndK9~s@VS-+$GXXQbG-qUhmeKR3
zc--tVMV-)(AP>eMo!JV-m{H*!(g+68VU2*9pzn!*&trtXL+vFmwhP7^o?w;V!NGP=
zcXV@ykwG}>AQ|0=F%FC!>=2HJvCc1}e4z&=(VQmDH-5&nszzmTutS)?!&+9EiI3*<
z7@>ID(Y)9$7%qOw^b@Q(*fLQY^kl^%;<_UKmQ}_$u;yT1!sqk4d+hw;>+3KsYMQ#*
zNHx!2G-^%r8@?Hl$1?QiZmj!ux7(kN^3$&v^YE;G`TLJiuC6w>V*`F1Z|*nm_mA?^
zQn@U9!!lS_Gt+uJ?!O#{@hEAKTsOM&{q8jGa3W2IGkCQ*0F$9Xm=5O{2wG;)@9%Hm
zs-y_kaz5vL{{?%^3;&NmIwpK0JEkej^UZ0q-QTvY6!h_HPCOpQ&jJ&In6yH_C8ie_
zB;fWKG&_1EX3O>@_(=~#_}IgXXOP8b`6-kz%07qiEt#RyVROG74}ymB?=FyzSI7Os
s_*%ZYzj-|+WwqY#Pm%(z30_^_|1-k-I&^Oiry7pUE{L<U%bz~{3luGAIsgCw

diff --git a/DuckDuckGo/Assets.xcassets/Images/BookmarksFolder.imageset/BookmarksFolder.svg b/DuckDuckGo/Assets.xcassets/Images/BookmarksFolder.imageset/BookmarksFolder.svg
new file mode 100644
index 0000000000..4487eeba1a
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/BookmarksFolder.imageset/BookmarksFolder.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon">
+<path id="Rectangle 862" d="M1.5 2.5C1.5 1.39543 2.39543 0.5 3.5 0.5H14.5V11.5H3L1.5 12.5V2.5Z" fill="#F9BE1A"/>
+<path id="Rectangle 708 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M1 2.5C1 1.11929 2.11929 0 3.5 0H14.5C14.7761 0 15 0.223858 15 0.5V11.5C15 11.7761 14.7761 12 14.5 12C14.2239 12 14 11.7761 14 11.5V1H3.5C2.67157 1 2 1.67157 2 2.5V13.5C2 13.7761 1.77614 14 1.5 14C1.22386 14 1 13.7761 1 13.5V2.5Z" fill="#92540C"/>
+<path id="Rectangle 864" d="M1.5 13.5C1.5 12.3954 2.39543 11.5 3.5 11.5H14.5L14.3523 11.9546C14.0258 12.959 14.0258 14.041 14.3523 15.0454L14.5 15.5H3.5C2.39543 15.5 1.5 14.6046 1.5 13.5Z" fill="#FFF0C2"/>
+<path id="Rectangle 709 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M1 13.5C1 12.1193 2.11929 11 3.5 11H14.5C14.6601 11 14.8104 11.0766 14.9045 11.2061C14.9986 11.3356 15.025 11.5023 14.9755 11.6545L14.8278 12.1091C14.534 13.0131 14.534 13.9869 14.8278 14.8909L14.9755 15.3455C15.025 15.4977 14.9986 15.6644 14.9045 15.7939C14.8104 15.9234 14.6601 16 14.5 16H3.5C2.11929 16 1 14.8807 1 13.5ZM3.5 12C2.67157 12 2 12.6716 2 13.5C2 14.3284 2.67157 15 3.5 15H13.8159C13.5379 14.0194 13.5379 12.9806 13.8159 12H3.5Z" fill="#92540C"/>
+<path id="Vector 278" d="M4.5 8.26984V0.5H9.5V8.26984C9.5 8.47209 9.27233 8.59063 9.10663 8.47464L7.14337 7.10036C7.05729 7.0401 6.94271 7.0401 6.85663 7.10036L4.89337 8.47464C4.72767 8.59063 4.5 8.47209 4.5 8.26984Z" fill="#7295F6"/>
+<path id="Vector 277 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M4 0H10V8.26984C10 8.87661 9.31698 9.23222 8.8199 8.88426L7 7.61033L5.1801 8.88426C4.68301 9.23222 4 8.8766 4 8.26984V0ZM5 1V7.78967L6.5699 6.69074C6.82814 6.50997 7.17186 6.50997 7.4301 6.69074L9 7.78967V1H5Z" fill="#1E42A4"/>
+</g>
+</svg>
diff --git a/DuckDuckGo/Assets.xcassets/Images/BookmarksFolder.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/BookmarksFolder.imageset/Contents.json
new file mode 100644
index 0000000000..aee9d2b2fb
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/BookmarksFolder.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "BookmarksFolder.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/Chevron-Next-16.imageset/Chevron-Next-16.pdf b/DuckDuckGo/Assets.xcassets/Images/Chevron-Medium-Right-16.imageset/Chevron-Medium-Right-16.pdf
similarity index 53%
rename from DuckDuckGo/Assets.xcassets/Images/Chevron-Next-16.imageset/Chevron-Next-16.pdf
rename to DuckDuckGo/Assets.xcassets/Images/Chevron-Medium-Right-16.imageset/Chevron-Medium-Right-16.pdf
index 463b781e2007af1affac63754707c0f9f2c7df0e..7d7e84fbe4807dd5ba892d914bf166abb2b50894 100644
GIT binary patch
delta 511
zcmZ9Iu};H442DI7gp!TD!%3(M5|-_=@6KWcR>U))ZUyxXq7F!mRNZ+AUJzdzrAco|
z@+Hpq|Nd_G?a!tqz~O|$Zgr~=v-)FTC^=ii!|z>>KqaD<U|`XZV)*DD5HJyvIZP%N
zHOvv4F{Ut^L{;Jv-a7%JM3jR9F=NKC?WXU@RfA!BHuU}*lM4lc%2I*g8BYoX;Y_jm
zYe*%(Da<9wnRxBw!P&_)ryxR=38aF==Ft@TR8lP}U@Wzj`rCo{w#Y1slW|Z%llY|f
zoCMR>YR@qSof;due#|;Yi+wi~k5A2gL-Mz4zOEk8ThtRiyWxtM*sCs4HoHV6$0J_9
M-Eg;FKfk{G14id%#{d8T

literal 1160
zcmZXUUvHZ*6vf}~r?@YX+DSDw1{<WR(weN(v`x$C-l{%O;-*XqY(S@OpMLl9Kfw=?
z`8oDE_xiwUySckk!U8CiSU&v(#OrIkxdB(~_!0a$_rADd-@KqEnDD>qrgG^Kyp8*l
zXD<18i|hOOQ&z)oAOYD9ypqe=xTy57D20(aR0gvnj60T-IxD~m8%eDtsz3z3iBy0`
zh=jD-_ccSMb?o~%AuUW8%fRBaRSRv53Pa35iAYIfB(3V$1W|y8nZ_V-m`N-Y$o-js
zoX)o*h-{!OQaR+&C=!y&4-K_+AVydf8!L&7zNGLwW<<nZ*%x=StJ4a_l2O~>0U55G
zu65XHMa&K2Do2H>Yg}e;gdiEPl3Ucfoufs=GkAgLcTm80;Mnw;7y`su>4FvdYK&Dd
zQi_}Rz9`D3#)n6W9}Vxv-(L>BZMt_o`093fdRxBX1GlLQ(>PIPK+|kEDRFiAT4k<A
z4tUZZw=Rpu6{N`N9^f{uh+){H**m~!d^fz$`Hrk2SCHVKvo2q0uUh!8iOfziCns@%
z^(Z(MzD}F;Q0`B+zE$oSD3{Qc&%bEGP=`pkABr-=1B(%9@_CAkqE?(CO}BK4B1vA)
zP&6IiRB3*274YqS+E6<#>hkC=@gm<{c1`h;vTTqGZX4{~=l>kJZ$BDo)wJcrI)>Hi
H!?(Nt>Sg|1

diff --git a/DuckDuckGo/Assets.xcassets/Images/Chevron-Medium-Right-16.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Chevron-Medium-Right-16.imageset/Contents.json
new file mode 100644
index 0000000000..fa088142ba
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/Chevron-Medium-Right-16.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Chevron-Medium-Right-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/CookieProtectionIcon.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/CookieProtectionIcon.imageset/Contents.json
new file mode 100644
index 0000000000..f3d28607c2
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/CookieProtectionIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 13.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/CookieProtectionIcon.imageset/Icon 13.pdf b/DuckDuckGo/Assets.xcassets/Images/CookieProtectionIcon.imageset/Icon 13.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..261eb7e2fe7bb67d9ca3ac87a5ef2a649e3002d9
GIT binary patch
literal 3835
zcmb7HO^@3)5WVwP@UlQsAhIZa3J3x;yG>EFMYm3GK@YB0*|=ESt?d+Pe|=}D;Um4i
zv^p5{6X(sF;S4F>+~2)>WxA-8(Y-$W_Pf&h^=tj+jhgol{8tSvzWQO_Kb}8nOW>Mk
zozBO3vs0_P`LFFXufKh(Z{N57rjz<pnXb=|?#tj6M$J24CdpvhwU)__g9$`oLm!jV
zr)jT@>&7v;(d*a+Z=$oBY#4OjGnjlojJ+l(4c4ciQ&B)r7}!yTCN_NzJ}J|8V+h9B
zI<vA|zpEURs`EhnbODO0Rw%SfK*T38PKu)J&5$eyG}6Q|P>kO9k-{*(ghtSk$qG%%
zcGkxfTr;n(f$4%9jOFZR%bsZ$j!6Ln1qOJ9=|Cu%*Q`|#C@KUFGHqj#@S2F*BwVik
zq&}&SU#Y$N`M;N)L|m2cDCFp=bb87M7m%fL@A_aE;j+V2tS_4gj~O~=(h!rjolhnX
zgEpbOgh7RJm3Y_p>0+LtA|FRyEna9^x73+nLhuVj-4HdK23onET+qCf++g)sd=ccs
zFj7ynkXed;QWd23cf&yaLMtYt`qFn|0Vpp|W_B0M;$I}?f~3M_osgbQYdjKSo1N=K
zNLtAh^J-#|Yos3;2Ew&33jqv+>sKJ)TEd@Nkvru&V`;r&(@NOID1|BbaikV4>i`Z4
zp<tlE0Ix6|2-#h;RzZ~lT?3AsaLHf>t*4sGtwhVPY-rKY%3nZKdya~Wyc*sY63+{<
z4|%WT0o9wlTR6xd*Co~}`--MbQFVVUvj+438`x5>vR^%v0i7Gvx6v*QY=`JW<OX)3
zG%%)SQEa@UBFVvWqe&Q48+k;C<;^p4M;An#=HgngaUrlYOPIzo9sYn!YFJ1E^^lMb
z#W9$GB*aE`A`hy-1m*Atg!9U~8ry0#5+AUl6__b<LJ`;?h#FWd1Yp8G4u3%SFv+RR
z=hl)ov?7>*gd(^(grEvcP!4}UIBF<Gp>Wiaayo|cu}Ix2d9WqDU<1;q2L`QRY7k@#
z81*W5l%sMK$F4|$KOnqc$aG*(4kjRokE6yPxX$}laV{kUT9FfVgFrnnkz;9==(=_e
zB!6<0<RabT7)(tf;jh8acakkca~&T?O()(`RIXIcuEm6ej<h8YuB<ht1DR--#|j}^
z7+k-CdQdcO;P|;b2%bo%r~=jup1*=%jyjfLu{G@I;L0YJc101LN^Y9%LgZk(;13Ec
zmG}e`Hb3|S!e6EmBd}N;V><-W_-imB027qM9}tdOKJ)mVBA1YIW8urma+9%UbhyY+
z)71;k>g)afa6ah|ztV+=p4BgZ|1s;;{pN8N;K%u4yLo%~qCfE2k)JxK-y(HXnAY>@
z@cB5+C(T!?wb0!j_UCy|9{E01!28XSFzp3uZe0xFHn#eH`#@4PN3hn#&+Xwe*_tc;
zCqfz~`lxT1IKUGe*1&H!=grgM@zV6masH_2E})k1`Bw+;t=9z0W9TE9A5EXd@>tTz
z4<I|xeeD@!>HFy!<kE94>wPsmA2-{l`Kai6y87;p((&SS*v&8Xi|xb9B`K@*;c(U*
ea8B^*{q~=k)aPsJ=6KHG*kG)>x%uX&cmD$7ANC*s

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/Assets.xcassets/Images/EmailProtectionIcon.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/EmailProtectionIcon.imageset/Contents.json
new file mode 100644
index 0000000000..e7cd622579
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/EmailProtectionIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 12.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/EmailProtectionIcon.imageset/Icon 12.pdf b/DuckDuckGo/Assets.xcassets/Images/EmailProtectionIcon.imageset/Icon 12.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..671d4a0b39c46b9cd5ea853f3391fd7a47995818
GIT binary patch
literal 6306
zcmeI1O>Z2>5r*&cE9N4=4&Y&be*lJoSc-!n38K)s89p$pwaj3}O-MR$^6T?dPftyA
zNf?ljqvs%v-tDfgs($;en%1kgZ@&4$E_s^lZ07Ud|1r(;mtW3beKj5L-pM~FH{w@+
zI^Mm1{Bibx*D~ti@&0)8VY+&A{P*qQc>VjY=hxqk|2jNO|C;P#+B2K&<qLfqev9iM
zxAd38hsi88r;zb&$sw9rc(KOTWao#&9fo7H*@fAv8JUx6$lea%zM5IQi7wUMmAZsb
zTu$?WncdHB*UzUN>t+ozyZy`IVK;i1@)m`TI_((t*H{P4EiM>W+?<zcoF!DZl#-H5
zbJ>Rb#d#OJ_^Mb~ObRJRd{rzh#`zG*3+Zw-HLHC|>$WJ>#lvK=94zaz`Zg{sKBrvW
zoR$)5v}U$(n;MtmtIGyQc2F~U8bCbg8MhcD_e|P%i*;M}^MGOU`L>>>AEzIFGu=&p
z{RBRh>Y{A$hmnaAfK6<fPbQbp_@u!nSe66C5;{d^Ov(G^3MqhU78bb@oEd%;c9bWG
zU2Lp2<dI-?F)^lEM}pO*TA0bv+6YGO@J-y<Gop~BDF>mE>~bGB@JU0E)V&m#?0I@N
zf7p@1YTrA~&A!&S@!j(g>H&@fiEMV_@DQ~a6n0tI7084q#({%9`y*F7ggthoc+a`W
z+b&g@g-QgB5t1vOBZKu~{2Z2Ai>Y#Co+sgxSe0yap0!P>^752bHCPMPkgJ_l2@#8_
zL}3d|B4%M#696;E#X*iFIpM69?7d*s=R%$^Q+!7LNRlN&j>!_LiPh`~3Gs_BL_Z8`
z2^OIXX&*_>lQSN|us|gWavnI_P^<!R`fDbhiQ^ekDY1$IAppk8hT(i<qyfwpRkCwk
zZ1t!MPE}XMak6f`_Y!HbDJQX(m%>RwpCo#;++i%^NVHC5-5BQ>m&JM|(ycN`FqdgN
zhzNX~2J|ee=CztqN|9p&zk_E-#EZ<|rfC2}dri?vtq$1|OPO~@>JEyU6|%oZBMXw5
z`mCmOyB9U3u4buo+lv^$gu0>Yi01bn6%)<xm{!2kq;m(1J<X_?XR|IRJpW03g$&zp
zjR`Jnm>fmu>l!b+dHr$sLZQaho|?S~G_p23P)Wx^&DtK3oNX1wx;G-K`#>0jl0Zl-
z#wA%7qlZR5*65v7FYGxAYZOV3X#NU;A`>xXI4SnpI01E$X0JJe0OH}g-3;8`h_yW;
zVq1KQ9fl22@ROuxUBeMtOs<ObaL|5<%t{m#62(Lf2I;A&O9{vZ!c!BZZ|y=wTcw_H
z977;QW`W9%EtdYMO2KL4veYyqnWn?Yc?GGdnaP&L=+@wxxEDOfdMscaYGl}|zYc6<
z*!l!TCDlE_qLMYS^p0t8ZS(rTxMb%O(KU-4UK$(`zUXmCgfA5;gUE~}FP4pk1M3<>
z8LCrU$<@KaR2xkrm!o)9lpNV&3G`SNp@EC^P*%W<q(%`7a+7F9fqEX401Dx>^hiy>
z6)Xs-4Jah;WkfSe6BuX@3seoXUbHSE2rd?A3+9kCPPb@lu?C@?g^9r>Y3VEtG5!c*
zBB@Js4vvB%^EkHrbeJfelrs*DREgriq#{+`k!<CWU~DptDVX!Nj<P4^DwDZ=IMPCU
zMI{@WYu&B2G4b9;GRX$#l5%VWrC8dS<@`B{hg1xhkRwg4P|BI$ya<_H^C0OPS;i^e
zp^asp-gZaXE>DT3lr}PN)9Ixt)FSh&5=<hCu!71&Nf69f9|>5BT0&HeNQo(i_m+4L
zB|`-RjFR}^YM^NngwGV|ST4hrnnvxVtEa7}8Ss#(u5D*^5V+|zZIkerL+K?U61q<m
z;dV@gvmor*+IDunK1scDxKOy^<LQMpKSh!HSyNIsMar>A8bm^*Ef6*!SRnGr#?W8O
z>zaesYi+vrYk6(;_5WI4Kc-cb)7>8Qub-Ai=9K9a<l5o#WhHYT>bJ@AiAl#?&{4(o
zYoD8q80geFt$iM+Vf}bVrZ!9+kptg-(w70#xdX=MG<xeq5BR9y(CyLawaOmf<QE*}
zu<oNospP@?Zb=bc?|^vpQG;Lp1^*S(xhK}t*n2ie6d!_oAZy0dS4CRu|54xnbT@4w
zwywXhpW0ngPu4i4oXFF}NyFh&be%l3OY)UfDAO3UmeN!4w}*m}b+{suqf1Ogx0}#$
zw4&?sYJEVu0kL(tkl0eJyQ9`M4D~?~sl(l@V#1$pLb2iH`A_PXj?#R!BJwfkj+>A*
z0cz_bx?1Y>I(gV8=p7xmGHg@ei`m9jePtMjq7PU8O51aZoxr*Y9mm&xd*q;q^++XG
zq`yd4&|h^SX~#O&-I4F{ZbBng9~2Qe(0Tnuwy8xVt=Hv`8m#`L28Py4^CjD)f}>=V
z^U+DAF9XqD!gMYj)i!s)^wLhQllxuqcCjpX$m@l3OeyMpGaI+xLtp*&?(Y2fFn{+w
z_tHF9fBVlrkMq^roA<{K{Q3Cq_U7yJ&+~ULWW{P`_qWZ`_3`2S)BWN2Fms~k>u&D#
z`R?&}$BJ_8y@79U?!jiRFd8&mjtiuh=2w5beTS>FL~uQC>%2by#9aH#{|Au45}P_$
zk^moc!9DQTH;*@`^ZTb$f4)EdFqt_|D=Fm9nG0dAVSxL??QMIT?-b(7?I{$q+|tOS
zqhij~zNZkMK^G7eXP@|Ze{*{}-cS55!qp$%kdDtD&L57S&!64C`+QBx)%E%OI7`4S
e!B^kj{`ZLY?SB()?jKt?$&@g?diA@%eDgn?l-5E3

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/Assets.xcassets/Images/FireSettings.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/FireSettings.imageset/Contents.json
new file mode 100644
index 0000000000..9a9c668121
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/FireSettings.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 17.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/FireSettings.imageset/Icon 17.pdf b/DuckDuckGo/Assets.xcassets/Images/FireSettings.imageset/Icon 17.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..bf31e9a7386206c8c9b2d7fd8270ce01bfc9d1a7
GIT binary patch
literal 33137
zcmd_zORwhHRp0S>y^1qIf&taf{UTYGzy>QyB8Z&<63U<{7sjM7PInVQUVT2_wg1o4
zUFQ@eWSSb-r+;VP_qwmO|L2eX`j>zCr~CKUcklKuyO(eO?jPU1y!`BEFJJuEfBD15
zmoNV2um0{IKYsWD=HD0p>Ek!Q`{5s64jTS?gMRhhxBv8qpLCf2UcZ|@tK)Bs_uZG@
zeE)|pzx(*jhkyCx_doynHq>wa>F<7+N&oWO@4nu!Uw{1m+kg7*!^iKN;@R@g|NPs3
ze)-#%-TU4A`|*eU<pKTp(|<FRp5OoQ-N!G#e)q*MKmO0(fB5+8U;X*ZFMjjW|N8L#
zyZ`ZS|LFc4`cI!fJ%6`<f7oBH_p50y$HQ%Zc=_=4yWRWSb$7nqfXCB$ckhS8THW^_
zzIk_kf4JRmmwQV+?oNl(%h&G?@6Wf>&5y>}UvJ0LizzO*+wS0p^Yya7xsmtB!+n1{
zzZ~D+PRHYA|MKCTC0*~w{bB!dH7abU{c(S~oQ<%1zu#XD{qz?4V1J)!cRrr%=jCql
z<NZ|6`|-NJ?Oty0kN3mjd@<+Y{qb_!U+<>8T%jim+V9W1>keYS=l%UN$cJ}tTiNwt
zce-4Re%J4?)9-%W9WLjW{eFf5eQ;ox-DQ7p6sPxx%jISjcjtaM?JhyLixu8J2Yq<=
znRa%v+aE6Wc6@){&uF*z*WLYa-oNY*@Apo?Xm#Bk&iAWX_wV<+-Tv0GoKI)7b+nfS
zb;yUq;dF2Q-R!~9`t|*Ga}L+{*A{$TJ<!DI<?{aSqD(P^d<w0u(axvsuGi!F)E(b0
zm-Aj%OS&Bn*Rzvzeiv)g_3(aoJzY*mOF=@nvr{~xio<O;lWm*$9H#T<S{~k;ZFjhL
zKfB%0xtrs9zu(dM&|6nA6W{my-Q{3!Kbd5Ay1KKIlRBPIi>~Lro4UAUw1Q~siomW{
z$Bfc$h_7}I?|i-OBlz>-cskxp?<S7dxMSn;uBTtxxK@j|bUf_O(Ib{Qo_3f5<aS)e
z%i;a43+rNmyNd-xrRU@E=$s68JMB+rt34c@+zEmMt_bY({u+^-bVMen>-BJMFq99&
z0sG_CM4gn&?}}a{AKtyiZ0K_8`ml1>*A|aw1MOc(hacxV?T>Z@yV@gO(5l0_Ip||&
zS-<^#x8ENjx7#t+YrgaSj351S+w_GDIUcmSKl;5zKD>L2q1D~>ewiECkw;fcxgaMr
zc6on7?r8DDJ1j`bkVohD#K2->>%2g=^K7Fh;^uI4Qpe8jtRL)h$8O1|g`Mp0ej-R*
zDn@jbZ-wQDcmMG2@85m%?!WxIWi(-Va$6=GA&oAHG*j*Gmz^_37Pm{6@`;ch=6CIc
zwC&xFSHdYFjgZeTU%}iXW^2XRmRNB@_J_<90w??cacQIq<bKd?$+X+)oY*k_<+#7k
zC7(`9@}I~e>~Tior^BxEIiFBPy!Jeg=eoXf9#7S9dVf!VrBZ02-RXR6dN+5XH@^Bz
zyL$hq2@)%pBg*+2sQVs0VbKG5M6-MaywVG4C*t|G-_80j`_t)8@9a~7huzU~Plv-1
zxdvTNnAyUOLhdGG4YI%7`zif*kN34Zk?ftB^`8^<O+Xx^<UX^$wd_qd-O-W3@1sYL
z7a|}9aouBr>n!?pyLvyh(Jdu}J*M~lO8cgd?A@8`t=*Y4x#4U|`*KWtC5#D+X>~%%
z2$@K?YTS4`IP4*Af}q>Svxj36^O%fCVl^WzvWJ|ngj4;leuLb9q9vc}TC08N#nG8-
zxrwjqJ>gC&TllUk9uNU;;AsQjbZ^ujwc|NGA7^|Gyx4*}+oR<3^-S!31-u?H2L*7(
z?8l{VuZZHT9Yc$;a7aI1jz@Ac=&-w<(cu!*XA~GnDx8rzDRj76de8~c5EOTc7d5ze
z5UXee?q}B5vVT<9lvV~*%O+9}ccL_%M-^RZt*-))`~B6jf#?u%20pa?vwNd1T`??4
zkvPmD2`FCPr}{{b^L2k3J_vR5qpe83-Tq?W&yBE+d|5gj#kjIrZ;f|%axbD`k2r%F
zVRyY=5CT<yVx2e-i@6-nqyRNS;yOOi`Eb8tLz14TcSEDquJ`lZctBPnip4{$E92Dl
zejYObgvNJuCH2-Z8}Ie{X4y%DF*2w}3$=4%fh@vTw%~HkmeGk0i2fINaSsc8-F-&=
z(a<nHV{Z+6d{42mquN}gh=+_zJ?@drn1dZsWUb|$K|F%w$Szn{Zh1uW5*w`EF-x!l
zIcllahjEX~=3`{sR!cmGMH|umlETyOOunU@pbyjOxz1Vt(*jCmAMYb}Fd*99k(R*S
zjSg(}1G1k6B=hE|-ge(c-HfBtdn9(W0cXviyX@|0k6t8W@!E_EWNr<3+|ecjzV6<r
zPrJ#jU(rr74hde*so0DpRz>HG*p7}8vEjY@p2Na!rQACbcSQPKLI`}<k`klKm!ZM5
zZ3qN}+YJyc?@#0Lka3pT-brNICzc^fv-;kyYtG<lthx3GBesq<sXmH^YmgqBLmco-
z>jpA#6MR~3w%)UQqdpBeTA0%{x{bov9dF06S6P5GP!jHNxf2@<8w&kE;p=%NDXwE|
zp~-Pmc2wNGHV@_@O)vrOP2}y3X2&*uMQr3E)#9j$@~fk}QN=fM->Hmyu?)=Tx?1hi
zRE!^ppcMJl74Yp+GiU+H&W-K37jr6hm92Nh*cX<_QYt5W$wDV#um|<Tj^IIN8oK8$
z3UzlFxoo6`D}wCrT-f?ucVtkAy`H!`KQUpS>ss`+8LjsII9s$tM!7rE9(OQNhrZ4n
zh|6HkCed8G8)6H~my2WKs4;?{<E>dX6PL(BvaYBzx$X~VtYw(p`Lt2-mHEkO^-B_B
zxaDacKl?V~)6hjT$J?g&E_yNG$OD$sk?|Q-Tu>h?huDei$&l!SPG#;+yZh}vws5iw
z$!LXSE~nfvw|}>3Vi>iud>K3`N~#rCWr^lm1*JNtE4I2={!a{X?Y8x`?5FL`%}zgc
z5cMCo36-!UjM$=KvD{#}@!6@H-Tv&`h)=7$9|-uH5f9`q&d(QT#%1|_wJ=-}w!iT)
zVQ>4cH6Cf9wus$be@58}BOREcFp~E~JJ7~=)SusE(^pH)Ex0GlGG&ag?7j;D?rvFJ
z9r;Kj3XK<G$i4e0hVt6VouG&a$o`UuydtuZ8Pq6cVCA#|dLgzaOv4W}Wn6^<S*9%Y
z3BKH~r_<<Fzr0+p_K_9Jn2nu;Ws*)AtL)|2`n6+_q5k?HI-a-7%}~cYkuYK_y3oq9
z|Htpf!Nn0;Yu-V25~G+QmRamj5D)CS$GQ2v?3R2hbmIgXGl|Y=8NGTsA-eIp*$*uA
zAz}O76>p)|Gv|hccUNvPNGt)14n)Y>ag(yK2+Ba@mXQRyVYtOO{ETcRBE%U}GFn~O
zGii%JW{wW+MqI4bB@W$1&~2X>4Wj=yh$>mL#@gilv=eYkeSyYIt*aoIUxHX6TdN%U
zHLF|CE2$k>*@CspZeP$9Jq={Dk5=0Or?fXtzfpBXDVkzMDU6m^HBce4HClW=d)?dW
z1586rJL+R=M^$VP;k~-%ZLO}P<vPv|cFoFq-P+;9x;~<JS!v_5eLzWXyr+Tqxyv%b
z6)9q^CM-BU7HiwA1MZhE#_=k+F;FbYd;;w`Q$e(yg$yJnv~@kODHn*1w|4B;4I-dc
z*LZTe9!T=7t8usS==rreez;3)ihcfMvziLI1koc=KX6BHt*+N(M(tSsQJr>I{?yDG
zLoCA(t&y2^6@TS{O}k5ejjlIy#0R=EEXdKwML=fFiZ#&YbS2AK`?X`uOjs6=<THc#
zG;6PHZ4TK$g0|SIuA)bRB7uzFCZiabw6U5?G{GD?5x_f&Bp9Mx&*{o>qRa!aDUGFT
zEFU5GiSKAhg{RRnj%2UzL^RrKF%OQVJ7#pbIZG*KjG5To1kT>^+=5<9%-QRk0K&f#
zEO1t&>k0xebg0aZk5Y{9$f<a-dkk8~0xIS*v!py9?O2^#yG3R0I1#YAZaxjj0X@1V
zc$(sPn+Qu&EHaKfm_gHZPIOu=3v_|Z+SL{Lu6Czfy4oFzBTg$J-wj&+?0{l#3oMec
z+T9=RqQQa4qBX(wo=dbA%tl*N2n^$`Mne@Fbj(N!5?EccvUri!bWI1YSw%RAQSF#1
zWJU|d*`^30J{RN|w3@Cbo~!YY6dMr_YL^MKsEmxoARwGeJ!pj&T;l2)r%YFVsadqU
zvwzH`oygDCATz93M-a~d5$YO6KWG-Ri;<`&+P~mx%4P)H86jW*);CErES4qkI)o!E
z&t6#KSs;`QqO{q4lwy;{!Yl@{<g;MHTCEeZqSkTW72246F<nONQUe8rJ2-l6bY16M
zILo?)lIX^|x`@PHAY~V&aY*T|Avr2ED>;ZaFkLCS-0kVgaa$L`ZDmW;&N(a|5&ej6
zg6Oa{8kvJfR#&dq22v-EIwR+@WGB)f?iaL)zXO3_s@0Xvwsl2ywpiDF^2F(j5WAa!
zc4?%6&SdS@brXQvO(3PNH2l_%x4d;NDluIdMxX2YX!qEd^{%}#Ft@ew5tf>4icglZ
zR@dRI)s3#J)naOEJFm>aY;1|$;*-c~?R7CkP!#z&HJK25O?L%6X%P`yf)Ya(*g$o~
z`SM}2IuXo)NlYsg`r{cL1rJJxF@nyn1SYRQ!7^bbO`JLJgPCDvIsMK)A&e_R>SxiU
zCd>((Y!7mi>8c;ktl%YEoRV=E5Kg6u>qpzr2VuGq=n&CU2Nfb-KmEwwHBu>yh(jx?
z#j$IZv}jdAKuOJz)16=r5%ld0c5FYyI{kzJ-T7d-!L^dwS^Y*(hTI(Kv^fZuZvF0i
zBD;RFDr<Ch^%_a4rt>T=IcW@3dS|B0d^V5%>$j(sSF3d0AUCI8zmYS8xUQ`q3u;b}
zaIvjvwVjl-Cc!Ys$|xCo`Due?md;oN(`xle82D|lxIpcJZ$V{CjuERYhCxaK4U(c6
zq<HW`##|b#0PSEWn;+yhD>sq|%tHLUwIN*AeD@UU^eZA=KaSqSC7d0-GKiS+YU9u!
z{c-}QA5Xhhmdg?uM3!?QDY_6YZTDU)w)yIJ<JL|q!JY0;tF+g&5ffcV*3jxVmpiRa
zu6tT#pbt{8Vh~o|Lh}E%{S_3h)m`kMR{TF=Pb7vt!*qs-MG^WTB5u(c4Et@Ez+m1b
z;V&RwE8?5q;{Mp`P8cG(GrA2X&W$x-StXq(LXCJKxWSNUgWR35i)y*!=#!R|tJJC}
zKFg|*eA*m>jjSE=T8AZJU(1~3fp4kvXSn}sJ9?cKfUtWVT(N5ssgr>0hX)~%MJEw9
z_gZLk&KbhHoPMm@ZW?lQrj5kkS|<qOaV|{eX0^H?;98|#7E*X=5Mh{YJ_NE>CFI<V
zp@Ef_zFOVT3?xgVe!@!WnrTIh!!FW4794UA5?DyNuR$_-YoiY0u}(TNI)d$o-u07y
zS_mdwD=6vFe8_h@7fEZjSXd$3TA6mON=|B=dhwLBs5S`89nL!CGuG(|kgrx*ORc~@
zJ6I#R>Nx`%C-Z*#3H^+n<M8f7ksPS}mV)MrIpV=g1xL*mB6En&>F3Cn?a#|x9r>HP
zWn82s?C>Q1!~<m&2%a$6M)S9fiUdB%`V>l;96VK;9>QiwwIUHZoz=ucFd3b87txQN
zQ$BOEFy1(8&w7PA2xA=qi({=Hw?JeUjoGQHbLqrjLX|iHHBWk>R%DN}fVd7$w}1*E
zG)OURS+n{H@@`o6RiitA6s4FT(P7^ZbUW!Y@eCbTztWN2TDL%8YLx}lT?-YK!V7V3
z3lVErx{&{mS87!{VCJLaC&pXN4k1v#PH5V=wMRc9V^$?(G&=3V3e~)kqyT1}bSa?&
z5#PiWvp*5pq0<No2{-x}h_%8YTfeFcLQrR>)wEg~8pgI>{YsurD~9TZjP_6z#Drh{
zWQ;~S!0feF!lg`#`jv1-fv+V`nf0NrQkjdoPLrJx-$K6;CORV^?OW6q-R8H*O-TB)
z1Vt8^4tTzr9L~p3gt%+>04xp7z-oUC(s8UMv(*$W!IQ}~t%|alsw@GWR#l0v0;4P_
z<cNvz)IgaI$!bR|DiD;~9~(M%0-H@&gJl(fX#4^p+6nd%EuahW&X^A31jW2SN~E9<
zFrQ!q{Y~&~W~I+4rMljbAZxZ(iZs%gz!bD&8jy=oyRupMa-b}#AcBIq8YD8+g$>9=
z+`u?AX!+FBE{a;vwyhJ}^f9aC&$c>LIi*OtmVjSf>8R;Cf@DEk4#HC6q^%u>n1!%)
zAFFe)3o5L#7Cc7(fFgSjaOp!E%jjP145HOmru9rPx7RnR-huX+`YZdp?)5;G8f~C5
z1=CeEPtMc=?OIpPwUgK&Og4~M%L8JPZ(XB~)s6);?FgI4XzB$P<T|%jo#E<=4(!#e
z7KOx{qJqB-N-+iryWogvRnTd56=;35s~$i*k$NI-+TALh2qJV)Q(aju+k&xGLBBwD
z%~&sGjJGLReq*YbJpQT`0UPIF6OK8e50vd08WxbvZw`uy#?CT%T#cFKc^qp@Cy+8O
zDUglLgrsd5-|I{S94Z6D!uK46x^j_`;&er}TRU0X&O~wv+u|$j%+I<aIM|L8`<3`Y
z{bPa1i=pNMBb7fX?7FAs(sIs(fZ_g;VWZ?k{Wc|6EUV%pV)s*lm0k52$}9KDIV!!|
zvI&E6SU}b9EU2{Iv{LS{L0Obj`y~<^6HM2PfoV69kb#P}FDS+vsG!8wbzJoUrH59#
zsq6`2A&qU4KpPqWQD$3LcFHzhB7M3FsBe4VEQ~3q2!NG3v!b?)rIsRLF!YWIH=``_
z*}5`%$J&ub=}0X^C}zqobS2!j@m%xhPX3U{OYP)`%SP6Uu{jgS#fY}8S$Uhxgxay|
zmw8a}=8zdtUA|0Lm0xQQg8oVGSun#Q@qt#%PkN#}Bw$TJ?9y>G1QVDKQ3~Iu<ak{R
zX3_OP=a5=Jq4aUl4pmfTn3`3sUru;L#)RJ%Oo~oiO`#&1woWRGv*4&{yBo8SK<C;M
zGAWN$Tml;2mI7$O@>2qA_EQ=;Ez9hj&Wzk8jwUgTk}b0$2h_<f&xTX5#kN3KjVBa)
zT+*FUnqi$o!E|*!RA78LrHYuVWDhATzB%S!MkG}_>WF^k;^;bt_w2UfMx>a5N9PZh
zq3VZ(Vh=jU#v{@4o3-mE=Iq!`I6jEEyJl4r%IKN}7r!VHTBQ)<FwLV#XmUJ3C2a=E
zq+YEgvzBm^MWK8*uvmFrSE8-1w?zMf*0w-7YaLTvlZ(?%m({LATo8g<Q0DT2vSYTc
zam)gd!)h0WFQ^L4nP8&rGeKdLt?NYPW@E^BwJV4{T}kS#YjqYIWP;W8Qen;lCD*5`
zEj+r$Yo8HV*<&d0bp=y$j0n#MW28wz#lKiZRJ_=FMI$aZ3$aiY4rKl_u29@8hC&_<
zDyE5%aR|B-iHf*OQQTDNwLYAh2&^cQ*y-T?{Q06MMFW#{YeWQ*Ds(<0XU&`^J@t6f
zu1MediqedXLZfOz2|u9dLy?_I!(@NZXwfizhksbuh0?3Ma~=6gpE;K$_R&chjam4q
z0+cG+Dv`IF>ORn^>#?nh8{=#&K1*n)9EBj3ZJKAcTwaErCp^f`M2u94e{`B9uq;<S
z7KAVYiBqdW+qz=55m{NN*$Q<X5u+VV+WnWkncxvf{RMHl&8iG%!i5%|G^ri_OaA+z
z=-q;{PlKdZw>$FdE;EqH@6@Ji%5tEs^1RW;|It-2@G&dHWM*~g5zchAk~OQ6y#>im
zu31w%kFFw-tDPfxw9At>t4(L`&R&`53#yFyvDf^j+S%+jE3LHJRnoC_t!RH*E$Uh0
zRo61$6n@VXOJNzT$iQlqnNcfO{o@H&dOV=Ii$}Y;f9<Nr)Ae;-oCTwDbZo)&1Pz;X
zTF_D*^N`^I@f2!B*$hdnc3hwV$1Gfs`x?k}Ti3jzfeO4mW>wTZAnOh3OjnuW1&uW}
zP_-L%oizEQYvrbaC1AF$1&V{D2eI39b^Qam%OU?jr`g#FKaD0HXgQMXfvM^kXnF4$
zc@BM>RqaabqzHxqyQZL(J9GpzDf7Bw$OS3-n#&2Kydnuoa?7@$=Gz2_vO8CL80jjo
zsTCDQv~07gx|s!YuOnEa;X_$bS6$KxNesl~1);oZSXbBLMPnym@0Gj&lp7>)g`o0J
zWQ^p&sK2aY!Rc*QhFgrqkhjdNaY-~u=Fwr|P@}>VpFGR?WtF58olVld5?INx&ye2K
zUcN5gY(31zMFa}k^Me;e=DJ+a1dktJCVAo}9k|+2kqg>(XEge2pyE_>Fik;xF0kOy
z>grAhs^)5g$Z`<zIR?Ujh4>aor>}NJ^fu_x71V2)%)aqM9$ja3z>L5(D`Hu*rcnpN
zt_w=EKNc+2I3PkBp0bCYnbftw(&|det*-3Cjo>TV;t^}d8c*^@jg-zTgvI;hcZ^=E
zsz9F1T@fV8*dd#=T6Cs<ZXk~1T1de!T30LT=1H|Q&yu`iB%2TrKp8nM*xcg*qtWk@
zIZ-3u!4I=n&QVp3=+R@P?0vyL;?BXcMLE3q4Kzi&SyWTBJNHW4vv{%Dy`*OEo2G~|
zcX6x&3fUP%%4*w7B^xh0ceEC>SbE*8rFI>nrKn?4lQ3*cfpQ2&rdIGZOE$r#$e606
zD~+m3k|3L|_yU&##nclxMk|5qv_YKpO$o4FR++tg6Dx0Zbu3Fo`P~xRsnS`U0%L2R
z(M&c*Q6)mddQE|A$9Up{6^L0-Ar!)bPmzIIE8&`vA0@OOb^()qBnSmnrO9fyJ;{;H
z%juo2<yR6tq{Tzc$|bm-0Y@Cyt|;PyCR@9pr9K%7PIc`SJvr^V+Ri#AKhiS;DXLnt
zo><%qDx>o3%08TSN4Ghv6Rz9Z32SXondxce5T9MMx)%7HBHwSI3CMj;SCV5<o&(RY
z<LBh^j2t5$%ABA)_FwXnAuE)h^Mj0vnp+?X(0LbkQCC1DFXM;@=17x51gh9dKZ#`u
zGCHI%RjkE1WP!MD$rnqLMqjdl2`Q42n1l+&XO?AF^7j|!K)O1Z!iU@<?Hu`}G(%|>
zv=CZQWLon4H?fW=C5-AVqQ4cfDVJNdx1lslvDJEWfM=B)t%6a5t@?o434sg&@e&F%
zxxqn6iLGUIMhi<Bzv>-hZCL)^)>~lZ(K`*c)-#Sy>#^}|J?MFznl(Dzt+#g_%Os+G
z(cAPc^R(u{M}BIJ6=rVO%1tbE9HrSebu}#+F|A^-F}L)FEnCd_#C>aS7IM3tmJ@K9
zmScM?tWbjcMnFj&Vz<!nuuPP}9WoDB1jokYVTQ5Z!3qQ{tdRAFJ<eRqNPk1u%8Sl)
z57T=}W@f};s)ga(S-F<QY*tITq%{v`Yh-dR+`2`wrn<q^4kJ8zi`G1P=hM$B>5<2J
zm?9fiq3!gZ%;YvVOKIDW!<aKKj9>V$Rg%Z6caNvG-H2dr_noQKsn*iN$;D&kUsmtZ
z0aj+;;@eBFxh^l-wv}VYREOSTers+DxF;lGm7&duo+50OGekrAu30(dIpH!blf2HQ
z9K8YveUc}|T1Gk`3w#+SSGkmsoEH_b&N5%In;+-02!NJ2RR}Q5Bon};R>@bQ+}tWi
z$mwDg3=1L0+$X=c;NlHr3vW9*Pjzy7i+6aS^0bp)i@LGoK0}v8VAUU9P0jrj1<hqz
zSZ8gW47YYMSib9E?6x`Kg)Um>RabMgT5?>rmRNVg3Sg|>o42MnXLT9<dJp9dwmCB}
zruFnDg$nw#9=j}>(L5AicRJ|2^BYXT)50qETD{e0J+K0}TW_ZH>|15u1gYyygKrqx
zSo@Z!>{OKSNM>+fw%$a}j42~fs(RLg!57BBj;f6qBg~CcfCXPxZ>m4KHKsUdC!i&D
zzqqVCRyqW>o`=-Vk)y!rU7&qQ68;<$qm~G`puUzA=-emFYlgxC<Pbh_pVM0yw_-W8
z<Lu`tUD;Arq`O5=Ic9!>$sk4ZsEsInP_>|Ep&X$Ms;Xfmf91Fw8lQt7l0-(+Ojc*l
zv|5jlOpN?^+T;DZ^j5&i16DmT4ht^G-lE#v2Qy1GIaQjBA!X%*qenWK<>%IBzyeND
z1+DDdxp-PK(YMMw5yOemd+u0l$~nX>rR`R4Lk>^#kSc>48AKOWx2h#|SDk|qy_lK!
zt@E;{his7G8~Fz<$Tc!(qA>OktD<98F3dXFNf-}qlA?`yPzkwOTKLkxvU7yO^p<wb
zlB*qiaKnUTH<@_N4t3X!NqEl6!%CnHrZi>i?UpudMdR0)Jr-Ln87Yr>mQFTe>D|?C
zGn8R*z?``iZP6#Fli6DK2xLYS?BCXdtREQg*?X$7TV*drx88D|TkpaMYi@b;2Zj$H
zb90$CbTs~)P=V|<_q;v$jGQZgxu}xaGgMhYeHI{d57i3Yc(%kxEha5P&AYN9F?_;2
z#kk(TQPkV}x6u#j0!~d2ok}gc+97CtGIc~}+29-X@^jgLeW`#Jo&(1VmHQV!70%ek
z!wR3QZ^ZV@&0L$g=b7CYu6&|SdN!-*yaSMC$nC2jm5nrZef2;tK_HQ-l-$FSuU^58
zuZ2+r;xwf2#-N+Rq2e**fcq|y(ta!NoBdKdn=pF&2(VzWV118?SVf7lj+%z*9S+iB
z6|FEdek29SLARicYKwG<V9dtmm0i4A9GnGFwTwJcDb~^(-1(R!87cHW5`;?_IrFUf
zofD6F^}?|Izh2oR%EA1n-Jb9G95TTt?~SmP5r~{j28C>l4c%_Z^Mn)y`N<2u=5V$6
zRx3oB%iMa4&>}v07UJ7h%Zs?~TlboMTm0KTt7&MThmGT$;H#CjV4>kx5BVk-kAU#I
z0tcoC;l(LZoJ2QCDX|==0<YA#fA~oTs4ALFa<A0bG%m|R#M~z$!o{InA^h#?ZRJnV
zI0*p}y2hmQbq713D_|%Erj`373n9E)L^F^2dP^2!O9}2UHsADPq+1N6Lie7RD!wW|
zFo?Gy4<zBUFp=lgis>4nymh|rK<N`F5E`1~m^Q0AKTJBMw_47-Xjh1>u61^OgGfAY
z$SNnU75jQdcTc!Aq$^q@QBs4rh&d?}lND=!7;%k--DjO1OU<dbkZqmpu34vUepvmK
z<ZS)ed^37q=$ZK()Y>26z0H?WTm8`D){133{nVv(qvp$Pc>A2Qey^Wb4nnLTKw2v`
z8`A5Ag{&&Q!76c@R<b>-l@~$_@gQ;#3^Rq9L>;}p=97}xMz1)_NaP*cc1DWR21%nq
z=-+Xb!%*dhm4pb%uvo3CtqMWVTbmLJGoPr6%{P`)j~Z!ca$_O6ln@yslu#SIlfx4x
zoIAy#OcCM<l2}}=cx>J1Jj+`M+dcsf<0kmgSd1;91_%Zrq(Y`5p;w~(f@#BsC#~z}
zMORf7S_wl9x0MRwTR>zJhO<O&SDU_4Fh&UOW}@*F3kI-?3W7O;b$XH&%J3jWSV2}s
zkmw!WPCPL~S(vCpgmoET6nyiM6ZT;1<#DN{(Sa&6oO%6T%bX<9TgsZJ-56)?H9wC@
zEXbIvTImGDp)8~n<RG1LGiY_4^U|u!*Fq?bTG47L?=oka53(n+w|-t%EUaROX;m_L
zTColXAuZN?b{0j}iVfN6xRYw_28o~s>Es8A`9q4tZv6<zH5Mai&4-rPd{a4HKZ%V&
zn8ij~^QjkKMVBfjW;Y(`kl98T!6i)f>t$+G+Z*DEe8Zd+DFfrsPI%IP%c_QOdly2q
zPce42%G)}d7#U<1Gjb+O#=~*^8O1W&6LTZ|$=*yU-sf7U*IU)fQAB;9sQppr0=&`8
zGMgz<8VaY<8nQ3j{W-*HBC5M9BBoyjz5G+f53y`JR^P^_RDYxPA+vFD0Cn@p6Kq_O
zGnF>$U`>S5c=qm86`;)we_^36H@cNES=_|CC`wMlIlYk<Tto3{h-_NU3qvgRodyzK
zShXgw>NHw=N9|7M*}6Lnk-Qjb;eZlmtb_uGOWODHmca+(mf2X3o%to*yvxo(>ES$y
z6%~sV<aD%W)e}8_3`+`5s~9=ND#@_gSo@6R+9zxqHcwz{m1Q=q>}R#&-K>!ca?VKe
zgmcZuG3-ti*_Obak>ndT#8MVQ=uR6|E!#SCEjG*zPAm4rAf93+kF81IZ6U&lkA5;v
z8-|ysRgsrjd4bG@44v6ahq0}**CErYmo3xE(Jmx|`>o7b6$&IAf{3!%u!uZK#5=1{
z%~z=;Vn#;tm<p_`67?G-En!g*D$>L*n0!`I$;jC3m>AJ8;ZUS{7nk7M1<})Fj(R>m
zqhqSk3$H&q5ZAw6*RtTuUbL}UM_aU7CB&ugS&J2aPL_zwvM0_k#Y}XtL5fO^XT@~Z
zewIr+O(|aw->~4i6JG!LvQ-#!Ah<Z<z6)aF6dLG>zx{1F_Pk9T2a-U+#w=i~C{*eA
zieAjDLQvKD)zxPEQiXQC3UIn0VgU&TiATt)bn?YR7sS-ux>jdB(FIm;A5hS)7$+wr
zhrF_^fvO!?5c!ju)vmgO4J`gqJ2q*txVrMJ<||}s^;Sqj_H%u|sdkyj)6OZP&LCFd
z>WZTYfS__?s})5YSq7SRoN2~+;l6<qFwI)*Vvfl<6s#L)Wrq5m1GWC>TD)tZsoJd_
z;nHYbFxHu_<;`YRV8psW4<M!;MX^q9eI4R6Uy*3RcpwcfQX>}5Oc;dNTS#?SgOoIx
zHdVH)e$IYtRcS!2Jj06yjkK-`vMS0#hGV8xU(}dZ6|;t*rwu_;3t1KZwpt*5%{N)7
z`iU=gI11EDX$>MuGl*)b4e0^J>c==*`;!Uj1goYdck3r<vXC)<LqrN=m0C%xtg-s$
z)AW;iU;V1RAH=DzbLq+0)(`Ehepqa^Lc5g|QJdS!DJl{U!dn{a&V1{;H88do#Z=uZ
zTXW8(iof}U9e3G<@R6OINm{3z5)B#V<puunNLq4syim%d_jYK8*@Ck(*YYOyD~=(D
z)ab0x0_p@^-vmp((ev9!bp+VQ0LM6$6C|Zx%cG>!XGm*(>Z9u5s1hgS-u0yqHt!HV
zsL1v}-SM;%Q(AnlU9Wc+h<K)*+kUjGj;OAR3?Hpzy5>ND#L?<XZ*5(-XcQZyFvxTj
zgI}#AT$1JkX6($YL)`;S@~J(L@bNuoQqW<wA~e=D^g&M4HC^RuqGC`YHi%8SEm**F
zok*o*OR{>r)tkv_XZo%XB<8w7vBE&xqi7S+1>1rd5o@mqiP>5^V~i-U;Jn@-OJ55X
zwi|mSkg8h;fXCc>AHyup-mDz&-sc6$`p??f&>1Nm6DPno;%Zls$y^RQtBgj`8}7rp
zX|f|)l@sbc@tiN?Yp^QM**DcuJEaUjfrB=s)U}F&)H%CHFywJBuf7k1re&7L@TR^h
zgGABF2k<9l&N6mE5bQlPUgnA&J$3_6j&`<EI%y_iG4-Uc?Nsj)D-iWlvs@sV>9YK`
z(t3;9$lZ#7nm~ko?z8l(sX)Xjb~0MQs5!Afp|%BLKnwuN#vEFc;!3m!WdKfBZuRgR
zu+P&Bm>V}?7oI>d8B++FC7WusimZd=>6U{^Y)ncm(3#AF`BzKHvc;<pt!t+6jAqZ1
z_88DG3lzc6#LzBz)~vQlat|ctzaX2~j;Zpo*{dH464wqPJ|OJ5Ab#TNN}@lz@^3b<
zlBVf8X$rHVYcg*^7_o)W&7{PLGy7SAZ6Hmt+KIkz?W&pojF`$IjOGNwGStvqzD?iG
z>;WespZ%x)KQ|by$_qe52TBy3sxRdO7?+q`6*&dRaCTyXbHzK&Ey(B?H6xrfE>t-j
zh>~#JH6e4(IWly-3a7`YD`M#pAZ9g9A2lt;ibqz^lLb&YW^eFdl_T;DX#zGtUpnH2
z6x-*?_%P0LU>a(9Tw+_fG)NsiH(zD%@tGZBX8nXM5i#cK6u61AQeG1IR$Vtymb5@D
zOjG?hZLAMW;(U2?jtF1N9+5(fpDNKdf!mUu9*1-y1#iziT{63@XvB`>@GNn@@x+N?
z{Yh3;pgW-%%E}M&O2pl`3jzn;UkU6I4XL(vB*s0_{vsqRaOa(RvP5d3M+SWi37f<*
zLa2S9r+#n0WZD<0MDBV&ZTzxn9j2&P-}Wh#jwCu&mUGYEi&UGh)8Rb!(55GJy&@o~
z+z-oT{H|P9Q_n3{M$|156e+T|=g{f=yS^mrlARwBL>4LSXQcU%Y?<Qz0kg*EhpGzw
zus$T)8`7a}UwJCOm?jtD>{DySpoI~}$UyIN4@|yn3-lf(&Z~L%jJgx}2Ff2b6~X3i
zkPl~y*duHES3CiQRvPg{<ZyUSEVS|hTdPE~EMwQkqbgF>uMlhR3B@%koSu)zuv1bR
z+d_%WvazXS#8#}cuK|?dM_;Iw8^|4qi!8Z-R<6~2fJ>zS(K&Y29AQ`U8mZrF%xyCg
zTzpz+jscbMwv9w^RT^LPL3E#qCgRV?>w*fH2n$$Yti#h9Rz<Ppx;wMEh{d73qtkp!
z<+>4`8fJ^S+TR2#ULiw+uP}pZ?D&)?b$s#q>x)k|{=d<i@ADK;%tGyZVT{$>U&^%a
zoc1xGxz<H+Pr|_j;tj;ed_oYHlfL%ZOP!LyiCuQu!ivVi-u8`0o;x95$p&I0dEU$8
zv4$8J#nj^HDg%agi{J84^<*=RBkT5)=yEeYF1FkoLYyR<ZyJjk;ul6cUz8O|HV7FL
zYB)vacmkp<iDL4}__Xx&+fMkou2%cJ!O}Ub(-=;Wjd6%n>|gAGAWf<(8tFZ8;ytnE
z2kNMhs2>D`NG|<EXossvv~2Haw3nZhKTcz<TAM+un~$Wqya`c?qK}D04f#l84ZmI2
zTJ1)axhLD%mL$sSjhZQ6a^fqys(^I#pi_&>7AC_!?XVWP7xsF*HOs~`g*mCBzVl~|
zOe{vDB38i$tWs~`j6xM***$~3?%Rk@PR(j4yBe9<EiLCFfjuZ>adpmavb?Bz2&D}x
zdFU>fJOfohlrR^%RODAz_HN$AJbxzO%LGUB#z@+v2+RAMSD={M0P%%ZSCPv&<0q1&
zc58ht`zfr%bI4K`lQNWclQp(!o@PdWA3QXsXvD$_$%So#?%B5ypK?>Mmu5$^U(ZLk
zNJKYNoH!QHy)SVUkC+g1vD*&(ZSTf>%bLT&3`}C#4KqvVzpR5B(-BMX-eRS<Ou3j#
zJ#X@eKUEknMlBvR{sM2I2c2o8Odz9U#0u>p6<VcGlC9`{jQuwvBk}N>HOJhOSvHJc
zvMVqb-O0Tm0s1DR^k_2I*S1nU=H%nh)(KW&0*-gTwAfLRSz#lGd!jwMNQAmjg2ufX
z+Kd8b355e=svs@wwo02q*ep$qO?#CJk<6K-OjxzlgHZ%q9J(iOwPK$?kToBKrfZ!p
zvY_W`wIr)@3&L-ZUO_dsVArfuIp??^GhfQ9RtPNhg2DSr${<zihB%Kkb`>~lzT)>A
zmcLc2vc;<(6*ov}wLy^Lqu<m$H@X{Mt=Qjdoy9b#U!l^~PodW~9}{D(%I}ttQ*pJ<
z1*NZkcD2p7J_*vQ)bMYuBphaR(!GhTpxwL`gq`PWff?fXHW8XVImr5Y452D`KkL+L
zS$tu0Z3J*PI-)n5xqgIV(p(#_0JeUZF;NdIuBVkKrBfJ$^|_GZJt1f-_n=m&dBY0j
zhEz4MT5aoOfgr)@*Oxk0KVoaG%Bgp-0s=WvwUR6t1Uul$5RWGpKU5cqEW<=o=dc;J
zs3SzeVn~<!ybwkysndKy_#}O;80d?@=PNZK0`VhAWSdq3gF@~PZq!eNserFm7Dtpr
zdW+RPaM#)vc2$irZ5&G?seVLE5di{Ergd`eL`A_v%Cu6`q?4dVF&bJ`SOn>gV?ZSg
zd0B2beliSk4S98s&V?lEQ9!>U8Il0?do6R4n{O#AHOG<9yDS+egx*bu5I}>J(;Orl
zeUMJM9ck6m^@R-qLn`7AK^L8T2xD=Oh;{X23(QIMQKr?(mezb^YIo?^GmEC5<l3WO
zkGPx{6)IyitqK4SQlw;%(g7j7ghg3u2`do^E8#Y+<|so@cQ;lEIx{zf>$FT}xj5Ft
zV6J-lMab>Ay7-mfV=z-SAyYX#`zypW7?WxQo*h)yu9fP#p)AEt%e0c?>6@d|4;T8S
z+ZXm7zLZ_9Xb>XkGD1V1ssiv#w<=$zUpjMaG4^=DK5ljX{}Lp6b}mZE3zr~PN&>YH
zg)lUSTzgh22hKznj$r$+O6As_RE0u9L}Pfi(E7yzZ;dJ<!bL}cdFdl9kfH^0gB;rM
zmyBygj#z<b@BT7Egc;UWg_FuKWju;Sjx-blp35y0F_-IU&N7I#LP3rVK@$m9njuPg
zCT^rCR?fYbH6viT(J@T(6=q<`5yLDj(muqYCEH!QC!ZmOF(WVMx=JX*rg$}swKP|f
z$ZI$Lw~$J0@+=3z^vli5tTt$^3SCYsI&-z+P|ga7l+j%B-F<^=*6HAh1pQz`^hR1<
zS_p@>`M40X0(%--SlC(vY)q+I4bfWxi(~cM6r^c~7N#HbV69Use`~drt?Giw&l)K@
zo4v5~9_!?VFRWnQjP!{k@mA)n5SVyp)d1x^#D15{goi6l6y7TRJ<gCuR*^+%-^oZ~
zp%Ud@J?Xh@jn5h7baH<XKsZexYP2euR(7;BV&7=C=+|yUT=9Bc$<1a(UxkfPouZg=
z4~V+d*(5Yd_Zg4ewkIhS;*40Z_i=VJ#tUOjtOwCE=@H>r=)Au~g;)bKFi09;6>J!C
z3wqOQaes6nnwpoZ9aoZZt7{)q!p1>;oI3&1w^C3PsF%p(c3n}TV9|hd!|E!MN8Q)1
z7Z8nR)Tv+vQIMmX1N+F<v@5RNHIp1w$<!6^kNBYui)IBeqsL6rjzNif29&R#u7$H^
z4^=gjH??x%Yc!#IvbF_FP>DXSt{lo(g`vJ>II_JlX^`;ZY@Zn}Wx910K^<QSxKwIy
zDpqm?R5Gltf*Oyml^)Ej$c#NP3w9S{UpWU#Y@n&C)78_bmGj}pl?mOtMy#t{cJQ?O
z)ZhDzUpS#RG)jZ(DmYmDQZ$YeyAnL0@`nSJIa;lVRkIFQ)PDmVSdjSgTy+t7_chQK
zUoZMNd^4bD##`4O_XN@14=6!AP<8Y(fg4<or*=8s3lzVbc7)^ulC@jVJbrCkA_tEJ
zGmf?eCsU>!E%AU70nMtIX4`9ZE8AXW9JhA!=XPqB0A348e5|h3kIdSbFOROMX<J?8
zz0-~so%@e8?8azigXRje*09T*aKY2nuJqsRmG0b*i4+(?8>gXk%uk4qi6qpOD_WMS
z9NGAaEW8eSvOz)tkqAO^;qq1l`zDU%cnb6M#S>1+$Xp=;1gB^NXB%=1Z6r;=kwX>p
zCcIvYsf5>OC~o=muVMn@(wAIwZo&i!@qtPS3^X?F3Obl?YbU)oA6>&y?r62^S=)5o
zY8qsbsxDYvx#mNe*)Nl0U?x;aGF=Ji`LJC6>zb7v$DZ4|%HU4B9+<BwazPg)8nYI{
zqa5~iXAXVqS`2QrGjEjX(_8{p3zBZ%AU4Z_wrp7K`ui>mBpFsTg*03X=0Oav)@q5g
z!p)<@r)znFHs<#@D5y-{f*9@F3Fkx2_VakR1y9;EkXz#dbR{AecM+|n7=oBAvo_Xp
zb*^(v-W07&Zqe#>IWz=<M}>XRWE~vAAFZ-*@~x+%O83Disy@=z69l2XlpaYxkC!MN
zwp$fD41ZL&t@U*v2u;fpBimjp_X-D<r#11AC(`cL>9K{`Uqj=}v{l^%W6iA!1anh)
zkdjifN0ID&ZxFe-w$0os-<RwancR3ZD`lDc96LPc5SgYtvbv@<X0-mq&v>kXY~2M?
zFQZgguDH0as5HXX${RG=1%&z*zX4fyLN<YYbZDmFCR6=ESvc+8|85KR>4`+-ESNP*
zme#J6S&A`-iuo{5FZ&iG2ecqDh^5_-E>~fJldG*Omw5IXBaU(h_2JG&lcI2PYgRll
zd!-i3g4UJ!w5FgbvC}{~F4MK*m91;<{5Fs`u-Y-k7Ssc{1?31#S33Q%V8;DACO0<5
zf?3_u){cpw>z3Nkbqh#lD0*>7GP4ba=7<cYSFa{5tIQ}(R;;FXi!?*hP*#7QQTB#a
z^$Uc&?9omiddF!t%LJ_Ug>LVX@I<-N{CaD|aVXqPPQk*;;rI1_xhIPphlmf+9|RD2
zuEZqYkyCgI62Gi03$?GHW>eY=TQCgslO)A7nK%`43qlC?W54Rz+}1d1J>4Oyq**v7
z`SeQKyPvXD&RAX_#?G2|hY@sY-C_|BZt839LL&tQkZ`YKV{Li&KKCbkA$UnRVC^ae
z#ujFT+r@|`G~5BM7;p2vKKi9j@^Z}C35X@HP&w-{$Nh;}HUggWR0-1OG({=!YJ_Ij
z1ZZ3!UnelPmR)63x5Zn*UKYfkE`~6%-pVET9V<066(KU3V>wo7GN&p(T>WmRPqdY{
zDcUO&l)Pgg=e?F@<+vxrMe6b!Q<_yDI)c);vK(EDoY5$e#|{a!wP!Du)}F`Qdvy+-
z&S!$yE8NZVC5z+^8PN2OcI<(XF+5OdhM`3kboOX!yu8UICPl%h7!*=DOokEXC9CCm
z)X&8|k)JH?x!}U{^sO3O<8Pb5M@B_|woX?P{=L$aMu|fDn;GMDm|A%j|JeW@8K7ko
zRpJ(sP2egal#(A3^kOPmBcC~nPG}|g-hKS$x8JY7GVQ1SlJ+}nu>DDG&idh4i@}Zl
zfA^=hrJetO{!`nfO8VzAwjU-Jy8ZkFpFfm*fBr`w5S)LB*XPea{^T{@6Mc4C>6yCy
zIOk8WAA9_p_ujRwKc&u=d)_(%|H-Xye_DP1cKY8?B;E9nf8zWv{`rSr{pN=+fA~1R
z|BL<n-*5i&m*4;Q`Dy)i_Wtvezoq`;pIra+r!Ri>63K0UwEffHz4@;%{I&K!`|1z>
z@a6w`=*M4Ve=|nF_9x_@JNeg!`}xn;whi{+4}WsxCnvT2*?FZ5>x4EY`?vp;`xnma
zci+GJ!qNWnTYotCGu+vL>y}QJ=hOuLPp1B}Z@&5Vhwoqhwm%~O<CgyV%in$6fdBmQ
zx4-}L-}~q28|lZtY#&){H}l0WzWwHhkKdTF6L^4s{pEMC7ZP)zpPW<B+QH9$_VUGl
z{QYk&^`#yB`sK0WUwr#d`tIMX|9i+!Mq(QMbf|Xt{d2}2cm9hnfB5pNZ-4h`-+%t@
z<KMp{X!q|HzYX^&Bx2;jw|`AAzrdmW%aB9!{d;*rJ%0EUq8{Hs6`8zhRmI^esI1Xz
zh+2LH6{UO)F)JR>58r+H`>#HJ_pamp55IJ{fBgNoUw{0Qmp}gfZ~tT+@fW}T_FL!M
n@y&gG@tfcOuaBLD!~On;FTeX?PDcvycz*XsfAklB^_Tw}g{fF;

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/Assets.xcassets/Images/GeneralIcon.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/GeneralIcon.imageset/Contents.json
new file mode 100644
index 0000000000..e12d3b5fd5
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/GeneralIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/GeneralIcon.imageset/Icon 16.pdf b/DuckDuckGo/Assets.xcassets/Images/GeneralIcon.imageset/Icon 16.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..9ab1864ed29b529ac0d88dc26866086ab3263f2e
GIT binary patch
literal 7715
zcma*sL602CaRuOe|BAjWAQ@0IGpj1I3J?TXyOv?thS!vDf)3Q|XhmZ<V{<4&*01;X
zvW8qPR|n5ww;7$46&dm3#mnfgzWwGmzo@ryxzua9KK<c8FW2iYe|i1YuP*nG-{qf|
z_PPDlzuZ55|KU&9h4FP(J%4zA|K{E0)i?M5^Y-rk^*{dl`t@%=|JU8~<-afWR_5Qe
zeEjf>PoF;fZmfG*hecaCj`g_Sy}Oj#-bbItFF!orJzmz^zAb&}*Sg+%J+^hfzPl{9
zag?%7W9@s{>-B-L9eu6!T9@0g?c2Itms_bvJ4Q^a|JTA)+px{Gw%bwGt?$=6k1n<L
z?TE3|K5C!)m9drXCH1z~vM<NAai)*#S8v-skJ4^^8^>b5dRw+yTDPBQ_uiL%uH(Vj
z?N@JYIXoR>ulv}9{Wj`0I+s1Xv~`-cy6&T0tH3N<v-6!8mAw@~IBdMw&vxQl>n=Eq
zt@F7g_S;d{dfjjR=zBe8pvO`=%UasP66adqocB5sfL7Pjw{;n1XWNc#i$^!^92^?A
zwlBRq;H`~C@UHzPlC5mhv8}C5PWo-_BDdKq&enD`Hiz5y{Te99ZQHM#u&u}F9ILHK
z97{Rs!sncF8*3Zeb-k4~5}#}~_GRbna@(wu7?G;2&*Zjklp<0BHO78ev-GX^Vy|`^
zZR@S&x%F7s9@vhhN>SE1heHCxwk~z?p&aYF_k0z1MpAu<!-<a87I<X?x@FB?fzi_2
z;^pfYJoMyhO<Nu9;Hpr7VHtIuY2Nr6WUOMhuaIB(a15AwxNNrI_6$lgT15^rw=IPN
z)4Rj=oA;J!8S7R`64{-5uX}vh%96TzxQts}Wj;Y!_qy6^+}3UH`!+302i|cTqgGh(
z99)mYewXD|k6=h(4jFx5ldQGJi>2<)25B-X)+|*8L+JtjwTPfKy=)Q+V1YF_<ls_w
z$SCxK4-h*rI%qQuOe_3CFh`tVJ&Q=`99v>N6#E2hz0E4#8IQgwqH{kLy*Z#%^aG@4
zU9Ce^&MY<|jA>tcSMJNLx1)F$|A1rJOABDQImCv4=%cR(v<5|W0TU+h^-vyOg+)~5
zbU*M1j8=fLhy7OM()v<>xmC~3{m@lYzcG%w_!I_PrL`rSYO3YD_JaaY?7%+;ll{1&
z$hR(2f^gJN{*`?e<N^_RChMejR;_wpu*`h4uA;od>W-Ms{SHxq85ynopYe;+i+W+)
zTdQH5Rq@wFI1W`Hm(vu8!Rv8T$>SstPA_H2*TK5lnDi!EG8|HtSKM(PPv%Nui4rXY
zV9|$lbTIQJh$Z!!@0IWgffZxzsWMi0bLzPkgTOf30xWfYQZ4H-VN=C8kcOLm*67@`
z?R5icRwx|Ha_;F!C3wLN`1+XitNur9;T{xXCv@bYym7s?HeiFF$4%rL3ShKMUTt}J
z=0LA8?qK2*zD+D`ZJk^L$_}S%KTVJk5AM{fV8BtF;lLqbDdGijs=*kKT_}SD8!FXl
z>VZ>-V#RZsoB|Pq6Iu&#Pp50zmi@L{l5nQ8cV}OL63Mmf$7RlY_-}ODyUU-#3=IUk
zN08Hyw|9v`k<}4w<BfDv6b}?2h=C3<4~RC!ExKYM;ZmRQ75zztYGm*#%o@&$%_o)?
z8`!}a20kcRbm%1ECv8FighaF3YHA#QD>ljwVui<94qSvs)lyv={>gJIUzEMlRHR$+
zC2^pcTCUy!gnwV2Fz5c`-(4Or|Nj4%Hn3SnnZ54N#}Grb4J_%+i15n~r?$a==@gQn
z3yGH40$ZIBV#J*lUBKjaCMzw4P&k-sB?Tr4ba9Z}G#4C<e}Z@IJe>HzSQoI8qL!8(
zL6P=#G@zU-i{7(^_7tctl>$RE+7HtvSz#KACGNdwrLECEG0H$y+-a><FVpJgN^)UV
zFUlZM=8heaI*EEdiqmD?){ecW9pLQkEaw)f7o6x3k!Ikj)94zwHCn(iiZ*(Pf)dTM
zMKG`@tRWA@qs!1e968WiB$~~f8)1sjuD1=%XF81S5oN$h<-HsNC8zhR)MGMYBG%VQ
zu-@o99Z1nMuU5DahEeAJhawJLFNsX{M^ec|sJ;sqV8q7j0vW^-N=4F61RcOkD#1zW
z2z}9J!K;9+T26vNPi&5oQr$&k?$tG5-3n(@x~c6O_DnBR7^P@-@fE)>EtZ5Ue1lMM
z!UWJLk)!s~-AdC(vJO?Lx7d`P{n#KEo`Jy*8)kt<zRm(_kx_xpj&rAywgnx@MVlV<
zSM~~`ZIzxb&ynL3m75rsI0=;!mJ-;#D+gI*VIIwq&@MnWI7)Ba@TE`$NsHF304BYy
zQyoX4j@5xNh{h<pR;d!IQOFVF3~+Bjp1p7?d`h8?<WAt#lX{6<%AHN`ogG7}o!hhg
z-@PE3_*f+@A%?ph5r#u1WqXeHamHvW-8KZnCMDcStH6%4^M`#1{b_^xDn3eq3W6W1
zD&j2wCq&XUL7pD;l{Jt%dxsjD*P9smC2BTfY=>H%fH*+bx1L$uypjO;sVa<V(akkX
zCm3)PY%t0b=9D~*56_<aEgF<`1HjtpmeaU#&?&<%cAf=2m@u?NO3f+0s1o^N%AEr0
zyaZJsaKK*iHWe`|gXYraCsZAii+M>T8_wx@yvUt!@IiF3c)D*TI76KnDq;!!YbjFa
zC18kX<{gAq7Ru~rn^B-L@Sr;raO=i&MwyD`*&+cYuIR7H`$t9AY_!R|>kj`<{|EtC
zVsvA~tS?5jA+Rulc0+YjrZw4&$i_AE9H?U%p`T3}CQW5sAxn40y|?JP=`^>5JruVn
z(p-w-wv5t+IwTz-@j0AW1~NLa8(9d|GI~_B*l<?96&o=Gq+A<-z<Z|FXH7^FlW=|L
zI*vQP`$}vs+<W+)lN|+3`X|j?e$J%o{x~2jfjT!SZmMK2ifs10TI<t!pJ6Pj-}gLC
zUQwJhMUH@nPAbxDsL1PMBMi<v4{Pc3Zpgao_sVj<iH2FQ4gdOB({!d4Z<++es=QzN
zQ{BVJi4Kw|YFBg)Z7y$02h~r)x&$v6M?9ik5uIU@1XO`48Nn*|34&zpHOH|Iw9z1y
z6H&w)S%FjDgbnCzU37-EBe-1sbQ<jB(wJDAFu+DQi1wQt7iM1ErGRO3zu4!xdCv|K
zIbsSjAJx~eQRE-FxWZNTGf0?|0(VEy&0vH(D@~D?=r}|Z;4!-8L^f$T6u=n<G?7t?
z`})*Ra}^{Zpva7$$d(6!$vtdw5kFOHam!e#8N%C6YQ$>{RtR@ILVu^}F}aW<Xr&wZ
z9gRY!VL+`hRL{R98U^X^1mVf`XbZi?h_>vbPP<Q0@zkhRqEFDEi{sB#mA;X?&^=gA
z)gTNaJ^OUpIQ?X0jP7{zdaT7nnZ#sH6HTjlh|SZq5h3<d&92%(5>EkOBGKe!<Tf>(
z0Tt(^L<|ISOL47N%+8T|<Y7V`1&t+VpO1JE?lTM-70oKj)Ik@RYc=+X7TDK+Lc36$
zD}n<=n%HVeLiowO=7nyNxzm_v3~GIny0xUp`P3i>&hO)q=vgV=Bt$-uVOu;(r_<SI
zpD-;kXGvYVNgD&qOAy5E1dFD@x>E>2s|dnYa%d+SDK|l7LQI{qFdY^g`I!rev4HX@
z-i~wvQr52Ugj4?u#yw8alW=%dE2ZC4^AJpGh$ew&HZ(yx1CvuQx?dl>v0rLFLV(ee
zMvyar?gu?otZL^RA*)=Nf+HO?Bc|C>OifTaqc<R=(?9iO*b~I%rar-tai%aRyUn$6
z;u3Rbu;n-y=~TG6tr&UKbT|2TkDLA(8#by;FpYTvF4RSO5-g<KVl-$!m1Y;^qR7W&
zoSA5*3~r*liuRoSM4iZU%?iChp8b&NifJ?If)cGdCXLLElnDg^#t9s)JF^}+#%6##
z_tWMUtOAsoW=;s0glU6BNHCQ;)B~s%QO<ZEBfacrKtxMxRT=(noU$LC;~2J94^i^7
z_3<5u%bX!l^huvKAye|>SV4<aVevVo)Sxo1oUA!8yVtAQ*^9L0XvEW^6f+C6JVU*#
z>5<~01(%)(Vf(B9dDF;bjdhO~#5-A_bWzkCX(f0ti>VF*Dk2{LM*@Wzfr@TtqkyD=
zUm|ZXN~u#<cwNYpPv})qOd08onrg&v)EMzRrsj|fH}t8brJXRCdkI7eOYU?7V~9Y(
zRU#i?-Ppi~l8T9ig4K%oHDQp_OwQfZCa)+nSCp(XiW=%MZLkX&i{WYNUnzPu;G%r$
z!of17)vzK?^oATPvCk|z<H<SMs+39Qh`BjVt!&7QqgX%z3CM!i<w^t<f=|b#n}vly
z2FTcoW3nB3c33wYM{B@B<wWF8DijB$j?;`nb@qo$&eBw}4(sPETEXYaSdfbc;%X8Y
zlLnur!;%q~_kiZsO^fGlX&`wOJ!Hn=B-t*Lh7fqF2sP!lqDSb&F=2oVaC}ELo`vOb
zio<@HK$T>}y3B7Ue@r4ZK8;bQcZU-DJdtJ{EVve=b_H_D<(4UL$Z7vZw@nkyY+em!
zUgsRzp&qPLiqO17sJwHOLw*F-ic4$3-`41YhJfy{kqzf82_@%tO)r~-@k#wamglBa
z$n{pNQHbiyl?z^T)C_*ybfdG)`EvUbSPF^~NS@W52Q6}8!4|}Bh&3F6(N&UgNR8_;
zxe5YCPT{=Fm$6k|^yLXNt-+=Qsw(!iO9Mb;k|Ls+t&v^|PuZ9vaV=Mq5Dr~EXGPwa
z@|0Xt7AzQkp&BxDkbLWrc3jeMlNUJ4q-%Zxk&ILG3(RoU^Qb2rB5fA^2qY!!2{k%&
zv1pcgYuTfGaW{)IHB;gckvUCnubCJ+>)9?)Z)DhVP=~pDe|gN$MpgMe@8!q3kH75Y
zN4)bFzku)44}LKJ!w-S4{{Hdt>BIB&cfa?;puboD@xT9de|`1soA2*m4F7un-P<?6
ze)`MxcWUL!-}$0y&Y%8%`1En7*Z0p)e|~>=|9s6)kFQ_0`}*ne!~LT-BA8FcZ{NIU
zyKXP0&wibZ>C>;4um1V%cU-;Z1h20j-}Cj;pFLZD;{P+tXFKUCpY4<bK7V@Q4+sDH
z&4)J+Pv8Ie(Z9UE|Kp`x$K^b0{(E&hlqBYtzp!5Zu8*HgVV577P|r_I;ocvw$`4jw
zm@<9(X!`K}&D)3j_ZL6ozWS$cgyUz=Pw(!3e*M|o?|yy;<<;w_rw`X0ct-uzZ{Pm)
ap7-<T+&Aw(%;OkRE|;&q`iFn}&Hn*fh5GXV

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/Assets.xcassets/Images/HomePage/Contents.json b/DuckDuckGo/Assets.xcassets/Images/HomePage/Contents.json
new file mode 100644
index 0000000000..73c00596a7
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/HomePage/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/HomePage/Rocket.imageset/rocket.pdf b/DuckDuckGo/Assets.xcassets/Images/HomePage/Rocket.imageset/rocket.pdf
deleted file mode 100644
index bbdd30402d4345c96e4ed6e5361c7aa55cee9f06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6315
zcmbuETW=i45ryC9SImn5JAj9MzW|1TSc-!n38K(>GxEStYncJbO-MR${Oj|bn%UuU
zcPV7;eUL^q)75o3Rdu@c=KZ^GzVK5W20yxS`;UJP<M`#5<5yn|oBI#?=MeVg7k}E^
ze|-93j0i9F)#KB{=IU;^c(?h_&GqK;_g{~1zuo`W_2cmG!B5V9quV`vu|Dm+3o-cG
z_=vx1jpOy*;HF+ns@OKwlwH?b?|d(Qe7wFN!sKHuA&qJ3F~;mhEvcauU&lDr61#WW
zHRaA%e(Ei^WRlsS#g3lFYpmpLk7@qCMQ0k4b6LBGmP4HPNhyuCbLN}t6Gq$)KMdaw
z_rqV$@ZI~I%)6LsDYNgby4)m;JKw`>_Tqa8KFg+<e2Nj@!xUplP4V!hMxU`WmhM`_
z7aT~w$nu_g$w*3Uu4Qw*<kCyzWv^MT`ziF+2|S;toN`9uqw^)`p@)b>uA@4z&a;j8
zMRDmqq8CZ^-SbtPGAfC1m_n{TSJsi5?gAMJQ;I%RGuUNslGt0R85cq&X+ajWL<Cru
zrj$u@M|-c%d96#q)gpsS&fX-!l@#<%YOeQrzko4GFe(*WiWKOnBMC9dV>glf)`0tj
zn$QFLttjQ8pdya9lI4J2>B_}nsbszqhKj8&I>%aGl7XCXKQtdf73TQX027XthBowj
z_GBmJFtyOLg4<nfAt1>_FIxf*@_a3L{pLJ;c~DU5n5WXQbir4RHIN}fP>Haj;}dyt
zOKmkm26E(Fb){Kth1Ltp!&GZ)VCQzAgs57@8CMf7w^3D9SS`O?B>fd7nKA~Dc;8&;
zSRnM&noQPO73#r7CXE3*y~`0v23RHL!a7<)0Df9`XxT3)xHTZnyV^;HI!D4cqJ&4g
z$hbre_QQZUOahsA!=8C1cj8Gv^5n>zr4Wl}NS5Mbm-B=zf-!0qKvA=4YT$SQsf)hO
zGV(zuq=r(YdikmV9>A~{MvtY`=d}{BL_1DB1iGjau;#?a<Ukln-leV-LOXY^HIR!(
z3M5IWIg=q;hEFs;Yb>p_hRett-PM3fy^><uNKmO`t*f55NJ7VO*%mOo1-cHd1TQ;o
zPw2PwodxJTfxeDjIUiEVZBF1P5zVJ_`;1sBc$s6x`Np(R@*94bfxM=7Ak+7NPtB76
zsOCN6hekq!burLoG#V)Nj<aOfyTXi8rz;5=V<}MA3P}gVPB132G+=;DS4~W(y)Lub
zbvB+~i^nGceJUQu_TA!FDUH^xs_ZFOD@IxagB18Cmy$fK6e|5roh*l@uFFgMNz@1+
z_Z1o1!N0TqP4KAZQ*k_wwgu)zMgZ19-d>BNdWxrbl!FXX#1W7&QArSrDKsjRDOEH&
zHEp5`Gy#l`%mY<n$Y5TbM?<E{4q8yCp}HB)2l~&4vxY1*MtU{z8J{!vfz!|rAVCKY
zn*S6uqr%F~VIZSZ9gL~k7)dHY7|UEA7;1C~05f)l>P*v7H-Z<@70j{DkY$i}aIH~9
zuF<3B<s+5BB(f(4tEM$FCb=Ux#3W9!BXlh3iILq<LTxyD1JkTC-W6xYPGY56t80uH
zkpR_=$y8=mB>{p%m%+piAyGUSicDK1unI9SrTNhDv&-d`c*FJhvDe{);w_?@vol^9
z5`EclR5FxE!ySCn?7>4Js-@CCMKPHDeryw6xf|M|IIbf=RDs-LeneQ2rlALC)zf9i
zN{kpgR0)j)o&(wKumK0bl8DchS)K|!t_qhO8dV`462kWwrYK>ZXcu~80_~B_0yE0A
zb!ZA^D+ypnqX{EB#VJ?ltQzNqUPrG|t3UKy3`F}!*dmReOwt|=fwVOU9Yu!FHQ14e
zW1}@N%Nv>llvC+FLZBM?K2WXM8k*I97c?KIUL)oZA{sF-f#gwf47OuPVxfSiAavJL
zGv6Hiz|dV>f?3M5%s3#8grMRqT-wTjSVj7bJdaeu9GD2+DFlk7LR?83mYgmk_JJAj
zp5fyuShS04G1|0-=?~{T74-AzU;|(t<_SndTm8~*AjC5Zgii|z^c^KE8~dRPz>2Bq
z`A7yVblfO0dfca~JM(lt2b9K=RRUvScC_-m&KL{di_Ad_XsD18F_u|G^g^8b)Ur~X
z10p*2DWD|%OcHXyNLg)IC99=->liZ!+E>YH!n$tt&?0*d&weGapPa%vY0-ogJ9$Pj
z?lfl_hdMBzm)#Ce3bgR?EUEA<`q8>h)$Ay6n3t$EgIVlsmGF6BT!7hmoxOsg0$#et
zteqH;a&?!T1$&ak&b@U+ie%B*OsTZ*Nfrx^{Zm+vVIi-V<gVaZle<bzCFwYos{~tT
zFs<wMK(T6Hp|e`BN>)4f)}6rWvuK6Wy7DEQ&Z4=VwXwmRM?D3q^Zz-yX|9J%%TiC}
zN0k^g(6cBTZ<+gyDvqQa!i|M7*wn{}7iSRribGMLbBW<GyTsk}z*I7#%S$M~ea_KF
z<;W?V%Lr2$?f8CV#M$Nas{5ZTsFUu42u2haHxP-OI*nMza0a8M5djuM;!u{EVyY+)
z4dE;xR|!jG7%>s}8)77u4^z|`m?HsPMv|_<PB=KWK^1LX^IeA_Hm<Q#-o#I-v?G9n
z7VIK=7+PpmFmlG{x=4|N#3+>l4vJ7G+Xf*LHs*T9Di~vQ3^DUKYRm?A+eR)pFeJCc
zV9Zel0PD>8-K_*yE8<?<?dZnHLYC<TGm7@1qqrQUS1gRt2<dQYQ$2E|7b#_U87CoN
zIV?v;;-Kjo8ARM08K>fO$vpwnuW?Hy)9j@}fs9mH6GVYLF_pT#v28eSAYtRiU4qsf
z+VCq0IVW(Mq)LdJllgw&@L?w8+y{XTcvfn#v20bBA{PU?$KX<cTLpqiLsD^qELc6S
zUa}!h-1wl%-D5*sf$B4H`-KfbzoqK=1VG;wIiA^&U3xN)BQZW?L!e*ro2mEGA*hR&
z3>_+fGR|@^0d6wD1c!IKT<bIs(n@#Znu`Mv&T@9K%cC09tXO9^V=p4{%+PhOyj&XZ
zZkXW|%gr<KOY6lmn>=4gU;Os|e*5$|e)o4SsQF#|?Z5xpj2G{(K5iDlpEn<FuD;&>
zG=8U0&Ao1Y@UZe(^!&8bbh&xl{`hdcc^tW487~)gZ@2ePn|pS|`&Ib<>H*nE=uNbD
zOD@rRdw%i9n-7>e%7e>sx6j+{kF51a_CF%o(*z*)G|9oob;D=J-(Edk-EKd=T>8_)
z=KH~ob(nqCpCd;%=n~@PCurz5a)Mlby7Ja<6>-8i7LnP5ub2i0qT=>+Jw06A+-@EQ
z{yX8~5AO)aXOG*v&FAB1Hy=KqgK}}X-9C+S*rI;%?aj{{thfJGxO#XpcbGVFc=P6W
HfBEKr6W-}f

diff --git a/DuckDuckGo/Assets.xcassets/Images/ITR-Icon.imageset/ITR-Icon.pdf b/DuckDuckGo/Assets.xcassets/Images/ITR-Icon.imageset/ITR-Icon.pdf
index 1ff6a4f6db7f5eb49a1d732bf7d6ebef1fbc4c10..71e908133d48e1c57639464825a9722d736aefbe 100644
GIT binary patch
delta 143
zcmZ3ea9(bL_{6h*o0S;NStlzo>Tm96>tX~l^fvo(D6xP=mhr?hG8>s&Z06uAWb`vI
tHc>DD0fjs+Fl}ILY-WKWWNC;lWNL<?(ad=AasEI~GfQ(WRaIAiHvlNmAr=4t

delta 353
zcmX>vw@_h%c)h-BMTvWGNn%N=f{l%WzN-nCN={TT(6cZx00IR&J1zxGpzmr#v`S;#
zD$P(#)^|0;trVfs&TgWZKO0DKdhz7htOgsWaIgZoMnLZ7*{r)5fox-ll>X*sb|n@d
z-vp|3^A+xRMrLCJv(09_g^YeihGq&NPZ}uXae-+AV^ebrbRjbXLv$f?a}#tS3zNxT
Q`2smD4a~VzRbBnv02LET*Z=?k

diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Contents.json
index 0223097db0..0d830310d5 100644
--- a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Contents.json
@@ -1,12 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "Gift-96.pdf",
+      "filename" : "Gift-New-96x96.pdf",
       "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Gift-96.pdf b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Gift-96.pdf
deleted file mode 100644
index 41180d6d4063373a4e87e2a6ae4d3acaefac519f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9684
zcmeI2%WfUH5r+5u6umJp6F{xzwMk%LAY*$5K@!BVvm0cg9G~$x&?S*Hfs?1tS0uYg
z=?I9t$;!uo-Ts>_)}2*kzj*ulhcmNm(`4p#zWLkVr+NPFyZQXh=ldVu-(TDx>;FRe
z=WsEvi(Tb6zkJEali&Fp|Ll?W*(2SvN1Er1eECwiKVE+jaVPsg?mrx_Ki>Z`JHU4`
z>hAvbcyTqIzdru!)8Y8;$M5G?@5lcg?xufE=WopX@oqwoMK|kwww^xe%jB0W6dk%;
zo}!r#SJS!#CqGpD_~GtwJ%uIM6q23Y5@oWPuO`2^&3Na*QkLI*31$Ld0?VEmTYK=^
z++GQZGJFLQ0yfQusggD8To>9bwA>PSn<H2fQZmyDbvMUdK({|Aa+vJ06-D$>cJV9&
z4`JCLWWsD0Cmav!$vh*H4SZdKtuo$q?#+@!Fkz-iXqE^N<1Sc6o^|msYD5oBUzcEJ
z$3(Cc(RE>T?Sc(RdnL5mqY6eCKwuLwL@>0h>oviI2j!~@hRrU)8uwK&RH+iSR|%x)
zp%OsvqMN3#x)3%K-FTK>J&TKAU@*9|qk^>u6+&$73OI@%s+Ox@DKxcV3tdm<HNR25
z#7D#kSXQ}L4^#=&PgM_x?$4^POE7UWe7p)~{OCYUFm*F^yu&nLO|a@_R>Tm&(DG^g
z9Hw8UpQr2T&n1HG7euf{OErQ$3g_ur5u6sAZNivg@uGf-;8@rTMk36&2#$+&#F~uD
zV${$cwiR{AD<iLDcoGE_`N$w>Pso}$*M)+3NLVb=dk<Fhmk6U&12FGS?Uy3UIxBJ@
zi>y^Z#R#K_$FER|62eYY3&-%F>xqXL=D~yVB_6WM_<?(rCbUwQu;qu`1S6A4)NL!W
zO3rBdk_eXkQ!o(>qUzQv*nl*_h6q-{*2NLRM#K=o(6X*q1uHx#UsbRY!ODFVj9jJ?
z)>lcAPSZmr5JVo;S6#^047;&(kVI4xtCciYjeaVIB4VFh?W0&&9IjCmB7&*fu!XKC
zKGOU~`4S%yH^Z{Zy?UTZsD7$?I85r#s;^5hakH{fh+q&^2U5WXMC~(RO|a@_Nvtn|
zp=Di9{o!E*yDx}f%@{Tn?|)VRpQeznTkzK{`0EzDlH4?)w6^&2E!ax{YniN>trye!
zE;}uuNm2Zs6~AUNW!vt1Mya~j2--1Smpc5>D<v>&DD+O=Q3F7r4Yzx7pu-iBlCTX|
zOdn2PDFG?}TE(Hu=x}9Nhb!_hL564R*I>N5znJ{|{AkKhdP7}b^cxGMj_J$OS4v>e
zFXiEGv_`2~oMm*lBBe~O!xhs9rKE@wkj+`#sPNvF(c#Ll4p(H<uR5o`eZq0=wy$G0
z$|oBvm4Rr<=CrzumNuI`1s;gwrJtqubBq<{{A?n%&_-uN?P&Ajvq@B99knV)W>*g(
z(-J6TmdxBJwa5rMLlY>iqoDxsIT?dy6=V??&4|S^irTsfD#f16E7i8lTep%B8iofo
zmZf2l8aLZ{1X;{GDbYLFHAkt9|3q2=RjZ|T5jg^@bWn-{6cdr7gJ?T?M=jLWpvFl%
zH_A(gsH^B%<cHdHAU!oTVu+M81M0(WNwH~NWx$jjX!eoHIW#+}BGz@{ng>;Qtd{de
ziP+Tx%_mT3c66(1i?b)pXpM2H?j<fMP4y>2;0Z6g9D1bZIXDG&`OV~z_Ea3)CmdQ1
zH<HV?6s6Rhp3X-c942=M*Glkea;QrjJc#Ixmeq|0Zw+gbUZ7*13H;<d;|UP|)7jYB
z5JpU<f#onEar~ugJQe85few?(Ii^VD_Nf|cw!ETzRfIBISS!)DhXJnK<dTDd76u(0
z!hmhH28k|j=>g>DAA~`w1RsV$-rZNjz^O4c3_4WYtMEl5qXTg-gsNfCQLpwU9ksUu
zrtCnok5tZ~*-;g-trLk>)eo-SIO^EQXZH|jKH*KHBR_Rcr)pJsqx!E?9*ZZtB(99j
zw<IRvfgQ?ol2uZ5lUPoanrS7yw@1Z>B&9Fuly&lx;4r(NTqwUfrF)IOb1KWDsI+C5
zL4>$Jn7ATWk)@9%3%6G7YBI`3w*=m+X!i}!T0O9>j;L%tiJ&tB+9T5ukcQyQLtO8v
zNh-}gQhcJ)=@h#^^|d=j{UzP*N^?GUwDaC6c5Ga`qr*rPFI<ciX_t$|hef0`Iayh4
z*2yU}uG>vIXlEzaRjbQ(NLv2g`P3aGb2V_ZVXV7?nY+0!DeTEH8>g+x7-nshhMZYE
zz^<Gm4CP;UAd1z@DG(c*uH1u4jIy(%jwS)y<>AO&GP|Yh$+Z$DH7R&GfNc|7sRQ~*
zk~jMZ*_Z&U59EkaCnh<mYPM2{#KNXvET=<#94$v>fm8cNq(i!@RFeBRT&)q=A3Dpr
zYKNql>`vQpLar28B7R3vct>^l2dMH%t+{ieGWM0ai1;X$eXJl{q^YV)K47{wv-?Pu
zy;JPG_q97#O6lLU<5=}nb-Eq_`Yve7(W1Im8h%^xG(2g~&p86cn$vVgQPSv_!zPLm
zssRPrU7JgC{<PVUIHy;L(xbgZ=8h_rPH%Xtb2=u$c|u%S=u|qSM26B=Y3Rcf;}!bi
zmL=$>gxJn)e&sp>o$V?(eJK0j;*v?8R)RBs8f=QBE2Q<2!#pZ|1&IUW5=D$*KlM(I
z4kNb=E>e)m?O1kfMsmE6t<TPaar#WZJ!5lfFRpMvsNZN{Hcn309D>Y?$w#RIH>!OO
zR%rmF$mU6o5uL@Kfs_eey1c>VfU#9jkZ>D8S2m2~Ks~y(oNETVS-gsuIY%yRVBBUG
zsNR{&4M|vOipmw6UpW#c8&S;48YFHCUk}4bvc__E6kMPv7KT~VbLG|yCiy7_TCliZ
zDwe}_yHY*Zi3}DEkqjN$f}bT*VN0*V)s&%65*DcclQhgL-H;QS$|=Q=;n<jtGB1vk
zXpW^t8!p-+TC<&~;*mMO*pW6Z1|$L^f3T1gN2%uD(+6=RYEH{oDWoHQQMLdpr`T&A
zFjB#04R<ExEZSoOZYsT{mFK}*<dL3~muP&GmkiIjTn|-5nh6ui$$guLchGox=`sy%
zh4WT+HnA^WO`heobsS6YnMpRokYnZscZ6)<LQ6V?HuEsaTRfIl6`v&Al3F@sxUg}S
zVp0-ynJIT|NZ{Z@qMx2e?kt*2(o!3mL+VkLoG8sHQa!82M299qR1u-|Sg&J=tU;}L
zW0$FTQ8n0LP||%^9SQV*8<bLjkjGKa#0wMi$P98rND!w1q>f*>)Fs>oknkg@Fbb2m
zl}g-mKd?h2fSi(~Co)Y3F$umQ7hjDU2@M62DEg`jiLrP76clT7K|=h_XA0u3Tio!p
zvu$ZhjF7U@L1np9Qx)`875YB~7>*V_sdPRg4Q5*MaxuxRuM3_eCFsUIJqJ~Cl8`(J
zrC@7bu>;a28tDg^>`h!Ul7h#PC1gm1569AxIzwqVt|RTY^*Hdrkp!;|+;U@jGVaDT
z6USlY69q0+$^K`gYmRr}r9^^aF=J`@LPBSgd^{zZB!p6ule?LXFW^`td%`CKi^Dv?
zXh;m1S1_GDXpX|ilUU?RPXdL#g!8O3c7c@Ho$3c69h82t<k?frccaS(D(&l&{ZkeB
zDy4p+gVM8p!9oi<e7W=6>+75QyZNWT*6(x9|MKsD9Ov`57axxe_~Y@zr;G1zKF>d4
zy;jHQL)H_LO>2#v(!1l`&9AqI<J~OZ3cYLOUfo>ZAFo+aKBU>fw->iyGyYMa;d2{-
z`e#PJ|MUS?XOZCDysz`>=2zyL6aMc&21?}5fszP#rwj67QWN~u#r?(Q&BupRKi?jI
zp4NGrs`&EvjGK@}f!j|$eURULy+c%ikDyE<JAvdj_rXN!7J}y?<kvp&{`TV2<?(is
z@2-CL8g+bgcXM_8cK+tmhi|J=&fneK+|MF#QSkZuPyac>efd7=;`Y9XlYO+)ix+SH
H^uvDv9PwaX

diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Gift-New-96x96.pdf b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Gift-New-96x96.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..f4fd0b70d68b50e25d46f98792d6a7276bc3c733
GIT binary patch
literal 7383
zcmeHM%Z_8W5#8UfxSIj&0CUCn127E4GjR|kK_>0&j4V1DdE9}zm9*M{ldsPyiuV*-
z5;8sTCX3Oc!9FC5^=1|Ct9Ng|eQlRKO?Ec(;ctJR=J~6y=C8k=b`S66-^q>m<`27v
z4^KbN9^j3vIzBz_Ztthf+ugtJw!53(elx%MZv1b1oc=l4#kAjS*1>CzIOpm*={UK)
zpUmQFF}`ANb~RYAvp63yoR8awDLC$m>*#*+W~niFlV(TMaivX*2{D0!VqCVJu7LXi
zbU41m9A{gXoNRE=#d@;M>xj^HDi_#(@=Gi>I}xU<Mm2IdM+#f0qp$Z=+<pM#5^Qm~
z%p~HeR#H)DJLy<Q`zd(R;r2k;JWm-gva_8ORhxn)_q(*@YD%(mh>J7T20PdZXLk|R
zcA!b?DY~D2oPL-dra!;f#i+eA7YhY0C3Y;nI-4*EE{ABFi$#j2N5jSH$;HaRy4plt
zOtHbmu7L0fJ!f?>S1w!(%IoT(F#qQ+rUrfHV)@d=RMYBW14jL9Cq>mJqdOp_UBngj
z#ktH;pjKPT@kJa0ZjejxHeldg4Aq?ZLs$=yG}X@|HiRW7_XFcs!C|-h_REARBp5mR
zc>atO+)^3$6WLI3k1XD!RzV(ATO7A6-Sxm|A95DS4!TjQD|r&-aw0H1`6URYmecVW
zhU&*Bj(C7VB)pvzB*Xgwq+EK0O0T>qwjFZP%j}jZ(V5-;cT(amJ^QoWX!KuXHwFU9
z>E+D1!0R*-JB3@TPT+}Y9oS@$M^3q8^-o>~_oxqIbK030VhuNtceQ2(EpNcI#FUNk
zvqGe?ofK3e!-!P4MK>TEPNc&?np`OnLZpGfypT-tF&AiMgsXEYCdOiB1*vK47h6Mc
zMnjo2hD^fsdp%;nu29jlt{gucq3e{$Fk+VA7TwTd|5v>rxfcAN-N?Y`m#$4+es&`$
z=$RWax6r$<IFV;AI=e#Lnu4z7B2pZ05Ll<*po+G1)KN|kSNJt-+^v<&CrWcxrN2xX
z^nRV!dr6~xtSF?>4ugstQI-cI$T9+wNzXFYI_!~n92%?jWMb0wb#74C_tBunk;P9`
zS!DJlE2lcv%MYnEtUYv<&iT~WNRQHfnriPS7tjNx7^V2_vz}K*UTpFq#91LF0+G2;
zspv>&b&q1(=?ZbOpi~Gck>Oe(4GylXCp6Y-FY?S%p#WoJY6?I{5Z&DLTvk1v59Eo$
zFUdrMb|Ng*xm@imS75c)nW9)&oXtK5AjP=sWH~y}Xfg&dl~_G814!7KGdkzRq5^P@
zzzOk-_qo)h``l7eO&&Z>uuKHwa;t`f2ZA)ix8)6@6zO(_eTxU6rQq^S>w`u^e6+R}
z-M5{PfUM0X$;Jv_31(KvE~%E9<zb`mbkJFLJ~b|KbmCi-2oEbuEh!a|vdiu9;^PY1
zaq0_?8MPWGqIC^Qe4T4`?EgO1oL~rg!K2Q{&FPk40yvys7a8ReVNVGqXgUud+K443
zDbxlqBX<Ca0@V-=T1thgh$QNlU|827g}D@q&$E&PR*XD70b9>iOsu`KsHoUG2M_m|
zUn?rP%qQy`*3VIFU`RnSuJot~J($oh4zdXDK5iAb8&Z=f)`leo?~8|73>+s%Um6-r
zbu9v_@wthNm@C!7fGwp<D9G-Pp^`>O#xt~qjdLc78oAak#o@&ujOQTaaO)<xgmNSS
z3<GB;D^W^@ka3UTZ47~gC=)*O0)dT@JU|TXZN_t^VBC$Dq2R^2Bor!MI~zyndl0TE
z;Qh~ek30g3#2g-zLQe2pJM11bmllubOt{s)1-S{xI#?W+l7q<@BJvfq)`FY_`i164
zqrb2a*5`{Mv*QL|Z=uV9<W^o`&|ACfLJvmCXwqL~WIeplCV52;InR(>rZCyU3Gq2V
zFu6UEL2t!{FgaZPL`PBWn)H-sSZC*1L*^tS;3wIamnB9kbK|J9iP^RVd~ye9Qd~tr
zlkzG$aC}XQE^mMv=}M{wB&h~fAy2uYeL_v{&N;y*b{CeQ@*1gTiW*mYjCw?G-G0y1
z*gh0A6H`v!^lDZ@((88ih)K%s+z}(2q(2~?4WZS|MSg`AvF<&TZ<uOsA`aRYOEuH^
zA|^%Rxz+{-FInychRSHwK!DD;RsEXu)fi+$A!*M#zY5~{?b2*y9qZ0H2Xv`7b?A1D
zpSo!I2Gu_>tzV;1oAj?#DF?@oRCuD*k5`*tKRg_sj`R0_#m6lCHh=l|KX&ux-R*~6
z2mZKwe|P)M;ph2#q_3`c4l2@M%BYNHjQZqC>1KC4{Peip9cTGmcGJndIXpb=9&n<3
zD_g;Lw~xSP6w(bEzNiVrFKwIO-@ON`vq*3=ujjlu{Di&sg8w6sff7ovfszP#<bf*q
zo7<<`{o%v&tv^5Rewa{wOeYED?~J-1Wh&tQv#1y4H$M=<CG;Fh1qJ3gB<+LzxG@`)
zs%MZjy7B4p_HMs>obc&!^SifD#}~)L{qD>8i@Wz<o|Lk=IUJs55x6OM^WEKlcHq8!
Vg1mivYT{&@?DXo@Z~pY{e*s5?oA&?!

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/Assets.xcassets/Images/DownloadsPreferences.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/OtherPlatformsPreferences.imageset/Contents.json
similarity index 100%
rename from DuckDuckGo/Assets.xcassets/Images/DownloadsPreferences.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/OtherPlatformsPreferences.imageset/Contents.json
diff --git a/DuckDuckGo/Assets.xcassets/Images/DownloadsPreferences.imageset/DownloadsPreferences.pdf b/DuckDuckGo/Assets.xcassets/Images/OtherPlatformsPreferences.imageset/DownloadsPreferences.pdf
similarity index 100%
rename from DuckDuckGo/Assets.xcassets/Images/DownloadsPreferences.imageset/DownloadsPreferences.pdf
rename to DuckDuckGo/Assets.xcassets/Images/OtherPlatformsPreferences.imageset/DownloadsPreferences.pdf
diff --git a/DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Contents.json
index 7b9656ec27..ec1dea3aba 100644
--- a/DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Privacy (Color).pdf",
+      "filename" : "Privacy.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Privacy (Color).pdf b/DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Privacy (Color).pdf
deleted file mode 100644
index 5d44d31ebdea8ebefd11731ae29afc05d60054dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2879
zcmbVOO^@3)5WVwP@Dd;?5Slam27&<1Zc`L((XG>4(1Yt$HZFFp)^>_CzrJrMiIUer
zzjQF@CvwDj@6C`;ZmwTHCzF&SZFT?4uS)9|FZ9cos@vbnU&Tv&^<B5WJH6Kq;96!K
zPls;vpjOx2AG>Y0{`!@^db9kuJ*wXo8CxH1r@`|!YVY#&&YH-jkki`-WlbndAz`I2
zmP*7R4};@&kJn@1DPGjFhHOmH=^3<!$px0x)_KRs)i}#32||`j3VN%&q2$>W?TpPp
zoxWGWM2~1$d&9Qa;B+)$NG6yPJX4vGWU@tciPdHi8IKQ?j9@d!hEuSVHG(+e$eQp`
zAMhzawxn#GK+aO2h<G3(dkRI9H?dg91@VwXaoJ<BH_2x_l1_=BtU@VM6lf$#W(|<U
zyI}5Ky;twPP<!>`zm<$8D$XU#Hf0ZoU{6G#xJfLM%^bAdJj~!MnXrZI*rkPz(QuAF
zdC5t1WN=R<F$>akWCIOSq@|9qO+YlBb!-eY9UHRHv0+OcXK>W9;PWBo1n<l`R^hR`
zGad0U5+x@covprrV*xL8MDo_zRP`Q3`wVm2{~_6^J91#};OAOpG*uZ%kx6-YpDgS)
zNXEzw4yFJDxrAMbWXT8iLBPV+p+u75;8TF$3n;<f77lGow~D};_t|5jH}G$X5hQ>(
z&L}%8sEw{fUq?f+;VoX-JiHw-hKX|kZ-|LC1Da89CFdX^8yErl;1LmJ7Bk!dBLw0S
z5D-G8VoQKuxS%UA;w2L;dPr>)#9Vs;^794Vpt>){7~nosallHj=|;pAc2Nw0#AV%9
zu?f;U;v8Q}7j^I9+qR8ns&TJ1=%bVtbqf;5<R#dc`^*xGkEooJiOmKImDQ1T=~EZl
zN*_qZI|P7ty~&gj9+D?Rfw|NGXob;b5RiRJNDcEE6e5JIv&N-Df%Szw$acnap`1h>
z3`0n@Kv3u4er^>=FGhj{XV5J7l<`vS34<zx=87Gdl+he4S}IXwSQIXDD76IIZRQN+
zMCyq>IXFCQiLIeuMCq;5#0tW<geZ%6VyF6u6~>P?sO=5*Y~WJ2GjvK9Zb=@;kWe+T
zLO5!`#gabR_k~6xT{NY@&XPS@pIxZM`WPE#kuY9o$tfmt<m9M`PoU;9)_*@F(sW3)
zW8j}VPBZj4aP?T9WJ1XdoQsA24s5FzC9=TUaVK}3@gg(bdgOvL+=fuYxm|{E&disj
z)tCEye>&>7KjYGbXZ6#czjb<bv$^X=;QQ`&w|Uin)NiFj44ZBPiW4-Crbz4V*nc=|
zyQ7wC*?J6j)$dQ;9$%C@*#zEf4!|_pMTHhOH-XxXZuRZ%7F*Sl!CFt>x#~Y)EnV#Y
z2xJinEpHKNNb_oQ+T8bd<5Efb__<AdJaq4r)kzKM%dd_hz?Oi=2R5uDjT_zgIP6oN
z2C-vYWgbBR?3_b5k}e>eT+^)6VY9pM4hmP?)i>9m<LR+~=$`4PyW3|2DXVqgpR^=g
c30}R~ed@6Ldez+=PBk5lA*m-%zWU+yU(`%VS^xk5

diff --git a/DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Privacy.pdf b/DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Privacy.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fd394055bc907b1c5ab51dc8b733c6e71dcb86a5
GIT binary patch
literal 4997
zcmeI0OOGQ(636fLDe5v3AW_c9cS>j^=Bd?!nC<3(ggAISW~SM0d$2ud;M4CfqRM6W
zV+7n*+O0!(Iw~VFp8trfN3Wi}_)><_b<(?j`}&uz@4x!0Uwr@j`*pwg;k(zrtXBtU
zJd1DEo41E|y=UXaM0&Z~et3VzV86$A#xpWrB5$|c?B6eU>&@!-Tkjt~o<v=Kczv)#
zUu<_b6YXNX-+tJw)_Xl--udLo_GABJ?*?bjX(9PYI<0;}6rB6RZoRze7SGndU9Hv^
zFQ4>JFVBCi_T8_Y9NA~lU(T!fT|I3|<N2$b&JD@8D7a>bK|%>EO3SX)e!trA`mU<V
z5=2r|mic8WHTnug#FeZ<YHY<h7Cu&wv{mPa$|I?l!B;8O_i@O%hzq?Rqy|?@pN5)J
z3#ktSO4Quo%PeDSftOi$m-{lLAhGJA)lv~qhS+LOt``|<Xt@*^mFOL|iHEcLTKhcY
z5^AWuguzvpnjYCQYQXA;)?7xxRTqbvbMwYplgp){taB+Q(S6wA&?BgE5wS=U?+e~j
zGhGg@!5TQ<1wCx=!TAz<i5w9MLT2AdI(l*SfVZ!^ciqq3ru!E`Cfg@}pMrZ@%`ZO@
zW_1%v5nZ29i$x3i{6Eb9WnrEJIj6`2LB92_c;}_JVh&QqVwSOn9Ti66C5y6VMyVn9
z3Nl4^^f#Rn6X`h;y>rql$x|>#62hmXBB_;iJdgTntqH|?A}Wb;pQU-HHQGvaB>%`N
z*-BH1xy-~k?hBFnn)iKzHG&Zcwtc~uL{+yM#B&7rL7vy3h3>OgTN4Q9YSPlA)Fpbn
zK^?L!wMg|NAhUoJRHv$_1in$;kffI66idLPn0;j*tD<#H^-IQ~C=AI*${!qafT<!5
zXpsP<2&)XKwj9`pJny}t6d0i@8*2*<8#Ge6HY4TcfE8Fl&nzJumV}y0$p#!K+zhTb
z6_qp@*hRej5G8?duxiqf4Xi5;h}B9yg(5f|2ZtOo7J>#f0s?VRREQcHLqQLQ`vI9G
z2QO<8x&zyz#GKUOHP;#oM@Q!aS}WQLOPqz$H99cv8d?ToNrzFzR8b~GRd%98Rj;;^
ztph2asPb(PdQ4Q)RDNy90@=magkqB#<`w5!Ap<8}&GEjd4~`}&nv(+>Jp5>uN0ij$
z2~sWF6CuG&c9FamDDz_@QH-~>=oQcLjF0pd-ANbm9tVaY)LfF$LhwQ)q2(qOi{J+E
zeWhT=NXI7Zj2Kk|xiKb0O=bxxm2eO=%^W!3rqe`XW-=Ro))u1ug=0pZOp}C1$laWZ
znJ>kMQFE|9IMK=@w@Y*6tPlt~bGBsEmQY>ah;t$_tyCmbN>C#}<J3llt>{nR);uEN
z)o6T2W^l*@h_a$%(Vw+bnL79`1rN~BjkWVy@zG`@p)WX(Ms6e=-&|9Y)}`rOC9_7E
zJTPvEM}3?l)QQdlq!q@iUlX02VE|W4VpLEPF3^=Wa+)`xx9DYD>9lTfrP`qZbxo)x
zW`O3RMagC62#fqsfJ;CUd5#=Vj2svMGDCxsJhKOfQKA)1R2t=5kW1k3a+xNNl0YjC
zQ&26cogY$3#L`GY(kO|XBx_-%FH>49aW@&L`NFj0D;1xqoy@6ZJ3~@#R+-|eS8YkU
zOe$72PrZ<FQ4o+UYH^SS6cNs4IK%O(w4s@nt;I@<+bbkiE8BbV(?JA{G_2Fs%tG78
z+13z*I=NP2!iyHK3eEwqbzr8%ZVh2gI82j=w2SI}Nce#XPxCIOA|4{3O1TB>2T*u9
z4sFa^UdtCSa0Cp$5^TIq>fm<bNQsRzT1%1P%fg~ih1MEwQDroZe4`aw9LXn?uv+y^
zc#H}ZC{HBy3NUZ9;3AVOv=RhNHQAIUjxg?~_+%&2QXI(3PFji|BaHFX;7HTqa*8^M
zt=vq3ARZ@L*t1q6Fu`<8>R8-E;5;Tuj2a>N7<kMIfiB@sk;h}1QX}if&~q%#rW-0w
zjiJ|6yB|**H@~oXvs-W8Om`1fdcW%Q{xn{+K+dEajLfwE*Y01y`Tz3$OM9R`*7|H=
zBb(9Ai1W5v_b<g<d#Jh7`m~}y&O2ra*ALz(=GP~V(>3FPuxr@Hu#?Gi)R|b$qCVZX
z?Lz$nWuuWk-Fu&ZJiNR-EDvjY|6J_f<+scIzil;M+4bkG3-;+AetWfe*=x#8H~HJ|
z?)_SDh5!2c{k!F#i#}e{@5xZY^j%@L<Wu4vKOW6S*s(sCb<R9BeT!gB8a?!v?)M9P
z_IBSbaP6}#m%#_3qyon%#XKL)jr{EBuQ!|RVc-9#UlvX#y;{CqPlRvRZ?2Yq_Zx*u
zI(_cYv^aiadAi*k)*DV#4;+cF^i#^AZxiXvPf8js(C;|^yn2JGy;^Y5A2oiu{Q$4r
z(|-@;Op;JeXQI@?{e0rd@~6wg@_PIBHt)yX`sWUqmTs&!{o6D1GGs!Z9z8&xo-ZW!
z1RZB=bw*;qzC+Rp`!0!=eVY{N&38#U-QU@zQ}G>AV#2*cV$7dOhu!k(dcEt^z5jTI
zb3fZ}Z`PmppIyEAe01^RV!Oq^>OPCt;_~W`wfX|*?hnh|!Mqc5%iW_#&%b-|A76w6
ABme*a

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/Assets.xcassets/Images/PrivateSearchIcon.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/PrivateSearchIcon.imageset/Contents.json
new file mode 100644
index 0000000000..a17c70f1fe
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/PrivateSearchIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 10.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/PrivateSearchIcon.imageset/Icon 10.pdf b/DuckDuckGo/Assets.xcassets/Images/PrivateSearchIcon.imageset/Icon 10.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..73ae44c94e97ff7b24e0784b029aa1d4e59a5c62
GIT binary patch
literal 3482
zcmeHJOK%%D5We$Q@Dd;?5Q^^y5EzJ`DB2*d)kA=whxK}6E0wjbc3n96^_}5zNlJ22
z=UyIc>f7NwzL_EC)#d5=TfrP5f^ynle<hT@dq)?)e|zZY;?u|LuU$I=25a$ax49kf
zs06{Q1YK<V$A{`b{5^e(XQqQo(6?<i!$Y&}Htn~a??*>T)$;Lrj7HD<?R~<ox}ksE
zw%vdxvgGk`|3p7i&Ujp9BkT;7-5;O|P7dR?YwpS7wEKJ2c2^h2^kiB8Y6tQc5%ck^
z`fc7Fev`9wdrvs?voGH0z$MM{L%ShD&$4db+*hDtLTSz&6`;qO5LAgNAIP4xB+F+k
zZw^0Y1ub})7%O(N{4*{Vs3qk@L91Q%yI_^wJMx8W$Zs!YI1_7FaKcDOf#J;O;U+T7
zxD>+anK(zMBXFJr249rmB`KUK!;J|wVx-qjQHXV>Ni!k5lA0<O1Q$9`2x^jY%uET-
zNJ|{E&IO@sDX0cvRYZi6iu$O)T12>$!Gk@=gm=NCl+~VtpB4(jYbldBcx7gvCI!(?
z$)xhe*&>w_Y?$-G2RqZjA%x_4T?Wht&Lcs}a}9n%9yN#hMPBy!Y{?I%F*}1zq`k8-
zkDNiJ!va(Lo0vzzj91nuaM&5oVFQW8bQ$9VmCObOIf0O!QQQbXlI~n@8L1j2W7#PK
zq)S%{hSM->su_}ydF`wKcjg|2OJ<5DTg2NY1z0yqMoUwOtgm2|-2yr$gK-)Xp)hvK
z1(X29E~TKLL<a7Rqnc@Ju)d&Z4f6&hu>;`#QNZ?^OpbZs0Ce05ZfFguzzq~xeN+S^
zEuZvR<7JR^z5}D6(!%kuiwSMDMib@mVHVd=J`hXHeZ@5-H-k{L*p<+fkZ++J_gJ-i
zTxSHcYrT~LbCaZU=N4557OVaSB9)ce8PJea0T=rg3ly)x<XJ&W07YNHs_a7l{1op&
z(rs?ig9JN#bO}DH)9Wj&<0uee=*X8n%8>T|ALV$fqza3Va@yyn&l|jI@{cksKs7!y
zLQH)WbwQCQo$GS`Ijrcx!k?bMXVQ*oo6;_o%vm=X#ZfE`VR6d(1l^CBF2m5-(|EBQ
zo3V@E&qVyU{Ll=4#@#f>;m@6^s|;tmyTt{?l1t;=?ze+q3z+NPuOIH3|5iQEZU;IL
zNW*51<lodC9Zg|_vbjItfvfr>4XAJxO$@zg=vx41w*y%KwWmD{DbHjH6;4^wHk<Yt
z#3a4nZ2EDapK;tQAze1NT>?IIH>>7H2UpZoW?(FfdGJ2zH)FQ}i^#wXUgCT`(vYBv
zCxoU5(Ai&BH{dG82(IYt@k##(XT^d410a<qm`-X{7~zmDmdH<<v03-GyJw%a-4_B+
znjljX;a_SEJX;j-w9o)93LP4k2ogNSRYCCb??Ms=yaNcPhdn8Gco3e=eJPJ~0j_LO
zaeU!+Apvjk42|1nweGeA>HYZ>$bCKZ_uU)%dUf+=qIhxD_rNdG7xT4PuD*B31&}+8
S&326Jz;GkTt5;_q&;J1ev)Ri4

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/Contents.json
new file mode 100644
index 0000000000..e708cce2ed
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "QandA-128.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/QandA-128.svg b/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/QandA-128.svg
new file mode 100644
index 0000000000..4e2ca57aaf
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/QandA-128.svg
@@ -0,0 +1,9 @@
+<svg fill="none" viewBox="0 0 128 96" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#888" d="m105.629 38.2 1.542-.4a.875.875 0 0 0 .629-.629l.4-1.543A.84.84 0 0 1 109 35c.4 0 .743.286.8.628l.4 1.543a.875.875 0 0 0 .629.629l1.542.4c.4.114.629.457.629.8 0 .4-.286.743-.629.8l-1.542.4a.875.875 0 0 0-.629.628l-.4 1.543a.84.84 0 0 1-.8.629c-.4 0-.743-.286-.8-.629l-.4-1.543a.875.875 0 0 0-.629-.628l-1.542-.4A.842.842 0 0 1 105 39c0-.4.286-.743.629-.8Zm-89.686-6.4 2.314-.6c.429-.086.857-.514.943-.943l.6-2.314c.171-.6.686-.943 1.2-.943.6 0 1.114.428 1.2.943l.6 2.314c.086.429.514.857.943.943l2.314.6c.6.171.943.686.943 1.2 0 .6-.429 1.114-.943 1.2l-2.314.6c-.429.086-.857.514-.943.943l-.6 2.314c-.171.6-.686.943-1.2.943-.6 0-1.114-.429-1.2-.943l-.6-2.314c-.086-.429-.514-.857-.943-.943l-2.314-.6c-.6-.172-.943-.686-.943-1.2 0-.6.429-1.114.943-1.2ZM.629 53.2l1.542-.4a.876.876 0 0 0 .629-.629l.4-1.543A.841.841 0 0 1 4 50c.4 0 .743.286.8.628l.4 1.543a.876.876 0 0 0 .629.629l1.542.4c.4.114.629.457.629.8 0 .4-.286.743-.629.8l-1.542.4a.875.875 0 0 0-.629.628l-.4 1.543A.841.841 0 0 1 4 58c-.4 0-.743-.286-.8-.629l-.4-1.543a.875.875 0 0 0-.629-.628L.63 54.8A.841.841 0 0 1 0 54c0-.4.286-.743.629-.8ZM126.5 52c-.825 0-1.5-.675-1.5-1.5s.675-1.5 1.5-1.5 1.5.675 1.5 1.5-.675 1.5-1.5 1.5ZM23 70c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2Z" opacity=".2"/>
+  <path fill="#557FF3" d="M73 35.045c1.641-.099 2.983-1.405 2.682-3.021-1.656-8.896-9.591-15.698-19.237-16.013V16h-4.89v.418c-9.175 1.856-16.063 9.686-16.063 19.063 0 6.221 3.032 11.761 7.751 15.328l-5.067 5.77c-.133.15-.238.308-.32.47H36.19v2.944h3.337a2.18 2.18 0 0 0 .61-.049 338.422 338.422 0 0 0 9.371-2.2c.88-.221 1.486-1.013 1.556-1.918.021-.277.048-.552.08-.826C52.387 44.219 61.588 35.733 73 35.045Z"/>
+  <path fill="#7295F6" d="M72.995 35.045C72.74 24.485 63.662 16 52.5 16 41.178 16 32 24.73 32 35.5c0 5.406 2.313 10.298 6.048 13.83.885.837 1.038 2.237.233 3.152l-3.597 4.097c-1.322 1.505.012 3.795 1.968 3.364 3.828-.845 8.934-2.032 13.678-3.327.416-.113.708-.483.744-.913.917-11.112 10.265-19.952 21.92-20.658Z"/>
+  <path fill="#fff" d="M52.57 49.398a22.174 22.174 0 0 1 2.916-5.123c-.575-1.338-1.93-2.315-3.468-2.315-2.04 0-3.76 1.72-3.76 3.72 0 2.04 1.72 3.76 3.76 3.76.187 0 .371-.014.552-.042ZM48.378 36.76c0 1.52.44 2.76 1.2 3.68l5.32-1.36c-.32-.32-.6-.92-.6-1.6 0-1.26 1.093-2.069 2.362-3.006 1.752-1.295 3.838-2.837 3.838-6.154 0-3.84-3.28-6.4-8.56-6.4-3.28 0-6.6 1.28-8.8 3.76l3.84 4.4c1.12-1.28 2.68-2.08 4.2-2.08 1.72 0 2.36.68 2.36 1.56 0 .799-.824 1.387-1.813 2.094-1.486 1.062-3.347 2.391-3.347 5.106Z"/>
+  <path fill="#4CBA3C" fill-rule="evenodd" d="M86.634 78.794c.823.195 1.476 1.168 2.321 1.205L89 80h2.997a.003.003 0 0 0 .003-.003c0-.002.002-.004.004-.004 1.643.107 2.67-1.861 1.511-3.18l-3.302-3.76c-.767-.873-.622-2.209.22-3.011 3.447-3.29 5.583-7.85 5.583-12.89 0-9.662-7.85-17.56-17.749-18.12a.016.016 0 0 1-.015-.016.016.016 0 0 0-.016-.016h-4.375a.164.164 0 0 0-.165.164c0 .08-.057.148-.135.163-8.71 1.61-15.291 8.979-15.291 17.826 0 7.318 4.502 13.624 10.987 16.497 3.895 1.753 11.198 3.682 17.377 5.144Z" clip-rule="evenodd"/>
+  <path fill="#63C853" fill-rule="evenodd" d="M87.134 70.007c-.856.775-1.016 2.105-.254 2.972l3.328 3.79c1.236 1.406-.012 3.546-1.838 3.13-6.928-1.577-18.269-4.377-22.734-6.732C59.336 70.236 55 64.097 55 57c0-9.941 8.507-18 19-18s19 8.059 19 18c0 5.114-2.251 9.73-5.866 13.007Z" clip-rule="evenodd"/>
+  <path fill="#fff" fill-rule="evenodd" d="M63.928 62.688C67.296 64.827 70.59 66 74 66c3.41 0 6.704-1.173 10.072-3.312l-2.144-3.376C78.997 61.173 76.44 62 74 62c-2.44 0-4.996-.827-7.928-2.688l-2.144 3.376ZM70.4 53.8c-.547-.486-1.419-.8-2.4-.8-.981 0-1.853.314-2.4.8a3 3 0 1 1 4.8 0Zm12 0c-.547-.486-1.419-.8-2.4-.8-.982 0-1.853.314-2.4.8a3 3 0 1 1 4.8 0Z" clip-rule="evenodd"/>
+</svg>
diff --git a/DuckDuckGo/Assets.xcassets/Images/SubscriptionIcon.imageset/SubscriptionIcon.pdf b/DuckDuckGo/Assets.xcassets/Images/SubscriptionIcon.imageset/SubscriptionIcon.pdf
index 934a29304855a8da122da590fa025cc53f443972..d9be8eca8e50aae5d9b27cf4e2e48715bd2c614e 100644
GIT binary patch
literal 4808
zcmd^@OOG2z5`^#lEBYe9UO>%yKLA63^@QOytex3|0b>soMN4DPkXn*j$ouQ}i|S^R
zoYBJa*}SMGx-u&(GBT@5k6u52`PdG*>uhiO?VDe_zW?T%e(}%WKdk%3Pd~o-b-g-(
z@mu_Ty?J+d-#aE=P0*{|_Tz^$gZB6Mt=Wu**ZA8lH~SCE-Fmb7{o?zRCzGq|k8cib
z(U;rZ-Gp7O_uG%V)q1Zb=9y2QZa?)u_hvBdcN*AqgifP>;R?(BVYgo1b&Kcg|J<zB
zSFfJ-&#uq^TJ5`kclKyLyM8>6=5K<m$-(ty@Fiti`_)}H&wDu7uQpw2HpTUR@F}=h
z`a3WmV@>9Sl_B|<+bmN;@QEcR#0}Y3*{!gfFf-VkGT3cr?O<zhm|lW0_`nJ?$h_jb
z=CKWHyh)+Iz(OdFt*zwoG&5HpoYBn5A(AoKYbMyV@(DYO@dVzU0)On=7O=hqYcbVX
z@j4RoI1DaLREu+kJwvN54=KfD!Wo!JNn?;DCU57Eh-<q$f%8UgyD;zg0t~rWEi!{)
z-mw`bX3n9R!gFxqIt-JyIV1C;Gop=6yO^=t6E-X14D-XJmzk1TXAhOP>fU$1berxU
ze_rttjrA_tFOYm1V$8{-kcetbFb>V9q552M1FQ2PraliL)l^bX&03dSsR+QBg4{<a
zR75IC#gI*{Bj^*=Q4wLT#%qaci_HNjpq-lAs@_#6Q%l&<h7@}%x`V5%M($ElV!=X)
z#(>$uqjV}7%taH31#34LXANZpYGQ2RlZC{R&7-m2R7M^(<Qxf`%m-iDCe~q47^)t8
zS{oG`QRGsCZ60&>krm_MDJjDUKQTt1WgV&eQZupnA$aRR)!S^07R*6sg5`!e<3xp1
zSE@msLNlYQHo#~MH7dwBgz6L|-%>6C3*ur0YkCI7kO7$@DG~)y4n~W?hbrBaL>?`n
zlvpfmI~#*7G#DmT{I9x7SAyUm%x8l)5N}vth>fP%nNn=)RuE2Rnw^1JBVVLG#Xxf)
z!F1RxOR(VmghhI2!^nWzUs2Y_I7~)64pn6`mgUWmAL!5Q*Ok=#y9^tw2?o0^%a^ao
zTYN<}PS;_-V2RH#P)k$>p|%Eu#HZ{S`XghKi5a3R#hZy(XwpgHt@jiCp{Nln8tP|E
zQ(|kfM0_Hu<ujJ#nMaSd#M9C)`2l5>9_&jWA$o0qlmr@M6Re@yiegI@gQhL)Ds;QS
z;cQH`4OF7|_9#4M*VL+*Ok_94<fEulz%x+tq582RQZ%ieqS`VFm2^Ua%FxFF(RtHW
zEfh4G{7eH->rrt>#~xJ$k!p+d1=5uZ-Y2kTPrgu?T0ZkQ=ET2R1yr#|!U~M(L$s8X
za)MiUVP!uCQ))?#D(|gLmiP=F#_BTBBR)(iQ*{8Uf^yC%EpZmZS(d5#EPey*A)Hp2
zZYXpQ8i9x}0Zq4htN2hg4#}mYqGle=Ls_BS(`8y_spG)<G9{*3C}f8Pb-?<A)8__J
zo{roKa)tiLEYBfN`N-6f6k^vMfTGm2TuDHL?T{>;f^aj(DBUq2+Z<>u$~B%0<-@T+
zj{=Jj$mS*Pkb`Bwq2st<DCpFx8ao|Ccx6i@qY|r9KtDzWATe7MLY}N^J&^(k%3M2{
zSw|gHQBkebRi;-3L;^-ixVf<jt|A-^LfAYaqfK#8iW+>e=c(_bVx1#k$#OqXy+`!S
zQo^!mov@-FFN}#J7E5V+ie$uT9*sX%+KM_Gjg9UjifyL96!-~-N+e+jA(&+Ik;c{(
zX^^DY`H^ipR}*J35y7;SptS~Rqf_co*kqd#gZc`TbCny5HgOE-IFuABty<Q|ifDzY
z_cx`2s^8G5Kno-}_KAGenA=P=h%^;;jm1#|n#TZ-$c8cfsx-CYvsE7oM)RsK)*%e7
z%@xO{0!{caoJy!4YfevYf65&4p*gme?jy|M5NV-Tj&B_?B`9|)PI%J!MPqg>LO3eo
zXz3Ya*2lg>Tjjb2^q?iQOUmEcEu~v;-cHwdMtY)jdV-8^6<2H0ga*?$zw8Oa;q+I2
z!sx)!uN_Bi@W(Hh+2-`Lx@#AV(bEZ~!sch#Y;^mX2htgKvbdcur=Ll?(l({tyE*G|
zM)h!=o~-Rn`V*2?rcY1D7oQHVt`Ez@x_y6P+dtPoEcd^)(fI1spBHb`(^K|xw0PA^
za?@k@^4o*I7QBMLz5Vch`Nyu0FWm<|1WZr!c_;tR-IFKdwsCf>k95J*^qlANGcxo=
zPvixhz1w#SsC~ZW3GtaM$>Er#a4Jo%U1z2F?Pjw*?E9bfI6rOa_43_%0)AM(y;=U*
zXTCh0{>MPFIQ}=qv+d@v-msz=ID)VBzY&L?%VmSkcoH=3K#KbQ<}IQ2+QC(SjQH91
zBewQI{CkiyPrA3AxzY~z^NOdPKU*G_x7&A@wx4$EUpkt*?OKVAb(Xkx#U6b6X#xHE
z%>;2pq)hHXnVeignYMc$;zYWH0?(`a5C`Rbh<nw2$a6N|^A)(>9HGN*d2_qob)xsX
z=aBo=etWn6y8r6t?bjp4i>vJxennr)*W&u-ziV*;x%<O%cWCVJY|GuFM=ySS`9G$N
B-@X6<

literal 2646
zcmZveTW=gi5QX38SM*Dy1S##RzPA)bBF;q!5XRvx;$c}&93y)dyc-nw^?cQ{UdKsB
zmfb$nm#TA4RnMcdm#?3yuhXPX-1d(@C+D6$b0@Dp?ccoJulDoupN>E4l@s5R@VMvC
zm!E0gT-dTHJXrtJyt&+ea1rpFiPLU>JFjl0lb7>9SL^xw%?o$>_VfSNyXo)g<dwS1
z-K5@5;0(DNJUx!S{jT=VvRmIw$9Z25cI(Yld}^WA=rsFOYH7{g0Jf&R1p`~@Evu_O
z#acshTD&wVxd8QEd&vXhyjtCQYCh){q%L6X#N54V=t-8{QcM9TOYgCdQ!^)Zma2Gd
zp|#>P`C5}^mWZ!~V~8*Lq^Tq#P#;T(Q4I@GdTF*=ea|HlKd4wL%nZKN5G#p*Nz8$`
zB3M-AZSoqWF^|>k6pC2fj6{PjQCN^;Bt?5<P4*$xo=7@+=;%4v>g+4qLpUgZ#NKD<
ziNF>`D>2uRZSSoVM!^SIY~ySgB?}eTeB!l?V>qQmalC^PsI|CSQrKaTG{~SV@;b*L
zF8G*R6?jswS&PDhPtpVAbXe*Mj>V@WF<QtbN|D~c(6z<rt_K$3cwoimU884j7z8W(
z2wM<nSgf&#trgKoI@Om@LaPgs)DYo-kPqufem!heGcnqk87A1vtd=_YjW`178CHwr
zYH?V+1b#gws;mu$m#hjI_nHbOJ*1AvzG`kLw=e{uYwVwcP@e}PV{ukF$j-t+cWTCq
z<pBqaEU-LQij>d?*hmiBiVwYO0y3FnZ&r{stLX3*R_l!LgV&Dp55|!Wlf+iFqWAEZ
z<US+|DTZNKsO`kIp4d35q~UELa9*38Idy?D=1M>%5ij1dR8yxG))Ur@DKGo+7SB1#
zR}pf!$NYpa-zfO?^Z`v#h68O!m8!kc2kt@Ns7LDc+N!h!ZC&BLEuzC3<)QFRZD|fT
z2!e#V>wyr2otFZSn5meD2!h%uBd!dmG?C^DvM`STsDjaID3VeeJ{biH$|0svgnC5<
zX3_|(r~~b(i<v(8n2NOoupDx+F1VC80uUH2fe<SN3a?p)nqZ|=Yb}vd4UjnICG2R#
zvZhkW${NnGXxSY>;RMT%b6ROcCcbNvHY`)=YAC>J+FELAZWyEpQFM%5b3wmI3bfit
z{$B}Tx>O$yx-1eTWVy%CDkRhxMZ<nkh=MJV2PUm~mntN~!3dPIsnI*Vz@o+)I-HJ&
zq7>^{P=>GRjnN100?Kz}+;BZ|Q|dJg0ZIy$StRE>-V6(`rO=lbr#I_FMs=zbiTVQN
zM@^7yEX`QJD#ygb7aYd5fVD=;MB{8~8)R1tvoHg;A4?OB6?V-ul&A$q0b55|oJFUm
zJrsh}g8``(E3VE3(Jj5<Q{y96TxHXTnInzsOTtZt_uoyM>DS4w_QSn>cgfp*zI-Go
z#yH;n=?L4m!}pubcE5A)e&<_)=j6A4|C-&&+3IpW06)(cSF0D>Pww4lMi1|LyK=`f
zF4bjpx6}E&+kU)V&pT&dE9ZypPPd!=yx~Oq1i1sxR<~e|mOLOnLGE%e=>9|J$EyoM
zb(X=oyF2G}`;oQ!Rs1`U&vv3`f3}k)xH}$rpZMu&zq;ODK3w|gc78vJtJ9LJ{dOhi
zm>uxpp~Z}m+Z>@voc0_cZbtHX2$|2nfC85O0*bVuJ7|Bqy1JfkCsXf-m(cNex4oI4
rxW`u)PZm;6&bQmWvxEo1CvUI*n~8pW*{yE(BOQt}O^+VE`sMZi<vbvv

diff --git a/DuckDuckGo/Assets.xcassets/Images/Chevron-Next-16.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Trash.imageset/Contents.json
similarity index 82%
rename from DuckDuckGo/Assets.xcassets/Images/Chevron-Next-16.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/Trash.imageset/Contents.json
index 715e36be33..ee8f9e1708 100644
--- a/DuckDuckGo/Assets.xcassets/Images/Chevron-Next-16.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/Trash.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Chevron-Next-16.pdf",
+      "filename" : "Trash.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/Trash.imageset/Trash.svg b/DuckDuckGo/Assets.xcassets/Images/Trash.imageset/Trash.svg
new file mode 100644
index 0000000000..385873ffbf
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/Trash.imageset/Trash.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon">
+<g id="Shape">
+<path d="M6.25 5.625C6.25 5.27982 5.97018 5 5.625 5C5.27982 5 5 5.27982 5 5.625V12.375C5 12.7202 5.27982 13 5.625 13C5.97018 13 6.25 12.7202 6.25 12.375V5.625Z" fill="black" fill-opacity="0.84"/>
+<path d="M11 5.625C11 5.27982 10.7202 5 10.375 5C10.0298 5 9.75 5.27982 9.75 5.625V12.375C9.75 12.7202 10.0298 13 10.375 13C10.7202 13 11 12.7202 11 12.375V5.625Z" fill="black" fill-opacity="0.84"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 2V1.875C11 0.839466 10.1605 0 9.125 0H6.875C5.83947 0 5 0.839466 5 1.875V2H1.625C1.27982 2 1 2.27982 1 2.625C1 2.97018 1.27982 3.25 1.625 3.25H2V12.875C2 14.6009 3.39911 16 5.125 16H10.875C12.6009 16 14 14.6009 14 12.875V3.25H14.375C14.7202 3.25 15 2.97018 15 2.625C15 2.27982 14.7202 2 14.375 2H11ZM6.25 2H9.75V1.875C9.75 1.52982 9.47018 1.25 9.125 1.25H6.875C6.52982 1.25 6.25 1.52982 6.25 1.875V2ZM12.75 3.25H3.25V12.875C3.25 13.9105 4.08947 14.75 5.125 14.75H10.875C11.9105 14.75 12.75 13.9105 12.75 12.875V3.25Z" fill="black" fill-opacity="0.84"/>
+</g>
+</g>
+</svg>
diff --git a/DuckDuckGo/Assets.xcassets/Images/WebTrackingProtectionIcon.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/WebTrackingProtectionIcon.imageset/Contents.json
new file mode 100644
index 0000000000..09604788db
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/WebTrackingProtectionIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 11.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/WebTrackingProtectionIcon.imageset/Icon 11.pdf b/DuckDuckGo/Assets.xcassets/Images/WebTrackingProtectionIcon.imageset/Icon 11.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..59f2624371964e36da805c6753e50bffc07732f8
GIT binary patch
literal 4673
zcmeI0U5^~a6^8HoSJaIqh(vFFo~n`%64)V%k|@rSJH*8@9?YWgPO`H^gkPWMt?ua=
z;|&t`j3ul0?W$Af^F62f#p_pJeiG(7O~HA0{Pu^*xlccJpM5s%AKvKCDPH3@f89U4
zefr)dz+0_4Jw5L4-c2{J_W!xx?Qj3|g?stc^<TTw^zSLme*Bz2KYX%1ZSUIoU6>22
zLvg!zlb=iMIiSOwQ%IF_=i1HJ=1#i@UcWCmI&FzQ@b7%s*y|(zgydqW@K9Rlz4H)~
zb)VdheKlG36)c7ls=31yQ6*XGF3chL#;F+*xy1z1di1`#GW%LW&Mu*1<PljmYg^Rv
zR?($6!;l(V<)KGb3CX>+<XzxE3qHrOF?Tjrfu-cai8iO)nh$~+GC30QJx4<=yce@i
z+FE$qYia^9AaX>J`uIXn^1fOE3N?g~$Ewl_UfE5V4OQ-79Zrrp$(R~aA6tW=lesvz
zP*OoRq}Ak$u{F+MISzSfoA4j;OSxk+>pH@!9N*9^u`14%%?~H}*$S>?9g+=aDlRD*
zF%r~!i<rNKctC*U#WQg~Oy5u6O%KyQNH_9%O^ZvKU7og=|0m&U^QkLoYAl$+Lr?ns
zo^Zb>+!d)@C)}1&Te3crZgtR_r{2%mIruGwy6{_AXpO3{SSf*p-$aGllg_(EaJ5>1
zE-v6E5-6@O&!+&b)v&uJ;#KhB8jCTtqLNz=*vx^97CkmZHMlKb<!>*ad$kI<s@;oX
zhf6_U4A_JKZKtmf7ig!t|HE%9`~YR2&FQH?NK32v)lk&Aw&0`5>n+g%)N2NXSc3D?
zTtlxuyGHx5s+NJ;Mw^L138I58fpV|{(eBvVbIO560{g{ew1z&@fa=PUq0(J|da;gz
ztje)=+6+-tR}8UnMx5c-(g)Xu9z%!z!RQD|8pv6l5E74b3axV*yJ>3lKq(Dc>80pE
zj-+6IoD<FWHk3`h<cu76yj4!uZVa{1Y!E)3#6<lGvd+y$XNWy^TGYTA4P&$|diZEG
zf%ZxBYr)kyV}sPiP51#N3aQ&O`G;N*Z>^OsgjWNHaWGA%)l9pHv!`3&*FIM|E)-3}
zqixXCh)1ZNHb*0|KvQF5ojXcmkeW*>^sfV0^XQhr=#weN4a55j7NnzARkbCpBH|zJ
zll<h(H+2k>suCfa37IDs7GyMR%;?MmLsD!q$Yx>wj1j{H$(l+y4-#0B_xBZo5j*{O
zu@S!>)WC}ojk6~zPQw0z3s-LuC8~(g!>*mmR7Hvs_Qm%-I}sNQLe7i`MIt0C0-COo
zG(5Oe@tAsu3)+-0?0`NLapp-5XR3nCe91~HrBDkbleTuFR7U1A_|WCiEmKk?*piYX
z5tsRDWHGtR{J>U9#S_8-GSM}nszD_(<Y+6SkPoIAEm^UV_BrIv6rmZ%B9%IhC_rQ@
zG>|jXrM5O-d~QI-oT&p;s?1-qwJ>r<R2aExEYM`dxWxD(h(gV@Mq`NTu_A2{1de4Z
zLtgR>K>~Y;k#HN%VX^{3Pv$CyEoMRrOj`vZUv8>1_Ng@tuqdl(Ax5Q*+C*A_Ql6nD
zQR0%6HfpJt22;aUm08UgZ={T;n0jS9R(Hh=$TBmZARk0;3j}oyJ9>d}#>uS1;V6xE
zMI<C?)yPsMK8ZLY+e<AbJD7Y)l!83GOgRmE;WF}05RnMv9aC<xR>syEFk3Mr8q{~-
z2u+g4Xsno-RcaCl&Xn9tU2C=$luJh|w!$hccU1)WNoJu6XKA(^%mqDCwd7qTofl~-
zB2R-fg~AU`U@JU17>)-@9PO0tjIv5uc;1Vxn3+k$IM`7UC07MP9gX5tYbNfTO5SHE
zAGxETqzH3yBpGxnZ<(o)LXb%$g@odSqXIVL<{SeSq^x*hGXC>;Qic*1Wh~x>xV`+r
zl>-_E2}vA-bJ>JqQW|DKw!%WVxe|Z{Du^OHfFY`p7HF98vXUVrN<*uJP`_kWDY^+Q
z`)D&t)e^i$<RPDH4YE3pYDSC~EmZEz6-Xn-tEwY7v_sP4+9Hyoq?XTyCovBx#(jri
z5AQU!;c-KNZx%0N`P$q%#f=vhcY7rdD~Te_V2MhCSe1CVRE0Uhr&1cNktCCqps}0y
zg_Sv%MB##w4qOU^MJP`N3l@#k)NWbNC1;UIMe7NMCH_lB(4;b0=iU>GCIli}p+|+E
zae%fU&B#dx2-*Q-gVA5d!5#C+$V$-g7M7qt{f#Tr@IDk|9Hwe2WD)Cfw$)3G>PP2i
z7~yJm(rtge%AfE3y5cY219ZXMJ_pd%E}sc*K7V*PKAqgx-|*Rh-_1Y&`>(ybd42bG
zzXE^Tzq!Br;`o#Mdh`*EU6+TzMRxq$<>@Txc7Hnl__*7joIXt4uHs%EAD;FPoJhOf
zz}I(=V2(aLpsQ~eg0^oOH-EW*gQ`vz+`98QFONU6H+-P~3FJx=?e<EN3_NWIUJQSE
z_jGqSzI}h|PmlZWCSo!zw(5Up%oD`{uRndR(9iKrWBq9o(QktwMXde>#6{s35Y6%f
zNcY)w<J05a{bBz&@sa1|&#!RDN2lYv{m1U3`!^piPPw@~9-o{H9$vrs>i*|F+K-Pt
TcaKlQ97-ZgFJAod?_d58P79)>

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift b/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift
index b43155f629..c43f7dc27c 100644
--- a/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift
+++ b/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift
@@ -41,7 +41,7 @@ final class AutoconsentUserScript: NSObject, WKScriptMessageHandlerWithReply, Us
     private weak var selfTestFrameInfo: WKFrameInfo?
 
     private var topUrl: URL?
-    private let preferences = PrivacySecurityPreferences.shared
+    private let preferences = CookiePopupProtectionPreferences.shared
     private let management = AutoconsentManagement.shared
 
     public var messageNames: [String] { MessageName.allCases.map(\.rawValue) }
@@ -209,7 +209,7 @@ extension AutoconsentUserScript {
             return
         }
 
-        if preferences.autoconsentEnabled == false {
+        if preferences.isAutoconsentEnabled == false {
             // this will only happen if the user has just declined a prompt in this tab
             replyHandler([ "type": "ok" ], nil) // this is just to prevent a Promise rejection
             return
@@ -240,7 +240,7 @@ extension AutoconsentUserScript {
             "rules": nil, // rules are bundled with the content script atm
             "config": [
                 "enabled": true,
-                "autoAction": preferences.autoconsentEnabled == true ? "optOut" : nil,
+                "autoAction": preferences.isAutoconsentEnabled == true ? "optOut" : nil,
                 "disabledCmps": disabledCMPs,
                 "enablePrehide": true,
                 "enableCosmeticRules": true,
diff --git a/DuckDuckGo/Autoconsent/autoconsent-bundle.js b/DuckDuckGo/Autoconsent/autoconsent-bundle.js
index 6994afdcd0..db02dcc60b 100644
--- a/DuckDuckGo/Autoconsent/autoconsent-bundle.js
+++ b/DuckDuckGo/Autoconsent/autoconsent-bundle.js
@@ -1 +1 @@
-!function(){"use strict";var e=class e{static setBase(t){e.base=t}static findElement(t,o=null,c=!1){let i=null;return i=null!=o?Array.from(o.querySelectorAll(t.selector)):null!=e.base?Array.from(e.base.querySelectorAll(t.selector)):Array.from(document.querySelectorAll(t.selector)),null!=t.textFilter&&(i=i.filter((e=>{const o=e.textContent.toLowerCase();if(Array.isArray(t.textFilter)){let e=!1;for(const c of t.textFilter)if(-1!==o.indexOf(c.toLowerCase())){e=!0;break}return e}if(null!=t.textFilter)return-1!==o.indexOf(t.textFilter.toLowerCase())}))),null!=t.styleFilters&&(i=i.filter((e=>{const o=window.getComputedStyle(e);let c=!0;for(const e of t.styleFilters){const t=o[e.option];c=e.negated?c&&t!==e.value:c&&t===e.value}return c}))),null!=t.displayFilter&&(i=i.filter((e=>t.displayFilter?0!==e.offsetHeight:0===e.offsetHeight))),null!=t.iframeFilter&&(i=i.filter((()=>t.iframeFilter?window.location!==window.parent.location:window.location===window.parent.location))),null!=t.childFilter&&(i=i.filter((o=>{const c=e.base;e.setBase(o);const i=e.find(t.childFilter);return e.setBase(c),null!=i.target}))),c?i:(i.length>1&&console.warn("Multiple possible targets: ",i,t,o),i[0])}static find(t,o=!1){const c=[];if(null!=t.parent){const i=e.findElement(t.parent,null,o);if(null!=i){if(i instanceof Array)return i.forEach((i=>{const n=e.findElement(t.target,i,o);n instanceof Array?n.forEach((e=>{c.push({parent:i,target:e})})):c.push({parent:i,target:n})})),c;{const n=e.findElement(t.target,i,o);n instanceof Array?n.forEach((e=>{c.push({parent:i,target:e})})):c.push({parent:i,target:n})}}}else{const i=e.findElement(t.target,null,o);i instanceof Array?i.forEach((e=>{c.push({parent:null,target:e})})):c.push({parent:null,target:i})}return 0===c.length&&c.push({parent:null,target:null}),o?c:(1!==c.length&&console.warn("Multiple results found, even though multiple false",c),c[0])}};e.base=null;var t=e;function o(e){const o=t.find(e);return"css"===e.type?!!o.target:"checkbox"===e.type?!!o.target&&o.target.checked:void 0}async function c(e,n){switch(e.type){case"click":return async function(e){const o=t.find(e);null!=o.target&&o.target.click();return i(0)}(e);case"list":return async function(e,t){for(const o of e.actions)await c(o,t)}(e,n);case"consent":return async function(e,t){for(const i of e.consents){const e=-1!==t.indexOf(i.type);if(i.matcher&&i.toggleAction){o(i.matcher)!==e&&await c(i.toggleAction)}else e?await c(i.trueAction):await c(i.falseAction)}}(e,n);case"ifcss":return async function(e,o){const i=t.find(e);i.target?e.falseAction&&await c(e.falseAction,o):e.trueAction&&await c(e.trueAction,o)}(e,n);case"waitcss":return async function(e){await new Promise((o=>{let c=e.retries||10;const i=e.waitTime||250,n=()=>{const a=t.find(e);(e.negated&&a.target||!e.negated&&!a.target)&&c>0?(c-=1,setTimeout(n,i)):o()};n()}))}(e);case"foreach":return async function(e,o){const i=t.find(e,!0),n=t.base;for(const n of i)n.target&&(t.setBase(n.target),await c(e.action,o));t.setBase(n)}(e,n);case"hide":return async function(e){const o=t.find(e);o.target&&o.target.classList.add("Autoconsent-Hidden")}(e);case"slide":return async function(e){const o=t.find(e),c=t.find(e.dragTarget);if(o.target){const e=o.target.getBoundingClientRect(),t=c.target.getBoundingClientRect();let i=t.top-e.top,n=t.left-e.left;"y"===this.config.axis.toLowerCase()&&(n=0),"x"===this.config.axis.toLowerCase()&&(i=0);const a=window.screenX+e.left+e.width/2,s=window.screenY+e.top+e.height/2,r=e.left+e.width/2,l=e.top+e.height/2,p=document.createEvent("MouseEvents");p.initMouseEvent("mousedown",!0,!0,window,0,a,s,r,l,!1,!1,!1,!1,0,o.target);const d=document.createEvent("MouseEvents");d.initMouseEvent("mousemove",!0,!0,window,0,a+n,s+i,r+n,l+i,!1,!1,!1,!1,0,o.target);const u=document.createEvent("MouseEvents");u.initMouseEvent("mouseup",!0,!0,window,0,a+n,s+i,r+n,l+i,!1,!1,!1,!1,0,o.target),o.target.dispatchEvent(p),await this.waitTimeout(10),o.target.dispatchEvent(d),await this.waitTimeout(10),o.target.dispatchEvent(u)}}(e);case"close":return async function(){window.close()}();case"wait":return async function(e){await i(e.waitTime)}(e);case"eval":return async function(e){return console.log("eval!",e.code),new Promise((t=>{try{e.async?(window.eval(e.code),setTimeout((()=>{t(window.eval("window.__consentCheckResult"))}),e.timeout||250)):t(window.eval(e.code))}catch(o){console.warn("eval error",o,e.code),t(!1)}}))}(e);default:throw"Unknown action type: "+e.type}}function i(e){return new Promise((t=>{setTimeout((()=>{t()}),e)}))}function n(){return crypto&&void 0!==crypto.randomUUID?crypto.randomUUID():Math.random().toString()}var a={pending:new Map,sendContentMessage:null};function s(e,t){const o=n();a.sendContentMessage({type:"eval",id:o,code:e,snippetId:t});const c=new class{constructor(e,t=1e3){this.id=e,this.promise=new Promise(((e,t)=>{this.resolve=e,this.reject=t})),this.timer=window.setTimeout((()=>{this.reject(new Error("timeout"))}),t)}}(o);return a.pending.set(c.id,c),c.promise}var r={EVAL_0:()=>console.log(1),EVAL_CONSENTMANAGER_1:()=>window.__cmp&&"object"==typeof __cmp("getCMPData"),EVAL_CONSENTMANAGER_2:()=>!__cmp("consentStatus").userChoiceExists,EVAL_CONSENTMANAGER_3:()=>__cmp("setConsent",0),EVAL_CONSENTMANAGER_4:()=>__cmp("setConsent",1),EVAL_CONSENTMANAGER_5:()=>__cmp("consentStatus").userChoiceExists,EVAL_COOKIEBOT_1:()=>!!window.Cookiebot,EVAL_COOKIEBOT_2:()=>!window.Cookiebot.hasResponse&&!0===window.Cookiebot.dialog?.visible,EVAL_COOKIEBOT_3:()=>window.Cookiebot.withdraw()||!0,EVAL_COOKIEBOT_4:()=>window.Cookiebot.hide()||!0,EVAL_COOKIEBOT_5:()=>!0===window.Cookiebot.declined,EVAL_KLARO_1:()=>{const e=globalThis.klaroConfig||globalThis.klaro?.getManager&&globalThis.klaro.getManager().config;if(!e)return!0;const t=(e.services||e.apps).filter((e=>!e.required)).map((e=>e.name));if(klaro&&klaro.getManager){const e=klaro.getManager();return t.every((t=>!e.consents[t]))}if(klaroConfig&&"cookie"===klaroConfig.storageMethod){const e=klaroConfig.cookieName||klaroConfig.storageName,o=JSON.parse(decodeURIComponent(document.cookie.split(";").find((t=>t.trim().startsWith(e))).split("=")[1]));return Object.keys(o).filter((e=>t.includes(e))).every((e=>!1===o[e]))}},EVAL_ONETRUST_1:()=>window.OnetrustActiveGroups.split(",").filter((e=>e.length>0)).length<=1,EVAL_TRUSTARC_TOP:()=>window&&window.truste&&"0"===window.truste.eu.bindMap.prefCookie,EVAL_ADROLL_0:()=>!document.cookie.includes("__adroll_fpc"),EVAL_ALMACMP_0:()=>document.cookie.includes('"name":"Google","consent":false'),EVAL_AFFINITY_SERIF_COM_0:()=>document.cookie.includes("serif_manage_cookies_viewed")&&!document.cookie.includes("serif_allow_analytics"),EVAL_ARBEITSAGENTUR_TEST:()=>document.cookie.includes("cookie_consent=denied"),EVAL_AXEPTIO_0:()=>document.cookie.includes("axeptio_authorized_vendors=%2C%2C"),EVAL_BAHN_TEST:()=>1===utag.gdpr.getSelectedCategories().length,EVAL_BING_0:()=>document.cookie.includes("AL=0")&&document.cookie.includes("AD=0")&&document.cookie.includes("SM=0"),EVAL_BLOCKSY_0:()=>document.cookie.includes("blocksy_cookies_consent_accepted=no"),EVAL_BORLABS_0:()=>!JSON.parse(decodeURIComponent(document.cookie.split(";").find((e=>-1!==e.indexOf("borlabs-cookie"))).split("=",2)[1])).consents.statistics,EVAL_BUNDESREGIERUNG_DE_0:()=>document.cookie.match("cookie-allow-tracking=0"),EVAL_CANVA_0:()=>!document.cookie.includes("gtm_fpc_engagement_event"),EVAL_CC_BANNER2_0:()=>!!document.cookie.match(/sncc=[^;]+D%3Dtrue/),EVAL_CLICKIO_0:()=>document.cookie.includes("__lxG__consent__v2_daisybit="),EVAL_CLINCH_0:()=>document.cookie.includes("ctc_rejected=1"),EVAL_COOKIECONSENT2_TEST:()=>document.cookie.includes("cc_cookie="),EVAL_COOKIECONSENT3_TEST:()=>document.cookie.includes("cc_cookie="),EVAL_COINBASE_0:()=>JSON.parse(decodeURIComponent(document.cookie.match(/cm_(eu|default)_preferences=([0-9a-zA-Z\\{\\}\\[\\]%:]*);?/)[2])).consent.length<=1,EVAL_COMPLIANZ_BANNER_0:()=>document.cookie.includes("cmplz_banner-status=dismissed"),EVAL_COOKIE_LAW_INFO_0:()=>CLI.disableAllCookies()||CLI.reject_close()||!0,EVAL_COOKIE_LAW_INFO_1:()=>-1===document.cookie.indexOf("cookielawinfo-checkbox-non-necessary=yes"),EVAL_COOKIE_LAW_INFO_DETECT:()=>!!window.CLI,EVAL_COOKIE_MANAGER_POPUP_0:()=>!1===JSON.parse(document.cookie.split(";").find((e=>e.trim().startsWith("CookieLevel"))).split("=")[1]).social,EVAL_COOKIEALERT_0:()=>document.querySelector("body").removeAttribute("style")||!0,EVAL_COOKIEALERT_1:()=>document.querySelector("body").removeAttribute("style")||!0,EVAL_COOKIEALERT_2:()=>!0===window.CookieConsent.declined,EVAL_COOKIEFIRST_0:()=>{return!1===(e=JSON.parse(decodeURIComponent(document.cookie.split(";").find((e=>-1!==e.indexOf("cookiefirst"))).trim()).split("=")[1])).performance&&!1===e.functional&&!1===e.advertising;var e},EVAL_COOKIEFIRST_1:()=>document.querySelectorAll("button[data-cookiefirst-accent-color=true][role=checkbox]:not([disabled])").forEach((e=>"true"==e.getAttribute("aria-checked")&&e.click()))||!0,EVAL_COOKIEINFORMATION_0:()=>CookieInformation.declineAllCategories()||!0,EVAL_COOKIEINFORMATION_1:()=>CookieInformation.submitAllCategories()||!0,EVAL_COOKIEINFORMATION_2:()=>document.cookie.includes("CookieInformationConsent="),EVAL_COOKIEYES_0:()=>document.cookie.includes("advertisement:no"),EVAL_DAILYMOTION_0:()=>!!document.cookie.match("dm-euconsent-v2"),EVAL_DNDBEYOND_TEST:()=>document.cookie.includes("cookie-consent=denied"),EVAL_DSGVO_0:()=>!document.cookie.includes("sp_dsgvo_cookie_settings"),EVAL_DUNELM_0:()=>document.cookie.includes("cc_functional=0")&&document.cookie.includes("cc_targeting=0"),EVAL_ETSY_0:()=>document.querySelectorAll(".gdpr-overlay-body input").forEach((e=>{e.checked=!1}))||!0,EVAL_ETSY_1:()=>document.querySelector(".gdpr-overlay-view button[data-wt-overlay-close]").click()||!0,EVAL_EU_COOKIE_COMPLIANCE_0:()=>-1===document.cookie.indexOf("cookie-agreed=2"),EVAL_EU_COOKIE_LAW_0:()=>!document.cookie.includes("euCookie"),EVAL_EZOIC_0:()=>ezCMP.handleAcceptAllClick(),EVAL_EZOIC_1:()=>!!document.cookie.match(/ez-consent-tcf/),EVAL_GOOGLE_0:()=>!!document.cookie.match(/SOCS=CAE/),EVAL_HEMA_TEST_0:()=>document.cookie.includes("cookies_rejected=1"),EVAL_IUBENDA_0:()=>document.querySelectorAll(".purposes-item input[type=checkbox]:not([disabled])").forEach((e=>{e.checked&&e.click()}))||!0,EVAL_IUBENDA_1:()=>!!document.cookie.match(/_iub_cs-\d+=/),EVAL_IWINK_TEST:()=>document.cookie.includes("cookie_permission_granted=no"),EVAL_JQUERY_COOKIEBAR_0:()=>!document.cookie.includes("cookies-state=accepted"),EVAL_MEDIAVINE_0:()=>document.querySelectorAll('[data-name="mediavine-gdpr-cmp"] input[type=checkbox]').forEach((e=>e.checked&&e.click()))||!0,EVAL_MICROSOFT_0:()=>Array.from(document.querySelectorAll("div > button")).filter((e=>e.innerText.match("Reject|Ablehnen")))[0].click()||!0,EVAL_MICROSOFT_1:()=>Array.from(document.querySelectorAll("div > button")).filter((e=>e.innerText.match("Accept|Annehmen")))[0].click()||!0,EVAL_MICROSOFT_2:()=>!!document.cookie.match("MSCC|GHCC"),EVAL_MOOVE_0:()=>document.querySelectorAll("#moove_gdpr_cookie_modal input").forEach((e=>{e.disabled||"moove_gdpr_strict_cookies"===e.name||(e.checked=!1)}))||!0,EVAL_ONENINETWO_0:()=>document.cookie.includes("CC_ADVERTISING=NO")&&document.cookie.includes("CC_ANALYTICS=NO"),EVAL_OPERA_0:()=>document.cookie.includes("cookie_consent_essential=true")&&!document.cookie.includes("cookie_consent_marketing=true"),EVAL_PAYPAL_0:()=>!0===document.cookie.includes("cookie_prefs"),EVAL_PRIMEBOX_0:()=>!document.cookie.includes("cb-enabled=accepted"),EVAL_PUBTECH_0:()=>document.cookie.includes("euconsent-v2")&&(document.cookie.match(/.YAAAAAAAAAAA/)||document.cookie.match(/.aAAAAAAAAAAA/)||document.cookie.match(/.YAAACFgAAAAA/)),EVAL_REDDIT_0:()=>document.cookie.includes("eu_cookie={%22opted%22:true%2C%22nonessential%22:false}"),EVAL_SIBBO_0:()=>!!window.localStorage.getItem("euconsent-v2"),EVAL_SIRDATA_UNBLOCK_SCROLL:()=>(document.documentElement.classList.forEach((e=>{e.startsWith("sd-cmp-")&&document.documentElement.classList.remove(e)})),!0),EVAL_SNIGEL_0:()=>!!document.cookie.match("snconsent"),EVAL_STEAMPOWERED_0:()=>2===JSON.parse(decodeURIComponent(document.cookie.split(";").find((e=>e.trim().startsWith("cookieSettings"))).split("=")[1])).preference_state,EVAL_SVT_TEST:()=>document.cookie.includes('cookie-consent-1={"optedIn":true,"functionality":false,"statistics":false}'),EVAL_TAKEALOT_0:()=>document.body.classList.remove("freeze")||(document.body.style="")||!0,EVAL_TARTEAUCITRON_0:()=>tarteaucitron.userInterface.respondAll(!1)||!0,EVAL_TARTEAUCITRON_1:()=>tarteaucitron.userInterface.respondAll(!0)||!0,EVAL_TARTEAUCITRON_2:()=>document.cookie.match(/tarteaucitron=[^;]*/)[0].includes("false"),EVAL_TAUNTON_TEST:()=>document.cookie.includes("taunton_user_consent_submitted=true"),EVAL_TEALIUM_0:()=>void 0!==window.utag&&"object"==typeof utag.gdpr,EVAL_TEALIUM_1:()=>utag.gdpr.setConsentValue(!1)||!0,EVAL_TEALIUM_DONOTSELL:()=>utag.gdpr.dns?.setDnsState(!1)||!0,EVAL_TEALIUM_2:()=>utag.gdpr.setConsentValue(!0)||!0,EVAL_TEALIUM_3:()=>1!==utag.gdpr.getConsentState(),EVAL_TEALIUM_DONOTSELL_CHECK:()=>1!==utag.gdpr.dns?.getDnsState(),EVAL_TESTCMP_0:()=>"button_clicked"===window.results.results[0],EVAL_TESTCMP_COSMETIC_0:()=>"banner_hidden"===window.results.results[0],EVAL_THEFREEDICTIONARY_0:()=>cmpUi.showPurposes()||cmpUi.rejectAll()||!0,EVAL_THEFREEDICTIONARY_1:()=>cmpUi.allowAll()||!0,EVAL_THEVERGE_0:()=>document.cookie.includes("_duet_gdpr_acknowledged=1"),EVAL_UBUNTU_COM_0:()=>document.cookie.includes("_cookies_accepted=essential"),EVAL_UK_COOKIE_CONSENT_0:()=>!document.cookie.includes("catAccCookies"),EVAL_USERCENTRICS_API_0:()=>"object"==typeof UC_UI,EVAL_USERCENTRICS_API_1:()=>!!UC_UI.closeCMP(),EVAL_USERCENTRICS_API_2:()=>!!UC_UI.denyAllConsents(),EVAL_USERCENTRICS_API_3:()=>!!UC_UI.acceptAllConsents(),EVAL_USERCENTRICS_API_4:()=>!!UC_UI.closeCMP(),EVAL_USERCENTRICS_API_5:()=>!0===UC_UI.areAllConsentsAccepted(),EVAL_USERCENTRICS_API_6:()=>!1===UC_UI.areAllConsentsAccepted(),EVAL_USERCENTRICS_BUTTON_0:()=>JSON.parse(localStorage.getItem("usercentrics")).consents.every((e=>e.isEssential||!e.consentStatus)),EVAL_WAITROSE_0:()=>Array.from(document.querySelectorAll("label[id$=cookies-deny-label]")).forEach((e=>e.click()))||!0,EVAL_WAITROSE_1:()=>document.cookie.includes("wtr_cookies_advertising=0")&&document.cookie.includes("wtr_cookies_analytics=0"),EVAL_WP_COOKIE_NOTICE_0:()=>document.cookie.includes("wpl_viewed_cookie=no"),EVAL_XE_TEST:()=>document.cookie.includes("xeConsentState={%22performance%22:false%2C%22marketing%22:false%2C%22compliance%22:false}"),EVAL_XING_0:()=>document.cookie.includes("userConsent=%7B%22marketing%22%3Afalse"),EVAL_YOUTUBE_DESKTOP_0:()=>!!document.cookie.match(/SOCS=CAE/),EVAL_YOUTUBE_MOBILE_0:()=>!!document.cookie.match(/SOCS=CAE/)};var l={main:!0,frame:!1,urlPattern:""},p=class{constructor(e){this.runContext=l,this.autoconsent=e}get hasSelfTest(){throw new Error("Not Implemented")}get isIntermediate(){throw new Error("Not Implemented")}get isCosmetic(){throw new Error("Not Implemented")}mainWorldEval(e){const t=r[e];if(!t)return console.warn("Snippet not found",e),Promise.resolve(!1);const o=this.autoconsent.config.logs;if(this.autoconsent.config.isMainWorld){o.evals&&console.log("inline eval:",e,t);let c=!1;try{c=!!t.call(globalThis)}catch(t){o.evals&&console.error("error evaluating rule",e,t)}return Promise.resolve(c)}const c=`(${t.toString()})()`;return o.evals&&console.log("async eval:",e,c),s(c,e).catch((t=>(o.evals&&console.error("error evaluating rule",e,t),!1)))}checkRunContext(){const e={...l,...this.runContext},t=window.top===window;return!(t&&!e.main)&&(!(!t&&!e.frame)&&!(e.urlPattern&&!window.location.href.match(e.urlPattern)))}detectCmp(){throw new Error("Not Implemented")}async detectPopup(){return!1}optOut(){throw new Error("Not Implemented")}optIn(){throw new Error("Not Implemented")}openCmp(){throw new Error("Not Implemented")}async test(){return Promise.resolve(!0)}click(e,t=!1){return this.autoconsent.domActions.click(e,t)}elementExists(e){return this.autoconsent.domActions.elementExists(e)}elementVisible(e,t){return this.autoconsent.domActions.elementVisible(e,t)}waitForElement(e,t){return this.autoconsent.domActions.waitForElement(e,t)}waitForVisible(e,t,o){return this.autoconsent.domActions.waitForVisible(e,t,o)}waitForThenClick(e,t,o){return this.autoconsent.domActions.waitForThenClick(e,t,o)}wait(e){return this.autoconsent.domActions.wait(e)}hide(e,t){return this.autoconsent.domActions.hide(e,t)}prehide(e){return this.autoconsent.domActions.prehide(e)}undoPrehide(){return this.autoconsent.domActions.undoPrehide()}querySingleReplySelector(e,t){return this.autoconsent.domActions.querySingleReplySelector(e,t)}querySelectorChain(e){return this.autoconsent.domActions.querySelectorChain(e)}elementSelector(e){return this.autoconsent.domActions.elementSelector(e)}},d=class extends p{constructor(e,t){super(t),this.rule=e,this.name=e.name,this.runContext=e.runContext||l}get hasSelfTest(){return!!this.rule.test}get isIntermediate(){return!!this.rule.intermediate}get isCosmetic(){return!!this.rule.cosmetic}get prehideSelectors(){return this.rule.prehideSelectors}async detectCmp(){return!!this.rule.detectCmp&&this._runRulesParallel(this.rule.detectCmp)}async detectPopup(){return!!this.rule.detectPopup&&this._runRulesSequentially(this.rule.detectPopup)}async optOut(){const e=this.autoconsent.config.logs;return!!this.rule.optOut&&(e.lifecycle&&console.log("Initiated optOut()",this.rule.optOut),this._runRulesSequentially(this.rule.optOut))}async optIn(){const e=this.autoconsent.config.logs;return!!this.rule.optIn&&(e.lifecycle&&console.log("Initiated optIn()",this.rule.optIn),this._runRulesSequentially(this.rule.optIn))}async openCmp(){return!!this.rule.openCmp&&this._runRulesSequentially(this.rule.openCmp)}async test(){return this.hasSelfTest?this._runRulesSequentially(this.rule.test):super.test()}async evaluateRuleStep(e){const t=[],o=this.autoconsent.config.logs;if(e.exists&&t.push(this.elementExists(e.exists)),e.visible&&t.push(this.elementVisible(e.visible,e.check)),e.eval){const o=this.mainWorldEval(e.eval);t.push(o)}if(e.waitFor&&t.push(this.waitForElement(e.waitFor,e.timeout)),e.waitForVisible&&t.push(this.waitForVisible(e.waitForVisible,e.timeout,e.check)),e.click&&t.push(this.click(e.click,e.all)),e.waitForThenClick&&t.push(this.waitForThenClick(e.waitForThenClick,e.timeout,e.all)),e.wait&&t.push(this.wait(e.wait)),e.hide&&t.push(this.hide(e.hide,e.method)),e.if){if(!e.if.exists&&!e.if.visible)return console.error("invalid conditional rule",e.if),!1;const c=await this.evaluateRuleStep(e.if);o.rulesteps&&console.log("Condition is",c),c?t.push(this._runRulesSequentially(e.then)):e.else?t.push(this._runRulesSequentially(e.else)):t.push(!0)}if(e.any){for(const t of e.any)if(await this.evaluateRuleStep(t))return!0;return!1}if(0===t.length)return o.errors&&console.warn("Unrecognized rule",e),!1;return(await Promise.all(t)).reduce(((e,t)=>e&&t),!0)}async _runRulesParallel(e){const t=e.map((e=>this.evaluateRuleStep(e)));return(await Promise.all(t)).every((e=>!!e))}async _runRulesSequentially(e){const t=this.autoconsent.config.logs;for(const o of e){t.rulesteps&&console.log("Running rule...",o);const e=await this.evaluateRuleStep(o);if(t.rulesteps&&console.log("...rule result",e),!e&&!o.optional)return!1}return!0}};function u(e="autoconsent-css-rules"){const t=`style#${e}`,o=document.querySelector(t);if(o&&o instanceof HTMLStyleElement)return o;{const t=document.head||document.getElementsByTagName("head")[0]||document.documentElement,o=document.createElement("style");return o.id=e,t.appendChild(o),o}}function m(e,t,o="display"){const c=`${t} { ${"opacity"===o?"opacity: 0":"display: none"} !important; z-index: -1 !important; pointer-events: none !important; } `;return e instanceof HTMLStyleElement&&(e.innerText+=c,t.length>0)}async function h(e,t,o){const c=await e();return!c&&t>0?new Promise((c=>{setTimeout((async()=>{c(h(e,t-1,o))}),o)})):Promise.resolve(c)}function k(e){if(!e)return!1;if(null!==e.offsetParent)return!0;{const t=window.getComputedStyle(e);if("fixed"===t.position&&"none"!==t.display)return!0}return!1}function b(e){const t={enabled:!0,autoAction:"optOut",disabledCmps:[],enablePrehide:!0,enableCosmeticRules:!0,detectRetries:20,isMainWorld:!1,prehideTimeout:2e3,logs:{lifecycle:!1,rulesteps:!1,evals:!1,errors:!0,messages:!1}},o=(c=t,globalThis.structuredClone?structuredClone(c):JSON.parse(JSON.stringify(c)));var c;for(const c of Object.keys(t))void 0!==e[c]&&(o[c]=e[c]);return o}var _="#truste-show-consent",g="#truste-consent-track",y=[class extends p{constructor(e){super(e),this.name="TrustArc-top",this.prehideSelectors=[".trustarc-banner-container",`.truste_popframe,.truste_overlay,.truste_box_overlay,${g}`],this.runContext={main:!0,frame:!1},this._shortcutButton=null,this._optInDone=!1}get hasSelfTest(){return!1}get isIntermediate(){return!this._optInDone&&!this._shortcutButton}get isCosmetic(){return!1}async detectCmp(){const e=this.elementExists(`${_},${g}`);return e&&(this._shortcutButton=document.querySelector("#truste-consent-required")),e}async detectPopup(){return this.elementVisible(`#truste-consent-content,#trustarc-banner-overlay,${g}`,"all")}openFrame(){this.click(_)}async optOut(){return this._shortcutButton?(this._shortcutButton.click(),!0):(m(u(),`.truste_popframe, .truste_overlay, .truste_box_overlay, ${g}`),this.click(_),setTimeout((()=>{u().remove()}),1e4),!0)}async optIn(){return this._optInDone=!0,this.click("#truste-consent-button")}async openCmp(){return!0}async test(){return await this.mainWorldEval("EVAL_TRUSTARC_TOP")}},class extends p{constructor(){super(...arguments),this.name="TrustArc-frame",this.runContext={main:!1,frame:!0,urlPattern:"^https://consent-pref\\.trustarc\\.com/\\?"}}get hasSelfTest(){return!1}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return!0}async detectPopup(){return this.elementVisible("#defaultpreferencemanager","any")&&this.elementVisible(".mainContent","any")}async navigateToSettings(){return await h((async()=>this.elementExists(".shp")||this.elementVisible(".advance","any")||this.elementExists(".switch span:first-child")),10,500),this.elementExists(".shp")&&this.click(".shp"),await this.waitForElement(".prefPanel",5e3),this.elementVisible(".advance","any")&&this.click(".advance"),await h((()=>this.elementVisible(".switch span:first-child","any")),5,1e3)}async optOut(){return await h((()=>"complete"===document.readyState),20,100),await this.waitForElement(".mainContent[aria-hidden=false]",5e3),!!this.click(".rejectAll")||(this.elementExists(".prefPanel")&&await this.waitForElement('.prefPanel[style="visibility: visible;"]',3e3),this.click("#catDetails0")?(this.click(".submit"),this.waitForThenClick("#gwt-debug-close_id",5e3),!0):this.click(".required")?(this.waitForThenClick("#gwt-debug-close_id",5e3),!0):(await this.navigateToSettings(),this.click(".switch span:nth-child(1):not(.active)",!0),this.click(".submit"),this.waitForThenClick("#gwt-debug-close_id",3e5),!0))}async optIn(){return this.click(".call")||(await this.navigateToSettings(),this.click(".switch span:nth-child(2)",!0),this.click(".submit"),this.waitForElement("#gwt-debug-close_id",3e5).then((()=>{this.click("#gwt-debug-close_id")}))),!0}},class extends p{constructor(){super(...arguments),this.name="Cybotcookiebot",this.prehideSelectors=["#CybotCookiebotDialog,#CybotCookiebotDialogBodyUnderlay,#dtcookie-container,#cookiebanner,#cb-cookieoverlay,.modal--cookie-banner,#cookiebanner_outer,#CookieBanner"]}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return await this.mainWorldEval("EVAL_COOKIEBOT_1")}async detectPopup(){return this.mainWorldEval("EVAL_COOKIEBOT_2")}async optOut(){await this.wait(500);let e=await this.mainWorldEval("EVAL_COOKIEBOT_3");return await this.wait(500),e=e&&await this.mainWorldEval("EVAL_COOKIEBOT_4"),e}async optIn(){return this.elementExists("#dtcookie-container")?this.click(".h-dtcookie-accept"):(this.click(".CybotCookiebotDialogBodyLevelButton:not(:checked):enabled",!0),this.click("#CybotCookiebotDialogBodyLevelButtonAccept"),this.click("#CybotCookiebotDialogBodyButtonAccept"),!0)}async test(){return await this.wait(500),await this.mainWorldEval("EVAL_COOKIEBOT_5")}},class extends p{constructor(){super(...arguments),this.name="Sourcepoint-frame",this.prehideSelectors=["div[id^='sp_message_container_'],.message-overlay","#sp_privacy_manager_container"],this.ccpaNotice=!1,this.ccpaPopup=!1,this.runContext={main:!1,frame:!0}}get hasSelfTest(){return!1}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){const e=new URL(location.href);return e.searchParams.has("message_id")&&"ccpa-notice.sp-prod.net"===e.hostname?(this.ccpaNotice=!0,!0):"ccpa-pm.sp-prod.net"===e.hostname?(this.ccpaPopup=!0,!0):("/index.html"===e.pathname||"/privacy-manager/index.html"===e.pathname||"/ccpa_pm/index.html"===e.pathname)&&(e.searchParams.has("message_id")||e.searchParams.has("requestUUID")||e.searchParams.has("consentUUID"))}async detectPopup(){return!!this.ccpaNotice||(this.ccpaPopup?await this.waitForElement(".priv-save-btn",2e3):(await this.waitForElement(".sp_choice_type_11,.sp_choice_type_12,.sp_choice_type_13,.sp_choice_type_ACCEPT_ALL,.sp_choice_type_SAVE_AND_EXIT",2e3),!this.elementExists(".sp_choice_type_9")))}async optIn(){return await this.waitForElement(".sp_choice_type_11,.sp_choice_type_ACCEPT_ALL",2e3),!!this.click(".sp_choice_type_11")||!!this.click(".sp_choice_type_ACCEPT_ALL")}isManagerOpen(){return"/privacy-manager/index.html"===location.pathname||"/ccpa_pm/index.html"===location.pathname}async optOut(){const e=this.autoconsent.config.logs;if(this.ccpaPopup){const e=document.querySelectorAll(".priv-purpose-container .sp-switch-arrow-block a.neutral.on .right");for(const t of e)t.click();const t=document.querySelectorAll(".priv-purpose-container .sp-switch-arrow-block a.switch-bg.on");for(const e of t)e.click();return this.click(".priv-save-btn")}if(!this.isManagerOpen()){if(!await this.waitForElement(".sp_choice_type_12,.sp_choice_type_13"))return!1;if(!this.elementExists(".sp_choice_type_12"))return this.click(".sp_choice_type_13");this.click(".sp_choice_type_12"),await h((()=>this.isManagerOpen()),200,100)}await this.waitForElement(".type-modal",2e4),this.waitForThenClick(".ccpa-stack .pm-switch[aria-checked=true] .slider",500,!0);try{const e=".sp_choice_type_REJECT_ALL",t=".reject-toggle",o=await Promise.race([this.waitForElement(e,2e3).then((e=>e?0:-1)),this.waitForElement(t,2e3).then((e=>e?1:-1)),this.waitForElement(".pm-features",2e3).then((e=>e?2:-1))]);if(0===o)return await this.wait(1500),this.click(e);1===o?this.click(t):2===o&&(await this.waitForElement(".pm-features",1e4),this.click(".checked > span",!0),this.click(".chevron"))}catch(t){e.errors&&console.warn(t)}return this.click(".sp_choice_type_SAVE_AND_EXIT")}},class extends p{constructor(){super(...arguments),this.name="consentmanager.net",this.prehideSelectors=["#cmpbox,#cmpbox2"],this.apiAvailable=!1}get hasSelfTest(){return this.apiAvailable}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.apiAvailable=await this.mainWorldEval("EVAL_CONSENTMANAGER_1"),!!this.apiAvailable||this.elementExists("#cmpbox")}async detectPopup(){return this.apiAvailable?(await this.wait(500),await this.mainWorldEval("EVAL_CONSENTMANAGER_2")):this.elementVisible("#cmpbox .cmpmore","any")}async optOut(){return await this.wait(500),this.apiAvailable?await this.mainWorldEval("EVAL_CONSENTMANAGER_3"):!!this.click(".cmpboxbtnno")||(this.elementExists(".cmpwelcomeprpsbtn")?(this.click(".cmpwelcomeprpsbtn > a[aria-checked=true]",!0),this.click(".cmpboxbtnsave"),!0):(this.click(".cmpboxbtncustom"),await this.waitForElement(".cmptblbox",2e3),this.click(".cmptdchoice > a[aria-checked=true]",!0),this.click(".cmpboxbtnyescustomchoices"),this.hide("#cmpwrapper,#cmpbox","display"),!0))}async optIn(){return this.apiAvailable?await this.mainWorldEval("EVAL_CONSENTMANAGER_4"):this.click(".cmpboxbtnyes")}async test(){if(this.apiAvailable)return await this.mainWorldEval("EVAL_CONSENTMANAGER_5")}},class extends p{constructor(){super(...arguments),this.name="Evidon"}get hasSelfTest(){return!1}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists("#_evidon_banner")}async detectPopup(){return this.elementVisible("#_evidon_banner","any")}async optOut(){return this.click("#_evidon-decline-button")||(m(u(),"#evidon-prefdiag-overlay,#evidon-prefdiag-background"),this.click("#_evidon-option-button"),await this.waitForElement("#evidon-prefdiag-overlay",5e3),this.click("#evidon-prefdiag-decline")),!0}async optIn(){return this.click("#_evidon-accept-button")}},class extends p{constructor(){super(...arguments),this.name="Onetrust",this.prehideSelectors=["#onetrust-banner-sdk,#onetrust-consent-sdk,.onetrust-pc-dark-filter,.js-consent-banner"],this.runContext={urlPattern:"^(?!.*https://www\\.nba\\.com/)"}}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists("#onetrust-banner-sdk,#onetrust-consent-sdk")}async detectPopup(){return this.elementVisible("#onetrust-banner-sdk,#onetrust-consent-sdk","any")}async optOut(){return this.elementVisible("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies","any")?this.click("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies"):(this.elementExists("#onetrust-pc-btn-handler")?this.click("#onetrust-pc-btn-handler"):this.click(".ot-sdk-show-settings,button.js-cookie-settings"),await this.waitForElement("#onetrust-consent-sdk",2e3),await this.wait(1e3),this.click("#onetrust-consent-sdk input.category-switch-handler:checked,.js-editor-toggle-state:checked",!0),await this.wait(1e3),await this.waitForElement(".save-preference-btn-handler,.js-consent-save",2e3),this.click(".save-preference-btn-handler,.js-consent-save"),await this.waitForVisible("#onetrust-banner-sdk",5e3,"none"),!0)}async optIn(){return this.click("#onetrust-accept-btn-handler,#accept-recommended-btn-handler,.js-accept-cookies")}async test(){return await h((()=>this.mainWorldEval("EVAL_ONETRUST_1")),10,500)}},class extends p{constructor(){super(...arguments),this.name="Klaro",this.prehideSelectors=[".klaro"],this.settingsOpen=!1}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists(".klaro > .cookie-modal")?(this.settingsOpen=!0,!0):this.elementExists(".klaro > .cookie-notice")}async detectPopup(){return this.elementVisible(".klaro > .cookie-notice,.klaro > .cookie-modal","any")}async optOut(){return!!this.click(".klaro .cn-decline")||(this.settingsOpen||(this.click(".klaro .cn-learn-more,.klaro .cm-button-manage"),await this.waitForElement(".klaro > .cookie-modal",2e3),this.settingsOpen=!0),!!this.click(".klaro .cn-decline")||(this.click(".cm-purpose:not(.cm-toggle-all) > input:not(.half-checked,.required,.only-required),.cm-purpose:not(.cm-toggle-all) > div > input:not(.half-checked,.required,.only-required)",!0),this.click(".cm-btn-accept,.cm-button")))}async optIn(){return!!this.click(".klaro .cm-btn-accept-all")||(this.settingsOpen?(this.click(".cm-purpose:not(.cm-toggle-all) > input.half-checked",!0),this.click(".cm-btn-accept")):this.click(".klaro .cookie-notice .cm-btn-success"))}async test(){return await this.mainWorldEval("EVAL_KLARO_1")}},class extends p{constructor(){super(...arguments),this.name="Uniconsent"}get prehideSelectors(){return[".unic",".modal:has(.unic)"]}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists(".unic .unic-box,.unic .unic-bar,.unic .unic-modal")}async detectPopup(){return this.elementVisible(".unic .unic-box,.unic .unic-bar,.unic .unic-modal","any")}async optOut(){if(await this.waitForElement(".unic button",1e3),document.querySelectorAll(".unic button").forEach((e=>{const t=e.textContent;(t.includes("Manage Options")||t.includes("Optionen verwalten"))&&e.click()})),await this.waitForElement(".unic input[type=checkbox]",1e3)){await this.waitForElement(".unic button",1e3),document.querySelectorAll(".unic input[type=checkbox]").forEach((e=>{e.checked&&e.click()}));for(const e of document.querySelectorAll(".unic button")){const t=e.textContent;for(const o of["Confirm Choices","Save Choices","Auswahl speichern"])if(t.includes(o))return e.click(),await this.wait(500),!0}}return!1}async optIn(){return this.waitForThenClick(".unic #unic-agree")}async test(){await this.wait(1e3);return!this.elementExists(".unic .unic-box,.unic .unic-bar")}},class extends p{constructor(){super(...arguments),this.prehideSelectors=[".cmp-root"],this.name="Conversant"}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists(".cmp-root .cmp-receptacle")}async detectPopup(){return this.elementVisible(".cmp-root .cmp-receptacle","any")}async optOut(){if(!await this.waitForThenClick(".cmp-main-button:not(.cmp-main-button--primary)"))return!1;if(!await this.waitForElement(".cmp-view-tab-tabs"))return!1;await this.waitForThenClick(".cmp-view-tab-tabs > :first-child"),await this.waitForThenClick(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");for(const e of Array.from(document.querySelectorAll(".cmp-accordion-item"))){e.querySelector(".cmp-accordion-item-title").click(),await h((()=>!!e.querySelector(".cmp-accordion-item-content.cmp-active")),10,50);const t=e.querySelector(".cmp-accordion-item-content.cmp-active");t.querySelectorAll(".cmp-toggle-actions .cmp-toggle-deny:not(.cmp-toggle-deny--active)").forEach((e=>e.click())),t.querySelectorAll(".cmp-toggle-actions .cmp-toggle-checkbox:not(.cmp-toggle-checkbox--active)").forEach((e=>e.click()))}return await this.click(".cmp-main-button:not(.cmp-main-button--primary)"),!0}async optIn(){return this.waitForThenClick(".cmp-main-button.cmp-main-button--primary")}async test(){return document.cookie.includes("cmp-data=0")}},class extends p{constructor(){super(...arguments),this.name="tiktok.com",this.runContext={urlPattern:"tiktok"}}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}getShadowRoot(){const e=document.querySelector("tiktok-cookie-banner");return e?e.shadowRoot:null}async detectCmp(){return this.elementExists("tiktok-cookie-banner")}async detectPopup(){return k(this.getShadowRoot().querySelector(".tiktok-cookie-banner"))}async optOut(){const e=this.autoconsent.config.logs,t=this.getShadowRoot().querySelector(".button-wrapper button:first-child");return t?(e.rulesteps&&console.log("[clicking]",t),t.click(),!0):(e.errors&&console.log("no decline button found"),!1)}async optIn(){const e=this.autoconsent.config.logs,t=this.getShadowRoot().querySelector(".button-wrapper button:last-child");return t?(e.rulesteps&&console.log("[clicking]",t),t.click(),!0):(e.errors&&console.log("no accept button found"),!1)}async test(){const e=document.cookie.match(/cookie-consent=([^;]+)/);if(!e)return!1;const t=JSON.parse(decodeURIComponent(e[1]));return Object.values(t).every((e=>"boolean"!=typeof e||!1===e))}},class extends p{constructor(){super(...arguments),this.runContext={urlPattern:"^https://(www\\.)?airbnb\\.[^/]+/"},this.prehideSelectors=["div[data-testid=main-cookies-banner-container]",'div:has(> div:first-child):has(> div:last-child):has(> section [data-testid="strictly-necessary-cookies"])']}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists("div[data-testid=main-cookies-banner-container]")}async detectPopup(){return this.elementVisible("div[data-testid=main-cookies-banner-container","any")}async optOut(){let e;for(await this.waitForThenClick("div[data-testid=main-cookies-banner-container] button._snbhip0");e=document.querySelector("[data-testid=modal-container] button[aria-checked=true]:not([disabled])");)e.click();return this.waitForThenClick("button[data-testid=save-btn]")}async optIn(){return this.waitForThenClick("div[data-testid=main-cookies-banner-container] button._148dgdpk")}async test(){return await h((()=>!!document.cookie.match("OptanonAlertBoxClosed")),20,200)}}];var w=[{name:"192.com",detectCmp:[{exists:".ont-cookies"}],detectPopup:[{visible:".ont-cookies"}],optIn:[{click:".ont-btn-main.ont-cookies-btn.js-ont-btn-ok2"}],optOut:[{click:".ont-cookes-btn-manage"},{click:".ont-btn-main.ont-cookies-btn.js-ont-btn-choose"}],test:[{eval:"EVAL_ONENINETWO_0"}]},{name:"1password-com",cosmetic:!0,prehideSelectors:['footer #footer-root [aria-label="Cookie Consent"]'],detectCmp:[{exists:'footer #footer-root [aria-label="Cookie Consent"]'}],detectPopup:[{visible:'footer #footer-root [aria-label="Cookie Consent"]'}],optIn:[{click:'footer #footer-root [aria-label="Cookie Consent"] button'}],optOut:[{hide:'footer #footer-root [aria-label="Cookie Consent"]'}]},{name:"abconcerts.be",vendorUrl:"https://unknown",intermediate:!1,prehideSelectors:["dialog.cookie-consent"],detectCmp:[{exists:"dialog.cookie-consent form.cookie-consent__form"}],detectPopup:[{visible:"dialog.cookie-consent form.cookie-consent__form"}],optIn:[{waitForThenClick:"dialog.cookie-consent form.cookie-consent__form button[value=yes]"}],optOut:[{if:{exists:"dialog.cookie-consent form.cookie-consent__form button[value=no]"},then:[{click:"dialog.cookie-consent form.cookie-consent__form button[value=no]"}],else:[{click:"dialog.cookie-consent form.cookie-consent__form button.cookie-consent__options-toggle"},{waitForThenClick:'dialog.cookie-consent form.cookie-consent__form button[value="save_options"]'}]}]},{name:"activobank.pt",runContext:{urlPattern:"^https://(www\\.)?activobank\\.pt"},prehideSelectors:["aside#cookies,.overlay-cookies"],detectCmp:[{exists:"#cookies .cookies-btn"}],detectPopup:[{visible:"#cookies #submitCookies"}],optIn:[{waitForThenClick:"#cookies #submitCookies"}],optOut:[{waitForThenClick:"#cookies #rejectCookies"}]},{name:"Adroll",prehideSelectors:["#adroll_consent_container"],detectCmp:[{exists:"#adroll_consent_container"}],detectPopup:[{visible:"#adroll_consent_container"}],optIn:[{waitForThenClick:"#adroll_consent_accept"}],optOut:[{waitForThenClick:"#adroll_consent_reject"}],test:[{eval:"EVAL_ADROLL_0"}]},{name:"affinity.serif.com",detectCmp:[{exists:".c-cookie-banner button[data-qa='allow-all-cookies']"}],detectPopup:[{visible:".c-cookie-banner"}],optIn:[{click:'button[data-qa="allow-all-cookies"]'}],optOut:[{click:'button[data-qa="manage-cookies"]'},{waitFor:'.c-cookie-banner ~ [role="dialog"]'},{waitForThenClick:'.c-cookie-banner ~ [role="dialog"] input[type="checkbox"][value="true"]',all:!0},{click:'.c-cookie-banner ~ [role="dialog"] .c-modal__action button'}],test:[{wait:500},{eval:"EVAL_AFFINITY_SERIF_COM_0"}]},{name:"agolde.com",cosmetic:!0,prehideSelectors:["#modal-1 div[data-micromodal-close]"],detectCmp:[{exists:"#modal-1 div[aria-labelledby=modal-1-title]"}],detectPopup:[{exists:"#modal-1 div[data-micromodal-close]"}],optIn:[{click:'button[aria-label="Close modal"]'}],optOut:[{hide:"#modal-1 div[data-micromodal-close]"}]},{name:"aliexpress",vendorUrl:"https://aliexpress.com/",runContext:{urlPattern:"^https://.*\\.aliexpress\\.com/"},prehideSelectors:["#gdpr-new-container"],detectCmp:[{exists:"#gdpr-new-container"}],detectPopup:[{visible:"#gdpr-new-container"}],optIn:[{waitForThenClick:"#gdpr-new-container .btn-accept"}],optOut:[{waitForThenClick:"#gdpr-new-container .btn-more"},{waitFor:"#gdpr-new-container .gdpr-dialog-switcher"},{click:"#gdpr-new-container .switcher-on",all:!0,optional:!0},{click:"#gdpr-new-container .btn-save"}]},{name:"almacmp",prehideSelectors:["#alma-cmpv2-container"],detectCmp:[{exists:"#alma-cmpv2-container"}],detectPopup:[{visible:"#alma-cmpv2-container #almacmp-modal-layer1"}],optIn:[{waitForThenClick:"#alma-cmpv2-container #almacmp-modal-layer1 #almacmp-modalConfirmBtn"}],optOut:[{waitForThenClick:"#alma-cmpv2-container #almacmp-modal-layer1 #almacmp-modalSettingBtn"},{waitFor:"#alma-cmpv2-container #almacmp-modal-layer2"},{waitForThenClick:"#alma-cmpv2-container #almacmp-modal-layer2 #almacmp-reject-all-layer2"}],test:[{eval:"EVAL_ALMACMP_0"}]},{name:"altium.com",cosmetic:!0,prehideSelectors:[".altium-privacy-bar"],detectCmp:[{exists:".altium-privacy-bar"}],detectPopup:[{exists:".altium-privacy-bar"}],optIn:[{click:"a.altium-privacy-bar__btn"}],optOut:[{hide:".altium-privacy-bar"}]},{name:"amazon.com",prehideSelectors:['span[data-action="sp-cc"][data-sp-cc*="rejectAllAction"]'],detectCmp:[{exists:'span[data-action="sp-cc"][data-sp-cc*="rejectAllAction"]'}],detectPopup:[{visible:'span[data-action="sp-cc"][data-sp-cc*="rejectAllAction"]'}],optIn:[{waitForVisible:"#sp-cc-accept"},{wait:500},{click:"#sp-cc-accept"}],optOut:[{waitForVisible:"#sp-cc-rejectall-link"},{wait:500},{click:"#sp-cc-rejectall-link"}]},{name:"aquasana.com",cosmetic:!0,prehideSelectors:["#consent-tracking"],detectCmp:[{exists:"#consent-tracking"}],detectPopup:[{exists:"#consent-tracking"}],optIn:[{click:"#accept_consent"}],optOut:[{hide:"#consent-tracking"}]},{name:"arbeitsagentur",vendorUrl:"https://www.arbeitsagentur.de/",prehideSelectors:[".modal-open bahf-cookie-disclaimer-dpl3"],detectCmp:[{exists:"bahf-cookie-disclaimer-dpl3"}],detectPopup:[{visible:"bahf-cookie-disclaimer-dpl3"}],optIn:[{waitForThenClick:["bahf-cookie-disclaimer-dpl3","bahf-cd-modal-dpl3 .ba-btn-primary"]}],optOut:[{waitForThenClick:["bahf-cookie-disclaimer-dpl3","bahf-cd-modal-dpl3 .ba-btn-contrast"]}],test:[{eval:"EVAL_ARBEITSAGENTUR_TEST"}]},{name:"asus",vendorUrl:"https://www.asus.com/",runContext:{urlPattern:"^https://www\\.asus\\.com/"},prehideSelectors:["#cookie-policy-info,#cookie-policy-info-bg"],detectCmp:[{exists:"#cookie-policy-info"}],detectPopup:[{visible:"#cookie-policy-info"}],optIn:[{waitForThenClick:'#cookie-policy-info [data-agree="Accept Cookies"]'}],optOut:[{if:{exists:"#cookie-policy-info .btn-reject"},then:[{waitForThenClick:"#cookie-policy-info .btn-reject"}],else:[{waitForThenClick:"#cookie-policy-info .btn-setting"},{waitForThenClick:'#cookie-policy-lightbox-wrapper [data-agree="Save Settings"]'}]}]},{name:"athlinks-com",runContext:{urlPattern:"^https://(www\\.)?athlinks\\.com/"},cosmetic:!0,prehideSelectors:["#footer-container ~ div"],detectCmp:[{exists:"#footer-container ~ div"}],detectPopup:[{visible:"#footer-container > div"}],optIn:[{click:"#footer-container ~ div button"}],optOut:[{hide:"#footer-container ~ div"}]},{name:"ausopen.com",cosmetic:!0,detectCmp:[{exists:".gdpr-popup__message"}],detectPopup:[{visible:".gdpr-popup__message"}],optOut:[{hide:".gdpr-popup__message"}],optIn:[{click:".gdpr-popup__message button"}]},{name:"automattic-cmp-optout",prehideSelectors:['form[class*="cookie-banner"][method="post"]'],detectCmp:[{exists:'form[class*="cookie-banner"][method="post"]'}],detectPopup:[{visible:'form[class*="cookie-banner"][method="post"]'}],optIn:[{click:'a[class*="accept-all-button"]'}],optOut:[{click:'form[class*="cookie-banner"] div[class*="simple-options"] a[class*="customize-button"]'},{waitForThenClick:"input[type=checkbox][checked]:not([disabled])",all:!0},{click:'a[class*="accept-selection-button"]'}]},{name:"aws.amazon.com",prehideSelectors:["#awsccc-cb-content","#awsccc-cs-container","#awsccc-cs-modalOverlay","#awsccc-cs-container-inner"],detectCmp:[{exists:"#awsccc-cb-content"}],detectPopup:[{visible:"#awsccc-cb-content"}],optIn:[{click:"button[data-id=awsccc-cb-btn-accept"}],optOut:[{click:"button[data-id=awsccc-cb-btn-customize]"},{waitFor:"input[aria-checked]"},{click:"input[aria-checked=true]",all:!0,optional:!0},{click:"button[data-id=awsccc-cs-btn-save]"}]},{name:"axeptio",prehideSelectors:[".axeptio_widget"],detectCmp:[{exists:".axeptio_widget"}],detectPopup:[{visible:".axeptio_widget"}],optIn:[{waitFor:".axeptio-widget--open"},{click:"button#axeptio_btn_acceptAll"}],optOut:[{waitFor:".axeptio-widget--open"},{click:"button#axeptio_btn_dismiss"}],test:[{eval:"EVAL_AXEPTIO_0"}]},{name:"baden-wuerttemberg.de",prehideSelectors:[".cookie-alert.t-dark"],cosmetic:!0,detectCmp:[{exists:".cookie-alert.t-dark"}],detectPopup:[{visible:".cookie-alert.t-dark"}],optIn:[{click:".cookie-alert__form input:not([disabled]):not([checked])"},{click:".cookie-alert__button button"}],optOut:[{hide:".cookie-alert.t-dark"}]},{name:"bahn-de",vendorUrl:"https://www.bahn.de/",cosmetic:!1,runContext:{main:!0,frame:!1,urlPattern:"^https://(www\\.)?bahn\\.de/"},intermediate:!1,prehideSelectors:[],detectCmp:[{exists:["body > div:first-child","#consent-layer"]}],detectPopup:[{visible:["body > div:first-child","#consent-layer"]}],optIn:[{waitForThenClick:["body > div:first-child","#consent-layer .js-accept-all-cookies"]}],optOut:[{waitForThenClick:["body > div:first-child","#consent-layer .js-accept-essential-cookies"]}],test:[{eval:"EVAL_BAHN_TEST"}]},{name:"bbb.org",runContext:{urlPattern:"^https://www\\.bbb\\.org/"},cosmetic:!0,prehideSelectors:['div[aria-label="use of cookies on bbb.org"]'],detectCmp:[{exists:'div[aria-label="use of cookies on bbb.org"]'}],detectPopup:[{visible:'div[aria-label="use of cookies on bbb.org"]'}],optIn:[{click:'div[aria-label="use of cookies on bbb.org"] button.bds-button-unstyled span.visually-hidden'}],optOut:[{hide:'div[aria-label="use of cookies on bbb.org"]'}]},{name:"bing.com",prehideSelectors:["#bnp_container"],detectCmp:[{exists:"#bnp_cookie_banner"}],detectPopup:[{visible:"#bnp_cookie_banner"}],optIn:[{click:"#bnp_btn_accept"}],optOut:[{click:"#bnp_btn_preference"},{click:"#mcp_savesettings"}],test:[{eval:"EVAL_BING_0"}]},{name:"blocksy",vendorUrl:"https://creativethemes.com/blocksy/docs/extensions/cookies-consent/",cosmetic:!1,runContext:{main:!0,frame:!1},intermediate:!1,prehideSelectors:[".cookie-notification"],detectCmp:[{exists:"#blocksy-ext-cookies-consent-styles-css"}],detectPopup:[{visible:".cookie-notification"}],optIn:[{click:".cookie-notification .ct-cookies-decline-button"}],optOut:[{waitForThenClick:".cookie-notification .ct-cookies-decline-button"}],test:[{eval:"EVAL_BLOCKSY_0"}]},{name:"borlabs",detectCmp:[{exists:"._brlbs-block-content"}],detectPopup:[{visible:"._brlbs-bar-wrap,._brlbs-box-wrap"}],optIn:[{click:"a[data-cookie-accept-all]"}],optOut:[{click:"a[data-cookie-individual]"},{waitForVisible:".cookie-preference"},{click:"input[data-borlabs-cookie-checkbox]:checked",all:!0,optional:!0},{click:"#CookiePrefSave"},{wait:500}],prehideSelectors:["#BorlabsCookieBox"],test:[{eval:"EVAL_BORLABS_0"}]},{name:"bundesregierung.de",prehideSelectors:[".bpa-cookie-banner"],detectCmp:[{exists:".bpa-cookie-banner"}],detectPopup:[{visible:".bpa-cookie-banner .bpa-module-full-hero"}],optIn:[{click:".bpa-accept-all-button"}],optOut:[{wait:500,comment:"click is not immediately recognized"},{waitForThenClick:".bpa-close-button"}],test:[{eval:"EVAL_BUNDESREGIERUNG_DE_0"}]},{name:"burpee.com",cosmetic:!0,prehideSelectors:["#notice-cookie-block"],detectCmp:[{exists:"#notice-cookie-block"}],detectPopup:[{exists:"#html-body #notice-cookie-block"}],optIn:[{click:"#btn-cookie-allow"}],optOut:[{hide:"#html-body #notice-cookie-block, #notice-cookie"}]},{name:"canva.com",prehideSelectors:['div[role="dialog"] a[data-anchor-id="cookie-policy"]'],detectCmp:[{exists:'div[role="dialog"] a[data-anchor-id="cookie-policy"]'}],detectPopup:[{exists:'div[role="dialog"] a[data-anchor-id="cookie-policy"]'}],optIn:[{click:'div[role="dialog"] button:nth-child(1)'}],optOut:[{if:{exists:'div[role="dialog"] button:nth-child(3)'},then:[{click:'div[role="dialog"] button:nth-child(2)'}],else:[{click:'div[role="dialog"] button:nth-child(2)'},{waitFor:'div[role="dialog"] a[data-anchor-id="privacy-policy"]'},{click:'div[role="dialog"] button:nth-child(2)'},{click:'div[role="dialog"] div:last-child button:only-child'}]}],test:[{eval:"EVAL_CANVA_0"}]},{name:"canyon.com",runContext:{urlPattern:"^https://www\\.canyon\\.com/"},prehideSelectors:["div.modal.cookiesModal.is-open"],detectCmp:[{exists:"div.modal.cookiesModal.is-open"}],detectPopup:[{visible:"div.modal.cookiesModal.is-open"}],optIn:[{click:'div.cookiesModal__buttonWrapper > button[data-closecause="close-by-submit"]'}],optOut:[{click:'div.cookiesModal__buttonWrapper > button[data-closecause="close-by-manage-cookies"]'},{waitForThenClick:"button#js-manage-data-privacy-save-button"}]},{name:"cc-banner-springer",prehideSelectors:[".cc-banner[data-cc-banner]"],detectCmp:[{exists:".cc-banner[data-cc-banner]"}],detectPopup:[{visible:".cc-banner[data-cc-banner]"}],optIn:[{waitForThenClick:".cc-banner[data-cc-banner] button[data-cc-action=accept]"}],optOut:[{if:{exists:".cc-banner[data-cc-banner] button[data-cc-action=reject]"},then:[{click:".cc-banner[data-cc-banner] button[data-cc-action=reject]"}],else:[{waitForThenClick:".cc-banner[data-cc-banner] button[data-cc-action=preferences]"},{waitFor:".cc-preferences[data-cc-preferences]"},{click:".cc-preferences[data-cc-preferences] input[type=radio][data-cc-action=toggle-category][value=off]",all:!0,optional:!0},{if:{exists:".cc-preferences[data-cc-preferences] button[data-cc-action=reject]"},then:[{click:".cc-preferences[data-cc-preferences] button[data-cc-action=reject]"}],else:[{click:".cc-preferences[data-cc-preferences] button[data-cc-action=save]"}]}]}],test:[{eval:"EVAL_CC_BANNER2_0"}]},{name:"cc_banner",cosmetic:!0,prehideSelectors:[".cc_banner-wrapper"],detectCmp:[{exists:".cc_banner-wrapper"}],detectPopup:[{visible:".cc_banner"}],optIn:[{click:".cc_btn_accept_all"}],optOut:[{hide:".cc_banner-wrapper"}]},{name:"ciaopeople.it",prehideSelectors:["#cp-gdpr-choices"],detectCmp:[{exists:"#cp-gdpr-choices"}],detectPopup:[{visible:"#cp-gdpr-choices"}],optIn:[{waitForThenClick:".gdpr-btm__right > button:nth-child(2)"}],optOut:[{waitForThenClick:".gdpr-top-content > button"},{waitFor:".gdpr-top-back"},{waitForThenClick:".gdpr-btm__right > button:nth-child(1)"}],test:[{visible:"#cp-gdpr-choices",check:"none"}]},{vendorUrl:"https://www.civicuk.com/cookie-control/",name:"civic-cookie-control",prehideSelectors:["#ccc-module,#ccc-overlay"],detectCmp:[{exists:"#ccc-module"}],detectPopup:[{visible:"#ccc"},{visible:"#ccc-module"}],optOut:[{click:"#ccc-reject-settings"}],optIn:[{click:"#ccc-recommended-settings"}]},{name:"click.io",prehideSelectors:["#cl-consent"],detectCmp:[{exists:"#cl-consent"}],detectPopup:[{visible:"#cl-consent"}],optIn:[{waitForThenClick:'#cl-consent [data-role="b_agree"]'}],optOut:[{waitFor:'#cl-consent [data-role="b_options"]'},{wait:500},{click:'#cl-consent [data-role="b_options"]'},{waitFor:'.cl-consent-popup.cl-consent-visible [data-role="alloff"]'},{click:'.cl-consent-popup.cl-consent-visible [data-role="alloff"]',all:!0},{click:'[data-role="b_save"]'}],test:[{eval:"EVAL_CLICKIO_0",comment:"TODO: this only checks if we interacted at all"}]},{name:"clinch",intermediate:!1,runContext:{frame:!1,main:!0},prehideSelectors:[".consent-modal[role=dialog]"],detectCmp:[{exists:".consent-modal[role=dialog]"}],detectPopup:[{visible:".consent-modal[role=dialog]"}],optIn:[{click:"#consent_agree"}],optOut:[{if:{exists:"#consent_reject"},then:[{click:"#consent_reject"}],else:[{click:"#manage_cookie_preferences"},{click:"#cookie_consent_preferences input:checked",all:!0,optional:!0},{click:"#consent_save"}]}],test:[{eval:"EVAL_CLINCH_0"}]},{name:"clustrmaps.com",runContext:{urlPattern:"^https://(www\\.)?clustrmaps\\.com/"},cosmetic:!0,prehideSelectors:["#gdpr-cookie-message"],detectCmp:[{exists:"#gdpr-cookie-message"}],detectPopup:[{visible:"#gdpr-cookie-message"}],optIn:[{click:"button#gdpr-cookie-accept"}],optOut:[{hide:"#gdpr-cookie-message"}]},{name:"coinbase",intermediate:!1,runContext:{frame:!0,main:!0,urlPattern:"^https://(www|help)\\.coinbase\\.com"},prehideSelectors:[],detectCmp:[{exists:"div[class^=CookieBannerContent__Container]"}],detectPopup:[{visible:"div[class^=CookieBannerContent__Container]"}],optIn:[{click:"div[class^=CookieBannerContent__CTA] :nth-last-child(1)"}],optOut:[{click:"button[class^=CookieBannerContent__Settings]"},{click:"div[class^=CookiePreferencesModal__CategoryContainer] input:checked",all:!0,optional:!0},{click:"div[class^=CookiePreferencesModal__ButtonContainer] > button"}],test:[{eval:"EVAL_COINBASE_0"}]},{name:"Complianz banner",prehideSelectors:["#cmplz-cookiebanner-container"],detectCmp:[{exists:"#cmplz-cookiebanner-container .cmplz-cookiebanner"}],detectPopup:[{visible:"#cmplz-cookiebanner-container .cmplz-cookiebanner",check:"any"}],optIn:[{waitForThenClick:".cmplz-cookiebanner .cmplz-accept"}],optOut:[{waitForThenClick:".cmplz-cookiebanner .cmplz-deny"}],test:[{eval:"EVAL_COMPLIANZ_BANNER_0"}]},{name:"Complianz categories",prehideSelectors:['.cc-type-categories[aria-describedby="cookieconsent:desc"]'],detectCmp:[{exists:'.cc-type-categories[aria-describedby="cookieconsent:desc"]'}],detectPopup:[{visible:'.cc-type-categories[aria-describedby="cookieconsent:desc"]'}],optIn:[{any:[{click:".cc-accept-all"},{click:".cc-allow-all"},{click:".cc-allow"},{click:".cc-dismiss"}]}],optOut:[{if:{exists:'.cc-type-categories[aria-describedby="cookieconsent:desc"] .cc-dismiss'},then:[{click:".cc-dismiss"}],else:[{click:".cc-type-categories input[type=checkbox]:not([disabled]):checked",all:!0,optional:!0},{click:".cc-save"}]}]},{name:"Complianz notice",prehideSelectors:['.cc-type-info[aria-describedby="cookieconsent:desc"]'],cosmetic:!0,detectCmp:[{exists:'.cc-type-info[aria-describedby="cookieconsent:desc"] .cc-compliance .cc-btn'}],detectPopup:[{visible:'.cc-type-info[aria-describedby="cookieconsent:desc"] .cc-compliance .cc-btn'}],optIn:[{click:".cc-accept-all",optional:!0},{click:".cc-allow",optional:!0},{click:".cc-dismiss",optional:!0}],optOut:[{if:{exists:".cc-deny"},then:[{click:".cc-deny"}],else:[{hide:'[aria-describedby="cookieconsent:desc"]'}]}]},{name:"Complianz opt-both",prehideSelectors:['[aria-describedby="cookieconsent:desc"] .cc-type-opt-both'],detectCmp:[{exists:'[aria-describedby="cookieconsent:desc"] .cc-type-opt-both'}],detectPopup:[{visible:'[aria-describedby="cookieconsent:desc"] .cc-type-opt-both'}],optIn:[{click:".cc-accept-all",optional:!0},{click:".cc-allow",optional:!0},{click:".cc-dismiss",optional:!0}],optOut:[{waitForThenClick:".cc-deny"}]},{name:"Complianz optin",prehideSelectors:['.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'],detectCmp:[{exists:'.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'}],detectPopup:[{visible:'.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'}],optIn:[{any:[{click:".cc-accept-all"},{click:".cc-allow"},{click:".cc-dismiss"}]}],optOut:[{if:{visible:".cc-deny"},then:[{click:".cc-deny"}],else:[{if:{visible:".cc-settings"},then:[{waitForThenClick:".cc-settings"},{waitForVisible:".cc-settings-view"},{click:".cc-settings-view input[type=checkbox]:not([disabled]):checked",all:!0,optional:!0},{click:".cc-settings-view .cc-btn-accept-selected"}],else:[{click:".cc-dismiss"}]}]}]},{name:"cookie-law-info",prehideSelectors:["#cookie-law-info-bar"],detectCmp:[{exists:"#cookie-law-info-bar"},{eval:"EVAL_COOKIE_LAW_INFO_DETECT"}],detectPopup:[{visible:"#cookie-law-info-bar"}],optIn:[{click:'[data-cli_action="accept_all"]'}],optOut:[{hide:"#cookie-law-info-bar"},{eval:"EVAL_COOKIE_LAW_INFO_0"}],test:[{eval:"EVAL_COOKIE_LAW_INFO_1"}]},{name:"cookie-manager-popup",cosmetic:!1,runContext:{main:!0,frame:!1},intermediate:!1,detectCmp:[{exists:"#notice-cookie-block #allow-functional-cookies, #notice-cookie-block #btn-cookie-settings"}],detectPopup:[{visible:"#notice-cookie-block"}],optIn:[{click:"#btn-cookie-allow"}],optOut:[{if:{exists:"#allow-functional-cookies"},then:[{click:"#allow-functional-cookies"}],else:[{waitForThenClick:"#btn-cookie-settings"},{waitForVisible:".modal-body"},{click:'.modal-body input:checked, .switch[data-switch="on"]',all:!0,optional:!0},{click:'[role="dialog"] .modal-footer button'}]}],prehideSelectors:["#btn-cookie-settings"],test:[{eval:"EVAL_COOKIE_MANAGER_POPUP_0"}]},{name:"cookie-notice",prehideSelectors:["#cookie-notice"],cosmetic:!0,detectCmp:[{visible:"#cookie-notice .cookie-notice-container"}],detectPopup:[{visible:"#cookie-notice"}],optIn:[{click:"#cn-accept-cookie"}],optOut:[{hide:"#cookie-notice"}]},{name:"cookie-script",vendorUrl:"https://cookie-script.com/",prehideSelectors:["#cookiescript_injected"],detectCmp:[{exists:"#cookiescript_injected"}],detectPopup:[{visible:"#cookiescript_injected"}],optOut:[{click:"#cookiescript_reject"}],optIn:[{click:"#cookiescript_accept"}]},{name:"cookieacceptbar",vendorUrl:"https://unknown",cosmetic:!0,prehideSelectors:["#cookieAcceptBar.cookieAcceptBar"],detectCmp:[{exists:"#cookieAcceptBar.cookieAcceptBar"}],detectPopup:[{visible:"#cookieAcceptBar.cookieAcceptBar"}],optIn:[{waitForThenClick:"#cookieAcceptBarConfirm"}],optOut:[{hide:"#cookieAcceptBar.cookieAcceptBar"}]},{name:"cookiealert",intermediate:!1,prehideSelectors:[],runContext:{frame:!0,main:!0},detectCmp:[{exists:".cookie-alert-extended"}],detectPopup:[{visible:".cookie-alert-extended-modal"}],optIn:[{click:"button[data-controller='cookie-alert/extended/button/accept']"},{eval:"EVAL_COOKIEALERT_0"}],optOut:[{click:"a[data-controller='cookie-alert/extended/detail-link']"},{click:".cookie-alert-configuration-input:checked",all:!0,optional:!0},{click:"button[data-controller='cookie-alert/extended/button/configuration']"},{eval:"EVAL_COOKIEALERT_0"}],test:[{eval:"EVAL_COOKIEALERT_2"}]},{name:"cookieconsent2",vendorUrl:"https://www.github.com/orestbida/cookieconsent",comment:"supports v2.x.x of the library",prehideSelectors:["#cc--main"],detectCmp:[{exists:"#cc--main"}],detectPopup:[{visible:"#cm"},{exists:"#s-all-bn"}],optIn:[{waitForThenClick:"#s-all-bn"}],optOut:[{waitForThenClick:"#s-rall-bn"}],test:[{eval:"EVAL_COOKIECONSENT2_TEST"}]},{name:"cookieconsent3",vendorUrl:"https://www.github.com/orestbida/cookieconsent",comment:"supports v3.x.x of the library",prehideSelectors:["#cc-main"],detectCmp:[{exists:"#cc-main"}],detectPopup:[{visible:"#cc-main .cm-wrapper"}],optIn:[{waitForThenClick:".cm__btn[data-role=all]"}],optOut:[{waitForThenClick:".cm__btn[data-role=necessary]"}],test:[{eval:"EVAL_COOKIECONSENT3_TEST"}]},{name:"cookiefirst.com",prehideSelectors:["#cookiefirst-root,.cookiefirst-root,[aria-labelledby=cookie-preference-panel-title]"],detectCmp:[{exists:"#cookiefirst-root,.cookiefirst-root"}],detectPopup:[{visible:"#cookiefirst-root,.cookiefirst-root"}],optIn:[{click:"button[data-cookiefirst-action=accept]"}],optOut:[{if:{exists:"button[data-cookiefirst-action=adjust]"},then:[{click:"button[data-cookiefirst-action=adjust]"},{waitForVisible:"[data-cookiefirst-widget=modal]",timeout:1e3},{eval:"EVAL_COOKIEFIRST_1"},{wait:1e3},{click:"button[data-cookiefirst-action=save]"}],else:[{click:"button[data-cookiefirst-action=reject]"}]}],test:[{eval:"EVAL_COOKIEFIRST_0"}]},{name:"Cookie Information Banner",prehideSelectors:["#cookie-information-template-wrapper"],detectCmp:[{exists:"#cookie-information-template-wrapper"}],detectPopup:[{visible:"#cookie-information-template-wrapper"}],optIn:[{eval:"EVAL_COOKIEINFORMATION_1"}],optOut:[{hide:"#cookie-information-template-wrapper",comment:"some templates don't hide the banner automatically"},{eval:"EVAL_COOKIEINFORMATION_0"}],test:[{eval:"EVAL_COOKIEINFORMATION_2"}]},{name:"cookieyes",prehideSelectors:[".cky-overlay,.cky-consent-container"],detectCmp:[{exists:".cky-consent-container"}],detectPopup:[{visible:".cky-consent-container"}],optIn:[{waitForThenClick:".cky-consent-container [data-cky-tag=accept-button]"}],optOut:[{if:{exists:".cky-consent-container [data-cky-tag=reject-button]"},then:[{waitForThenClick:".cky-consent-container [data-cky-tag=reject-button]"}],else:[{if:{exists:".cky-consent-container [data-cky-tag=settings-button]"},then:[{click:".cky-consent-container [data-cky-tag=settings-button]"},{waitFor:".cky-modal-open input[type=checkbox]"},{click:".cky-modal-open input[type=checkbox]:checked",all:!0,optional:!0},{waitForThenClick:".cky-modal [data-cky-tag=detail-save-button]"}],else:[{hide:".cky-consent-container,.cky-overlay"}]}]}],test:[{eval:"EVAL_COOKIEYES_0"}]},{name:"corona-in-zahlen.de",prehideSelectors:[".cookiealert"],detectCmp:[{exists:".cookiealert"}],detectPopup:[{visible:".cookiealert"}],optOut:[{click:".configurecookies"},{click:".confirmcookies"}],optIn:[{click:".acceptcookies"}]},{name:"crossfit-com",cosmetic:!0,prehideSelectors:['body #modal > div > div[class^="_wrapper_"]'],detectCmp:[{exists:'body #modal > div > div[class^="_wrapper_"]'}],detectPopup:[{visible:'body #modal > div > div[class^="_wrapper_"]'}],optIn:[{click:'button[aria-label="accept cookie policy"]'}],optOut:[{hide:'body #modal > div > div[class^="_wrapper_"]'}]},{name:"csu-landtag-de",runContext:{urlPattern:"^https://(www|)?\\.csu-landtag\\.de"},prehideSelectors:["#cookie-disclaimer"],detectCmp:[{exists:"#cookie-disclaimer"}],detectPopup:[{visible:"#cookie-disclaimer"}],optIn:[{click:"#cookieall"}],optOut:[{click:"#cookiesel"}]},{name:"dailymotion-us",cosmetic:!0,prehideSelectors:['div[class*="CookiePopup__desktopContainer"]:has(div[class*="CookiePopup"])'],detectCmp:[{exists:'div[class*="CookiePopup__desktopContainer"]'}],detectPopup:[{visible:'div[class*="CookiePopup__desktopContainer"]'}],optIn:[{click:'div[class*="CookiePopup__desktopContainer"] > button > span'}],optOut:[{hide:'div[class*="CookiePopup__desktopContainer"]'}]},{name:"dailymotion.com",runContext:{urlPattern:"^https://(www\\.)?dailymotion\\.com/"},prehideSelectors:['div[class*="Overlay__container"]:has(div[class*="TCF2Popup"])'],detectCmp:[{exists:'div[class*="TCF2Popup"]'}],detectPopup:[{visible:'[class*="TCF2Popup"] a[href^="https://www.dailymotion.com/legal/cookiemanagement"]'}],optIn:[{waitForThenClick:'button[class*="TCF2Popup__button"]:not([class*="TCF2Popup__personalize"])'}],optOut:[{waitForThenClick:'button[class*="TCF2ContinueWithoutAcceptingButton"]'}],test:[{eval:"EVAL_DAILYMOTION_0"}]},{name:"deepl.com",prehideSelectors:[".dl_cookieBanner_container"],detectCmp:[{exists:".dl_cookieBanner_container"}],detectPopup:[{visible:".dl_cookieBanner_container"}],optOut:[{click:".dl_cookieBanner--buttonSelected"}],optIn:[{click:".dl_cookieBanner--buttonAll"}]},{name:"delta.com",runContext:{urlPattern:"^https://www\\.delta\\.com/"},cosmetic:!0,prehideSelectors:["ngc-cookie-banner"],detectCmp:[{exists:"div.cookie-footer-container"}],detectPopup:[{visible:"div.cookie-footer-container"}],optIn:[{click:" button.cookie-close-icon"}],optOut:[{hide:"div.cookie-footer-container"}]},{name:"dmgmedia-us",prehideSelectors:["#mol-ads-cmp-iframe, div.mol-ads-cmp > form > div"],detectCmp:[{exists:"div.mol-ads-cmp > form > div"}],detectPopup:[{waitForVisible:"div.mol-ads-cmp > form > div"}],optIn:[{waitForThenClick:"button.mol-ads-cmp--btn-primary"}],optOut:[{waitForThenClick:"div.mol-ads-ccpa--message > u > a"},{waitForVisible:".mol-ads-cmp--modal-dialog"},{waitForThenClick:"a.mol-ads-cmp-footer-privacy"},{waitForThenClick:"button.mol-ads-cmp--btn-secondary"}]},{name:"dmgmedia",prehideSelectors:['[data-project="mol-fe-cmp"]'],detectCmp:[{exists:'[data-project="mol-fe-cmp"]'}],detectPopup:[{visible:'[data-project="mol-fe-cmp"]'}],optIn:[{waitForThenClick:'[data-project="mol-fe-cmp"] button[class*=primary]'}],optOut:[{waitForThenClick:'[data-project="mol-fe-cmp"] button[class*=basic]'},{waitForVisible:'[data-project="mol-fe-cmp"] div[class*="tabContent"]'},{waitForThenClick:'[data-project="mol-fe-cmp"] div[class*="toggle"][class*="enabled"]',all:!0},{waitForThenClick:'[data-project="mol-fe-cmp"] button[class*=white]'}]},{name:"dndbeyond",vendorUrl:"https://www.dndbeyond.com/",runContext:{urlPattern:"^https://(www\\.)?dndbeyond\\.com/"},prehideSelectors:["[id^=cookie-consent-banner]"],detectCmp:[{exists:"[id^=cookie-consent-banner]"}],detectPopup:[{visible:"[id^=cookie-consent-banner]"}],optIn:[{waitForThenClick:"#cookie-consent-granted"}],optOut:[{waitForThenClick:"#cookie-consent-denied"}],test:[{eval:"EVAL_DNDBEYOND_TEST"}]},{name:"Drupal",detectCmp:[{exists:"#drupalorg-crosssite-gdpr"}],detectPopup:[{visible:"#drupalorg-crosssite-gdpr"}],optOut:[{click:".no"}],optIn:[{click:".yes"}]},{name:"WP DSGVO Tools",link:"https://wordpress.org/plugins/shapepress-dsgvo/",prehideSelectors:[".sp-dsgvo"],cosmetic:!0,detectCmp:[{exists:".sp-dsgvo.sp-dsgvo-popup-overlay"}],detectPopup:[{visible:".sp-dsgvo.sp-dsgvo-popup-overlay",check:"any"}],optIn:[{click:".sp-dsgvo-privacy-btn-accept-all",all:!0}],optOut:[{hide:".sp-dsgvo.sp-dsgvo-popup-overlay"}],test:[{eval:"EVAL_DSGVO_0"}]},{name:"dunelm.com",prehideSelectors:["div[data-testid=cookie-consent-modal-backdrop]"],detectCmp:[{exists:"div[data-testid=cookie-consent-message-contents]"}],detectPopup:[{visible:"div[data-testid=cookie-consent-message-contents]"}],optIn:[{click:'[data-testid="cookie-consent-allow-all"]'}],optOut:[{click:"button[data-testid=cookie-consent-adjust-settings]"},{click:"button[data-testid=cookie-consent-preferences-save]"}],test:[{eval:"EVAL_DUNELM_0"}]},{name:"ecosia",vendorUrl:"https://www.ecosia.org/",runContext:{urlPattern:"^https://www\\.ecosia\\.org/"},prehideSelectors:[".cookie-wrapper"],detectCmp:[{exists:".cookie-wrapper > .cookie-notice"}],detectPopup:[{visible:".cookie-wrapper > .cookie-notice"}],optIn:[{waitForThenClick:"[data-test-id=cookie-notice-accept]"}],optOut:[{waitForThenClick:"[data-test-id=cookie-notice-reject]"}]},{name:"etsy",prehideSelectors:["#gdpr-single-choice-overlay","#gdpr-privacy-settings"],detectCmp:[{exists:"#gdpr-single-choice-overlay"}],detectPopup:[{visible:"#gdpr-single-choice-overlay"}],optOut:[{click:"button[data-gdpr-open-full-settings]"},{waitForVisible:".gdpr-overlay-body input",timeout:3e3},{wait:1e3},{eval:"EVAL_ETSY_0"},{eval:"EVAL_ETSY_1"}],optIn:[{click:"button[data-gdpr-single-choice-accept]"}]},{name:"eu-cookie-compliance-banner",detectCmp:[{exists:"body.eu-cookie-compliance-popup-open"}],detectPopup:[{exists:"body.eu-cookie-compliance-popup-open"}],optIn:[{click:".agree-button"}],optOut:[{if:{visible:".decline-button,.eu-cookie-compliance-save-preferences-button"},then:[{click:".decline-button,.eu-cookie-compliance-save-preferences-button"}]},{hide:".eu-cookie-compliance-banner-info, #sliding-popup"}],test:[{eval:"EVAL_EU_COOKIE_COMPLIANCE_0"}]},{name:"EU Cookie Law",prehideSelectors:[".pea_cook_wrapper,.pea_cook_more_info_popover"],cosmetic:!0,detectCmp:[{exists:".pea_cook_wrapper"}],detectPopup:[{wait:500},{visible:".pea_cook_wrapper"}],optIn:[{click:"#pea_cook_btn"}],optOut:[{hide:".pea_cook_wrapper"}],test:[{eval:"EVAL_EU_COOKIE_LAW_0"}]},{name:"europa-eu",vendorUrl:"https://ec.europa.eu/",runContext:{urlPattern:"^https://[^/]*europa\\.eu/"},prehideSelectors:["#cookie-consent-banner"],detectCmp:[{exists:".cck-container"}],detectPopup:[{visible:".cck-container"}],optIn:[{waitForThenClick:'.cck-actions-button[href="#accept"]'}],optOut:[{waitForThenClick:'.cck-actions-button[href="#refuse"]',hide:".cck-container"}]},{name:"EZoic",prehideSelectors:["#ez-cookie-dialog-wrapper"],detectCmp:[{exists:"#ez-cookie-dialog-wrapper"}],detectPopup:[{visible:"#ez-cookie-dialog-wrapper"}],optIn:[{click:"#ez-accept-all",optional:!0},{eval:"EVAL_EZOIC_0",optional:!0}],optOut:[{wait:500},{click:"#ez-manage-settings"},{waitFor:"#ez-cookie-dialog input[type=checkbox]"},{click:"#ez-cookie-dialog input[type=checkbox]:checked",all:!0},{click:"#ez-save-settings"}],test:[{eval:"EVAL_EZOIC_1"}]},{name:"facebook",runContext:{urlPattern:"^https://([a-z0-9-]+\\.)?facebook\\.com/"},prehideSelectors:['div[data-testid="cookie-policy-manage-dialog"]'],detectCmp:[{exists:'div[data-testid="cookie-policy-manage-dialog"]'}],detectPopup:[{visible:'div[data-testid="cookie-policy-manage-dialog"]'}],optIn:[{waitForThenClick:'button[data-cookiebanner="accept_button"]'},{waitForVisible:'div[data-testid="cookie-policy-manage-dialog"]',check:"none"}],optOut:[{waitForThenClick:'button[data-cookiebanner="accept_only_essential_button"]'},{waitForVisible:'div[data-testid="cookie-policy-manage-dialog"]',check:"none"}]},{name:"fides",vendorUrl:"https://github.com/ethyca/fides",prehideSelectors:["#fides-overlay"],detectCmp:[{exists:"#fides-overlay #fides-banner"}],detectPopup:[{visible:"#fides-overlay #fides-banner"}],optIn:[{waitForThenClick:'#fides-banner [data-testid="Accept all-btn"]'}],optOut:[{waitForThenClick:'#fides-banner [data-testid="Reject all-btn"]'}]},{name:"funding-choices",prehideSelectors:[".fc-consent-root,.fc-dialog-container,.fc-dialog-overlay,.fc-dialog-content"],detectCmp:[{exists:".fc-consent-root"}],detectPopup:[{exists:".fc-dialog-container"}],optOut:[{click:".fc-cta-do-not-consent,.fc-cta-manage-options"},{click:".fc-preference-consent:checked,.fc-preference-legitimate-interest:checked",all:!0,optional:!0},{click:".fc-confirm-choices",optional:!0}],optIn:[{click:".fc-cta-consent"}]},{name:"geeks-for-geeks",runContext:{urlPattern:"^https://www\\.geeksforgeeks\\.org/"},cosmetic:!0,prehideSelectors:[".cookie-consent"],detectCmp:[{exists:".cookie-consent"}],detectPopup:[{visible:".cookie-consent"}],optIn:[{click:".cookie-consent button.consent-btn"}],optOut:[{hide:".cookie-consent"}]},{name:"generic-cosmetic",cosmetic:!0,prehideSelectors:["#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"],detectCmp:[{exists:"#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"}],detectPopup:[{visible:"#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"}],optIn:[],optOut:[{hide:"#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"}]},{name:"google-consent-standalone",prehideSelectors:[],detectCmp:[{exists:'a[href^="https://policies.google.com/technologies/cookies"'},{exists:'form[action^="https://consent.google."][action$=".com/save"]'}],detectPopup:[{visible:'a[href^="https://policies.google.com/technologies/cookies"'}],optIn:[{waitForThenClick:'form[action^="https://consent.google."][action$=".com/save"]:has(input[name=set_eom][value=false]) button'}],optOut:[{waitForThenClick:'form[action^="https://consent.google."][action$=".com/save"]:has(input[name=set_eom][value=true]) button'}]},{name:"google.com",prehideSelectors:[".HTjtHe#xe7COe"],detectCmp:[{exists:".HTjtHe#xe7COe"},{exists:'.HTjtHe#xe7COe a[href^="https://policies.google.com/technologies/cookies"]'}],detectPopup:[{visible:".HTjtHe#xe7COe button#W0wltc"}],optIn:[{waitForThenClick:".HTjtHe#xe7COe button#L2AGLb"}],optOut:[{waitForThenClick:".HTjtHe#xe7COe button#W0wltc"}],test:[{eval:"EVAL_GOOGLE_0"}]},{name:"gov.uk",detectCmp:[{exists:"#global-cookie-message"}],detectPopup:[{exists:"#global-cookie-message"}],optIn:[{click:"button[data-accept-cookies=true]"}],optOut:[{click:"button[data-reject-cookies=true],#reject-cookies"},{click:"button[data-hide-cookie-banner=true],#hide-cookie-decision"}]},{name:"hashicorp",vendorUrl:"https://hashicorp.com/",runContext:{urlPattern:"^https://[^.]*\\.hashicorp\\.com/"},prehideSelectors:["[data-testid=consent-banner]"],detectCmp:[{exists:"[data-testid=consent-banner]"}],detectPopup:[{visible:"[data-testid=consent-banner]"}],optIn:[{waitForThenClick:"[data-testid=accept]"}],optOut:[{waitForThenClick:"[data-testid=manage-preferences]"},{waitForThenClick:"[data-testid=consent-mgr-dialog] [data-ga-button=save-preferences]"}]},{name:"healthline-media",prehideSelectors:["#modal-host > div.no-hash > div.window-wrapper"],detectCmp:[{exists:"#modal-host > div.no-hash > div.window-wrapper, div[data-testid=qualtrics-container]"}],detectPopup:[{exists:"#modal-host > div.no-hash > div.window-wrapper, div[data-testid=qualtrics-container]"}],optIn:[{click:"#modal-host > div.no-hash > div.window-wrapper > div:last-child button"}],optOut:[{if:{exists:'#modal-host > div.no-hash > div.window-wrapper > div:last-child a[href="/privacy-settings"]'},then:[{click:'#modal-host > div.no-hash > div.window-wrapper > div:last-child a[href="/privacy-settings"]'}],else:[{waitForVisible:"div#__next"},{click:"#__next div:nth-child(1) > button:first-child"}]}]},{name:"hema",prehideSelectors:[".cookie-modal"],detectCmp:[{visible:".cookie-modal .cookie-accept-btn"}],detectPopup:[{visible:".cookie-modal .cookie-accept-btn"}],optIn:[{waitForThenClick:".cookie-modal .cookie-accept-btn"}],optOut:[{waitForThenClick:".cookie-modal .js-cookie-reject-btn"}],test:[{eval:"EVAL_HEMA_TEST_0"}]},{name:"hetzner.com",runContext:{urlPattern:"^https://www\\.hetzner\\.com/"},prehideSelectors:["#CookieConsent"],detectCmp:[{exists:"#CookieConsent"}],detectPopup:[{visible:"#CookieConsent"}],optIn:[{click:"#CookieConsentGiven"}],optOut:[{click:"#CookieConsentDeclined"}]},{name:"hl.co.uk",prehideSelectors:[".cookieModalContent","#cookie-banner-overlay"],detectCmp:[{exists:"#cookie-banner-overlay"}],detectPopup:[{exists:"#cookie-banner-overlay"}],optIn:[{click:"#acceptCookieButton"}],optOut:[{click:"#manageCookie"},{hide:".cookieSettingsModal"},{waitFor:"#AOCookieToggle"},{click:"#AOCookieToggle[aria-pressed=true]",optional:!0},{waitFor:"#TPCookieToggle"},{click:"#TPCookieToggle[aria-pressed=true]",optional:!0},{click:"#updateCookieButton"}]},{name:"hu-manity",vendorUrl:"https://hu-manity.co/",prehideSelectors:["#hu.hu-wrapper"],detectCmp:[{exists:"#hu.hu-visible"}],detectPopup:[{visible:"#hu.hu-visible"}],optIn:[{waitForThenClick:"[data-hu-action=cookies-notice-consent-choices-3]"},{waitForThenClick:"#hu-cookies-save"}],optOut:[{waitForThenClick:"#hu-cookies-save"}]},{name:"hubspot",detectCmp:[{exists:"#hs-eu-cookie-confirmation"}],detectPopup:[{visible:"#hs-eu-cookie-confirmation"}],optIn:[{click:"#hs-eu-confirmation-button"}],optOut:[{click:"#hs-eu-decline-button"}]},{name:"indeed.com",cosmetic:!0,prehideSelectors:["#CookiePrivacyNotice"],detectCmp:[{exists:"#CookiePrivacyNotice"}],detectPopup:[{visible:"#CookiePrivacyNotice"}],optIn:[{click:"#CookiePrivacyNotice button[data-gnav-element-name=CookiePrivacyNoticeOk]"}],optOut:[{hide:"#CookiePrivacyNotice"}]},{name:"ing.de",runContext:{urlPattern:"^https://www\\.ing\\.de/"},cosmetic:!0,prehideSelectors:['div[slot="backdrop"]'],detectCmp:[{exists:'[data-tag-name="ing-cc-dialog-frame"]'}],detectPopup:[{visible:'[data-tag-name="ing-cc-dialog-frame"]'}],optIn:[{click:['[data-tag-name="ing-cc-dialog-level0"]','[data-tag-name="ing-cc-button"][class*="accept"]']}],optOut:[{click:['[data-tag-name="ing-cc-dialog-level0"]','[data-tag-name="ing-cc-button"][class*="more"]']}]},{name:"instagram",vendorUrl:"https://instagram.com",runContext:{urlPattern:"^https://www\\.instagram\\.com/"},prehideSelectors:[".x78zum5.xdt5ytf.xg6iff7.x1n2onr6"],detectCmp:[{exists:".x1qjc9v5.x9f619.x78zum5.xdt5ytf.x1iyjqo2.xl56j7k"}],detectPopup:[{visible:".x1qjc9v5.x9f619.x78zum5.xdt5ytf.x1iyjqo2.xl56j7k"}],optIn:[{waitForThenClick:"._a9--._a9_0"}],optOut:[{waitForThenClick:"._a9--._a9_1"},{wait:2e3}]},{name:"ionos.de",prehideSelectors:[".privacy-consent--backdrop",".privacy-consent--modal"],detectCmp:[{exists:".privacy-consent--modal"}],detectPopup:[{visible:".privacy-consent--modal"}],optIn:[{click:"#selectAll"}],optOut:[{click:".footer-config-link"},{click:"#confirmSelection"}]},{name:"itopvpn.com",cosmetic:!0,prehideSelectors:[".pop-cookie"],detectCmp:[{exists:".pop-cookie"}],detectPopup:[{exists:".pop-cookie"}],optIn:[{click:"#_pcookie"}],optOut:[{hide:".pop-cookie"}]},{name:"iubenda",prehideSelectors:["#iubenda-cs-banner"],detectCmp:[{exists:"#iubenda-cs-banner"}],detectPopup:[{visible:".iubenda-cs-accept-btn"}],optIn:[{click:".iubenda-cs-accept-btn"}],optOut:[{click:".iubenda-cs-customize-btn"},{eval:"EVAL_IUBENDA_0"},{click:"#iubFooterBtn"}],test:[{eval:"EVAL_IUBENDA_1"}]},{name:"iWink",prehideSelectors:["body.cookies-request #cookie-bar"],detectCmp:[{exists:"body.cookies-request #cookie-bar"}],detectPopup:[{visible:"body.cookies-request #cookie-bar"}],optIn:[{waitForThenClick:"body.cookies-request #cookie-bar .allow-cookies"}],optOut:[{waitForThenClick:"body.cookies-request #cookie-bar .disallow-cookies"}],test:[{eval:"EVAL_IWINK_TEST"}]},{name:"jdsports",vendorUrl:"https://www.jdsports.co.uk/",runContext:{urlPattern:"^https://(www|m)\\.jdsports\\."},prehideSelectors:[".miniConsent,#PrivacyPolicyBanner"],detectCmp:[{exists:".miniConsent,#PrivacyPolicyBanner"}],detectPopup:[{visible:".miniConsent,#PrivacyPolicyBanner"}],optIn:[{waitForThenClick:".miniConsent .accept-all-cookies"}],optOut:[{if:{exists:"#PrivacyPolicyBanner"},then:[{hide:"#PrivacyPolicyBanner"}],else:[{waitForThenClick:"#cookie-settings"},{waitForThenClick:"#reject-all-cookies"}]}]},{name:"johnlewis.com",prehideSelectors:["div[class^=pecr-cookie-banner-]"],detectCmp:[{exists:"div[class^=pecr-cookie-banner-]"}],detectPopup:[{exists:"div[class^=pecr-cookie-banner-]"}],optOut:[{click:"button[data-test^=manage-cookies]"},{wait:"500"},{click:"label[data-test^=toggle][class*=checked]:not([class*=disabled])",all:!0,optional:!0},{click:"button[data-test=save-preferences]"}],optIn:[{click:"button[data-test=allow-all]"}]},{name:"jquery.cookieBar",vendorUrl:"https://github.com/kovarp/jquery.cookieBar",prehideSelectors:[".cookie-bar"],cosmetic:!0,detectCmp:[{exists:".cookie-bar .cookie-bar__message,.cookie-bar .cookie-bar__buttons"}],detectPopup:[{visible:".cookie-bar .cookie-bar__message,.cookie-bar .cookie-bar__buttons",check:"any"}],optIn:[{click:".cookie-bar .cookie-bar__btn"}],optOut:[{hide:".cookie-bar"}],test:[{visible:".cookie-bar .cookie-bar__message,.cookie-bar .cookie-bar__buttons",check:"none"},{eval:"EVAL_JQUERY_COOKIEBAR_0"}]},{name:"justwatch.com",prehideSelectors:[".consent-banner"],detectCmp:[{exists:".consent-banner .consent-banner__actions"}],detectPopup:[{visible:".consent-banner .consent-banner__actions"}],optIn:[{click:".consent-banner__actions button.basic-button.primary"}],optOut:[{click:".consent-banner__actions button.basic-button.secondary"},{waitForThenClick:".consent-modal__footer button.basic-button.secondary"},{waitForThenClick:".consent-modal ion-content > div > a:nth-child(9)"},{click:"label.consent-switch input[type=checkbox]:checked",all:!0,optional:!0},{waitForVisible:".consent-modal__footer button.basic-button.primary"},{click:".consent-modal__footer button.basic-button.primary"}]},{name:"ketch",vendorUrl:"https://www.ketch.com",runContext:{frame:!1,main:!0},intermediate:!1,prehideSelectors:["#lanyard_root div[role='dialog']"],detectCmp:[{exists:"#lanyard_root div[role='dialog']"}],detectPopup:[{visible:"#lanyard_root div[role='dialog']"}],optIn:[{if:{exists:"#lanyard_root button[class='confirmButton']"},then:[{waitForThenClick:"#lanyard_root div[class*=buttons] > :nth-child(2)"},{click:"#lanyard_root button[class='confirmButton']"}],else:[{waitForThenClick:"#lanyard_root div[class*=buttons] > :nth-child(2)"}]}],optOut:[{if:{exists:"#lanyard_root [aria-describedby=banner-description]"},then:[{waitForThenClick:"#lanyard_root div[class*=buttons] > button[class*=secondaryButton]",comment:"can be either settings or reject button"}]},{waitFor:"#lanyard_root [aria-describedby=preference-description],#lanyard_root [aria-describedby=modal-description]",timeout:1e3,optional:!0},{if:{exists:"#lanyard_root [aria-describedby=preference-description],#lanyard_root [aria-describedby=modal-description]"},then:[{waitForThenClick:"#lanyard_root button[class*=rejectButton]"},{click:"#lanyard_root button[class*=confirmButton],#lanyard_root div[class*=actions_] > button:nth-child(1)"}]}]},{name:"kleinanzeigen-de",runContext:{urlPattern:"^https?://(www\\.)?kleinanzeigen\\.de"},prehideSelectors:["#gdpr-banner-container"],detectCmp:[{any:[{exists:"#gdpr-banner-container #gdpr-banner [data-testid=gdpr-banner-cmp-button]"},{exists:"#ConsentManagementPage"}]}],detectPopup:[{any:[{visible:"#gdpr-banner-container #gdpr-banner [data-testid=gdpr-banner-cmp-button]"},{visible:"#ConsentManagementPage"}]}],optIn:[{if:{exists:"#gdpr-banner-container #gdpr-banner"},then:[{click:"#gdpr-banner-container #gdpr-banner [data-testid=gdpr-banner-accept]"}],else:[{click:"#ConsentManagementPage .Button-primary"}]}],optOut:[{if:{exists:"#gdpr-banner-container #gdpr-banner"},then:[{click:"#gdpr-banner-container #gdpr-banner [data-testid=gdpr-banner-cmp-button]"}],else:[{click:"#ConsentManagementPage .Button-secondary"}]}]},{name:"lightbox",prehideSelectors:[".darken-layer.open,.lightbox.lightbox--cookie-consent"],detectCmp:[{exists:"body.cookie-consent-is-active div.lightbox--cookie-consent > div.lightbox__content > div.cookie-consent[data-jsb]"}],detectPopup:[{visible:"body.cookie-consent-is-active div.lightbox--cookie-consent > div.lightbox__content > div.cookie-consent[data-jsb]"}],optOut:[{click:".cookie-consent__footer > button[type='submit']:not([data-button='selectAll'])"}],optIn:[{click:".cookie-consent__footer > button[type='submit'][data-button='selectAll']"}]},{name:"lineagrafica",vendorUrl:"https://addons.prestashop.com/en/legal/8734-eu-cookie-law-gdpr-banner-blocker.html",cosmetic:!0,prehideSelectors:["#lgcookieslaw_banner,#lgcookieslaw_modal,.lgcookieslaw-overlay"],detectCmp:[{exists:"#lgcookieslaw_banner,#lgcookieslaw_modal,.lgcookieslaw-overlay"}],detectPopup:[{exists:"#lgcookieslaw_banner,#lgcookieslaw_modal,.lgcookieslaw-overlay"}],optIn:[{waitForThenClick:"#lgcookieslaw_accept"}],optOut:[{hide:"#lgcookieslaw_banner,#lgcookieslaw_modal,.lgcookieslaw-overlay"}]},{name:"linkedin.com",prehideSelectors:[".artdeco-global-alert[type=COOKIE_CONSENT]"],detectCmp:[{exists:".artdeco-global-alert[type=COOKIE_CONSENT]"}],detectPopup:[{visible:".artdeco-global-alert[type=COOKIE_CONSENT]"}],optIn:[{waitForVisible:".artdeco-global-alert[type=COOKIE_CONSENT] button[action-type=ACCEPT]"},{wait:500},{waitForThenClick:".artdeco-global-alert[type=COOKIE_CONSENT] button[action-type=ACCEPT]"}],optOut:[{waitForVisible:".artdeco-global-alert[type=COOKIE_CONSENT] button[action-type=DENY]"},{wait:500},{waitForThenClick:".artdeco-global-alert[type=COOKIE_CONSENT] button[action-type=DENY]"}],test:[{waitForVisible:".artdeco-global-alert[type=COOKIE_CONSENT]",check:"none"}]},{name:"livejasmin",vendorUrl:"https://www.livejasmin.com/",runContext:{urlPattern:"^https://(m|www)\\.livejasmin\\.com/"},prehideSelectors:["#consent_modal"],detectCmp:[{exists:"#consent_modal"}],detectPopup:[{visible:"#consent_modal"}],optIn:[{waitForThenClick:"#consent_modal button[data-testid=ButtonStyledButton]:first-of-type"}],optOut:[{waitForThenClick:"#consent_modal button[data-testid=ButtonStyledButton]:nth-of-type(2)"},{waitForVisible:"[data-testid=PrivacyPreferenceCenterWithConsentCookieContent]"},{click:"[data-testid=PrivacyPreferenceCenterWithConsentCookieContent] input[data-testid=PrivacyPreferenceCenterWithConsentCookieSwitch]:checked",optional:!0,all:!0},{waitForThenClick:"[data-testid=PrivacyPreferenceCenterWithConsentCookieContent] button[data-testid=ButtonStyledButton]:last-child"}]},{name:"macpaw.com",cosmetic:!0,prehideSelectors:['div[data-banner="cookies"]'],detectCmp:[{exists:'div[data-banner="cookies"]'}],detectPopup:[{exists:'div[data-banner="cookies"]'}],optIn:[{click:'button[data-banner-close="cookies"]'}],optOut:[{hide:'div[data-banner="cookies"]'}]},{name:"marksandspencer.com",cosmetic:!0,detectCmp:[{exists:".navigation-cookiebbanner"}],detectPopup:[{visible:".navigation-cookiebbanner"}],optOut:[{hide:".navigation-cookiebbanner"}],optIn:[{click:".navigation-cookiebbanner__submit"}]},{name:"mediamarkt.de",prehideSelectors:["div[aria-labelledby=pwa-consent-layer-title]","div[class^=StyledConsentLayerWrapper-]"],detectCmp:[{exists:"div[aria-labelledby^=pwa-consent-layer-title]"}],detectPopup:[{exists:"div[aria-labelledby^=pwa-consent-layer-title]"}],optOut:[{click:"button[data-test^=pwa-consent-layer-deny-all]"}],optIn:[{click:"button[data-test^=pwa-consent-layer-accept-all"}]},{name:"Mediavine",prehideSelectors:['[data-name="mediavine-gdpr-cmp"]'],detectCmp:[{exists:'[data-name="mediavine-gdpr-cmp"]'}],detectPopup:[{wait:500},{visible:'[data-name="mediavine-gdpr-cmp"]'}],optIn:[{waitForThenClick:'[data-name="mediavine-gdpr-cmp"] [format="primary"]'}],optOut:[{waitForThenClick:'[data-name="mediavine-gdpr-cmp"] [data-view="manageSettings"]'},{waitFor:'[data-name="mediavine-gdpr-cmp"] input[type=checkbox]'},{eval:"EVAL_MEDIAVINE_0",optional:!0},{click:'[data-name="mediavine-gdpr-cmp"] [format="secondary"]'}]},{name:"microsoft.com",prehideSelectors:["#wcpConsentBannerCtrl"],detectCmp:[{exists:"#wcpConsentBannerCtrl"}],detectPopup:[{exists:"#wcpConsentBannerCtrl"}],optOut:[{eval:"EVAL_MICROSOFT_0"}],optIn:[{eval:"EVAL_MICROSOFT_1"}],test:[{eval:"EVAL_MICROSOFT_2"}]},{name:"midway-usa",runContext:{urlPattern:"^https://www\\.midwayusa\\.com/"},cosmetic:!0,prehideSelectors:["#cookie-container"],detectCmp:[{exists:['div[aria-label="Cookie Policy Banner"]']}],detectPopup:[{visible:"#cookie-container"}],optIn:[{click:"button#cookie-btn"}],optOut:[{hide:'div[aria-label="Cookie Policy Banner"]'}]},{name:"moneysavingexpert.com",detectCmp:[{exists:"dialog[data-testid=accept-our-cookies-dialog]"}],detectPopup:[{visible:"dialog[data-testid=accept-our-cookies-dialog]"}],optIn:[{click:"#banner-accept"}],optOut:[{click:"#banner-manage"},{click:"#pc-confirm"}]},{name:"monzo.com",prehideSelectors:[".cookie-alert, cookie-alert__content"],detectCmp:[{exists:'div.cookie-alert[role="dialog"]'},{exists:'a[href*="monzo"]'}],detectPopup:[{visible:".cookie-alert__content"}],optIn:[{click:".js-accept-cookie-policy"}],optOut:[{click:".js-decline-cookie-policy"}]},{name:"Moove",prehideSelectors:["#moove_gdpr_cookie_info_bar"],detectCmp:[{exists:"#moove_gdpr_cookie_info_bar"}],detectPopup:[{visible:"#moove_gdpr_cookie_info_bar"}],optIn:[{waitForThenClick:".moove-gdpr-infobar-allow-all"}],optOut:[{if:{exists:"#moove_gdpr_cookie_info_bar .change-settings-button"},then:[{click:"#moove_gdpr_cookie_info_bar .change-settings-button"},{waitForVisible:"#moove_gdpr_cookie_modal"},{eval:"EVAL_MOOVE_0"},{click:".moove-gdpr-modal-save-settings"}],else:[{hide:"#moove_gdpr_cookie_info_bar"}]}],test:[{visible:"#moove_gdpr_cookie_info_bar",check:"none"}]},{name:"national-lottery.co.uk",detectCmp:[{exists:".cuk_cookie_consent"}],detectPopup:[{visible:".cuk_cookie_consent",check:"any"}],optOut:[{click:".cuk_cookie_consent_manage_pref"},{click:".cuk_cookie_consent_save_pref"},{click:".cuk_cookie_consent_close"}],optIn:[{click:".cuk_cookie_consent_accept_all"}]},{name:"nba.com",runContext:{urlPattern:"^https://(www\\.)?nba.com/"},cosmetic:!0,prehideSelectors:["#onetrust-banner-sdk"],detectCmp:[{exists:"#onetrust-banner-sdk"}],detectPopup:[{visible:"#onetrust-banner-sdk"}],optIn:[{click:"#onetrust-accept-btn-handler"}],optOut:[{hide:"#onetrust-banner-sdk"}]},{name:"netflix.de",detectCmp:[{exists:"#cookie-disclosure"}],detectPopup:[{visible:".cookie-disclosure-message",check:"any"}],optIn:[{click:".btn-accept"}],optOut:[{hide:"#cookie-disclosure"},{click:".btn-reject"}]},{name:"nhs.uk",prehideSelectors:["#nhsuk-cookie-banner"],detectCmp:[{exists:"#nhsuk-cookie-banner"}],detectPopup:[{exists:"#nhsuk-cookie-banner"}],optOut:[{click:"#nhsuk-cookie-banner__link_accept"}],optIn:[{click:"#nhsuk-cookie-banner__link_accept_analytics"}]},{name:"notice-cookie",prehideSelectors:[".button--notice"],cosmetic:!0,detectCmp:[{exists:".notice--cookie"}],detectPopup:[{visible:".notice--cookie"}],optIn:[{click:".button--notice"}],optOut:[{hide:".notice--cookie"}]},{name:"nrk.no",cosmetic:!0,prehideSelectors:[".nrk-masthead__info-banner--cookie"],detectCmp:[{exists:".nrk-masthead__info-banner--cookie"}],detectPopup:[{exists:".nrk-masthead__info-banner--cookie"}],optIn:[{click:"div.nrk-masthead__info-banner--cookie button > span:has(+ svg.nrk-close)"}],optOut:[{hide:".nrk-masthead__info-banner--cookie"}]},{name:"obi.de",prehideSelectors:[".disc-cp--active"],detectCmp:[{exists:".disc-cp-modal__modal"}],detectPopup:[{visible:".disc-cp-modal__modal"}],optIn:[{click:".js-disc-cp-accept-all"}],optOut:[{click:".js-disc-cp-deny-all"}]},{name:"om",vendorUrl:"https://olli-machts.de/en/extension/cookie-manager",prehideSelectors:[".tx-om-cookie-consent"],detectCmp:[{exists:".tx-om-cookie-consent .active[data-omcookie-panel]"}],detectPopup:[{exists:".tx-om-cookie-consent .active[data-omcookie-panel]"}],optIn:[{waitForThenClick:"[data-omcookie-panel-save=all]"}],optOut:[{if:{exists:"[data-omcookie-panel-save=min]"},then:[{waitForThenClick:"[data-omcookie-panel-save=min]"}],else:[{click:"input[data-omcookie-panel-grp]:checked:not(:disabled)",all:!0,optional:!0},{waitForThenClick:"[data-omcookie-panel-save=save]"}]}]},{name:"onlyFans.com",prehideSelectors:["div.b-cookies-informer"],detectCmp:[{exists:"div.b-cookies-informer"}],detectPopup:[{exists:"div.b-cookies-informer"}],optIn:[{click:"div.b-cookies-informer__nav > button:nth-child(2)"}],optOut:[{click:"div.b-cookies-informer__nav > button:nth-child(1)"},{click:'div.b-cookies-informer__switchers > div:nth-child(2) > div[at-attr="checkbox"] > span.b-input-radio__container > input[type="checkbox"]'},{click:"div.b-cookies-informer__nav > button"}]},{name:"openli",vendorUrl:"https://openli.com",prehideSelectors:[".legalmonster-cleanslate"],detectCmp:[{exists:".legalmonster-cleanslate"}],detectPopup:[{visible:".legalmonster-cleanslate #lm-cookie-wall-container",check:"any"}],optIn:[{waitForThenClick:"#lm-accept-all"}],optOut:[{waitForThenClick:"#lm-accept-necessary"}]},{name:"opera.com",vendorUrl:"https://unknown",cosmetic:!1,runContext:{main:!0,frame:!1},intermediate:!1,prehideSelectors:[],detectCmp:[{exists:"#cookie-consent .manage-cookies__btn"}],detectPopup:[{visible:"#cookie-consent .cookie-basic-consent__btn"}],optIn:[{waitForThenClick:"#cookie-consent .cookie-basic-consent__btn"}],optOut:[{waitForThenClick:"#cookie-consent .manage-cookies__btn"},{waitForThenClick:"#cookie-consent .active.marketing_option_switch.cookie-consent__switch",all:!0},{waitForThenClick:"#cookie-consent .cookie-selection__btn"}],test:[{eval:"EVAL_OPERA_0"}]},{name:"osano",prehideSelectors:[".osano-cm-window,.osano-cm-dialog"],detectCmp:[{exists:".osano-cm-window"}],detectPopup:[{visible:".osano-cm-dialog"}],optIn:[{click:".osano-cm-accept-all",optional:!0}],optOut:[{waitForThenClick:".osano-cm-denyAll"}]},{name:"otto.de",prehideSelectors:[".cookieBanner--visibility"],detectCmp:[{exists:".cookieBanner--visibility"}],detectPopup:[{visible:".cookieBanner__wrapper"}],optIn:[{click:".js_cookieBannerPermissionButton"}],optOut:[{click:".js_cookieBannerProhibitionButton"}]},{name:"ourworldindata",vendorUrl:"https://ourworldindata.org/",runContext:{urlPattern:"^https://ourworldindata\\.org/"},prehideSelectors:[".cookie-manager"],detectCmp:[{exists:".cookie-manager"}],detectPopup:[{visible:".cookie-manager .cookie-notice.open"}],optIn:[{waitForThenClick:".cookie-notice [data-test=accept]"}],optOut:[{waitForThenClick:".cookie-notice [data-test=reject]"}]},{name:"pabcogypsum",vendorUrl:"https://unknown",prehideSelectors:[".js-cookie-notice:has(#cookie_settings-form)"],detectCmp:[{exists:".js-cookie-notice #cookie_settings-form"}],detectPopup:[{visible:".js-cookie-notice #cookie_settings-form"}],optIn:[{waitForThenClick:".js-cookie-notice button[value=allow]"}],optOut:[{waitForThenClick:".js-cookie-notice button[value=disable]"}]},{name:"paypal-us",prehideSelectors:["#ccpaCookieContent_wrapper, article.ppvx_modal--overpanel"],detectCmp:[{exists:"#ccpaCookieBanner, .privacy-sheet-content"}],detectPopup:[{exists:"#ccpaCookieBanner, .privacy-sheet-content"}],optIn:[{click:"#acceptAllButton"}],optOut:[{if:{exists:"a#manageCookiesLink"},then:[{click:"a#manageCookiesLink"}],else:[{waitForVisible:".privacy-sheet-content #formContent"},{click:"#formContent .cookiepref-11m2iee-checkbox_base input:checked",all:!0,optional:!0},{click:".confirmCookie #submitCookiesBtn"}]}]},{name:"paypal.com",prehideSelectors:["#gdprCookieBanner"],detectCmp:[{exists:"#gdprCookieBanner"}],detectPopup:[{visible:"#gdprCookieContent_wrapper"}],optIn:[{click:"#acceptAllButton"}],optOut:[{wait:200},{click:".gdprCookieBanner_decline-button"}],test:[{wait:500},{eval:"EVAL_PAYPAL_0"}]},{name:"pinetools.com",cosmetic:!0,prehideSelectors:["#aviso_cookies"],detectCmp:[{exists:"#aviso_cookies"}],detectPopup:[{exists:".lang_en #aviso_cookies"}],optIn:[{click:"#aviso_cookies .a_boton_cerrar"}],optOut:[{hide:"#aviso_cookies"}]},{name:"pmc",cosmetic:!0,prehideSelectors:["#pmc-pp-tou--notice"],detectCmp:[{exists:"#pmc-pp-tou--notice"}],detectPopup:[{visible:"#pmc-pp-tou--notice"}],optIn:[{click:"span.pmc-pp-tou--notice-close-btn"}],optOut:[{hide:"#pmc-pp-tou--notice"}]},{name:"pornhub.com",runContext:{urlPattern:"^https://(www\\.)?pornhub\\.com/"},cosmetic:!0,prehideSelectors:[".cookiesBanner"],detectCmp:[{exists:".cookiesBanner"}],detectPopup:[{visible:".cookiesBanner"}],optIn:[{click:".cookiesBanner .okButton"}],optOut:[{hide:".cookiesBanner"}]},{name:"pornpics.com",cosmetic:!0,prehideSelectors:["#cookie-contract"],detectCmp:[{exists:"#cookie-contract"}],detectPopup:[{visible:"#cookie-contract"}],optIn:[{click:"#cookie-contract .icon-cross"}],optOut:[{hide:"#cookie-contract"}]},{name:"PrimeBox CookieBar",prehideSelectors:["#cookie-bar"],detectCmp:[{exists:"#cookie-bar .cb-enable,#cookie-bar .cb-disable,#cookie-bar .cb-policy"}],detectPopup:[{visible:"#cookie-bar .cb-enable,#cookie-bar .cb-disable,#cookie-bar .cb-policy",check:"any"}],optIn:[{waitForThenClick:"#cookie-bar .cb-enable"}],optOut:[{click:"#cookie-bar .cb-disable",optional:!0},{hide:"#cookie-bar"}],test:[{eval:"EVAL_PRIMEBOX_0"}]},{name:"privacymanager.io",prehideSelectors:["#gdpr-consent-tool-wrapper",'iframe[src^="https://cmp-consent-tool.privacymanager.io"]'],runContext:{urlPattern:"^https://cmp-consent-tool\\.privacymanager\\.io/",main:!1,frame:!0},detectCmp:[{exists:"button#save"}],detectPopup:[{visible:"button#save"}],optIn:[{click:"button#save"}],optOut:[{if:{exists:"#denyAll"},then:[{click:"#denyAll"},{waitForThenClick:".okButton"}],else:[{waitForThenClick:"#manageSettings"},{waitFor:".purposes-overview-list"},{waitFor:"button#saveAndExit"},{click:"span[role=checkbox][aria-checked=true]",all:!0,optional:!0},{click:"button#saveAndExit"}]}]},{name:"productz.com",vendorUrl:"https://productz.com/",runContext:{urlPattern:"^https://productz\\.com/"},prehideSelectors:[],detectCmp:[{exists:".c-modal.is-active"}],detectPopup:[{visible:".c-modal.is-active"}],optIn:[{waitForThenClick:".c-modal.is-active .is-accept"}],optOut:[{waitForThenClick:".c-modal.is-active .is-dismiss"}]},{name:"pubtech",prehideSelectors:["#pubtech-cmp"],detectCmp:[{exists:"#pubtech-cmp"}],detectPopup:[{visible:"#pubtech-cmp #pt-actions"}],optIn:[{if:{exists:"#pt-accept-all"},then:[{click:"#pubtech-cmp #pt-actions #pt-accept-all"}],else:[{click:"#pubtech-cmp #pt-actions button:nth-of-type(2)"}]}],optOut:[{click:"#pubtech-cmp #pt-close"}],test:[{eval:"EVAL_PUBTECH_0"}]},{name:"quantcast",prehideSelectors:["#qc-cmp2-main,#qc-cmp2-container"],detectCmp:[{exists:"#qc-cmp2-container"}],detectPopup:[{visible:"#qc-cmp2-ui"}],optOut:[{click:'.qc-cmp2-summary-buttons > button[mode="secondary"]'},{waitFor:"#qc-cmp2-ui"},{click:'.qc-cmp2-toggle-switch > button[aria-checked="true"]',all:!0,optional:!0},{click:'.qc-cmp2-main button[aria-label="REJECT ALL"]',optional:!0},{waitForThenClick:'.qc-cmp2-main button[aria-label="SAVE & EXIT"],.qc-cmp2-buttons-desktop > button[mode="primary"]',timeout:5e3}],optIn:[{click:'.qc-cmp2-summary-buttons > button[mode="primary"]'}]},{name:"reddit.com",runContext:{urlPattern:"^https://www\\.reddit\\.com/"},prehideSelectors:["[bundlename=reddit_cookie_banner]"],detectCmp:[{exists:"reddit-cookie-banner"}],detectPopup:[{visible:"reddit-cookie-banner"}],optIn:[{waitForThenClick:["reddit-cookie-banner","#accept-all-cookies-button > button"]}],optOut:[{waitForThenClick:["reddit-cookie-banner","#reject-nonessential-cookies-button > button"]}],test:[{eval:"EVAL_REDDIT_0"}]},{name:"rog-forum.asus.com",runContext:{urlPattern:"^https://rog-forum\\.asus\\.com/"},prehideSelectors:["#cookie-policy-info"],detectCmp:[{exists:"#cookie-policy-info"}],detectPopup:[{visible:"#cookie-policy-info"}],optIn:[{click:'div.cookie-btn-box > div[aria-label="Accept"]'}],optOut:[{click:'div.cookie-btn-box > div[aria-label="Reject"]'},{waitForThenClick:'.cookie-policy-lightbox-bottom > div[aria-label="Save Settings"]'}]},{name:"roofingmegastore.co.uk",runContext:{urlPattern:"^https://(www\\.)?roofingmegastore\\.co\\.uk"},prehideSelectors:["#m-cookienotice"],detectCmp:[{exists:"#m-cookienotice"}],detectPopup:[{visible:"#m-cookienotice"}],optIn:[{click:"#accept-cookies"}],optOut:[{click:"#manage-cookies"},{waitForThenClick:"#accept-selected"}]},{name:"samsung.com",runContext:{urlPattern:"^https://www\\.samsung\\.com/"},cosmetic:!0,prehideSelectors:["div.cookie-bar"],detectCmp:[{exists:"div.cookie-bar"}],detectPopup:[{visible:"div.cookie-bar"}],optIn:[{click:"div.cookie-bar__manage > a"}],optOut:[{hide:"div.cookie-bar"}]},{name:"setapp.com",vendorUrl:"https://setapp.com/",cosmetic:!0,runContext:{urlPattern:"^https://setapp\\.com/"},prehideSelectors:[],detectCmp:[{exists:".cookie-banner.js-cookie-banner"}],detectPopup:[{visible:".cookie-banner.js-cookie-banner"}],optIn:[{waitForThenClick:".cookie-banner.js-cookie-banner button"}],optOut:[{hide:".cookie-banner.js-cookie-banner"}]},{name:"sibbo",prehideSelectors:["sibbo-cmp-layout"],detectCmp:[{exists:"sibbo-cmp-layout"}],detectPopup:[{visible:"sibbo-cmp-layout"}],optIn:[{click:"sibbo-cmp-layout [data-accept-all]"}],optOut:[{click:'.sibbo-panel__aside__buttons a[data-nav="purposes"]'},{click:'.sibbo-panel__main__header__actions a[data-focusable="reject-all"]'},{if:{exists:"[data-view=purposes] .sibbo-panel__main__footer__actions [data-save-and-exit]"},then:[],else:[{waitFor:'.sibbo-panel__main__footer__actions a[data-focusable="next"]:not(.sibbo-cmp-button--disabled)'},{click:'.sibbo-panel__main__footer__actions a[data-focusable="next"]'},{click:'.sibbo-panel__main div[data-view="purposesLegInt"] a[data-focusable="reject-all"]'}]},{waitFor:".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"},{click:".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"}],test:[{eval:"EVAL_SIBBO_0"}]},{name:"similarweb.com",cosmetic:!0,prehideSelectors:[".app-cookies-notification"],detectCmp:[{exists:".app-cookies-notification"}],detectPopup:[{exists:".app-layout .app-cookies-notification"}],optIn:[{click:"button.app-cookies-notification__dismiss"}],optOut:[{hide:".app-layout .app-cookies-notification"}]},{name:"Sirdata",cosmetic:!0,prehideSelectors:["#sd-cmp"],detectCmp:[{exists:"#sd-cmp"}],detectPopup:[{visible:"#sd-cmp"}],optIn:[{waitForThenClick:"#sd-cmp .sd-cmp-3cRQ2"}],optOut:[{hide:"#sd-cmp"},{eval:"EVAL_SIRDATA_UNBLOCK_SCROLL"}]},{name:"snigel",detectCmp:[{exists:".snigel-cmp-framework"}],detectPopup:[{visible:".snigel-cmp-framework"}],optOut:[{click:"#sn-b-custom"},{click:"#sn-b-save"}],test:[{eval:"EVAL_SNIGEL_0"}],optIn:[{click:".snigel-cmp-framework #accept-choices"}]},{name:"steampowered.com",detectCmp:[{exists:".cookiepreferences_popup"},{visible:".cookiepreferences_popup"}],detectPopup:[{visible:".cookiepreferences_popup"}],optOut:[{click:"#rejectAllButton"}],optIn:[{click:"#acceptAllButton"}],test:[{wait:1e3},{eval:"EVAL_STEAMPOWERED_0"}]},{name:"strato.de",prehideSelectors:["#cookie_initial_modal",".modal-backdrop"],runContext:{urlPattern:"^https://www\\.strato\\.de/"},detectCmp:[{exists:"#cookie_initial_modal"}],detectPopup:[{visible:"#cookie_initial_modal"}],optIn:[{click:"button#jss_consent_all_initial_modal"}],optOut:[{click:"button#jss_open_settings_modal"},{click:"button#jss_consent_checked"}]},{name:"svt.se",vendorUrl:"https://www.svt.se/",runContext:{urlPattern:"^https://www\\.svt\\.se/"},prehideSelectors:["[class*=CookieConsent__root___]"],detectCmp:[{exists:"[class*=CookieConsent__root___]"}],detectPopup:[{visible:"[class*=CookieConsent__modal___]"}],optIn:[{waitForThenClick:"[class*=CookieConsent__modal___] > div > button[class*=primary]"}],optOut:[{waitForThenClick:"[class*=CookieConsent__modal___] > div > button[class*=secondary]:nth-child(2)"}],test:[{eval:"EVAL_SVT_TEST"}]},{name:"takealot.com",cosmetic:!0,prehideSelectors:['div[class^="cookies-banner-module_"]'],detectCmp:[{exists:'div[class^="cookies-banner-module_cookie-banner_"]'}],detectPopup:[{exists:'div[class^="cookies-banner-module_cookie-banner_"]'}],optIn:[{click:'button[class*="cookies-banner-module_dismiss-button_"]'}],optOut:[{hide:'div[class^="cookies-banner-module_"]'},{if:{exists:'div[class^="cookies-banner-module_small-cookie-banner_"]'},then:[{eval:"EVAL_TAKEALOT_0"}],else:[]}]},{name:"tarteaucitron.js",prehideSelectors:["#tarteaucitronRoot"],detectCmp:[{exists:"#tarteaucitronRoot"}],detectPopup:[{visible:"#tarteaucitronRoot #tarteaucitronAlertSmall,#tarteaucitronRoot #tarteaucitronAlertBig",check:"any"}],optIn:[{eval:"EVAL_TARTEAUCITRON_1"}],optOut:[{eval:"EVAL_TARTEAUCITRON_0"}],test:[{eval:"EVAL_TARTEAUCITRON_2",comment:"sometimes there are required categories, so we check that at least something is false"}]},{name:"taunton",vendorUrl:"https://www.taunton.com/",prehideSelectors:["#taunton-user-consent__overlay"],detectCmp:[{exists:"#taunton-user-consent__overlay"}],detectPopup:[{exists:"#taunton-user-consent__overlay:not([aria-hidden=true])"}],optIn:[{click:"#taunton-user-consent__toolbar input[type=checkbox]:not(:checked)"},{click:"#taunton-user-consent__toolbar button[type=submit]"}],optOut:[{click:"#taunton-user-consent__toolbar input[type=checkbox]:checked",optional:!0,all:!0},{click:"#taunton-user-consent__toolbar button[type=submit]"}],test:[{eval:"EVAL_TAUNTON_TEST"}]},{name:"Tealium",prehideSelectors:["#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal,#consent-layer"],detectCmp:[{exists:"#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *"},{eval:"EVAL_TEALIUM_0"}],detectPopup:[{visible:"#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *",check:"any"}],optOut:[{eval:"EVAL_TEALIUM_1"},{eval:"EVAL_TEALIUM_DONOTSELL"},{hide:"#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal"},{waitForThenClick:"#cm-acceptNone,.js-accept-essential-cookies",timeout:1e3,optional:!0}],optIn:[{hide:"#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs"},{eval:"EVAL_TEALIUM_2"}],test:[{eval:"EVAL_TEALIUM_3"},{eval:"EVAL_TEALIUM_DONOTSELL_CHECK"},{visible:"#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs",check:"none"}]},{name:"temu",vendorUrl:"https://temu.com",runContext:{urlPattern:"^https://[^/]*temu\\.com/"},prehideSelectors:["._2d-8vq-W,._1UdBUwni"],detectCmp:[{exists:"._3YCsmIaS"}],detectPopup:[{visible:"._3YCsmIaS"}],optIn:[{waitForThenClick:"._3fKiu5wx._3zN5SumS._3tAK973O.IYOfhWEs.VGNGF1pA"}],optOut:[{waitForThenClick:"._3fKiu5wx._1_XToJBF._3tAK973O.IYOfhWEs.VGNGF1pA"}]},{name:"Termly",prehideSelectors:["#termly-code-snippet-support"],detectCmp:[{exists:"#termly-code-snippet-support"}],detectPopup:[{visible:"#termly-code-snippet-support div"}],optIn:[{waitForThenClick:'[data-tid="banner-accept"]'}],optOut:[{if:{exists:'[data-tid="banner-decline"]'},then:[{click:'[data-tid="banner-decline"]'}],else:[{click:".t-preference-button"},{wait:500},{if:{exists:".t-declineAllButton"},then:[{click:".t-declineAllButton"}],else:[{waitForThenClick:".t-preference-modal input[type=checkbox][checked]:not([disabled])",all:!0},{waitForThenClick:".t-saveButton"}]}]}]},{name:"termsfeed",vendorUrl:"https://termsfeed.com",comment:"v4.x.x",prehideSelectors:[".termsfeed-com---nb"],detectCmp:[{exists:".termsfeed-com---nb"}],detectPopup:[{visible:".termsfeed-com---nb"}],optIn:[{waitForThenClick:".cc-nb-okagree"}],optOut:[{waitForThenClick:".cc-nb-reject"}]},{name:"termsfeed3",vendorUrl:"https://termsfeed.com",comment:"v3.x.x",cosmetic:!0,prehideSelectors:[".cc_dialog.cc_css_reboot"],detectCmp:[{exists:".cc_dialog.cc_css_reboot"}],detectPopup:[{visible:".cc_dialog.cc_css_reboot"}],optIn:[{waitForThenClick:".cc_dialog.cc_css_reboot .cc_b_ok"}],optOut:[{hide:".cc_dialog.cc_css_reboot"}]},{name:"Test page cosmetic CMP",cosmetic:!0,prehideSelectors:["#privacy-test-page-cmp-test-prehide"],detectCmp:[{exists:"#privacy-test-page-cmp-test-banner"}],detectPopup:[{visible:"#privacy-test-page-cmp-test-banner"}],optIn:[{waitFor:"#accept-all"},{click:"#accept-all"}],optOut:[{hide:"#privacy-test-page-cmp-test-banner"}],test:[{wait:500},{eval:"EVAL_TESTCMP_COSMETIC_0"}]},{name:"Test page CMP",prehideSelectors:["#reject-all"],detectCmp:[{exists:"#privacy-test-page-cmp-test"}],detectPopup:[{visible:"#privacy-test-page-cmp-test"}],optIn:[{waitFor:"#accept-all"},{click:"#accept-all"}],optOut:[{waitFor:"#reject-all"},{click:"#reject-all"}],test:[{eval:"EVAL_TESTCMP_0"}]},{name:"thalia.de",prehideSelectors:[".consent-banner-box"],detectCmp:[{exists:"consent-banner[component=consent-banner]"}],detectPopup:[{visible:".consent-banner-box"}],optIn:[{click:".button-zustimmen"}],optOut:[{click:"button[data-consent=disagree]"}]},{name:"thefreedictionary.com",prehideSelectors:["#cmpBanner"],detectCmp:[{exists:"#cmpBanner"}],detectPopup:[{visible:"#cmpBanner"}],optIn:[{eval:"EVAL_THEFREEDICTIONARY_1"}],optOut:[{eval:"EVAL_THEFREEDICTIONARY_0"}]},{name:"theverge",runContext:{frame:!1,main:!0,urlPattern:"^https://(www)?\\.theverge\\.com"},intermediate:!1,prehideSelectors:[".duet--cta--cookie-banner"],detectCmp:[{exists:".duet--cta--cookie-banner"}],detectPopup:[{visible:".duet--cta--cookie-banner"}],optIn:[{click:".duet--cta--cookie-banner button.tracking-12",all:!1}],optOut:[{click:".duet--cta--cookie-banner button.tracking-12 > span"}],test:[{eval:"EVAL_THEVERGE_0"}]},{name:"tidbits-com",cosmetic:!0,prehideSelectors:["#eu_cookie_law_widget-2"],detectCmp:[{exists:"#eu_cookie_law_widget-2"}],detectPopup:[{visible:"#eu_cookie_law_widget-2"}],optIn:[{click:"#eu-cookie-law form > input.accept"}],optOut:[{hide:"#eu_cookie_law_widget-2"}]},{name:"tractor-supply",runContext:{urlPattern:"^https://www\\.tractorsupply\\.com/"},cosmetic:!0,prehideSelectors:[".tsc-cookie-banner"],detectCmp:[{exists:".tsc-cookie-banner"}],detectPopup:[{visible:".tsc-cookie-banner"}],optIn:[{click:"#cookie-banner-cancel"}],optOut:[{hide:".tsc-cookie-banner"}]},{name:"trader-joes-com",cosmetic:!0,prehideSelectors:['div.aem-page > div[class^="CookiesAlert_cookiesAlert__"]'],detectCmp:[{exists:'div.aem-page > div[class^="CookiesAlert_cookiesAlert__"]'}],detectPopup:[{visible:'div.aem-page > div[class^="CookiesAlert_cookiesAlert__"]'}],optIn:[{click:'div[class^="CookiesAlert_cookiesAlert__container__"] button'}],optOut:[{hide:'div.aem-page > div[class^="CookiesAlert_cookiesAlert__"]'}]},{name:"transcend",vendorUrl:"https://unknown",cosmetic:!0,prehideSelectors:["#transcend-consent-manager"],detectCmp:[{exists:"#transcend-consent-manager"}],detectPopup:[{visible:"#transcend-consent-manager"}],optIn:[{waitForThenClick:["#transcend-consent-manager","#consentManagerMainDialog .inner-container button"]}],optOut:[{hide:"#transcend-consent-manager"}]},{name:"transip-nl",runContext:{urlPattern:"^https://www\\.transip\\.nl/"},prehideSelectors:["#consent-modal"],detectCmp:[{any:[{exists:"#consent-modal"},{exists:"#privacy-settings-content"}]}],detectPopup:[{any:[{visible:"#consent-modal"},{visible:"#privacy-settings-content"}]}],optIn:[{click:'button[type="submit"]'}],optOut:[{if:{exists:"#privacy-settings-content"},then:[{click:'button[type="submit"]'}],else:[{click:"div.one-modal__action-footer-column--secondary > a"}]}]},{name:"tropicfeel-com",prehideSelectors:["#shopify-section-cookies-controller"],detectCmp:[{exists:"#shopify-section-cookies-controller"}],detectPopup:[{visible:"#shopify-section-cookies-controller #cookies-controller-main-pane",check:"any"}],optIn:[{waitForThenClick:"#cookies-controller-main-pane form[data-form-allow-all] button"}],optOut:[{click:"#cookies-controller-main-pane a[data-tab-target=manage-cookies]"},{waitFor:"#manage-cookies-pane.active"},{click:"#manage-cookies-pane.active input[type=checkbox][checked]:not([disabled])",all:!0},{click:"#manage-cookies-pane.active button[type=submit]"}],test:[]},{name:"true-car",runContext:{urlPattern:"^https://www\\.truecar\\.com/"},cosmetic:!0,prehideSelectors:[['div[aria-labelledby="cookie-banner-heading"]']],detectCmp:[{exists:'div[aria-labelledby="cookie-banner-heading"]'}],detectPopup:[{visible:'div[aria-labelledby="cookie-banner-heading"]'}],optIn:[{click:'div[aria-labelledby="cookie-banner-heading"] > button[aria-label="Close"]'}],optOut:[{hide:'div[aria-labelledby="cookie-banner-heading"]'}]},{name:"truyo",prehideSelectors:["#truyo-consent-module"],detectCmp:[{exists:"#truyo-cookieBarContent"}],detectPopup:[{visible:"#truyo-consent-module"}],optIn:[{click:"button#acceptAllCookieButton"}],optOut:[{click:"button#declineAllCookieButton"}]},{name:"tumblr-com",cosmetic:!0,prehideSelectors:["#cmp-app-container"],detectCmp:[{exists:"#cmp-app-container"}],detectPopup:[{visible:"#cmp-app-container"}],optIn:[{click:"#tumblr #cmp-app-container div.components-modal__frame > iframe > html body > div > div > div.cmp__dialog-footer > div > button.components-button.white-space-normal.is-primary"}],optOut:[{hide:"#cmp-app-container"}]},{name:"twitch-mobile",vendorUrl:"https://m.twitch.tv/",cosmetic:!0,runContext:{urlPattern:"^https?://m\\.twitch\\.tv"},prehideSelectors:[],detectCmp:[{exists:'.ReactModal__Overlay [href="https://www.twitch.tv/p/cookie-policy"]'}],detectPopup:[{visible:'.ReactModal__Overlay [href="https://www.twitch.tv/p/cookie-policy"]'}],optIn:[{waitForThenClick:'.ReactModal__Overlay:has([href="https://www.twitch.tv/p/cookie-policy"]) button'}],optOut:[{hide:'.ReactModal__Overlay:has([href="https://www.twitch.tv/p/cookie-policy"])'}]},{name:"twitch.tv",runContext:{urlPattern:"^https?://(www\\.)?twitch\\.tv"},prehideSelectors:["div:has(> .consent-banner .consent-banner__content--gdpr-v2),.ReactModalPortal:has([data-a-target=consent-modal-save])"],detectCmp:[{exists:".consent-banner .consent-banner__content--gdpr-v2"}],detectPopup:[{visible:".consent-banner .consent-banner__content--gdpr-v2"}],optIn:[{click:'button[data-a-target="consent-banner-accept"]'}],optOut:[{hide:"div:has(> .consent-banner .consent-banner__content--gdpr-v2)"},{click:'button[data-a-target="consent-banner-manage-preferences"]'},{waitFor:"input[type=checkbox][data-a-target=tw-checkbox]"},{click:"input[type=checkbox][data-a-target=tw-checkbox][checked]:not([disabled])",all:!0,optional:!0},{waitForThenClick:"[data-a-target=consent-modal-save]"},{waitForVisible:".ReactModalPortal:has([data-a-target=consent-modal-save])",check:"none"}]},{name:"twitter",runContext:{urlPattern:"^https://([a-z0-9-]+\\.)?twitter\\.com/"},prehideSelectors:['[data-testid="BottomBar"]'],detectCmp:[{exists:'[data-testid="BottomBar"] div'}],detectPopup:[{visible:'[data-testid="BottomBar"] div'}],optIn:[{waitForThenClick:'[data-testid="BottomBar"] > div:has(>div:first-child>div:last-child>span[role=button]) > div:last-child > div[role=button]:first-child'}],optOut:[{waitForThenClick:'[data-testid="BottomBar"] > div:has(>div:first-child>div:last-child>span[role=button]) > div:last-child > div[role=button]:last-child'}],TODOtest:[{eval:"EVAL_document.cookie.includes('d_prefs=MjoxLGNvbnNlbnRfdmVyc2lvbjoy')"}]},{name:"ubuntu.com",prehideSelectors:["dialog.cookie-policy"],detectCmp:[{any:[{exists:"dialog.cookie-policy header"},{exists:'xpath///*[@id="modal"]/div/header'}]}],detectPopup:[{any:[{visible:"dialog header"},{visible:'xpath///*[@id="modal"]/div/header'}]}],optIn:[{any:[{waitForThenClick:"#cookie-policy-button-accept"},{waitForThenClick:'xpath///*[@id="cookie-policy-button-accept"]'}]}],optOut:[{any:[{waitForThenClick:"button.js-manage"},{waitForThenClick:'xpath///*[@id="cookie-policy-content"]/p[4]/button[2]'}]},{waitForThenClick:"dialog.cookie-policy .p-switch__input:checked",optional:!0,all:!0,timeout:500},{any:[{waitForThenClick:"dialog.cookie-policy .js-save-preferences"},{waitForThenClick:'xpath///*[@id="modal"]/div/button'}]}],test:[{eval:"EVAL_UBUNTU_COM_0"}]},{name:"UK Cookie Consent",prehideSelectors:["#catapult-cookie-bar"],cosmetic:!0,detectCmp:[{exists:"#catapult-cookie-bar"}],detectPopup:[{exists:".has-cookie-bar #catapult-cookie-bar"}],optIn:[{click:"#catapultCookie"}],optOut:[{hide:"#catapult-cookie-bar"}],test:[{eval:"EVAL_UK_COOKIE_CONSENT_0"}]},{name:"urbanarmorgear-com",cosmetic:!0,prehideSelectors:['div[class^="Layout__CookieBannerContainer-"]'],detectCmp:[{exists:'div[class^="Layout__CookieBannerContainer-"]'}],detectPopup:[{visible:'div[class^="Layout__CookieBannerContainer-"]'}],optIn:[{click:'button[class^="CookieBanner__AcceptButton"]'}],optOut:[{hide:'div[class^="Layout__CookieBannerContainer-"]'}]},{name:"usercentrics-api",detectCmp:[{exists:"#usercentrics-root"}],detectPopup:[{eval:"EVAL_USERCENTRICS_API_0"},{exists:["#usercentrics-root","[data-testid=uc-container]"]},{waitForVisible:"#usercentrics-root",timeout:2e3}],optIn:[{eval:"EVAL_USERCENTRICS_API_3"},{eval:"EVAL_USERCENTRICS_API_1"},{eval:"EVAL_USERCENTRICS_API_5"}],optOut:[{eval:"EVAL_USERCENTRICS_API_1"},{eval:"EVAL_USERCENTRICS_API_2"}],test:[{eval:"EVAL_USERCENTRICS_API_6"}]},{name:"usercentrics-button",detectCmp:[{exists:"#usercentrics-button"}],detectPopup:[{visible:"#usercentrics-button #uc-btn-accept-banner"}],optIn:[{click:"#usercentrics-button #uc-btn-accept-banner"}],optOut:[{click:"#usercentrics-button #uc-btn-deny-banner"}],test:[{eval:"EVAL_USERCENTRICS_BUTTON_0"}]},{name:"uswitch.com",prehideSelectors:["#cookie-banner-wrapper"],detectCmp:[{exists:"#cookie-banner-wrapper"}],detectPopup:[{visible:"#cookie-banner-wrapper"}],optIn:[{click:"#cookie_banner_accept_mobile"}],optOut:[{click:"#cookie_banner_save"}]},{name:"vodafone.de",runContext:{urlPattern:"^https://www\\.vodafone\\.de/"},prehideSelectors:[".dip-consent,.dip-consent-container"],detectCmp:[{exists:".dip-consent-container"}],detectPopup:[{visible:".dip-consent-content"}],optOut:[{click:'.dip-consent-btn[tabindex="2"]'}],optIn:[{click:'.dip-consent-btn[tabindex="1"]'}]},{name:"waitrose.com",prehideSelectors:["div[aria-labelledby=CookieAlertModalHeading]","section[data-test=initial-waitrose-cookie-consent-banner]","section[data-test=cookie-consent-modal]"],detectCmp:[{exists:"section[data-test=initial-waitrose-cookie-consent-banner]"}],detectPopup:[{visible:"section[data-test=initial-waitrose-cookie-consent-banner]"}],optIn:[{click:"button[data-test=accept-all]"}],optOut:[{click:"button[data-test=manage-cookies]"},{wait:200},{eval:"EVAL_WAITROSE_0"},{click:"button[data-test=submit]"}],test:[{eval:"EVAL_WAITROSE_1"}]},{name:"webflow",vendorUrl:"https://webflow.com/",prehideSelectors:[".fs-cc-components"],detectCmp:[{exists:".fs-cc-components"}],detectPopup:[{visible:".fs-cc-components"},{visible:"[fs-cc=banner]"}],optIn:[{wait:500},{waitForThenClick:"[fs-cc=banner] [fs-cc=allow]"}],optOut:[{wait:500},{waitForThenClick:"[fs-cc=banner] [fs-cc=deny]"}]},{name:"wetransfer.com",detectCmp:[{exists:".welcome__cookie-notice"}],detectPopup:[{visible:".welcome__cookie-notice"}],optIn:[{click:".welcome__button--accept"}],optOut:[{click:".welcome__button--decline"}]},{name:"whitepages.com",runContext:{urlPattern:"^https://www\\.whitepages\\.com/"},cosmetic:!0,prehideSelectors:[".cookie-wrapper, .cookie-overlay"],detectCmp:[{exists:".cookie-wrapper"}],detectPopup:[{visible:".cookie-overlay"}],optIn:[{click:'button[aria-label="Got it"]'}],optOut:[{hide:".cookie-wrapper"}]},{name:"wolframalpha",vendorUrl:"https://www.wolframalpha.com",prehideSelectors:[],cosmetic:!0,runContext:{urlPattern:"^https://www\\.wolframalpha\\.com/"},detectCmp:[{exists:"section._a_yb"}],detectPopup:[{visible:"section._a_yb"}],optIn:[{waitForThenClick:"section._a_yb button"}],optOut:[{hide:"section._a_yb"}]},{name:"woo-commerce-com",prehideSelectors:[".wccom-comp-privacy-banner .wccom-privacy-banner"],detectCmp:[{exists:".wccom-comp-privacy-banner .wccom-privacy-banner"}],detectPopup:[{exists:".wccom-comp-privacy-banner .wccom-privacy-banner"}],optIn:[{click:".wccom-privacy-banner__content-buttons button.is-primary"}],optOut:[{click:".wccom-privacy-banner__content-buttons button.is-secondary"},{waitForThenClick:"input[type=checkbox][checked]:not([disabled])",all:!0},{click:"div.wccom-modal__footer > button"}]},{name:"WP Cookie Notice for GDPR",vendorUrl:"https://wordpress.org/plugins/gdpr-cookie-consent/",prehideSelectors:["#gdpr-cookie-consent-bar"],detectCmp:[{exists:"#gdpr-cookie-consent-bar"}],detectPopup:[{visible:"#gdpr-cookie-consent-bar"}],optIn:[{waitForThenClick:"#gdpr-cookie-consent-bar #cookie_action_accept"}],optOut:[{waitForThenClick:"#gdpr-cookie-consent-bar #cookie_action_reject"}],test:[{eval:"EVAL_WP_COOKIE_NOTICE_0"}]},{name:"wpcc",cosmetic:!0,prehideSelectors:[".wpcc-container"],detectCmp:[{exists:".wpcc-container"}],detectPopup:[{exists:".wpcc-container .wpcc-message"}],optIn:[{click:".wpcc-compliance .wpcc-btn"}],optOut:[{hide:".wpcc-container"}]},{name:"xe.com",vendorUrl:"https://www.xe.com/",runContext:{urlPattern:"^https://www\\.xe\\.com/"},prehideSelectors:["[class*=ConsentBanner]"],detectCmp:[{exists:"[class*=ConsentBanner]"}],detectPopup:[{visible:"[class*=ConsentBanner]"}],optIn:[{waitForThenClick:"[class*=ConsentBanner] .egnScw"}],optOut:[{wait:1e3},{waitForThenClick:"[class*=ConsentBanner] .frDWEu"},{waitForThenClick:"[class*=ConsentBanner] .hXIpFU"}],test:[{eval:"EVAL_XE_TEST"}]},{name:"xhamster-eu",prehideSelectors:[".cookies-modal"],detectCmp:[{exists:".cookies-modal"}],detectPopup:[{exists:".cookies-modal"}],optIn:[{click:"button.cmd-button-accept-all"}],optOut:[{click:"button.cmd-button-reject-all"}]},{name:"xhamster-us",runContext:{urlPattern:"^https://(www\\.)?xhamster\\d?\\.com"},cosmetic:!0,prehideSelectors:[".cookie-announce"],detectCmp:[{exists:".cookie-announce"}],detectPopup:[{visible:".cookie-announce .announce-text"}],optIn:[{click:".cookie-announce button.xh-button"}],optOut:[{hide:".cookie-announce"}]},{name:"xing.com",detectCmp:[{exists:"div[class^=cookie-consent-CookieConsent]"}],detectPopup:[{exists:"div[class^=cookie-consent-CookieConsent]"}],optIn:[{click:"#consent-accept-button"}],optOut:[{click:"#consent-settings-button"},{click:".consent-banner-button-accept-overlay"}],test:[{eval:"EVAL_XING_0"}]},{name:"xnxx-com",cosmetic:!0,prehideSelectors:["#cookies-use-alert"],detectCmp:[{exists:"#cookies-use-alert"}],detectPopup:[{visible:"#cookies-use-alert"}],optIn:[{click:"#cookies-use-alert .close"}],optOut:[{hide:"#cookies-use-alert"}]},{name:"xvideos",vendorUrl:"https://xvideos.com",runContext:{urlPattern:"^https://[^/]*xvideos\\.com/"},prehideSelectors:[],detectCmp:[{exists:".disclaimer-opened #disclaimer-cookies"}],detectPopup:[{visible:".disclaimer-opened #disclaimer-cookies"}],optIn:[{waitForThenClick:"#disclaimer-accept_cookies"}],optOut:[{waitForThenClick:"#disclaimer-reject_cookies"}]},{name:"Yahoo",runContext:{urlPattern:"^https://consent\\.yahoo\\.com/v2/"},prehideSelectors:["#reject-all"],detectCmp:[{exists:"#consent-page"}],detectPopup:[{visible:"#consent-page"}],optIn:[{waitForThenClick:"#consent-page button[value=agree]"}],optOut:[{waitForThenClick:"#consent-page button[value=reject]"}]},{name:"youporn.com",cosmetic:!0,prehideSelectors:[".euCookieModal, #js_euCookieModal"],detectCmp:[{exists:".euCookieModal"}],detectPopup:[{exists:".euCookieModal, #js_euCookieModal"}],optIn:[{click:'button[name="user_acceptCookie"]'}],optOut:[{hide:".euCookieModal"}]},{name:"youtube-desktop",prehideSelectors:["tp-yt-iron-overlay-backdrop.opened","ytd-consent-bump-v2-lightbox"],detectCmp:[{exists:"ytd-consent-bump-v2-lightbox tp-yt-paper-dialog"},{exists:'ytd-consent-bump-v2-lightbox tp-yt-paper-dialog a[href^="https://consent.youtube.com/"]'}],detectPopup:[{visible:"ytd-consent-bump-v2-lightbox tp-yt-paper-dialog"}],optIn:[{waitForThenClick:"ytd-consent-bump-v2-lightbox .eom-buttons .eom-button-row:first-child ytd-button-renderer:last-child #button,ytd-consent-bump-v2-lightbox .eom-buttons .eom-button-row:first-child ytd-button-renderer:last-child button"},{wait:500}],optOut:[{waitForThenClick:"ytd-consent-bump-v2-lightbox .eom-buttons .eom-button-row:first-child ytd-button-renderer:first-child #button,ytd-consent-bump-v2-lightbox .eom-buttons .eom-button-row:first-child ytd-button-renderer:first-child button"},{wait:500}],test:[{wait:500},{eval:"EVAL_YOUTUBE_DESKTOP_0"}]},{name:"youtube-mobile",prehideSelectors:[".consent-bump-v2-lightbox"],detectCmp:[{exists:"ytm-consent-bump-v2-renderer"}],detectPopup:[{visible:"ytm-consent-bump-v2-renderer"}],optIn:[{waitForThenClick:"ytm-consent-bump-v2-renderer .privacy-terms + .one-col-dialog-buttons c3-material-button:first-child button, ytm-consent-bump-v2-renderer .privacy-terms + .one-col-dialog-buttons ytm-button-renderer:first-child button"},{wait:500}],optOut:[{waitForThenClick:"ytm-consent-bump-v2-renderer .privacy-terms + .one-col-dialog-buttons c3-material-button:nth-child(2) button, ytm-consent-bump-v2-renderer .privacy-terms + .one-col-dialog-buttons ytm-button-renderer:nth-child(2) button"},{wait:500}],test:[{wait:500},{eval:"EVAL_YOUTUBE_MOBILE_0"}]},{name:"zdf",prehideSelectors:["#zdf-cmp-banner-sdk"],detectCmp:[{exists:"#zdf-cmp-banner-sdk"}],detectPopup:[{visible:"#zdf-cmp-main.zdf-cmp-show"}],optIn:[{waitForThenClick:"#zdf-cmp-main #zdf-cmp-accept-btn"}],optOut:[{waitForThenClick:"#zdf-cmp-main #zdf-cmp-deny-btn"}],test:[]}],C={"didomi.io":{detectors:[{presentMatcher:{target:{selector:"#didomi-host, #didomi-notice"},type:"css"},showingMatcher:{target:{selector:"body.didomi-popup-open, .didomi-notice-banner"},type:"css"}}],methods:[{action:{target:{selector:".didomi-popup-notice-buttons .didomi-button:not(.didomi-button-highlight), .didomi-notice-banner .didomi-learn-more-button"},type:"click"},name:"OPEN_OPTIONS"},{action:{actions:[{retries:50,target:{selector:"#didomi-purpose-cookies"},type:"waitcss",waitTime:50},{consents:[{description:"Share (everything) with others",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-share_whith_others]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-share_whith_others]:last-child"},type:"click"},type:"X"},{description:"Information storage and access",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-cookies]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-cookies]:last-child"},type:"click"},type:"D"},{description:"Content selection, offers and marketing",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-CL-T1Rgm7]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-CL-T1Rgm7]:last-child"},type:"click"},type:"E"},{description:"Analytics",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-analytics]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-analytics]:last-child"},type:"click"},type:"B"},{description:"Analytics",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-M9NRHJe3G]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-M9NRHJe3G]:last-child"},type:"click"},type:"B"},{description:"Ad and content selection",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-advertising_personalization]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-advertising_personalization]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection",falseAction:{parent:{childFilter:{target:{selector:"#didomi-purpose-pub-ciblee"}},selector:".didomi-consent-popup-data-processing, .didomi-components-accordion-label-container"},target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-pub-ciblee]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-pub-ciblee]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection - basics",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-q4zlJqdcD]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-q4zlJqdcD]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection - partners and subsidiaries",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-partenaire-cAsDe8jC]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-partenaire-cAsDe8jC]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection - social networks",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-p4em9a8m]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-p4em9a8m]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection - others",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-autres-pub]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-autres-pub]:last-child"},type:"click"},type:"F"},{description:"Social networks",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-reseauxsociaux]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-reseauxsociaux]:last-child"},type:"click"},type:"A"},{description:"Social networks",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-social_media]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-social_media]:last-child"},type:"click"},type:"A"},{description:"Content selection",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-content_personalization]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-content_personalization]:last-child"},type:"click"},type:"E"},{description:"Ad delivery",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-ad_delivery]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-ad_delivery]:last-child"},type:"click"},type:"F"}],type:"consent"},{action:{consents:[{matcher:{childFilter:{target:{selector:":not(.didomi-components-radio__option--selected)"}},type:"css"},trueAction:{target:{selector:":nth-child(2)"},type:"click"},falseAction:{target:{selector:":first-child"},type:"click"},type:"X"}],type:"consent"},target:{selector:".didomi-components-radio"},type:"foreach"}],type:"list"},name:"DO_CONSENT"},{action:{parent:{selector:".didomi-consent-popup-footer .didomi-consent-popup-actions"},target:{selector:".didomi-components-button:first-child"},type:"click"},name:"SAVE_CONSENT"}]},oil:{detectors:[{presentMatcher:{target:{selector:".as-oil-content-overlay"},type:"css"},showingMatcher:{target:{selector:".as-oil-content-overlay"},type:"css"}}],methods:[{action:{actions:[{target:{selector:".as-js-advanced-settings"},type:"click"},{retries:"10",target:{selector:".as-oil-cpc__purpose-container"},type:"waitcss",waitTime:"250"}],type:"list"},name:"OPEN_OPTIONS"},{action:{actions:[{consents:[{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Information storage and access","Opbevaring af og adgang til oplysninger på din enhed"]},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Information storage and access","Opbevaring af og adgang til oplysninger på din enhed"]},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"D"},{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Personlige annoncer","Personalisation"]},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Personlige annoncer","Personalisation"]},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"E"},{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Annoncevalg, levering og rapportering","Ad selection, delivery, reporting"]},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Annoncevalg, levering og rapportering","Ad selection, delivery, reporting"]},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"F"},{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Personalisering af indhold","Content selection, delivery, reporting"]},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Personalisering af indhold","Content selection, delivery, reporting"]},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"E"},{matcher:{parent:{childFilter:{target:{selector:".as-oil-cpc__purpose-header",textFilter:["Måling","Measurement"]}},selector:".as-oil-cpc__purpose-container"},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{childFilter:{target:{selector:".as-oil-cpc__purpose-header",textFilter:["Måling","Measurement"]}},selector:".as-oil-cpc__purpose-container"},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"B"},{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:"Google"},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:"Google"},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"F"}],type:"consent"}],type:"list"},name:"DO_CONSENT"},{action:{target:{selector:".as-oil__btn-optin"},type:"click"},name:"SAVE_CONSENT"},{action:{target:{selector:"div.as-oil"},type:"hide"},name:"HIDE_CMP"}]},optanon:{detectors:[{presentMatcher:{target:{selector:"#optanon-menu, .optanon-alert-box-wrapper"},type:"css"},showingMatcher:{target:{displayFilter:!0,selector:".optanon-alert-box-wrapper"},type:"css"}}],methods:[{action:{actions:[{target:{selector:".optanon-alert-box-wrapper .optanon-toggle-display, a[onclick*='OneTrust.ToggleInfoDisplay()'], a[onclick*='Optanon.ToggleInfoDisplay()']"},type:"click"}],type:"list"},name:"OPEN_OPTIONS"},{action:{actions:[{target:{selector:".preference-menu-item #Your-privacy"},type:"click"},{target:{selector:"#optanon-vendor-consent-text"},type:"click"},{action:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"X"}],type:"consent"},target:{selector:"#optanon-vendor-consent-list .vendor-item"},type:"foreach"},{target:{selector:".vendor-consent-back-link"},type:"click"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-performance"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-performance"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-functional"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-functional"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-advertising"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-advertising"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-social"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-social"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Social Media Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Social Media Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Personalisation"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Personalisation"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Site monitoring cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Site monitoring cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Third party privacy-enhanced content"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Third party privacy-enhanced content"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"X"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Performance & Advertising Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Performance & Advertising Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Information storage and access"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Information storage and access"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"D"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Ad selection, delivery, reporting"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Ad selection, delivery, reporting"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Content selection, delivery, reporting"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Content selection, delivery, reporting"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Measurement"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Measurement"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Recommended Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Recommended Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"X"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Unclassified Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Unclassified Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"X"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Analytical Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Analytical Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Marketing Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Marketing Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Personalization"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Personalization"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Ad Selection, Delivery & Reporting"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Ad Selection, Delivery & Reporting"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Content Selection, Delivery & Reporting"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Content Selection, Delivery & Reporting"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"}],type:"list"},name:"DO_CONSENT"},{action:{parent:{selector:".optanon-save-settings-button"},target:{selector:".optanon-white-button-middle"},type:"click"},name:"SAVE_CONSENT"},{action:{actions:[{target:{selector:"#optanon-popup-wrapper"},type:"hide"},{target:{selector:"#optanon-popup-bg"},type:"hide"},{target:{selector:".optanon-alert-box-wrapper"},type:"hide"}],type:"list"},name:"HIDE_CMP"}]},quantcast2:{detectors:[{presentMatcher:{target:{selector:"[data-tracking-opt-in-overlay]"},type:"css"},showingMatcher:{target:{selector:"[data-tracking-opt-in-overlay] [data-tracking-opt-in-learn-more]"},type:"css"}}],methods:[{action:{target:{selector:"[data-tracking-opt-in-overlay] [data-tracking-opt-in-learn-more]"},type:"click"},name:"OPEN_OPTIONS"},{action:{actions:[{type:"wait",waitTime:500},{action:{actions:[{target:{selector:"div",textFilter:["Information storage and access"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"D"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Personalization"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"F"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Ad selection, delivery, reporting"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"F"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Content selection, delivery, reporting"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"E"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Measurement"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"B"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Other Partners"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"X"}],type:"consent"},type:"ifcss"}],type:"list"},parent:{childFilter:{target:{selector:"input"}},selector:"[data-tracking-opt-in-overlay] > div > div"},target:{childFilter:{target:{selector:"input"}},selector:":scope > div"},type:"foreach"}],type:"list"},name:"DO_CONSENT"},{action:{target:{selector:"[data-tracking-opt-in-overlay] [data-tracking-opt-in-save]"},type:"click"},name:"SAVE_CONSENT"}]},springer:{detectors:[{presentMatcher:{parent:null,target:{selector:".cmp-app_gdpr"},type:"css"},showingMatcher:{parent:null,target:{displayFilter:!0,selector:".cmp-popup_popup"},type:"css"}}],methods:[{action:{actions:[{target:{selector:".cmp-intro_rejectAll"},type:"click"},{type:"wait",waitTime:250},{target:{selector:".cmp-purposes_purposeItem:not(.cmp-purposes_selectedPurpose)"},type:"click"}],type:"list"},name:"OPEN_OPTIONS"},{action:{consents:[{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Przechowywanie informacji na urządzeniu lub dostęp do nich",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Przechowywanie informacji na urządzeniu lub dostęp do nich",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"D"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór podstawowych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór podstawowych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"F"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Tworzenie profilu spersonalizowanych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Tworzenie profilu spersonalizowanych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"F"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór spersonalizowanych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór spersonalizowanych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"E"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Tworzenie profilu spersonalizowanych treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Tworzenie profilu spersonalizowanych treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"E"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór spersonalizowanych treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór spersonalizowanych treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"B"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Pomiar wydajności reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Pomiar wydajności reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"B"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Pomiar wydajności treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Pomiar wydajności treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"B"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Stosowanie badań rynkowych w celu generowania opinii odbiorców",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Stosowanie badań rynkowych w celu generowania opinii odbiorców",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"X"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Opracowywanie i ulepszanie produktów",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Opracowywanie i ulepszanie produktów",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"X"}],type:"consent"},name:"DO_CONSENT"},{action:{target:{selector:".cmp-details_save"},type:"click"},name:"SAVE_CONSENT"}]},wordpressgdpr:{detectors:[{presentMatcher:{parent:null,target:{selector:".wpgdprc-consent-bar"},type:"css"},showingMatcher:{parent:null,target:{displayFilter:!0,selector:".wpgdprc-consent-bar"},type:"css"}}],methods:[{action:{parent:null,target:{selector:".wpgdprc-consent-bar .wpgdprc-consent-bar__settings",textFilter:null},type:"click"},name:"OPEN_OPTIONS"},{action:{actions:[{target:{selector:".wpgdprc-consent-modal .wpgdprc-button",textFilter:"Eyeota"},type:"click"},{consents:[{description:"Eyeota Cookies",matcher:{parent:{selector:".wpgdprc-consent-modal__description",textFilter:"Eyeota"},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".wpgdprc-consent-modal__description",textFilter:"Eyeota"},target:{selector:"label"},type:"click"},type:"X"}],type:"consent"},{target:{selector:".wpgdprc-consent-modal .wpgdprc-button",textFilter:"Advertising"},type:"click"},{consents:[{description:"Advertising Cookies",matcher:{parent:{selector:".wpgdprc-consent-modal__description",textFilter:"Advertising"},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".wpgdprc-consent-modal__description",textFilter:"Advertising"},target:{selector:"label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},name:"DO_CONSENT"},{action:{parent:null,target:{selector:".wpgdprc-button",textFilter:"Save my settings"},type:"click"},name:"SAVE_CONSENT"}]}},v={autoconsent:w,consentomatic:C},f=Object.freeze({__proto__:null,autoconsent:w,consentomatic:C,default:v});const A=new class{constructor(e,t=null,o=null){if(this.id=n(),this.rules=[],this.foundCmp=null,this.state={lifecycle:"loading",prehideOn:!1,findCmpAttempts:0,detectedCmps:[],detectedPopups:[],selfTest:null},a.sendContentMessage=e,this.sendContentMessage=e,this.rules=[],this.updateState({lifecycle:"loading"}),this.addDynamicRules(),t)this.initialize(t,o);else{o&&this.parseDeclarativeRules(o);e({type:"init",url:window.location.href}),this.updateState({lifecycle:"waitingForInitResponse"})}this.domActions=new class{constructor(e){this.autoconsentInstance=e}click(e,t=!1){const o=this.elementSelector(e);return this.autoconsentInstance.config.logs.rulesteps&&console.log("[click]",e,t,o),o.length>0&&(t?o.forEach((e=>e.click())):o[0].click()),o.length>0}elementExists(e){return this.elementSelector(e).length>0}elementVisible(e,t){const o=this.elementSelector(e),c=new Array(o.length);return o.forEach(((e,t)=>{c[t]=k(e)})),"none"===t?c.every((e=>!e)):0!==c.length&&("any"===t?c.some((e=>e)):c.every((e=>e)))}waitForElement(e,t=1e4){const o=Math.ceil(t/200);return this.autoconsentInstance.config.logs.rulesteps&&console.log("[waitForElement]",e),h((()=>this.elementSelector(e).length>0),o,200)}waitForVisible(e,t=1e4,o="any"){return h((()=>this.elementVisible(e,o)),Math.ceil(t/200),200)}async waitForThenClick(e,t=1e4,o=!1){return await this.waitForElement(e,t),this.click(e,o)}wait(e){return new Promise((t=>{setTimeout((()=>{t(!0)}),e)}))}hide(e,t){return m(u(),e,t)}prehide(e){const t=u("autoconsent-prehide");return this.autoconsentInstance.config.logs.lifecycle&&console.log("[prehide]",t,location.href),m(t,e,"opacity")}undoPrehide(){const e=u("autoconsent-prehide");return this.autoconsentInstance.config.logs.lifecycle&&console.log("[undoprehide]",e,location.href),e&&e.remove(),!!e}querySingleReplySelector(e,t=document){if(e.startsWith("aria/"))return[];if(e.startsWith("xpath/")){const o=e.slice(6),c=document.evaluate(o,t,null,XPathResult.ANY_TYPE,null);let i=null;const n=[];for(;i=c.iterateNext();)n.push(i);return n}return e.startsWith("text/")||e.startsWith("pierce/")?[]:t.shadowRoot?Array.from(t.shadowRoot.querySelectorAll(e)):Array.from(t.querySelectorAll(e))}querySelectorChain(e){let t,o=document;for(const c of e){if(t=this.querySingleReplySelector(c,o),0===t.length)return[];o=t[0]}return t}elementSelector(e){return"string"==typeof e?this.querySingleReplySelector(e):this.querySelectorChain(e)}}(this)}initialize(e,t){const o=b(e);if(o.logs.lifecycle&&console.log("autoconsent init",window.location.href),this.config=o,o.enabled){if(t&&this.parseDeclarativeRules(t),this.rules=function(e,t){return e.filter((e=>(!t.disabledCmps||!t.disabledCmps.includes(e.name))&&(t.enableCosmeticRules||!e.isCosmetic)))}(this.rules,o),e.enablePrehide)if(document.documentElement)this.prehideElements();else{const e=()=>{window.removeEventListener("DOMContentLoaded",e),this.prehideElements()};window.addEventListener("DOMContentLoaded",e)}if("loading"===document.readyState){const e=()=>{window.removeEventListener("DOMContentLoaded",e),this.start()};window.addEventListener("DOMContentLoaded",e)}else this.start();this.updateState({lifecycle:"initialized"})}else o.logs.lifecycle&&console.log("autoconsent is disabled")}addDynamicRules(){y.forEach((e=>{this.rules.push(new e(this))}))}parseDeclarativeRules(e){Object.keys(e.consentomatic).forEach((t=>{this.addConsentomaticCMP(t,e.consentomatic[t])})),e.autoconsent.forEach((e=>{this.addDeclarativeCMP(e)}))}addDeclarativeCMP(e){this.rules.push(new d(e,this))}addConsentomaticCMP(e,t){this.rules.push(new class{constructor(e,t){this.name=e,this.config=t,this.methods=new Map,this.runContext=l,this.isCosmetic=!1,t.methods.forEach((e=>{e.action&&this.methods.set(e.name,e.action)})),this.hasSelfTest=!1}get isIntermediate(){return!1}checkRunContext(){return!0}async detectCmp(){return this.config.detectors.map((e=>o(e.presentMatcher))).some((e=>!!e))}async detectPopup(){return this.config.detectors.map((e=>o(e.showingMatcher))).some((e=>!!e))}async executeAction(e,t){return!this.methods.has(e)||c(this.methods.get(e),t)}async optOut(){return await this.executeAction("HIDE_CMP"),await this.executeAction("OPEN_OPTIONS"),await this.executeAction("HIDE_CMP"),await this.executeAction("DO_CONSENT",[]),await this.executeAction("SAVE_CONSENT"),!0}async optIn(){return await this.executeAction("HIDE_CMP"),await this.executeAction("OPEN_OPTIONS"),await this.executeAction("HIDE_CMP"),await this.executeAction("DO_CONSENT",["D","A","B","E","F","X"]),await this.executeAction("SAVE_CONSENT"),!0}async openCmp(){return await this.executeAction("HIDE_CMP"),await this.executeAction("OPEN_OPTIONS"),!0}async test(){return!0}}(`com_${e}`,t))}start(){window.requestIdleCallback?window.requestIdleCallback((()=>this._start()),{timeout:500}):this._start()}async _start(){const e=this.config.logs;e.lifecycle&&console.log(`Detecting CMPs on ${window.location.href}`),this.updateState({lifecycle:"started"});const t=await this.findCmp(this.config.detectRetries);if(this.updateState({detectedCmps:t.map((e=>e.name))}),0===t.length)return e.lifecycle&&console.log("no CMP found",location.href),this.config.enablePrehide&&this.undoPrehide(),this.updateState({lifecycle:"nothingDetected"}),!1;this.updateState({lifecycle:"cmpDetected"});const o=[],c=[];for(const e of t)e.isCosmetic?c.push(e):o.push(e);let i=!1,n=await this.detectPopups(o,(async e=>{i=await this.handlePopup(e)}));if(0===n.length&&(n=await this.detectPopups(c,(async e=>{i=await this.handlePopup(e)}))),0===n.length)return e.lifecycle&&console.log("no popup found"),this.config.enablePrehide&&this.undoPrehide(),!1;if(n.length>1){const t={msg:"Found multiple CMPs, check the detection rules.",cmps:n.map((e=>e.name))};e.errors&&console.warn(t.msg,t.cmps),this.sendContentMessage({type:"autoconsentError",details:t})}return i}async findCmp(e){const t=this.config.logs;this.updateState({findCmpAttempts:this.state.findCmpAttempts+1});const o=[];for(const e of this.rules)try{if(!e.checkRunContext())continue;await e.detectCmp()&&(t.lifecycle&&console.log(`Found CMP: ${e.name} ${window.location.href}`),this.sendContentMessage({type:"cmpDetected",url:location.href,cmp:e.name}),o.push(e))}catch(o){t.errors&&console.warn(`error detecting ${e.name}`,o)}return 0===o.length&&e>0?(await this.domActions.wait(500),this.findCmp(e-1)):o}async detectPopup(e){if(await this.waitForPopup(e).catch((t=>(this.config.logs.errors&&console.warn(`error waiting for a popup for ${e.name}`,t),!1))))return this.updateState({detectedPopups:this.state.detectedPopups.concat([e.name])}),this.sendContentMessage({type:"popupFound",cmp:e.name,url:location.href}),e;throw new Error("Popup is not shown")}async detectPopups(e,t){const o=e.map((e=>this.detectPopup(e)));await Promise.any(o).then((e=>{t(e)})).catch((()=>null));const c=await Promise.allSettled(o),i=[];for(const e of c)"fulfilled"===e.status&&i.push(e.value);return i}async handlePopup(e){return this.updateState({lifecycle:"openPopupDetected"}),this.config.enablePrehide&&!this.state.prehideOn&&this.prehideElements(),this.foundCmp=e,"optOut"===this.config.autoAction?await this.doOptOut():"optIn"===this.config.autoAction?await this.doOptIn():(this.config.logs.lifecycle&&console.log("waiting for opt-out signal...",location.href),!0)}async doOptOut(){const e=this.config.logs;let t;return this.updateState({lifecycle:"runningOptOut"}),this.foundCmp?(e.lifecycle&&console.log(`CMP ${this.foundCmp.name}: opt out on ${window.location.href}`),t=await this.foundCmp.optOut(),e.lifecycle&&console.log(`${this.foundCmp.name}: opt out result ${t}`)):(e.errors&&console.log("no CMP to opt out"),t=!1),this.config.enablePrehide&&this.undoPrehide(),this.sendContentMessage({type:"optOutResult",cmp:this.foundCmp?this.foundCmp.name:"none",result:t,scheduleSelfTest:this.foundCmp&&this.foundCmp.hasSelfTest,url:location.href}),t&&!this.foundCmp.isIntermediate?(this.sendContentMessage({type:"autoconsentDone",cmp:this.foundCmp.name,isCosmetic:this.foundCmp.isCosmetic,url:location.href}),this.updateState({lifecycle:"done"})):this.updateState({lifecycle:t?"optOutSucceeded":"optOutFailed"}),t}async doOptIn(){const e=this.config.logs;let t;return this.updateState({lifecycle:"runningOptIn"}),this.foundCmp?(e.lifecycle&&console.log(`CMP ${this.foundCmp.name}: opt in on ${window.location.href}`),t=await this.foundCmp.optIn(),e.lifecycle&&console.log(`${this.foundCmp.name}: opt in result ${t}`)):(e.errors&&console.log("no CMP to opt in"),t=!1),this.config.enablePrehide&&this.undoPrehide(),this.sendContentMessage({type:"optInResult",cmp:this.foundCmp?this.foundCmp.name:"none",result:t,scheduleSelfTest:!1,url:location.href}),t&&!this.foundCmp.isIntermediate?(this.sendContentMessage({type:"autoconsentDone",cmp:this.foundCmp.name,isCosmetic:this.foundCmp.isCosmetic,url:location.href}),this.updateState({lifecycle:"done"})):this.updateState({lifecycle:t?"optInSucceeded":"optInFailed"}),t}async doSelfTest(){const e=this.config.logs;let t;return this.foundCmp?(e.lifecycle&&console.log(`CMP ${this.foundCmp.name}: self-test on ${window.location.href}`),t=await this.foundCmp.test()):(e.errors&&console.log("no CMP to self test"),t=!1),this.sendContentMessage({type:"selfTestResult",cmp:this.foundCmp?this.foundCmp.name:"none",result:t,url:location.href}),this.updateState({selfTest:t}),t}async waitForPopup(e,t=5,o=500){const c=this.config.logs;c.lifecycle&&console.log("checking if popup is open...",e.name);const i=await e.detectPopup().catch((t=>(c.errors&&console.warn(`error detecting popup for ${e.name}`,t),!1)));return!i&&t>0?(await this.domActions.wait(o),this.waitForPopup(e,t-1,o)):(c.lifecycle&&console.log(e.name,"popup is "+(i?"open":"not open")),i)}prehideElements(){const e=this.config.logs,t=this.rules.reduce(((e,t)=>t.prehideSelectors?[...e,...t.prehideSelectors]:e),["#didomi-popup,.didomi-popup-container,.didomi-popup-notice,.didomi-consent-popup-preferences,#didomi-notice,.didomi-popup-backdrop,.didomi-screen-medium"]);return this.updateState({prehideOn:!0}),setTimeout((()=>{this.config.enablePrehide&&this.state.prehideOn&&!["runningOptOut","runningOptIn"].includes(this.state.lifecycle)&&(e.lifecycle&&console.log("Process is taking too long, unhiding elements"),this.undoPrehide())}),this.config.prehideTimeout||2e3),this.domActions.prehide(t.join(","))}undoPrehide(){return this.updateState({prehideOn:!1}),this.domActions.undoPrehide()}updateState(e){Object.assign(this.state,e),this.sendContentMessage({type:"report",instanceId:this.id,url:window.location.href,mainFrame:window.top===window.self,state:this.state})}async receiveMessageCallback(e){const t=this.config?.logs;switch(t?.messages&&console.log("received from background",e,window.location.href),e.type){case"initResp":this.initialize(e.config,e.rules);break;case"optIn":await this.doOptIn();break;case"optOut":await this.doOptOut();break;case"selfTest":await this.doSelfTest();break;case"evalResp":!function(e,t){const o=a.pending.get(e);o?(a.pending.delete(e),o.timer&&window.clearTimeout(o.timer),o.resolve(t)):console.warn("no eval #",e)}(e.id,e.result)}}}((e=>{window.webkit.messageHandlers[e.type]&&window.webkit.messageHandlers[e.type].postMessage(e).then((e=>{A.receiveMessageCallback(e)}))}),null,f);window.autoconsentMessageCallback=e=>{A.receiveMessageCallback(e)}}();
+!function(){"use strict";var e=class e{static setBase(t){e.base=t}static findElement(t,o=null,c=!1){let i=null;return i=null!=o?Array.from(o.querySelectorAll(t.selector)):null!=e.base?Array.from(e.base.querySelectorAll(t.selector)):Array.from(document.querySelectorAll(t.selector)),null!=t.textFilter&&(i=i.filter((e=>{const o=e.textContent.toLowerCase();if(Array.isArray(t.textFilter)){let e=!1;for(const c of t.textFilter)if(-1!==o.indexOf(c.toLowerCase())){e=!0;break}return e}if(null!=t.textFilter)return-1!==o.indexOf(t.textFilter.toLowerCase())}))),null!=t.styleFilters&&(i=i.filter((e=>{const o=window.getComputedStyle(e);let c=!0;for(const e of t.styleFilters){const t=o[e.option];c=e.negated?c&&t!==e.value:c&&t===e.value}return c}))),null!=t.displayFilter&&(i=i.filter((e=>t.displayFilter?0!==e.offsetHeight:0===e.offsetHeight))),null!=t.iframeFilter&&(i=i.filter((()=>t.iframeFilter?window.location!==window.parent.location:window.location===window.parent.location))),null!=t.childFilter&&(i=i.filter((o=>{const c=e.base;e.setBase(o);const i=e.find(t.childFilter);return e.setBase(c),null!=i.target}))),c?i:(i.length>1&&console.warn("Multiple possible targets: ",i,t,o),i[0])}static find(t,o=!1){const c=[];if(null!=t.parent){const i=e.findElement(t.parent,null,o);if(null!=i){if(i instanceof Array)return i.forEach((i=>{const n=e.findElement(t.target,i,o);n instanceof Array?n.forEach((e=>{c.push({parent:i,target:e})})):c.push({parent:i,target:n})})),c;{const n=e.findElement(t.target,i,o);n instanceof Array?n.forEach((e=>{c.push({parent:i,target:e})})):c.push({parent:i,target:n})}}}else{const i=e.findElement(t.target,null,o);i instanceof Array?i.forEach((e=>{c.push({parent:null,target:e})})):c.push({parent:null,target:i})}return 0===c.length&&c.push({parent:null,target:null}),o?c:(1!==c.length&&console.warn("Multiple results found, even though multiple false",c),c[0])}};e.base=null;var t=e;function o(e){const o=t.find(e);return"css"===e.type?!!o.target:"checkbox"===e.type?!!o.target&&o.target.checked:void 0}async function c(e,n){switch(e.type){case"click":return async function(e){const o=t.find(e);null!=o.target&&o.target.click();return i(0)}(e);case"list":return async function(e,t){for(const o of e.actions)await c(o,t)}(e,n);case"consent":return async function(e,t){for(const i of e.consents){const e=-1!==t.indexOf(i.type);if(i.matcher&&i.toggleAction){o(i.matcher)!==e&&await c(i.toggleAction)}else e?await c(i.trueAction):await c(i.falseAction)}}(e,n);case"ifcss":return async function(e,o){const i=t.find(e);i.target?e.falseAction&&await c(e.falseAction,o):e.trueAction&&await c(e.trueAction,o)}(e,n);case"waitcss":return async function(e){await new Promise((o=>{let c=e.retries||10;const i=e.waitTime||250,n=()=>{const a=t.find(e);(e.negated&&a.target||!e.negated&&!a.target)&&c>0?(c-=1,setTimeout(n,i)):o()};n()}))}(e);case"foreach":return async function(e,o){const i=t.find(e,!0),n=t.base;for(const n of i)n.target&&(t.setBase(n.target),await c(e.action,o));t.setBase(n)}(e,n);case"hide":return async function(e){const o=t.find(e);o.target&&o.target.classList.add("Autoconsent-Hidden")}(e);case"slide":return async function(e){const o=t.find(e),c=t.find(e.dragTarget);if(o.target){const e=o.target.getBoundingClientRect(),t=c.target.getBoundingClientRect();let i=t.top-e.top,n=t.left-e.left;"y"===this.config.axis.toLowerCase()&&(n=0),"x"===this.config.axis.toLowerCase()&&(i=0);const a=window.screenX+e.left+e.width/2,s=window.screenY+e.top+e.height/2,r=e.left+e.width/2,l=e.top+e.height/2,p=document.createEvent("MouseEvents");p.initMouseEvent("mousedown",!0,!0,window,0,a,s,r,l,!1,!1,!1,!1,0,o.target);const d=document.createEvent("MouseEvents");d.initMouseEvent("mousemove",!0,!0,window,0,a+n,s+i,r+n,l+i,!1,!1,!1,!1,0,o.target);const u=document.createEvent("MouseEvents");u.initMouseEvent("mouseup",!0,!0,window,0,a+n,s+i,r+n,l+i,!1,!1,!1,!1,0,o.target),o.target.dispatchEvent(p),await this.waitTimeout(10),o.target.dispatchEvent(d),await this.waitTimeout(10),o.target.dispatchEvent(u)}}(e);case"close":return async function(){window.close()}();case"wait":return async function(e){await i(e.waitTime)}(e);case"eval":return async function(e){return console.log("eval!",e.code),new Promise((t=>{try{e.async?(window.eval(e.code),setTimeout((()=>{t(window.eval("window.__consentCheckResult"))}),e.timeout||250)):t(window.eval(e.code))}catch(o){console.warn("eval error",o,e.code),t(!1)}}))}(e);default:throw"Unknown action type: "+e.type}}function i(e){return new Promise((t=>{setTimeout((()=>{t()}),e)}))}function n(){return crypto&&void 0!==crypto.randomUUID?crypto.randomUUID():Math.random().toString()}var a={pending:new Map,sendContentMessage:null};function s(e,t){const o=n();a.sendContentMessage({type:"eval",id:o,code:e,snippetId:t});const c=new class{constructor(e,t=1e3){this.id=e,this.promise=new Promise(((e,t)=>{this.resolve=e,this.reject=t})),this.timer=window.setTimeout((()=>{this.reject(new Error("timeout"))}),t)}}(o);return a.pending.set(c.id,c),c.promise}var r={EVAL_0:()=>console.log(1),EVAL_CONSENTMANAGER_1:()=>window.__cmp&&"object"==typeof __cmp("getCMPData"),EVAL_CONSENTMANAGER_2:()=>!__cmp("consentStatus").userChoiceExists,EVAL_CONSENTMANAGER_3:()=>__cmp("setConsent",0),EVAL_CONSENTMANAGER_4:()=>__cmp("setConsent",1),EVAL_CONSENTMANAGER_5:()=>__cmp("consentStatus").userChoiceExists,EVAL_COOKIEBOT_1:()=>!!window.Cookiebot,EVAL_COOKIEBOT_2:()=>!window.Cookiebot.hasResponse&&!0===window.Cookiebot.dialog?.visible,EVAL_COOKIEBOT_3:()=>window.Cookiebot.withdraw()||!0,EVAL_COOKIEBOT_4:()=>window.Cookiebot.hide()||!0,EVAL_COOKIEBOT_5:()=>!0===window.Cookiebot.declined,EVAL_KLARO_1:()=>{const e=globalThis.klaroConfig||globalThis.klaro?.getManager&&globalThis.klaro.getManager().config;if(!e)return!0;const t=(e.services||e.apps).filter((e=>!e.required)).map((e=>e.name));if(klaro&&klaro.getManager){const e=klaro.getManager();return t.every((t=>!e.consents[t]))}if(klaroConfig&&"cookie"===klaroConfig.storageMethod){const e=klaroConfig.cookieName||klaroConfig.storageName,o=JSON.parse(decodeURIComponent(document.cookie.split(";").find((t=>t.trim().startsWith(e))).split("=")[1]));return Object.keys(o).filter((e=>t.includes(e))).every((e=>!1===o[e]))}},EVAL_ONETRUST_1:()=>window.OnetrustActiveGroups.split(",").filter((e=>e.length>0)).length<=1,EVAL_TRUSTARC_TOP:()=>window&&window.truste&&"0"===window.truste.eu.bindMap.prefCookie,EVAL_ADROLL_0:()=>!document.cookie.includes("__adroll_fpc"),EVAL_ALMACMP_0:()=>document.cookie.includes('"name":"Google","consent":false'),EVAL_AFFINITY_SERIF_COM_0:()=>document.cookie.includes("serif_manage_cookies_viewed")&&!document.cookie.includes("serif_allow_analytics"),EVAL_ARBEITSAGENTUR_TEST:()=>document.cookie.includes("cookie_consent=denied"),EVAL_AXEPTIO_0:()=>document.cookie.includes("axeptio_authorized_vendors=%2C%2C"),EVAL_BAHN_TEST:()=>1===utag.gdpr.getSelectedCategories().length,EVAL_BING_0:()=>document.cookie.includes("AL=0")&&document.cookie.includes("AD=0")&&document.cookie.includes("SM=0"),EVAL_BLOCKSY_0:()=>document.cookie.includes("blocksy_cookies_consent_accepted=no"),EVAL_BORLABS_0:()=>!JSON.parse(decodeURIComponent(document.cookie.split(";").find((e=>-1!==e.indexOf("borlabs-cookie"))).split("=",2)[1])).consents.statistics,EVAL_BUNDESREGIERUNG_DE_0:()=>document.cookie.match("cookie-allow-tracking=0"),EVAL_CANVA_0:()=>!document.cookie.includes("gtm_fpc_engagement_event"),EVAL_CC_BANNER2_0:()=>!!document.cookie.match(/sncc=[^;]+D%3Dtrue/),EVAL_CLICKIO_0:()=>document.cookie.includes("__lxG__consent__v2_daisybit="),EVAL_CLINCH_0:()=>document.cookie.includes("ctc_rejected=1"),EVAL_COOKIECONSENT2_TEST:()=>document.cookie.includes("cc_cookie="),EVAL_COOKIECONSENT3_TEST:()=>document.cookie.includes("cc_cookie="),EVAL_COINBASE_0:()=>JSON.parse(decodeURIComponent(document.cookie.match(/cm_(eu|default)_preferences=([0-9a-zA-Z\\{\\}\\[\\]%:]*);?/)[2])).consent.length<=1,EVAL_COMPLIANZ_BANNER_0:()=>document.cookie.includes("cmplz_banner-status=dismissed"),EVAL_COOKIE_LAW_INFO_0:()=>CLI.disableAllCookies()||CLI.reject_close()||!0,EVAL_COOKIE_LAW_INFO_1:()=>-1===document.cookie.indexOf("cookielawinfo-checkbox-non-necessary=yes"),EVAL_COOKIE_LAW_INFO_DETECT:()=>!!window.CLI,EVAL_COOKIE_MANAGER_POPUP_0:()=>!1===JSON.parse(document.cookie.split(";").find((e=>e.trim().startsWith("CookieLevel"))).split("=")[1]).social,EVAL_COOKIEALERT_0:()=>document.querySelector("body").removeAttribute("style")||!0,EVAL_COOKIEALERT_1:()=>document.querySelector("body").removeAttribute("style")||!0,EVAL_COOKIEALERT_2:()=>!0===window.CookieConsent.declined,EVAL_COOKIEFIRST_0:()=>{return!1===(e=JSON.parse(decodeURIComponent(document.cookie.split(";").find((e=>-1!==e.indexOf("cookiefirst"))).trim()).split("=")[1])).performance&&!1===e.functional&&!1===e.advertising;var e},EVAL_COOKIEFIRST_1:()=>document.querySelectorAll("button[data-cookiefirst-accent-color=true][role=checkbox]:not([disabled])").forEach((e=>"true"==e.getAttribute("aria-checked")&&e.click()))||!0,EVAL_COOKIEINFORMATION_0:()=>CookieInformation.declineAllCategories()||!0,EVAL_COOKIEINFORMATION_1:()=>CookieInformation.submitAllCategories()||!0,EVAL_COOKIEINFORMATION_2:()=>document.cookie.includes("CookieInformationConsent="),EVAL_COOKIEYES_0:()=>document.cookie.includes("advertisement:no"),EVAL_DAILYMOTION_0:()=>!!document.cookie.match("dm-euconsent-v2"),EVAL_DNDBEYOND_TEST:()=>document.cookie.includes("cookie-consent=denied"),EVAL_DSGVO_0:()=>!document.cookie.includes("sp_dsgvo_cookie_settings"),EVAL_DUNELM_0:()=>document.cookie.includes("cc_functional=0")&&document.cookie.includes("cc_targeting=0"),EVAL_ETSY_0:()=>document.querySelectorAll(".gdpr-overlay-body input").forEach((e=>{e.checked=!1}))||!0,EVAL_ETSY_1:()=>document.querySelector(".gdpr-overlay-view button[data-wt-overlay-close]").click()||!0,EVAL_EU_COOKIE_COMPLIANCE_0:()=>-1===document.cookie.indexOf("cookie-agreed=2"),EVAL_EU_COOKIE_LAW_0:()=>!document.cookie.includes("euCookie"),EVAL_EZOIC_0:()=>ezCMP.handleAcceptAllClick(),EVAL_EZOIC_1:()=>!!document.cookie.match(/ez-consent-tcf/),EVAL_GOOGLE_0:()=>!!document.cookie.match(/SOCS=CAE/),EVAL_HEMA_TEST_0:()=>document.cookie.includes("cookies_rejected=1"),EVAL_IUBENDA_0:()=>document.querySelectorAll(".purposes-item input[type=checkbox]:not([disabled])").forEach((e=>{e.checked&&e.click()}))||!0,EVAL_IUBENDA_1:()=>!!document.cookie.match(/_iub_cs-\d+=/),EVAL_IWINK_TEST:()=>document.cookie.includes("cookie_permission_granted=no"),EVAL_JQUERY_COOKIEBAR_0:()=>!document.cookie.includes("cookies-state=accepted"),EVAL_MEDIAVINE_0:()=>document.querySelectorAll('[data-name="mediavine-gdpr-cmp"] input[type=checkbox]').forEach((e=>e.checked&&e.click()))||!0,EVAL_MICROSOFT_0:()=>Array.from(document.querySelectorAll("div > button")).filter((e=>e.innerText.match("Reject|Ablehnen")))[0].click()||!0,EVAL_MICROSOFT_1:()=>Array.from(document.querySelectorAll("div > button")).filter((e=>e.innerText.match("Accept|Annehmen")))[0].click()||!0,EVAL_MICROSOFT_2:()=>!!document.cookie.match("MSCC|GHCC"),EVAL_MOOVE_0:()=>document.querySelectorAll("#moove_gdpr_cookie_modal input").forEach((e=>{e.disabled||"moove_gdpr_strict_cookies"===e.name||(e.checked=!1)}))||!0,EVAL_ONENINETWO_0:()=>document.cookie.includes("CC_ADVERTISING=NO")&&document.cookie.includes("CC_ANALYTICS=NO"),EVAL_OPERA_0:()=>document.cookie.includes("cookie_consent_essential=true")&&!document.cookie.includes("cookie_consent_marketing=true"),EVAL_PAYPAL_0:()=>!0===document.cookie.includes("cookie_prefs"),EVAL_PRIMEBOX_0:()=>!document.cookie.includes("cb-enabled=accepted"),EVAL_PUBTECH_0:()=>document.cookie.includes("euconsent-v2")&&(document.cookie.match(/.YAAAAAAAAAAA/)||document.cookie.match(/.aAAAAAAAAAAA/)||document.cookie.match(/.YAAACFgAAAAA/)),EVAL_REDDIT_0:()=>document.cookie.includes("eu_cookie={%22opted%22:true%2C%22nonessential%22:false}"),EVAL_SIBBO_0:()=>!!window.localStorage.getItem("euconsent-v2"),EVAL_SIRDATA_UNBLOCK_SCROLL:()=>(document.documentElement.classList.forEach((e=>{e.startsWith("sd-cmp-")&&document.documentElement.classList.remove(e)})),!0),EVAL_SNIGEL_0:()=>!!document.cookie.match("snconsent"),EVAL_STEAMPOWERED_0:()=>2===JSON.parse(decodeURIComponent(document.cookie.split(";").find((e=>e.trim().startsWith("cookieSettings"))).split("=")[1])).preference_state,EVAL_SVT_TEST:()=>document.cookie.includes('cookie-consent-1={"optedIn":true,"functionality":false,"statistics":false}'),EVAL_TAKEALOT_0:()=>document.body.classList.remove("freeze")||(document.body.style="")||!0,EVAL_TARTEAUCITRON_0:()=>tarteaucitron.userInterface.respondAll(!1)||!0,EVAL_TARTEAUCITRON_1:()=>tarteaucitron.userInterface.respondAll(!0)||!0,EVAL_TARTEAUCITRON_2:()=>document.cookie.match(/tarteaucitron=[^;]*/)[0].includes("false"),EVAL_TAUNTON_TEST:()=>document.cookie.includes("taunton_user_consent_submitted=true"),EVAL_TEALIUM_0:()=>void 0!==window.utag&&"object"==typeof utag.gdpr,EVAL_TEALIUM_1:()=>utag.gdpr.setConsentValue(!1)||!0,EVAL_TEALIUM_DONOTSELL:()=>utag.gdpr.dns?.setDnsState(!1)||!0,EVAL_TEALIUM_2:()=>utag.gdpr.setConsentValue(!0)||!0,EVAL_TEALIUM_3:()=>1!==utag.gdpr.getConsentState(),EVAL_TEALIUM_DONOTSELL_CHECK:()=>1!==utag.gdpr.dns?.getDnsState(),EVAL_TESTCMP_0:()=>"button_clicked"===window.results.results[0],EVAL_TESTCMP_COSMETIC_0:()=>"banner_hidden"===window.results.results[0],EVAL_THEFREEDICTIONARY_0:()=>cmpUi.showPurposes()||cmpUi.rejectAll()||!0,EVAL_THEFREEDICTIONARY_1:()=>cmpUi.allowAll()||!0,EVAL_THEVERGE_0:()=>document.cookie.includes("_duet_gdpr_acknowledged=1"),EVAL_UBUNTU_COM_0:()=>document.cookie.includes("_cookies_accepted=essential"),EVAL_UK_COOKIE_CONSENT_0:()=>!document.cookie.includes("catAccCookies"),EVAL_USERCENTRICS_API_0:()=>"object"==typeof UC_UI,EVAL_USERCENTRICS_API_1:()=>!!UC_UI.closeCMP(),EVAL_USERCENTRICS_API_2:()=>!!UC_UI.denyAllConsents(),EVAL_USERCENTRICS_API_3:()=>!!UC_UI.acceptAllConsents(),EVAL_USERCENTRICS_API_4:()=>!!UC_UI.closeCMP(),EVAL_USERCENTRICS_API_5:()=>!0===UC_UI.areAllConsentsAccepted(),EVAL_USERCENTRICS_API_6:()=>!1===UC_UI.areAllConsentsAccepted(),EVAL_USERCENTRICS_BUTTON_0:()=>JSON.parse(localStorage.getItem("usercentrics")).consents.every((e=>e.isEssential||!e.consentStatus)),EVAL_WAITROSE_0:()=>Array.from(document.querySelectorAll("label[id$=cookies-deny-label]")).forEach((e=>e.click()))||!0,EVAL_WAITROSE_1:()=>document.cookie.includes("wtr_cookies_advertising=0")&&document.cookie.includes("wtr_cookies_analytics=0"),EVAL_WP_COOKIE_NOTICE_0:()=>document.cookie.includes("wpl_viewed_cookie=no"),EVAL_XE_TEST:()=>document.cookie.includes("xeConsentState={%22performance%22:false%2C%22marketing%22:false%2C%22compliance%22:false}"),EVAL_XING_0:()=>document.cookie.includes("userConsent=%7B%22marketing%22%3Afalse"),EVAL_YOUTUBE_DESKTOP_0:()=>!!document.cookie.match(/SOCS=CAE/),EVAL_YOUTUBE_MOBILE_0:()=>!!document.cookie.match(/SOCS=CAE/)};var l={main:!0,frame:!1,urlPattern:""},p=class{constructor(e){this.runContext=l,this.autoconsent=e}get hasSelfTest(){throw new Error("Not Implemented")}get isIntermediate(){throw new Error("Not Implemented")}get isCosmetic(){throw new Error("Not Implemented")}mainWorldEval(e){const t=r[e];if(!t)return console.warn("Snippet not found",e),Promise.resolve(!1);const o=this.autoconsent.config.logs;if(this.autoconsent.config.isMainWorld){o.evals&&console.log("inline eval:",e,t);let c=!1;try{c=!!t.call(globalThis)}catch(t){o.evals&&console.error("error evaluating rule",e,t)}return Promise.resolve(c)}const c=`(${t.toString()})()`;return o.evals&&console.log("async eval:",e,c),s(c,e).catch((t=>(o.evals&&console.error("error evaluating rule",e,t),!1)))}checkRunContext(){const e={...l,...this.runContext},t=window.top===window;return!(t&&!e.main)&&(!(!t&&!e.frame)&&!(e.urlPattern&&!window.location.href.match(e.urlPattern)))}detectCmp(){throw new Error("Not Implemented")}async detectPopup(){return!1}optOut(){throw new Error("Not Implemented")}optIn(){throw new Error("Not Implemented")}openCmp(){throw new Error("Not Implemented")}async test(){return Promise.resolve(!0)}click(e,t=!1){return this.autoconsent.domActions.click(e,t)}elementExists(e){return this.autoconsent.domActions.elementExists(e)}elementVisible(e,t){return this.autoconsent.domActions.elementVisible(e,t)}waitForElement(e,t){return this.autoconsent.domActions.waitForElement(e,t)}waitForVisible(e,t,o){return this.autoconsent.domActions.waitForVisible(e,t,o)}waitForThenClick(e,t,o){return this.autoconsent.domActions.waitForThenClick(e,t,o)}wait(e){return this.autoconsent.domActions.wait(e)}hide(e,t){return this.autoconsent.domActions.hide(e,t)}prehide(e){return this.autoconsent.domActions.prehide(e)}undoPrehide(){return this.autoconsent.domActions.undoPrehide()}querySingleReplySelector(e,t){return this.autoconsent.domActions.querySingleReplySelector(e,t)}querySelectorChain(e){return this.autoconsent.domActions.querySelectorChain(e)}elementSelector(e){return this.autoconsent.domActions.elementSelector(e)}},d=class extends p{constructor(e,t){super(t),this.rule=e,this.name=e.name,this.runContext=e.runContext||l}get hasSelfTest(){return!!this.rule.test}get isIntermediate(){return!!this.rule.intermediate}get isCosmetic(){return!!this.rule.cosmetic}get prehideSelectors(){return this.rule.prehideSelectors}async detectCmp(){return!!this.rule.detectCmp&&this._runRulesParallel(this.rule.detectCmp)}async detectPopup(){return!!this.rule.detectPopup&&this._runRulesSequentially(this.rule.detectPopup)}async optOut(){const e=this.autoconsent.config.logs;return!!this.rule.optOut&&(e.lifecycle&&console.log("Initiated optOut()",this.rule.optOut),this._runRulesSequentially(this.rule.optOut))}async optIn(){const e=this.autoconsent.config.logs;return!!this.rule.optIn&&(e.lifecycle&&console.log("Initiated optIn()",this.rule.optIn),this._runRulesSequentially(this.rule.optIn))}async openCmp(){return!!this.rule.openCmp&&this._runRulesSequentially(this.rule.openCmp)}async test(){return this.hasSelfTest?this._runRulesSequentially(this.rule.test):super.test()}async evaluateRuleStep(e){const t=[],o=this.autoconsent.config.logs;if(e.exists&&t.push(this.elementExists(e.exists)),e.visible&&t.push(this.elementVisible(e.visible,e.check)),e.eval){const o=this.mainWorldEval(e.eval);t.push(o)}if(e.waitFor&&t.push(this.waitForElement(e.waitFor,e.timeout)),e.waitForVisible&&t.push(this.waitForVisible(e.waitForVisible,e.timeout,e.check)),e.click&&t.push(this.click(e.click,e.all)),e.waitForThenClick&&t.push(this.waitForThenClick(e.waitForThenClick,e.timeout,e.all)),e.wait&&t.push(this.wait(e.wait)),e.hide&&t.push(this.hide(e.hide,e.method)),e.if){if(!e.if.exists&&!e.if.visible)return console.error("invalid conditional rule",e.if),!1;const c=await this.evaluateRuleStep(e.if);o.rulesteps&&console.log("Condition is",c),c?t.push(this._runRulesSequentially(e.then)):e.else?t.push(this._runRulesSequentially(e.else)):t.push(!0)}if(e.any){for(const t of e.any)if(await this.evaluateRuleStep(t))return!0;return!1}if(0===t.length)return o.errors&&console.warn("Unrecognized rule",e),!1;return(await Promise.all(t)).reduce(((e,t)=>e&&t),!0)}async _runRulesParallel(e){const t=e.map((e=>this.evaluateRuleStep(e)));return(await Promise.all(t)).every((e=>!!e))}async _runRulesSequentially(e){const t=this.autoconsent.config.logs;for(const o of e){t.rulesteps&&console.log("Running rule...",o);const e=await this.evaluateRuleStep(o);if(t.rulesteps&&console.log("...rule result",e),!e&&!o.optional)return!1}return!0}};function u(e="autoconsent-css-rules"){const t=`style#${e}`,o=document.querySelector(t);if(o&&o instanceof HTMLStyleElement)return o;{const t=document.head||document.getElementsByTagName("head")[0]||document.documentElement,o=document.createElement("style");return o.id=e,t.appendChild(o),o}}function m(e,t,o="display"){const c=`${t} { ${"opacity"===o?"opacity: 0":"display: none"} !important; z-index: -1 !important; pointer-events: none !important; } `;return e instanceof HTMLStyleElement&&(e.innerText+=c,t.length>0)}async function h(e,t,o){const c=await e();return!c&&t>0?new Promise((c=>{setTimeout((async()=>{c(h(e,t-1,o))}),o)})):Promise.resolve(c)}function k(e){if(!e)return!1;if(null!==e.offsetParent)return!0;{const t=window.getComputedStyle(e);if("fixed"===t.position&&"none"!==t.display)return!0}return!1}function b(e){const t={enabled:!0,autoAction:"optOut",disabledCmps:[],enablePrehide:!0,enableCosmeticRules:!0,detectRetries:20,isMainWorld:!1,prehideTimeout:2e3,logs:{lifecycle:!1,rulesteps:!1,evals:!1,errors:!0,messages:!1}},o=(c=t,globalThis.structuredClone?structuredClone(c):JSON.parse(JSON.stringify(c)));var c;for(const c of Object.keys(t))void 0!==e[c]&&(o[c]=e[c]);return o}var _="#truste-show-consent",g="#truste-consent-track",y=[class extends p{constructor(e){super(e),this.name="TrustArc-top",this.prehideSelectors=[".trustarc-banner-container",`.truste_popframe,.truste_overlay,.truste_box_overlay,${g}`],this.runContext={main:!0,frame:!1},this._shortcutButton=null,this._optInDone=!1}get hasSelfTest(){return!1}get isIntermediate(){return!this._optInDone&&!this._shortcutButton}get isCosmetic(){return!1}async detectCmp(){const e=this.elementExists(`${_},${g}`);return e&&(this._shortcutButton=document.querySelector("#truste-consent-required")),e}async detectPopup(){return this.elementVisible(`#truste-consent-content,#trustarc-banner-overlay,${g}`,"all")}openFrame(){this.click(_)}async optOut(){return this._shortcutButton?(this._shortcutButton.click(),!0):(m(u(),`.truste_popframe, .truste_overlay, .truste_box_overlay, ${g}`),this.click(_),setTimeout((()=>{u().remove()}),1e4),!0)}async optIn(){return this._optInDone=!0,this.click("#truste-consent-button")}async openCmp(){return!0}async test(){return await this.mainWorldEval("EVAL_TRUSTARC_TOP")}},class extends p{constructor(){super(...arguments),this.name="TrustArc-frame",this.runContext={main:!1,frame:!0,urlPattern:"^https://consent-pref\\.trustarc\\.com/\\?"}}get hasSelfTest(){return!1}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return!0}async detectPopup(){return this.elementVisible("#defaultpreferencemanager","any")&&this.elementVisible(".mainContent","any")}async navigateToSettings(){return await h((async()=>this.elementExists(".shp")||this.elementVisible(".advance","any")||this.elementExists(".switch span:first-child")),10,500),this.elementExists(".shp")&&this.click(".shp"),await this.waitForElement(".prefPanel",5e3),this.elementVisible(".advance","any")&&this.click(".advance"),await h((()=>this.elementVisible(".switch span:first-child","any")),5,1e3)}async optOut(){return await h((()=>"complete"===document.readyState),20,100),await this.waitForElement(".mainContent[aria-hidden=false]",5e3),!!this.click(".rejectAll")||(this.elementExists(".prefPanel")&&await this.waitForElement('.prefPanel[style="visibility: visible;"]',3e3),this.click("#catDetails0")?(this.click(".submit"),this.waitForThenClick("#gwt-debug-close_id",5e3),!0):this.click(".required")?(this.waitForThenClick("#gwt-debug-close_id",5e3),!0):(await this.navigateToSettings(),this.click(".switch span:nth-child(1):not(.active)",!0),this.click(".submit"),this.waitForThenClick("#gwt-debug-close_id",3e5),!0))}async optIn(){return this.click(".call")||(await this.navigateToSettings(),this.click(".switch span:nth-child(2)",!0),this.click(".submit"),this.waitForElement("#gwt-debug-close_id",3e5).then((()=>{this.click("#gwt-debug-close_id")}))),!0}},class extends p{constructor(){super(...arguments),this.name="Cybotcookiebot",this.prehideSelectors=["#CybotCookiebotDialog,#CybotCookiebotDialogBodyUnderlay,#dtcookie-container,#cookiebanner,#cb-cookieoverlay,.modal--cookie-banner,#cookiebanner_outer,#CookieBanner"]}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return await this.mainWorldEval("EVAL_COOKIEBOT_1")}async detectPopup(){return this.mainWorldEval("EVAL_COOKIEBOT_2")}async optOut(){await this.wait(500);let e=await this.mainWorldEval("EVAL_COOKIEBOT_3");return await this.wait(500),e=e&&await this.mainWorldEval("EVAL_COOKIEBOT_4"),e}async optIn(){return this.elementExists("#dtcookie-container")?this.click(".h-dtcookie-accept"):(this.click(".CybotCookiebotDialogBodyLevelButton:not(:checked):enabled",!0),this.click("#CybotCookiebotDialogBodyLevelButtonAccept"),this.click("#CybotCookiebotDialogBodyButtonAccept"),!0)}async test(){return await this.wait(500),await this.mainWorldEval("EVAL_COOKIEBOT_5")}},class extends p{constructor(){super(...arguments),this.name="Sourcepoint-frame",this.prehideSelectors=["div[id^='sp_message_container_'],.message-overlay","#sp_privacy_manager_container"],this.ccpaNotice=!1,this.ccpaPopup=!1,this.runContext={main:!1,frame:!0}}get hasSelfTest(){return!1}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){const e=new URL(location.href);return e.searchParams.has("message_id")&&"ccpa-notice.sp-prod.net"===e.hostname?(this.ccpaNotice=!0,!0):"ccpa-pm.sp-prod.net"===e.hostname?(this.ccpaPopup=!0,!0):("/index.html"===e.pathname||"/privacy-manager/index.html"===e.pathname||"/ccpa_pm/index.html"===e.pathname)&&(e.searchParams.has("message_id")||e.searchParams.has("requestUUID")||e.searchParams.has("consentUUID"))}async detectPopup(){return!!this.ccpaNotice||(this.ccpaPopup?await this.waitForElement(".priv-save-btn",2e3):(await this.waitForElement(".sp_choice_type_11,.sp_choice_type_12,.sp_choice_type_13,.sp_choice_type_ACCEPT_ALL,.sp_choice_type_SAVE_AND_EXIT",2e3),!this.elementExists(".sp_choice_type_9")))}async optIn(){return await this.waitForElement(".sp_choice_type_11,.sp_choice_type_ACCEPT_ALL",2e3),!!this.click(".sp_choice_type_11")||!!this.click(".sp_choice_type_ACCEPT_ALL")}isManagerOpen(){return"/privacy-manager/index.html"===location.pathname||"/ccpa_pm/index.html"===location.pathname}async optOut(){const e=this.autoconsent.config.logs;if(this.ccpaPopup){const e=document.querySelectorAll(".priv-purpose-container .sp-switch-arrow-block a.neutral.on .right");for(const t of e)t.click();const t=document.querySelectorAll(".priv-purpose-container .sp-switch-arrow-block a.switch-bg.on");for(const e of t)e.click();return this.click(".priv-save-btn")}if(!this.isManagerOpen()){if(!await this.waitForElement(".sp_choice_type_12,.sp_choice_type_13"))return!1;if(!this.elementExists(".sp_choice_type_12"))return this.click(".sp_choice_type_13");this.click(".sp_choice_type_12"),await h((()=>this.isManagerOpen()),200,100)}await this.waitForElement(".type-modal",2e4),this.waitForThenClick(".ccpa-stack .pm-switch[aria-checked=true] .slider",500,!0);try{const e=".sp_choice_type_REJECT_ALL",t=".reject-toggle",o=await Promise.race([this.waitForElement(e,2e3).then((e=>e?0:-1)),this.waitForElement(t,2e3).then((e=>e?1:-1)),this.waitForElement(".pm-features",2e3).then((e=>e?2:-1))]);if(0===o)return await this.wait(1500),this.click(e);1===o?this.click(t):2===o&&(await this.waitForElement(".pm-features",1e4),this.click(".checked > span",!0),this.click(".chevron"))}catch(t){e.errors&&console.warn(t)}return this.click(".sp_choice_type_SAVE_AND_EXIT")}},class extends p{constructor(){super(...arguments),this.name="consentmanager.net",this.prehideSelectors=["#cmpbox,#cmpbox2"],this.apiAvailable=!1}get hasSelfTest(){return this.apiAvailable}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.apiAvailable=await this.mainWorldEval("EVAL_CONSENTMANAGER_1"),!!this.apiAvailable||this.elementExists("#cmpbox")}async detectPopup(){return this.apiAvailable?(await this.wait(500),await this.mainWorldEval("EVAL_CONSENTMANAGER_2")):this.elementVisible("#cmpbox .cmpmore","any")}async optOut(){return await this.wait(500),this.apiAvailable?await this.mainWorldEval("EVAL_CONSENTMANAGER_3"):!!this.click(".cmpboxbtnno")||(this.elementExists(".cmpwelcomeprpsbtn")?(this.click(".cmpwelcomeprpsbtn > a[aria-checked=true]",!0),this.click(".cmpboxbtnsave"),!0):(this.click(".cmpboxbtncustom"),await this.waitForElement(".cmptblbox",2e3),this.click(".cmptdchoice > a[aria-checked=true]",!0),this.click(".cmpboxbtnyescustomchoices"),this.hide("#cmpwrapper,#cmpbox","display"),!0))}async optIn(){return this.apiAvailable?await this.mainWorldEval("EVAL_CONSENTMANAGER_4"):this.click(".cmpboxbtnyes")}async test(){if(this.apiAvailable)return await this.mainWorldEval("EVAL_CONSENTMANAGER_5")}},class extends p{constructor(){super(...arguments),this.name="Evidon"}get hasSelfTest(){return!1}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists("#_evidon_banner")}async detectPopup(){return this.elementVisible("#_evidon_banner","any")}async optOut(){return this.click("#_evidon-decline-button")||(m(u(),"#evidon-prefdiag-overlay,#evidon-prefdiag-background"),this.click("#_evidon-option-button"),await this.waitForElement("#evidon-prefdiag-overlay",5e3),this.click("#evidon-prefdiag-decline")),!0}async optIn(){return this.click("#_evidon-accept-button")}},class extends p{constructor(){super(...arguments),this.name="Onetrust",this.prehideSelectors=["#onetrust-banner-sdk,#onetrust-consent-sdk,.onetrust-pc-dark-filter,.js-consent-banner"],this.runContext={urlPattern:"^(?!.*https://www\\.nba\\.com/)"}}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists("#onetrust-banner-sdk,#onetrust-pc-sdk")}async detectPopup(){return this.elementVisible("#onetrust-banner-sdk,#onetrust-pc-sdk","any")}async optOut(){return this.elementVisible("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies","any")?this.click("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies"):(this.elementExists("#onetrust-pc-btn-handler")?this.click("#onetrust-pc-btn-handler"):this.click(".ot-sdk-show-settings,button.js-cookie-settings"),await this.waitForElement("#onetrust-consent-sdk",2e3),await this.wait(1e3),this.click("#onetrust-consent-sdk input.category-switch-handler:checked,.js-editor-toggle-state:checked",!0),await this.wait(1e3),await this.waitForElement(".save-preference-btn-handler,.js-consent-save",2e3),this.click(".save-preference-btn-handler,.js-consent-save"),await this.waitForVisible("#onetrust-banner-sdk",5e3,"none"),!0)}async optIn(){return this.click("#onetrust-accept-btn-handler,#accept-recommended-btn-handler,.js-accept-cookies")}async test(){return await h((()=>this.mainWorldEval("EVAL_ONETRUST_1")),10,500)}},class extends p{constructor(){super(...arguments),this.name="Klaro",this.prehideSelectors=[".klaro"],this.settingsOpen=!1}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists(".klaro > .cookie-modal")?(this.settingsOpen=!0,!0):this.elementExists(".klaro > .cookie-notice")}async detectPopup(){return this.elementVisible(".klaro > .cookie-notice,.klaro > .cookie-modal","any")}async optOut(){return!!this.click(".klaro .cn-decline")||(this.settingsOpen||(this.click(".klaro .cn-learn-more,.klaro .cm-button-manage"),await this.waitForElement(".klaro > .cookie-modal",2e3),this.settingsOpen=!0),!!this.click(".klaro .cn-decline")||(this.click(".cm-purpose:not(.cm-toggle-all) > input:not(.half-checked,.required,.only-required),.cm-purpose:not(.cm-toggle-all) > div > input:not(.half-checked,.required,.only-required)",!0),this.click(".cm-btn-accept,.cm-button")))}async optIn(){return!!this.click(".klaro .cm-btn-accept-all")||(this.settingsOpen?(this.click(".cm-purpose:not(.cm-toggle-all) > input.half-checked",!0),this.click(".cm-btn-accept")):this.click(".klaro .cookie-notice .cm-btn-success"))}async test(){return await this.mainWorldEval("EVAL_KLARO_1")}},class extends p{constructor(){super(...arguments),this.name="Uniconsent"}get prehideSelectors(){return[".unic",".modal:has(.unic)"]}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists(".unic .unic-box,.unic .unic-bar,.unic .unic-modal")}async detectPopup(){return this.elementVisible(".unic .unic-box,.unic .unic-bar,.unic .unic-modal","any")}async optOut(){if(await this.waitForElement(".unic button",1e3),document.querySelectorAll(".unic button").forEach((e=>{const t=e.textContent;(t.includes("Manage Options")||t.includes("Optionen verwalten"))&&e.click()})),await this.waitForElement(".unic input[type=checkbox]",1e3)){await this.waitForElement(".unic button",1e3),document.querySelectorAll(".unic input[type=checkbox]").forEach((e=>{e.checked&&e.click()}));for(const e of document.querySelectorAll(".unic button")){const t=e.textContent;for(const o of["Confirm Choices","Save Choices","Auswahl speichern"])if(t.includes(o))return e.click(),await this.wait(500),!0}}return!1}async optIn(){return this.waitForThenClick(".unic #unic-agree")}async test(){await this.wait(1e3);return!this.elementExists(".unic .unic-box,.unic .unic-bar")}},class extends p{constructor(){super(...arguments),this.prehideSelectors=[".cmp-root"],this.name="Conversant"}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists(".cmp-root .cmp-receptacle")}async detectPopup(){return this.elementVisible(".cmp-root .cmp-receptacle","any")}async optOut(){if(!await this.waitForThenClick(".cmp-main-button:not(.cmp-main-button--primary)"))return!1;if(!await this.waitForElement(".cmp-view-tab-tabs"))return!1;await this.waitForThenClick(".cmp-view-tab-tabs > :first-child"),await this.waitForThenClick(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");for(const e of Array.from(document.querySelectorAll(".cmp-accordion-item"))){e.querySelector(".cmp-accordion-item-title").click(),await h((()=>!!e.querySelector(".cmp-accordion-item-content.cmp-active")),10,50);const t=e.querySelector(".cmp-accordion-item-content.cmp-active");t.querySelectorAll(".cmp-toggle-actions .cmp-toggle-deny:not(.cmp-toggle-deny--active)").forEach((e=>e.click())),t.querySelectorAll(".cmp-toggle-actions .cmp-toggle-checkbox:not(.cmp-toggle-checkbox--active)").forEach((e=>e.click()))}return await this.click(".cmp-main-button:not(.cmp-main-button--primary)"),!0}async optIn(){return this.waitForThenClick(".cmp-main-button.cmp-main-button--primary")}async test(){return document.cookie.includes("cmp-data=0")}},class extends p{constructor(){super(...arguments),this.name="tiktok.com",this.runContext={urlPattern:"tiktok"}}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}getShadowRoot(){const e=document.querySelector("tiktok-cookie-banner");return e?e.shadowRoot:null}async detectCmp(){return this.elementExists("tiktok-cookie-banner")}async detectPopup(){return k(this.getShadowRoot().querySelector(".tiktok-cookie-banner"))}async optOut(){const e=this.autoconsent.config.logs,t=this.getShadowRoot().querySelector(".button-wrapper button:first-child");return t?(e.rulesteps&&console.log("[clicking]",t),t.click(),!0):(e.errors&&console.log("no decline button found"),!1)}async optIn(){const e=this.autoconsent.config.logs,t=this.getShadowRoot().querySelector(".button-wrapper button:last-child");return t?(e.rulesteps&&console.log("[clicking]",t),t.click(),!0):(e.errors&&console.log("no accept button found"),!1)}async test(){const e=document.cookie.match(/cookie-consent=([^;]+)/);if(!e)return!1;const t=JSON.parse(decodeURIComponent(e[1]));return Object.values(t).every((e=>"boolean"!=typeof e||!1===e))}},class extends p{constructor(){super(...arguments),this.runContext={urlPattern:"^https://(www\\.)?airbnb\\.[^/]+/"},this.prehideSelectors=["div[data-testid=main-cookies-banner-container]",'div:has(> div:first-child):has(> div:last-child):has(> section [data-testid="strictly-necessary-cookies"])']}get hasSelfTest(){return!0}get isIntermediate(){return!1}get isCosmetic(){return!1}async detectCmp(){return this.elementExists("div[data-testid=main-cookies-banner-container]")}async detectPopup(){return this.elementVisible("div[data-testid=main-cookies-banner-container","any")}async optOut(){let e;for(await this.waitForThenClick("div[data-testid=main-cookies-banner-container] button._snbhip0");e=document.querySelector("[data-testid=modal-container] button[aria-checked=true]:not([disabled])");)e.click();return this.waitForThenClick("button[data-testid=save-btn]")}async optIn(){return this.waitForThenClick("div[data-testid=main-cookies-banner-container] button._148dgdpk")}async test(){return await h((()=>!!document.cookie.match("OptanonAlertBoxClosed")),20,200)}}];var w=[{name:"192.com",detectCmp:[{exists:".ont-cookies"}],detectPopup:[{visible:".ont-cookies"}],optIn:[{click:".ont-btn-main.ont-cookies-btn.js-ont-btn-ok2"}],optOut:[{click:".ont-cookes-btn-manage"},{click:".ont-btn-main.ont-cookies-btn.js-ont-btn-choose"}],test:[{eval:"EVAL_ONENINETWO_0"}]},{name:"1password-com",cosmetic:!0,prehideSelectors:['footer #footer-root [aria-label="Cookie Consent"]'],detectCmp:[{exists:'footer #footer-root [aria-label="Cookie Consent"]'}],detectPopup:[{visible:'footer #footer-root [aria-label="Cookie Consent"]'}],optIn:[{click:'footer #footer-root [aria-label="Cookie Consent"] button'}],optOut:[{hide:'footer #footer-root [aria-label="Cookie Consent"]'}]},{name:"abconcerts.be",vendorUrl:"https://unknown",intermediate:!1,prehideSelectors:["dialog.cookie-consent"],detectCmp:[{exists:"dialog.cookie-consent form.cookie-consent__form"}],detectPopup:[{visible:"dialog.cookie-consent form.cookie-consent__form"}],optIn:[{waitForThenClick:"dialog.cookie-consent form.cookie-consent__form button[value=yes]"}],optOut:[{if:{exists:"dialog.cookie-consent form.cookie-consent__form button[value=no]"},then:[{click:"dialog.cookie-consent form.cookie-consent__form button[value=no]"}],else:[{click:"dialog.cookie-consent form.cookie-consent__form button.cookie-consent__options-toggle"},{waitForThenClick:'dialog.cookie-consent form.cookie-consent__form button[value="save_options"]'}]}]},{name:"activobank.pt",runContext:{urlPattern:"^https://(www\\.)?activobank\\.pt"},prehideSelectors:["aside#cookies,.overlay-cookies"],detectCmp:[{exists:"#cookies .cookies-btn"}],detectPopup:[{visible:"#cookies #submitCookies"}],optIn:[{waitForThenClick:"#cookies #submitCookies"}],optOut:[{waitForThenClick:"#cookies #rejectCookies"}]},{name:"Adroll",prehideSelectors:["#adroll_consent_container"],detectCmp:[{exists:"#adroll_consent_container"}],detectPopup:[{visible:"#adroll_consent_container"}],optIn:[{waitForThenClick:"#adroll_consent_accept"}],optOut:[{waitForThenClick:"#adroll_consent_reject"}],test:[{eval:"EVAL_ADROLL_0"}]},{name:"affinity.serif.com",detectCmp:[{exists:".c-cookie-banner button[data-qa='allow-all-cookies']"}],detectPopup:[{visible:".c-cookie-banner"}],optIn:[{click:'button[data-qa="allow-all-cookies"]'}],optOut:[{click:'button[data-qa="manage-cookies"]'},{waitFor:'.c-cookie-banner ~ [role="dialog"]'},{waitForThenClick:'.c-cookie-banner ~ [role="dialog"] input[type="checkbox"][value="true"]',all:!0},{click:'.c-cookie-banner ~ [role="dialog"] .c-modal__action button'}],test:[{wait:500},{eval:"EVAL_AFFINITY_SERIF_COM_0"}]},{name:"agolde.com",cosmetic:!0,prehideSelectors:["#modal-1 div[data-micromodal-close]"],detectCmp:[{exists:"#modal-1 div[aria-labelledby=modal-1-title]"}],detectPopup:[{exists:"#modal-1 div[data-micromodal-close]"}],optIn:[{click:'button[aria-label="Close modal"]'}],optOut:[{hide:"#modal-1 div[data-micromodal-close]"}]},{name:"aliexpress",vendorUrl:"https://aliexpress.com/",runContext:{urlPattern:"^https://.*\\.aliexpress\\.com/"},prehideSelectors:["#gdpr-new-container"],detectCmp:[{exists:"#gdpr-new-container"}],detectPopup:[{visible:"#gdpr-new-container"}],optIn:[{waitForThenClick:"#gdpr-new-container .btn-accept"}],optOut:[{waitForThenClick:"#gdpr-new-container .btn-more"},{waitFor:"#gdpr-new-container .gdpr-dialog-switcher"},{click:"#gdpr-new-container .switcher-on",all:!0,optional:!0},{click:"#gdpr-new-container .btn-save"}]},{name:"almacmp",prehideSelectors:["#alma-cmpv2-container"],detectCmp:[{exists:"#alma-cmpv2-container"}],detectPopup:[{visible:"#alma-cmpv2-container #almacmp-modal-layer1"}],optIn:[{waitForThenClick:"#alma-cmpv2-container #almacmp-modal-layer1 #almacmp-modalConfirmBtn"}],optOut:[{waitForThenClick:"#alma-cmpv2-container #almacmp-modal-layer1 #almacmp-modalSettingBtn"},{waitFor:"#alma-cmpv2-container #almacmp-modal-layer2"},{waitForThenClick:"#alma-cmpv2-container #almacmp-modal-layer2 #almacmp-reject-all-layer2"}],test:[{eval:"EVAL_ALMACMP_0"}]},{name:"altium.com",cosmetic:!0,prehideSelectors:[".altium-privacy-bar"],detectCmp:[{exists:".altium-privacy-bar"}],detectPopup:[{exists:".altium-privacy-bar"}],optIn:[{click:"a.altium-privacy-bar__btn"}],optOut:[{hide:".altium-privacy-bar"}]},{name:"amazon.com",prehideSelectors:['span[data-action="sp-cc"][data-sp-cc*="rejectAllAction"]'],detectCmp:[{exists:'span[data-action="sp-cc"][data-sp-cc*="rejectAllAction"]'}],detectPopup:[{visible:'span[data-action="sp-cc"][data-sp-cc*="rejectAllAction"]'}],optIn:[{waitForVisible:"#sp-cc-accept"},{wait:500},{click:"#sp-cc-accept"}],optOut:[{waitForVisible:"#sp-cc-rejectall-link"},{wait:500},{click:"#sp-cc-rejectall-link"}]},{name:"aquasana.com",cosmetic:!0,prehideSelectors:["#consent-tracking"],detectCmp:[{exists:"#consent-tracking"}],detectPopup:[{exists:"#consent-tracking"}],optIn:[{click:"#accept_consent"}],optOut:[{hide:"#consent-tracking"}]},{name:"arbeitsagentur",vendorUrl:"https://www.arbeitsagentur.de/",prehideSelectors:[".modal-open bahf-cookie-disclaimer-dpl3"],detectCmp:[{exists:"bahf-cookie-disclaimer-dpl3"}],detectPopup:[{visible:"bahf-cookie-disclaimer-dpl3"}],optIn:[{waitForThenClick:["bahf-cookie-disclaimer-dpl3","bahf-cd-modal-dpl3 .ba-btn-primary"]}],optOut:[{waitForThenClick:["bahf-cookie-disclaimer-dpl3","bahf-cd-modal-dpl3 .ba-btn-contrast"]}],test:[{eval:"EVAL_ARBEITSAGENTUR_TEST"}]},{name:"asus",vendorUrl:"https://www.asus.com/",runContext:{urlPattern:"^https://www\\.asus\\.com/"},prehideSelectors:["#cookie-policy-info,#cookie-policy-info-bg"],detectCmp:[{exists:"#cookie-policy-info"}],detectPopup:[{visible:"#cookie-policy-info"}],optIn:[{waitForThenClick:'#cookie-policy-info [data-agree="Accept Cookies"]'}],optOut:[{if:{exists:"#cookie-policy-info .btn-reject"},then:[{waitForThenClick:"#cookie-policy-info .btn-reject"}],else:[{waitForThenClick:"#cookie-policy-info .btn-setting"},{waitForThenClick:'#cookie-policy-lightbox-wrapper [data-agree="Save Settings"]'}]}]},{name:"athlinks-com",runContext:{urlPattern:"^https://(www\\.)?athlinks\\.com/"},cosmetic:!0,prehideSelectors:["#footer-container ~ div"],detectCmp:[{exists:"#footer-container ~ div"}],detectPopup:[{visible:"#footer-container > div"}],optIn:[{click:"#footer-container ~ div button"}],optOut:[{hide:"#footer-container ~ div"}]},{name:"ausopen.com",cosmetic:!0,detectCmp:[{exists:".gdpr-popup__message"}],detectPopup:[{visible:".gdpr-popup__message"}],optOut:[{hide:".gdpr-popup__message"}],optIn:[{click:".gdpr-popup__message button"}]},{name:"automattic-cmp-optout",prehideSelectors:['form[class*="cookie-banner"][method="post"]'],detectCmp:[{exists:'form[class*="cookie-banner"][method="post"]'}],detectPopup:[{visible:'form[class*="cookie-banner"][method="post"]'}],optIn:[{click:'a[class*="accept-all-button"]'}],optOut:[{click:'form[class*="cookie-banner"] div[class*="simple-options"] a[class*="customize-button"]'},{waitForThenClick:"input[type=checkbox][checked]:not([disabled])",all:!0},{click:'a[class*="accept-selection-button"]'}]},{name:"aws.amazon.com",prehideSelectors:["#awsccc-cb-content","#awsccc-cs-container","#awsccc-cs-modalOverlay","#awsccc-cs-container-inner"],detectCmp:[{exists:"#awsccc-cb-content"}],detectPopup:[{visible:"#awsccc-cb-content"}],optIn:[{click:"button[data-id=awsccc-cb-btn-accept"}],optOut:[{click:"button[data-id=awsccc-cb-btn-customize]"},{waitFor:"input[aria-checked]"},{click:"input[aria-checked=true]",all:!0,optional:!0},{click:"button[data-id=awsccc-cs-btn-save]"}]},{name:"axeptio",prehideSelectors:[".axeptio_widget"],detectCmp:[{exists:".axeptio_widget"}],detectPopup:[{visible:".axeptio_widget"}],optIn:[{waitFor:".axeptio-widget--open"},{click:"button#axeptio_btn_acceptAll"}],optOut:[{waitFor:".axeptio-widget--open"},{click:"button#axeptio_btn_dismiss"}],test:[{eval:"EVAL_AXEPTIO_0"}]},{name:"baden-wuerttemberg.de",prehideSelectors:[".cookie-alert.t-dark"],cosmetic:!0,detectCmp:[{exists:".cookie-alert.t-dark"}],detectPopup:[{visible:".cookie-alert.t-dark"}],optIn:[{click:".cookie-alert__form input:not([disabled]):not([checked])"},{click:".cookie-alert__button button"}],optOut:[{hide:".cookie-alert.t-dark"}]},{name:"bahn-de",vendorUrl:"https://www.bahn.de/",cosmetic:!1,runContext:{main:!0,frame:!1,urlPattern:"^https://(www\\.)?bahn\\.de/"},intermediate:!1,prehideSelectors:[],detectCmp:[{exists:["body > div:first-child","#consent-layer"]}],detectPopup:[{visible:["body > div:first-child","#consent-layer"]}],optIn:[{waitForThenClick:["body > div:first-child","#consent-layer .js-accept-all-cookies"]}],optOut:[{waitForThenClick:["body > div:first-child","#consent-layer .js-accept-essential-cookies"]}],test:[{eval:"EVAL_BAHN_TEST"}]},{name:"bbb.org",runContext:{urlPattern:"^https://www\\.bbb\\.org/"},cosmetic:!0,prehideSelectors:['div[aria-label="use of cookies on bbb.org"]'],detectCmp:[{exists:'div[aria-label="use of cookies on bbb.org"]'}],detectPopup:[{visible:'div[aria-label="use of cookies on bbb.org"]'}],optIn:[{click:'div[aria-label="use of cookies on bbb.org"] button.bds-button-unstyled span.visually-hidden'}],optOut:[{hide:'div[aria-label="use of cookies on bbb.org"]'}]},{name:"bing.com",prehideSelectors:["#bnp_container"],detectCmp:[{exists:"#bnp_cookie_banner"}],detectPopup:[{visible:"#bnp_cookie_banner"}],optIn:[{click:"#bnp_btn_accept"}],optOut:[{click:"#bnp_btn_preference"},{click:"#mcp_savesettings"}],test:[{eval:"EVAL_BING_0"}]},{name:"blocksy",vendorUrl:"https://creativethemes.com/blocksy/docs/extensions/cookies-consent/",cosmetic:!1,runContext:{main:!0,frame:!1},intermediate:!1,prehideSelectors:[".cookie-notification"],detectCmp:[{exists:"#blocksy-ext-cookies-consent-styles-css"}],detectPopup:[{visible:".cookie-notification"}],optIn:[{click:".cookie-notification .ct-cookies-decline-button"}],optOut:[{waitForThenClick:".cookie-notification .ct-cookies-decline-button"}],test:[{eval:"EVAL_BLOCKSY_0"}]},{name:"borlabs",detectCmp:[{exists:"._brlbs-block-content"}],detectPopup:[{visible:"._brlbs-bar-wrap,._brlbs-box-wrap"}],optIn:[{click:"a[data-cookie-accept-all]"}],optOut:[{click:"a[data-cookie-individual]"},{waitForVisible:".cookie-preference"},{click:"input[data-borlabs-cookie-checkbox]:checked",all:!0,optional:!0},{click:"#CookiePrefSave"},{wait:500}],prehideSelectors:["#BorlabsCookieBox"],test:[{eval:"EVAL_BORLABS_0"}]},{name:"bundesregierung.de",prehideSelectors:[".bpa-cookie-banner"],detectCmp:[{exists:".bpa-cookie-banner"}],detectPopup:[{visible:".bpa-cookie-banner .bpa-module-full-hero"}],optIn:[{click:".bpa-accept-all-button"}],optOut:[{wait:500,comment:"click is not immediately recognized"},{waitForThenClick:".bpa-close-button"}],test:[{eval:"EVAL_BUNDESREGIERUNG_DE_0"}]},{name:"burpee.com",cosmetic:!0,prehideSelectors:["#notice-cookie-block"],detectCmp:[{exists:"#notice-cookie-block"}],detectPopup:[{exists:"#html-body #notice-cookie-block"}],optIn:[{click:"#btn-cookie-allow"}],optOut:[{hide:"#html-body #notice-cookie-block, #notice-cookie"}]},{name:"canva.com",prehideSelectors:['div[role="dialog"] a[data-anchor-id="cookie-policy"]'],detectCmp:[{exists:'div[role="dialog"] a[data-anchor-id="cookie-policy"]'}],detectPopup:[{exists:'div[role="dialog"] a[data-anchor-id="cookie-policy"]'}],optIn:[{click:'div[role="dialog"] button:nth-child(1)'}],optOut:[{if:{exists:'div[role="dialog"] button:nth-child(3)'},then:[{click:'div[role="dialog"] button:nth-child(2)'}],else:[{click:'div[role="dialog"] button:nth-child(2)'},{waitFor:'div[role="dialog"] a[data-anchor-id="privacy-policy"]'},{click:'div[role="dialog"] button:nth-child(2)'},{click:'div[role="dialog"] div:last-child button:only-child'}]}],test:[{eval:"EVAL_CANVA_0"}]},{name:"canyon.com",runContext:{urlPattern:"^https://www\\.canyon\\.com/"},prehideSelectors:["div.modal.cookiesModal.is-open"],detectCmp:[{exists:"div.modal.cookiesModal.is-open"}],detectPopup:[{visible:"div.modal.cookiesModal.is-open"}],optIn:[{click:'div.cookiesModal__buttonWrapper > button[data-closecause="close-by-submit"]'}],optOut:[{click:'div.cookiesModal__buttonWrapper > button[data-closecause="close-by-manage-cookies"]'},{waitForThenClick:"button#js-manage-data-privacy-save-button"}]},{name:"cc-banner-springer",prehideSelectors:[".cc-banner[data-cc-banner]"],detectCmp:[{exists:".cc-banner[data-cc-banner]"}],detectPopup:[{visible:".cc-banner[data-cc-banner]"}],optIn:[{waitForThenClick:".cc-banner[data-cc-banner] button[data-cc-action=accept]"}],optOut:[{if:{exists:".cc-banner[data-cc-banner] button[data-cc-action=reject]"},then:[{click:".cc-banner[data-cc-banner] button[data-cc-action=reject]"}],else:[{waitForThenClick:".cc-banner[data-cc-banner] button[data-cc-action=preferences]"},{waitFor:".cc-preferences[data-cc-preferences]"},{click:".cc-preferences[data-cc-preferences] input[type=radio][data-cc-action=toggle-category][value=off]",all:!0,optional:!0},{if:{exists:".cc-preferences[data-cc-preferences] button[data-cc-action=reject]"},then:[{click:".cc-preferences[data-cc-preferences] button[data-cc-action=reject]"}],else:[{click:".cc-preferences[data-cc-preferences] button[data-cc-action=save]"}]}]}],test:[{eval:"EVAL_CC_BANNER2_0"}]},{name:"cc_banner",cosmetic:!0,prehideSelectors:[".cc_banner-wrapper"],detectCmp:[{exists:".cc_banner-wrapper"}],detectPopup:[{visible:".cc_banner"}],optIn:[{click:".cc_btn_accept_all"}],optOut:[{hide:".cc_banner-wrapper"}]},{name:"ciaopeople.it",prehideSelectors:["#cp-gdpr-choices"],detectCmp:[{exists:"#cp-gdpr-choices"}],detectPopup:[{visible:"#cp-gdpr-choices"}],optIn:[{waitForThenClick:".gdpr-btm__right > button:nth-child(2)"}],optOut:[{waitForThenClick:".gdpr-top-content > button"},{waitFor:".gdpr-top-back"},{waitForThenClick:".gdpr-btm__right > button:nth-child(1)"}],test:[{visible:"#cp-gdpr-choices",check:"none"}]},{vendorUrl:"https://www.civicuk.com/cookie-control/",name:"civic-cookie-control",prehideSelectors:["#ccc-module,#ccc-overlay"],detectCmp:[{exists:"#ccc-module"}],detectPopup:[{visible:"#ccc"},{visible:"#ccc-module"}],optOut:[{click:"#ccc-reject-settings"}],optIn:[{click:"#ccc-recommended-settings"}]},{name:"click.io",prehideSelectors:["#cl-consent"],detectCmp:[{exists:"#cl-consent"}],detectPopup:[{visible:"#cl-consent"}],optIn:[{waitForThenClick:'#cl-consent [data-role="b_agree"]'}],optOut:[{waitFor:'#cl-consent [data-role="b_options"]'},{wait:500},{click:'#cl-consent [data-role="b_options"]'},{waitFor:'.cl-consent-popup.cl-consent-visible [data-role="alloff"]'},{click:'.cl-consent-popup.cl-consent-visible [data-role="alloff"]',all:!0},{click:'[data-role="b_save"]'}],test:[{eval:"EVAL_CLICKIO_0",comment:"TODO: this only checks if we interacted at all"}]},{name:"clinch",intermediate:!1,runContext:{frame:!1,main:!0},prehideSelectors:[".consent-modal[role=dialog]"],detectCmp:[{exists:".consent-modal[role=dialog]"}],detectPopup:[{visible:".consent-modal[role=dialog]"}],optIn:[{click:"#consent_agree"}],optOut:[{if:{exists:"#consent_reject"},then:[{click:"#consent_reject"}],else:[{click:"#manage_cookie_preferences"},{click:"#cookie_consent_preferences input:checked",all:!0,optional:!0},{click:"#consent_save"}]}],test:[{eval:"EVAL_CLINCH_0"}]},{name:"clustrmaps.com",runContext:{urlPattern:"^https://(www\\.)?clustrmaps\\.com/"},cosmetic:!0,prehideSelectors:["#gdpr-cookie-message"],detectCmp:[{exists:"#gdpr-cookie-message"}],detectPopup:[{visible:"#gdpr-cookie-message"}],optIn:[{click:"button#gdpr-cookie-accept"}],optOut:[{hide:"#gdpr-cookie-message"}]},{name:"coinbase",intermediate:!1,runContext:{frame:!0,main:!0,urlPattern:"^https://(www|help)\\.coinbase\\.com"},prehideSelectors:[],detectCmp:[{exists:"div[class^=CookieBannerContent__Container]"}],detectPopup:[{visible:"div[class^=CookieBannerContent__Container]"}],optIn:[{click:"div[class^=CookieBannerContent__CTA] :nth-last-child(1)"}],optOut:[{click:"button[class^=CookieBannerContent__Settings]"},{click:"div[class^=CookiePreferencesModal__CategoryContainer] input:checked",all:!0,optional:!0},{click:"div[class^=CookiePreferencesModal__ButtonContainer] > button"}],test:[{eval:"EVAL_COINBASE_0"}]},{name:"Complianz banner",prehideSelectors:["#cmplz-cookiebanner-container"],detectCmp:[{exists:"#cmplz-cookiebanner-container .cmplz-cookiebanner"}],detectPopup:[{visible:"#cmplz-cookiebanner-container .cmplz-cookiebanner",check:"any"}],optIn:[{waitForThenClick:".cmplz-cookiebanner .cmplz-accept"}],optOut:[{waitForThenClick:".cmplz-cookiebanner .cmplz-deny"}],test:[{eval:"EVAL_COMPLIANZ_BANNER_0"}]},{name:"Complianz categories",prehideSelectors:['.cc-type-categories[aria-describedby="cookieconsent:desc"]'],detectCmp:[{exists:'.cc-type-categories[aria-describedby="cookieconsent:desc"]'}],detectPopup:[{visible:'.cc-type-categories[aria-describedby="cookieconsent:desc"]'}],optIn:[{any:[{click:".cc-accept-all"},{click:".cc-allow-all"},{click:".cc-allow"},{click:".cc-dismiss"}]}],optOut:[{if:{exists:'.cc-type-categories[aria-describedby="cookieconsent:desc"] .cc-dismiss'},then:[{click:".cc-dismiss"}],else:[{click:".cc-type-categories input[type=checkbox]:not([disabled]):checked",all:!0,optional:!0},{click:".cc-save"}]}]},{name:"Complianz notice",prehideSelectors:['.cc-type-info[aria-describedby="cookieconsent:desc"]'],cosmetic:!0,detectCmp:[{exists:'.cc-type-info[aria-describedby="cookieconsent:desc"] .cc-compliance .cc-btn'}],detectPopup:[{visible:'.cc-type-info[aria-describedby="cookieconsent:desc"] .cc-compliance .cc-btn'}],optIn:[{click:".cc-accept-all",optional:!0},{click:".cc-allow",optional:!0},{click:".cc-dismiss",optional:!0}],optOut:[{if:{exists:".cc-deny"},then:[{click:".cc-deny"}],else:[{hide:'[aria-describedby="cookieconsent:desc"]'}]}]},{name:"Complianz opt-both",prehideSelectors:['[aria-describedby="cookieconsent:desc"] .cc-type-opt-both'],detectCmp:[{exists:'[aria-describedby="cookieconsent:desc"] .cc-type-opt-both'}],detectPopup:[{visible:'[aria-describedby="cookieconsent:desc"] .cc-type-opt-both'}],optIn:[{click:".cc-accept-all",optional:!0},{click:".cc-allow",optional:!0},{click:".cc-dismiss",optional:!0}],optOut:[{waitForThenClick:".cc-deny"}]},{name:"Complianz optin",prehideSelectors:['.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'],detectCmp:[{exists:'.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'}],detectPopup:[{visible:'.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'}],optIn:[{any:[{click:".cc-accept-all"},{click:".cc-allow"},{click:".cc-dismiss"}]}],optOut:[{if:{visible:".cc-deny"},then:[{click:".cc-deny"}],else:[{if:{visible:".cc-settings"},then:[{waitForThenClick:".cc-settings"},{waitForVisible:".cc-settings-view"},{click:".cc-settings-view input[type=checkbox]:not([disabled]):checked",all:!0,optional:!0},{click:".cc-settings-view .cc-btn-accept-selected"}],else:[{click:".cc-dismiss"}]}]}]},{name:"cookie-law-info",prehideSelectors:["#cookie-law-info-bar"],detectCmp:[{exists:"#cookie-law-info-bar"},{eval:"EVAL_COOKIE_LAW_INFO_DETECT"}],detectPopup:[{visible:"#cookie-law-info-bar"}],optIn:[{click:'[data-cli_action="accept_all"]'}],optOut:[{hide:"#cookie-law-info-bar"},{eval:"EVAL_COOKIE_LAW_INFO_0"}],test:[{eval:"EVAL_COOKIE_LAW_INFO_1"}]},{name:"cookie-manager-popup",cosmetic:!1,runContext:{main:!0,frame:!1},intermediate:!1,detectCmp:[{exists:"#notice-cookie-block #allow-functional-cookies, #notice-cookie-block #btn-cookie-settings"}],detectPopup:[{visible:"#notice-cookie-block"}],optIn:[{click:"#btn-cookie-allow"}],optOut:[{if:{exists:"#allow-functional-cookies"},then:[{click:"#allow-functional-cookies"}],else:[{waitForThenClick:"#btn-cookie-settings"},{waitForVisible:".modal-body"},{click:'.modal-body input:checked, .switch[data-switch="on"]',all:!0,optional:!0},{click:'[role="dialog"] .modal-footer button'}]}],prehideSelectors:["#btn-cookie-settings"],test:[{eval:"EVAL_COOKIE_MANAGER_POPUP_0"}]},{name:"cookie-notice",prehideSelectors:["#cookie-notice"],cosmetic:!0,detectCmp:[{visible:"#cookie-notice .cookie-notice-container"}],detectPopup:[{visible:"#cookie-notice"}],optIn:[{click:"#cn-accept-cookie"}],optOut:[{hide:"#cookie-notice"}]},{name:"cookie-script",vendorUrl:"https://cookie-script.com/",prehideSelectors:["#cookiescript_injected"],detectCmp:[{exists:"#cookiescript_injected"}],detectPopup:[{visible:"#cookiescript_injected"}],optOut:[{click:"#cookiescript_reject"}],optIn:[{click:"#cookiescript_accept"}]},{name:"cookieacceptbar",vendorUrl:"https://unknown",cosmetic:!0,prehideSelectors:["#cookieAcceptBar.cookieAcceptBar"],detectCmp:[{exists:"#cookieAcceptBar.cookieAcceptBar"}],detectPopup:[{visible:"#cookieAcceptBar.cookieAcceptBar"}],optIn:[{waitForThenClick:"#cookieAcceptBarConfirm"}],optOut:[{hide:"#cookieAcceptBar.cookieAcceptBar"}]},{name:"cookiealert",intermediate:!1,prehideSelectors:[],runContext:{frame:!0,main:!0},detectCmp:[{exists:".cookie-alert-extended"}],detectPopup:[{visible:".cookie-alert-extended-modal"}],optIn:[{click:"button[data-controller='cookie-alert/extended/button/accept']"},{eval:"EVAL_COOKIEALERT_0"}],optOut:[{click:"a[data-controller='cookie-alert/extended/detail-link']"},{click:".cookie-alert-configuration-input:checked",all:!0,optional:!0},{click:"button[data-controller='cookie-alert/extended/button/configuration']"},{eval:"EVAL_COOKIEALERT_0"}],test:[{eval:"EVAL_COOKIEALERT_2"}]},{name:"cookieconsent2",vendorUrl:"https://www.github.com/orestbida/cookieconsent",comment:"supports v2.x.x of the library",prehideSelectors:["#cc--main"],detectCmp:[{exists:"#cc--main"}],detectPopup:[{visible:"#cm"},{exists:"#s-all-bn"}],optIn:[{waitForThenClick:"#s-all-bn"}],optOut:[{waitForThenClick:"#s-rall-bn"}],test:[{eval:"EVAL_COOKIECONSENT2_TEST"}]},{name:"cookieconsent3",vendorUrl:"https://www.github.com/orestbida/cookieconsent",comment:"supports v3.x.x of the library",prehideSelectors:["#cc-main"],detectCmp:[{exists:"#cc-main"}],detectPopup:[{visible:"#cc-main .cm-wrapper"}],optIn:[{waitForThenClick:".cm__btn[data-role=all]"}],optOut:[{waitForThenClick:".cm__btn[data-role=necessary]"}],test:[{eval:"EVAL_COOKIECONSENT3_TEST"}]},{name:"cookiefirst.com",prehideSelectors:["#cookiefirst-root,.cookiefirst-root,[aria-labelledby=cookie-preference-panel-title]"],detectCmp:[{exists:"#cookiefirst-root,.cookiefirst-root"}],detectPopup:[{visible:"#cookiefirst-root,.cookiefirst-root"}],optIn:[{click:"button[data-cookiefirst-action=accept]"}],optOut:[{if:{exists:"button[data-cookiefirst-action=adjust]"},then:[{click:"button[data-cookiefirst-action=adjust]"},{waitForVisible:"[data-cookiefirst-widget=modal]",timeout:1e3},{eval:"EVAL_COOKIEFIRST_1"},{wait:1e3},{click:"button[data-cookiefirst-action=save]"}],else:[{click:"button[data-cookiefirst-action=reject]"}]}],test:[{eval:"EVAL_COOKIEFIRST_0"}]},{name:"Cookie Information Banner",prehideSelectors:["#cookie-information-template-wrapper"],detectCmp:[{exists:"#cookie-information-template-wrapper"}],detectPopup:[{visible:"#cookie-information-template-wrapper"}],optIn:[{eval:"EVAL_COOKIEINFORMATION_1"}],optOut:[{hide:"#cookie-information-template-wrapper",comment:"some templates don't hide the banner automatically"},{eval:"EVAL_COOKIEINFORMATION_0"}],test:[{eval:"EVAL_COOKIEINFORMATION_2"}]},{name:"cookieyes",prehideSelectors:[".cky-overlay,.cky-consent-container"],detectCmp:[{exists:".cky-consent-container"}],detectPopup:[{visible:".cky-consent-container"}],optIn:[{waitForThenClick:".cky-consent-container [data-cky-tag=accept-button]"}],optOut:[{if:{exists:".cky-consent-container [data-cky-tag=reject-button]"},then:[{waitForThenClick:".cky-consent-container [data-cky-tag=reject-button]"}],else:[{if:{exists:".cky-consent-container [data-cky-tag=settings-button]"},then:[{click:".cky-consent-container [data-cky-tag=settings-button]"},{waitFor:".cky-modal-open input[type=checkbox]"},{click:".cky-modal-open input[type=checkbox]:checked",all:!0,optional:!0},{waitForThenClick:".cky-modal [data-cky-tag=detail-save-button]"}],else:[{hide:".cky-consent-container,.cky-overlay"}]}]}],test:[{eval:"EVAL_COOKIEYES_0"}]},{name:"corona-in-zahlen.de",prehideSelectors:[".cookiealert"],detectCmp:[{exists:".cookiealert"}],detectPopup:[{visible:".cookiealert"}],optOut:[{click:".configurecookies"},{click:".confirmcookies"}],optIn:[{click:".acceptcookies"}]},{name:"crossfit-com",cosmetic:!0,prehideSelectors:['body #modal > div > div[class^="_wrapper_"]'],detectCmp:[{exists:'body #modal > div > div[class^="_wrapper_"]'}],detectPopup:[{visible:'body #modal > div > div[class^="_wrapper_"]'}],optIn:[{click:'button[aria-label="accept cookie policy"]'}],optOut:[{hide:'body #modal > div > div[class^="_wrapper_"]'}]},{name:"csu-landtag-de",runContext:{urlPattern:"^https://(www|)?\\.csu-landtag\\.de"},prehideSelectors:["#cookie-disclaimer"],detectCmp:[{exists:"#cookie-disclaimer"}],detectPopup:[{visible:"#cookie-disclaimer"}],optIn:[{click:"#cookieall"}],optOut:[{click:"#cookiesel"}]},{name:"dailymotion-us",cosmetic:!0,prehideSelectors:['div[class*="CookiePopup__desktopContainer"]:has(div[class*="CookiePopup"])'],detectCmp:[{exists:'div[class*="CookiePopup__desktopContainer"]'}],detectPopup:[{visible:'div[class*="CookiePopup__desktopContainer"]'}],optIn:[{click:'div[class*="CookiePopup__desktopContainer"] > button > span'}],optOut:[{hide:'div[class*="CookiePopup__desktopContainer"]'}]},{name:"dailymotion.com",runContext:{urlPattern:"^https://(www\\.)?dailymotion\\.com/"},prehideSelectors:['div[class*="Overlay__container"]:has(div[class*="TCF2Popup"])'],detectCmp:[{exists:'div[class*="TCF2Popup"]'}],detectPopup:[{visible:'[class*="TCF2Popup"] a[href^="https://www.dailymotion.com/legal/cookiemanagement"]'}],optIn:[{waitForThenClick:'button[class*="TCF2Popup__button"]:not([class*="TCF2Popup__personalize"])'}],optOut:[{waitForThenClick:'button[class*="TCF2ContinueWithoutAcceptingButton"]'}],test:[{eval:"EVAL_DAILYMOTION_0"}]},{name:"deepl.com",prehideSelectors:[".dl_cookieBanner_container"],detectCmp:[{exists:".dl_cookieBanner_container"}],detectPopup:[{visible:".dl_cookieBanner_container"}],optOut:[{click:".dl_cookieBanner--buttonSelected"}],optIn:[{click:".dl_cookieBanner--buttonAll"}]},{name:"delta.com",runContext:{urlPattern:"^https://www\\.delta\\.com/"},cosmetic:!0,prehideSelectors:["ngc-cookie-banner"],detectCmp:[{exists:"div.cookie-footer-container"}],detectPopup:[{visible:"div.cookie-footer-container"}],optIn:[{click:" button.cookie-close-icon"}],optOut:[{hide:"div.cookie-footer-container"}]},{name:"dmgmedia-us",prehideSelectors:["#mol-ads-cmp-iframe, div.mol-ads-cmp > form > div"],detectCmp:[{exists:"div.mol-ads-cmp > form > div"}],detectPopup:[{waitForVisible:"div.mol-ads-cmp > form > div"}],optIn:[{waitForThenClick:"button.mol-ads-cmp--btn-primary"}],optOut:[{waitForThenClick:"div.mol-ads-ccpa--message > u > a"},{waitForVisible:".mol-ads-cmp--modal-dialog"},{waitForThenClick:"a.mol-ads-cmp-footer-privacy"},{waitForThenClick:"button.mol-ads-cmp--btn-secondary"}]},{name:"dmgmedia",prehideSelectors:['[data-project="mol-fe-cmp"]'],detectCmp:[{exists:'[data-project="mol-fe-cmp"]'}],detectPopup:[{visible:'[data-project="mol-fe-cmp"]'}],optIn:[{waitForThenClick:'[data-project="mol-fe-cmp"] button[class*=primary]'}],optOut:[{waitForThenClick:'[data-project="mol-fe-cmp"] button[class*=basic]'},{waitForVisible:'[data-project="mol-fe-cmp"] div[class*="tabContent"]'},{waitForThenClick:'[data-project="mol-fe-cmp"] div[class*="toggle"][class*="enabled"]',all:!0},{waitForThenClick:'[data-project="mol-fe-cmp"] button[class*=white]'}]},{name:"dndbeyond",vendorUrl:"https://www.dndbeyond.com/",runContext:{urlPattern:"^https://(www\\.)?dndbeyond\\.com/"},prehideSelectors:["[id^=cookie-consent-banner]"],detectCmp:[{exists:"[id^=cookie-consent-banner]"}],detectPopup:[{visible:"[id^=cookie-consent-banner]"}],optIn:[{waitForThenClick:"#cookie-consent-granted"}],optOut:[{waitForThenClick:"#cookie-consent-denied"}],test:[{eval:"EVAL_DNDBEYOND_TEST"}]},{name:"Drupal",detectCmp:[{exists:"#drupalorg-crosssite-gdpr"}],detectPopup:[{visible:"#drupalorg-crosssite-gdpr"}],optOut:[{click:".no"}],optIn:[{click:".yes"}]},{name:"WP DSGVO Tools",link:"https://wordpress.org/plugins/shapepress-dsgvo/",prehideSelectors:[".sp-dsgvo"],cosmetic:!0,detectCmp:[{exists:".sp-dsgvo.sp-dsgvo-popup-overlay"}],detectPopup:[{visible:".sp-dsgvo.sp-dsgvo-popup-overlay",check:"any"}],optIn:[{click:".sp-dsgvo-privacy-btn-accept-all",all:!0}],optOut:[{hide:".sp-dsgvo.sp-dsgvo-popup-overlay"}],test:[{eval:"EVAL_DSGVO_0"}]},{name:"dunelm.com",prehideSelectors:["div[data-testid=cookie-consent-modal-backdrop]"],detectCmp:[{exists:"div[data-testid=cookie-consent-message-contents]"}],detectPopup:[{visible:"div[data-testid=cookie-consent-message-contents]"}],optIn:[{click:'[data-testid="cookie-consent-allow-all"]'}],optOut:[{click:"button[data-testid=cookie-consent-adjust-settings]"},{click:"button[data-testid=cookie-consent-preferences-save]"}],test:[{eval:"EVAL_DUNELM_0"}]},{name:"ecosia",vendorUrl:"https://www.ecosia.org/",runContext:{urlPattern:"^https://www\\.ecosia\\.org/"},prehideSelectors:[".cookie-wrapper"],detectCmp:[{exists:".cookie-wrapper > .cookie-notice"}],detectPopup:[{visible:".cookie-wrapper > .cookie-notice"}],optIn:[{waitForThenClick:"[data-test-id=cookie-notice-accept]"}],optOut:[{waitForThenClick:"[data-test-id=cookie-notice-reject]"}]},{name:"etsy",prehideSelectors:["#gdpr-single-choice-overlay","#gdpr-privacy-settings"],detectCmp:[{exists:"#gdpr-single-choice-overlay"}],detectPopup:[{visible:"#gdpr-single-choice-overlay"}],optOut:[{click:"button[data-gdpr-open-full-settings]"},{waitForVisible:".gdpr-overlay-body input",timeout:3e3},{wait:1e3},{eval:"EVAL_ETSY_0"},{eval:"EVAL_ETSY_1"}],optIn:[{click:"button[data-gdpr-single-choice-accept]"}]},{name:"eu-cookie-compliance-banner",detectCmp:[{exists:"body.eu-cookie-compliance-popup-open"}],detectPopup:[{exists:"body.eu-cookie-compliance-popup-open"}],optIn:[{click:".agree-button"}],optOut:[{if:{visible:".decline-button,.eu-cookie-compliance-save-preferences-button"},then:[{click:".decline-button,.eu-cookie-compliance-save-preferences-button"}]},{hide:".eu-cookie-compliance-banner-info, #sliding-popup"}],test:[{eval:"EVAL_EU_COOKIE_COMPLIANCE_0"}]},{name:"EU Cookie Law",prehideSelectors:[".pea_cook_wrapper,.pea_cook_more_info_popover"],cosmetic:!0,detectCmp:[{exists:".pea_cook_wrapper"}],detectPopup:[{wait:500},{visible:".pea_cook_wrapper"}],optIn:[{click:"#pea_cook_btn"}],optOut:[{hide:".pea_cook_wrapper"}],test:[{eval:"EVAL_EU_COOKIE_LAW_0"}]},{name:"europa-eu",vendorUrl:"https://ec.europa.eu/",runContext:{urlPattern:"^https://[^/]*europa\\.eu/"},prehideSelectors:["#cookie-consent-banner"],detectCmp:[{exists:".cck-container"}],detectPopup:[{visible:".cck-container"}],optIn:[{waitForThenClick:'.cck-actions-button[href="#accept"]'}],optOut:[{waitForThenClick:'.cck-actions-button[href="#refuse"]',hide:".cck-container"}]},{name:"EZoic",prehideSelectors:["#ez-cookie-dialog-wrapper"],detectCmp:[{exists:"#ez-cookie-dialog-wrapper"}],detectPopup:[{visible:"#ez-cookie-dialog-wrapper"}],optIn:[{click:"#ez-accept-all",optional:!0},{eval:"EVAL_EZOIC_0",optional:!0}],optOut:[{wait:500},{click:"#ez-manage-settings"},{waitFor:"#ez-cookie-dialog input[type=checkbox]"},{click:"#ez-cookie-dialog input[type=checkbox]:checked",all:!0},{click:"#ez-save-settings"}],test:[{eval:"EVAL_EZOIC_1"}]},{name:"facebook",runContext:{urlPattern:"^https://([a-z0-9-]+\\.)?facebook\\.com/"},prehideSelectors:['div[data-testid="cookie-policy-manage-dialog"]'],detectCmp:[{exists:'div[data-testid="cookie-policy-manage-dialog"]'}],detectPopup:[{visible:'div[data-testid="cookie-policy-manage-dialog"]'}],optIn:[{waitForThenClick:'button[data-cookiebanner="accept_button"]'},{waitForVisible:'div[data-testid="cookie-policy-manage-dialog"]',check:"none"}],optOut:[{waitForThenClick:'button[data-cookiebanner="accept_only_essential_button"]'},{waitForVisible:'div[data-testid="cookie-policy-manage-dialog"]',check:"none"}]},{name:"fides",vendorUrl:"https://github.com/ethyca/fides",prehideSelectors:["#fides-overlay"],detectCmp:[{exists:"#fides-overlay #fides-banner"}],detectPopup:[{visible:"#fides-overlay #fides-banner"}],optIn:[{waitForThenClick:'#fides-banner [data-testid="Accept all-btn"]'}],optOut:[{waitForThenClick:'#fides-banner [data-testid="Reject all-btn"]'}]},{name:"funding-choices",prehideSelectors:[".fc-consent-root,.fc-dialog-container,.fc-dialog-overlay,.fc-dialog-content"],detectCmp:[{exists:".fc-consent-root"}],detectPopup:[{exists:".fc-dialog-container"}],optOut:[{click:".fc-cta-do-not-consent,.fc-cta-manage-options"},{click:".fc-preference-consent:checked,.fc-preference-legitimate-interest:checked",all:!0,optional:!0},{click:".fc-confirm-choices",optional:!0}],optIn:[{click:".fc-cta-consent"}]},{name:"geeks-for-geeks",runContext:{urlPattern:"^https://www\\.geeksforgeeks\\.org/"},cosmetic:!0,prehideSelectors:[".cookie-consent"],detectCmp:[{exists:".cookie-consent"}],detectPopup:[{visible:".cookie-consent"}],optIn:[{click:".cookie-consent button.consent-btn"}],optOut:[{hide:".cookie-consent"}]},{name:"generic-cosmetic",cosmetic:!0,prehideSelectors:["#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"],detectCmp:[{exists:"#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"}],detectPopup:[{visible:"#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"}],optIn:[],optOut:[{hide:"#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"}]},{name:"google-consent-standalone",prehideSelectors:[],detectCmp:[{exists:'a[href^="https://policies.google.com/technologies/cookies"'},{exists:'form[action^="https://consent.google."][action$=".com/save"]'}],detectPopup:[{visible:'a[href^="https://policies.google.com/technologies/cookies"'}],optIn:[{waitForThenClick:'form[action^="https://consent.google."][action$=".com/save"]:has(input[name=set_eom][value=false]) button'}],optOut:[{waitForThenClick:'form[action^="https://consent.google."][action$=".com/save"]:has(input[name=set_eom][value=true]) button'}]},{name:"google.com",prehideSelectors:[".HTjtHe#xe7COe"],detectCmp:[{exists:".HTjtHe#xe7COe"},{exists:'.HTjtHe#xe7COe a[href^="https://policies.google.com/technologies/cookies"]'}],detectPopup:[{visible:".HTjtHe#xe7COe button#W0wltc"}],optIn:[{waitForThenClick:".HTjtHe#xe7COe button#L2AGLb"}],optOut:[{waitForThenClick:".HTjtHe#xe7COe button#W0wltc"}],test:[{eval:"EVAL_GOOGLE_0"}]},{name:"gov.uk",detectCmp:[{exists:"#global-cookie-message"}],detectPopup:[{exists:"#global-cookie-message"}],optIn:[{click:"button[data-accept-cookies=true]"}],optOut:[{click:"button[data-reject-cookies=true],#reject-cookies"},{click:"button[data-hide-cookie-banner=true],#hide-cookie-decision"}]},{name:"hashicorp",vendorUrl:"https://hashicorp.com/",runContext:{urlPattern:"^https://[^.]*\\.hashicorp\\.com/"},prehideSelectors:["[data-testid=consent-banner]"],detectCmp:[{exists:"[data-testid=consent-banner]"}],detectPopup:[{visible:"[data-testid=consent-banner]"}],optIn:[{waitForThenClick:"[data-testid=accept]"}],optOut:[{waitForThenClick:"[data-testid=manage-preferences]"},{waitForThenClick:"[data-testid=consent-mgr-dialog] [data-ga-button=save-preferences]"}]},{name:"healthline-media",prehideSelectors:["#modal-host > div.no-hash > div.window-wrapper"],detectCmp:[{exists:"#modal-host > div.no-hash > div.window-wrapper, div[data-testid=qualtrics-container]"}],detectPopup:[{exists:"#modal-host > div.no-hash > div.window-wrapper, div[data-testid=qualtrics-container]"}],optIn:[{click:"#modal-host > div.no-hash > div.window-wrapper > div:last-child button"}],optOut:[{if:{exists:'#modal-host > div.no-hash > div.window-wrapper > div:last-child a[href="/privacy-settings"]'},then:[{click:'#modal-host > div.no-hash > div.window-wrapper > div:last-child a[href="/privacy-settings"]'}],else:[{waitForVisible:"div#__next"},{click:"#__next div:nth-child(1) > button:first-child"}]}]},{name:"hema",prehideSelectors:[".cookie-modal"],detectCmp:[{visible:".cookie-modal .cookie-accept-btn"}],detectPopup:[{visible:".cookie-modal .cookie-accept-btn"}],optIn:[{waitForThenClick:".cookie-modal .cookie-accept-btn"}],optOut:[{waitForThenClick:".cookie-modal .js-cookie-reject-btn"}],test:[{eval:"EVAL_HEMA_TEST_0"}]},{name:"hetzner.com",runContext:{urlPattern:"^https://www\\.hetzner\\.com/"},prehideSelectors:["#CookieConsent"],detectCmp:[{exists:"#CookieConsent"}],detectPopup:[{visible:"#CookieConsent"}],optIn:[{click:"#CookieConsentGiven"}],optOut:[{click:"#CookieConsentDeclined"}]},{name:"hl.co.uk",prehideSelectors:[".cookieModalContent","#cookie-banner-overlay"],detectCmp:[{exists:"#cookie-banner-overlay"}],detectPopup:[{exists:"#cookie-banner-overlay"}],optIn:[{click:"#acceptCookieButton"}],optOut:[{click:"#manageCookie"},{hide:".cookieSettingsModal"},{waitFor:"#AOCookieToggle"},{click:"#AOCookieToggle[aria-pressed=true]",optional:!0},{waitFor:"#TPCookieToggle"},{click:"#TPCookieToggle[aria-pressed=true]",optional:!0},{click:"#updateCookieButton"}]},{name:"hu-manity",vendorUrl:"https://hu-manity.co/",prehideSelectors:["#hu.hu-wrapper"],detectCmp:[{exists:"#hu.hu-visible"}],detectPopup:[{visible:"#hu.hu-visible"}],optIn:[{waitForThenClick:"[data-hu-action=cookies-notice-consent-choices-3]"},{waitForThenClick:"#hu-cookies-save"}],optOut:[{waitForThenClick:"#hu-cookies-save"}]},{name:"hubspot",detectCmp:[{exists:"#hs-eu-cookie-confirmation"}],detectPopup:[{visible:"#hs-eu-cookie-confirmation"}],optIn:[{click:"#hs-eu-confirmation-button"}],optOut:[{click:"#hs-eu-decline-button"}]},{name:"indeed.com",cosmetic:!0,prehideSelectors:["#CookiePrivacyNotice"],detectCmp:[{exists:"#CookiePrivacyNotice"}],detectPopup:[{visible:"#CookiePrivacyNotice"}],optIn:[{click:"#CookiePrivacyNotice button[data-gnav-element-name=CookiePrivacyNoticeOk]"}],optOut:[{hide:"#CookiePrivacyNotice"}]},{name:"ing.de",runContext:{urlPattern:"^https://www\\.ing\\.de/"},cosmetic:!0,prehideSelectors:['div[slot="backdrop"]'],detectCmp:[{exists:'[data-tag-name="ing-cc-dialog-frame"]'}],detectPopup:[{visible:'[data-tag-name="ing-cc-dialog-frame"]'}],optIn:[{click:['[data-tag-name="ing-cc-dialog-level0"]','[data-tag-name="ing-cc-button"][class*="accept"]']}],optOut:[{click:['[data-tag-name="ing-cc-dialog-level0"]','[data-tag-name="ing-cc-button"][class*="more"]']}]},{name:"instagram",vendorUrl:"https://instagram.com",runContext:{urlPattern:"^https://www\\.instagram\\.com/"},prehideSelectors:[".x78zum5.xdt5ytf.xg6iff7.x1n2onr6"],detectCmp:[{exists:".x1qjc9v5.x9f619.x78zum5.xdt5ytf.x1iyjqo2.xl56j7k"}],detectPopup:[{visible:".x1qjc9v5.x9f619.x78zum5.xdt5ytf.x1iyjqo2.xl56j7k"}],optIn:[{waitForThenClick:"._a9--._a9_0"}],optOut:[{waitForThenClick:"._a9--._a9_1"},{wait:2e3}]},{name:"ionos.de",prehideSelectors:[".privacy-consent--backdrop",".privacy-consent--modal"],detectCmp:[{exists:".privacy-consent--modal"}],detectPopup:[{visible:".privacy-consent--modal"}],optIn:[{click:"#selectAll"}],optOut:[{click:".footer-config-link"},{click:"#confirmSelection"}]},{name:"itopvpn.com",cosmetic:!0,prehideSelectors:[".pop-cookie"],detectCmp:[{exists:".pop-cookie"}],detectPopup:[{exists:".pop-cookie"}],optIn:[{click:"#_pcookie"}],optOut:[{hide:".pop-cookie"}]},{name:"iubenda",prehideSelectors:["#iubenda-cs-banner"],detectCmp:[{exists:"#iubenda-cs-banner"}],detectPopup:[{visible:".iubenda-cs-accept-btn"}],optIn:[{click:".iubenda-cs-accept-btn"}],optOut:[{click:".iubenda-cs-customize-btn"},{eval:"EVAL_IUBENDA_0"},{click:"#iubFooterBtn"}],test:[{eval:"EVAL_IUBENDA_1"}]},{name:"iWink",prehideSelectors:["body.cookies-request #cookie-bar"],detectCmp:[{exists:"body.cookies-request #cookie-bar"}],detectPopup:[{visible:"body.cookies-request #cookie-bar"}],optIn:[{waitForThenClick:"body.cookies-request #cookie-bar .allow-cookies"}],optOut:[{waitForThenClick:"body.cookies-request #cookie-bar .disallow-cookies"}],test:[{eval:"EVAL_IWINK_TEST"}]},{name:"jdsports",vendorUrl:"https://www.jdsports.co.uk/",runContext:{urlPattern:"^https://(www|m)\\.jdsports\\."},prehideSelectors:[".miniConsent,#PrivacyPolicyBanner"],detectCmp:[{exists:".miniConsent,#PrivacyPolicyBanner"}],detectPopup:[{visible:".miniConsent,#PrivacyPolicyBanner"}],optIn:[{waitForThenClick:".miniConsent .accept-all-cookies"}],optOut:[{if:{exists:"#PrivacyPolicyBanner"},then:[{hide:"#PrivacyPolicyBanner"}],else:[{waitForThenClick:"#cookie-settings"},{waitForThenClick:"#reject-all-cookies"}]}]},{name:"johnlewis.com",prehideSelectors:["div[class^=pecr-cookie-banner-]"],detectCmp:[{exists:"div[class^=pecr-cookie-banner-]"}],detectPopup:[{exists:"div[class^=pecr-cookie-banner-]"}],optOut:[{click:"button[data-test^=manage-cookies]"},{wait:"500"},{click:"label[data-test^=toggle][class*=checked]:not([class*=disabled])",all:!0,optional:!0},{click:"button[data-test=save-preferences]"}],optIn:[{click:"button[data-test=allow-all]"}]},{name:"jquery.cookieBar",vendorUrl:"https://github.com/kovarp/jquery.cookieBar",prehideSelectors:[".cookie-bar"],cosmetic:!0,detectCmp:[{exists:".cookie-bar .cookie-bar__message,.cookie-bar .cookie-bar__buttons"}],detectPopup:[{visible:".cookie-bar .cookie-bar__message,.cookie-bar .cookie-bar__buttons",check:"any"}],optIn:[{click:".cookie-bar .cookie-bar__btn"}],optOut:[{hide:".cookie-bar"}],test:[{visible:".cookie-bar .cookie-bar__message,.cookie-bar .cookie-bar__buttons",check:"none"},{eval:"EVAL_JQUERY_COOKIEBAR_0"}]},{name:"justwatch.com",prehideSelectors:[".consent-banner"],detectCmp:[{exists:".consent-banner .consent-banner__actions"}],detectPopup:[{visible:".consent-banner .consent-banner__actions"}],optIn:[{click:".consent-banner__actions button.basic-button.primary"}],optOut:[{click:".consent-banner__actions button.basic-button.secondary"},{waitForThenClick:".consent-modal__footer button.basic-button.secondary"},{waitForThenClick:".consent-modal ion-content > div > a:nth-child(9)"},{click:"label.consent-switch input[type=checkbox]:checked",all:!0,optional:!0},{waitForVisible:".consent-modal__footer button.basic-button.primary"},{click:".consent-modal__footer button.basic-button.primary"}]},{name:"ketch",vendorUrl:"https://www.ketch.com",runContext:{frame:!1,main:!0},intermediate:!1,prehideSelectors:["#lanyard_root div[role='dialog']"],detectCmp:[{exists:"#lanyard_root div[role='dialog']"}],detectPopup:[{visible:"#lanyard_root div[role='dialog']"}],optIn:[{if:{exists:"#lanyard_root button[class='confirmButton']"},then:[{waitForThenClick:"#lanyard_root div[class*=buttons] > :nth-child(2)"},{click:"#lanyard_root button[class='confirmButton']"}],else:[{waitForThenClick:"#lanyard_root div[class*=buttons] > :nth-child(2)"}]}],optOut:[{if:{exists:"#lanyard_root [aria-describedby=banner-description]"},then:[{waitForThenClick:"#lanyard_root div[class*=buttons] > button[class*=secondaryButton]",comment:"can be either settings or reject button"}]},{waitFor:"#lanyard_root [aria-describedby=preference-description],#lanyard_root [aria-describedby=modal-description]",timeout:1e3,optional:!0},{if:{exists:"#lanyard_root [aria-describedby=preference-description],#lanyard_root [aria-describedby=modal-description]"},then:[{waitForThenClick:"#lanyard_root button[class*=rejectButton]"},{click:"#lanyard_root button[class*=confirmButton],#lanyard_root div[class*=actions_] > button:nth-child(1)"}]}]},{name:"kleinanzeigen-de",runContext:{urlPattern:"^https?://(www\\.)?kleinanzeigen\\.de"},prehideSelectors:["#gdpr-banner-container"],detectCmp:[{any:[{exists:"#gdpr-banner-container #gdpr-banner [data-testid=gdpr-banner-cmp-button]"},{exists:"#ConsentManagementPage"}]}],detectPopup:[{any:[{visible:"#gdpr-banner-container #gdpr-banner [data-testid=gdpr-banner-cmp-button]"},{visible:"#ConsentManagementPage"}]}],optIn:[{if:{exists:"#gdpr-banner-container #gdpr-banner"},then:[{click:"#gdpr-banner-container #gdpr-banner [data-testid=gdpr-banner-accept]"}],else:[{click:"#ConsentManagementPage .Button-primary"}]}],optOut:[{if:{exists:"#gdpr-banner-container #gdpr-banner"},then:[{click:"#gdpr-banner-container #gdpr-banner [data-testid=gdpr-banner-cmp-button]"}],else:[{click:"#ConsentManagementPage .Button-secondary"}]}]},{name:"lightbox",prehideSelectors:[".darken-layer.open,.lightbox.lightbox--cookie-consent"],detectCmp:[{exists:"body.cookie-consent-is-active div.lightbox--cookie-consent > div.lightbox__content > div.cookie-consent[data-jsb]"}],detectPopup:[{visible:"body.cookie-consent-is-active div.lightbox--cookie-consent > div.lightbox__content > div.cookie-consent[data-jsb]"}],optOut:[{click:".cookie-consent__footer > button[type='submit']:not([data-button='selectAll'])"}],optIn:[{click:".cookie-consent__footer > button[type='submit'][data-button='selectAll']"}]},{name:"lineagrafica",vendorUrl:"https://addons.prestashop.com/en/legal/8734-eu-cookie-law-gdpr-banner-blocker.html",cosmetic:!0,prehideSelectors:["#lgcookieslaw_banner,#lgcookieslaw_modal,.lgcookieslaw-overlay"],detectCmp:[{exists:"#lgcookieslaw_banner,#lgcookieslaw_modal,.lgcookieslaw-overlay"}],detectPopup:[{exists:"#lgcookieslaw_banner,#lgcookieslaw_modal,.lgcookieslaw-overlay"}],optIn:[{waitForThenClick:"#lgcookieslaw_accept"}],optOut:[{hide:"#lgcookieslaw_banner,#lgcookieslaw_modal,.lgcookieslaw-overlay"}]},{name:"linkedin.com",prehideSelectors:[".artdeco-global-alert[type=COOKIE_CONSENT]"],detectCmp:[{exists:".artdeco-global-alert[type=COOKIE_CONSENT]"}],detectPopup:[{visible:".artdeco-global-alert[type=COOKIE_CONSENT]"}],optIn:[{waitForVisible:".artdeco-global-alert[type=COOKIE_CONSENT] button[action-type=ACCEPT]"},{wait:500},{waitForThenClick:".artdeco-global-alert[type=COOKIE_CONSENT] button[action-type=ACCEPT]"}],optOut:[{waitForVisible:".artdeco-global-alert[type=COOKIE_CONSENT] button[action-type=DENY]"},{wait:500},{waitForThenClick:".artdeco-global-alert[type=COOKIE_CONSENT] button[action-type=DENY]"}],test:[{waitForVisible:".artdeco-global-alert[type=COOKIE_CONSENT]",check:"none"}]},{name:"livejasmin",vendorUrl:"https://www.livejasmin.com/",runContext:{urlPattern:"^https://(m|www)\\.livejasmin\\.com/"},prehideSelectors:["#consent_modal"],detectCmp:[{exists:"#consent_modal"}],detectPopup:[{visible:"#consent_modal"}],optIn:[{waitForThenClick:"#consent_modal button[data-testid=ButtonStyledButton]:first-of-type"}],optOut:[{waitForThenClick:"#consent_modal button[data-testid=ButtonStyledButton]:nth-of-type(2)"},{waitForVisible:"[data-testid=PrivacyPreferenceCenterWithConsentCookieContent]"},{click:"[data-testid=PrivacyPreferenceCenterWithConsentCookieContent] input[data-testid=PrivacyPreferenceCenterWithConsentCookieSwitch]:checked",optional:!0,all:!0},{waitForThenClick:"[data-testid=PrivacyPreferenceCenterWithConsentCookieContent] button[data-testid=ButtonStyledButton]:last-child"}]},{name:"macpaw.com",cosmetic:!0,prehideSelectors:['div[data-banner="cookies"]'],detectCmp:[{exists:'div[data-banner="cookies"]'}],detectPopup:[{exists:'div[data-banner="cookies"]'}],optIn:[{click:'button[data-banner-close="cookies"]'}],optOut:[{hide:'div[data-banner="cookies"]'}]},{name:"marksandspencer.com",cosmetic:!0,detectCmp:[{exists:".navigation-cookiebbanner"}],detectPopup:[{visible:".navigation-cookiebbanner"}],optOut:[{hide:".navigation-cookiebbanner"}],optIn:[{click:".navigation-cookiebbanner__submit"}]},{name:"mediamarkt.de",prehideSelectors:["div[aria-labelledby=pwa-consent-layer-title]","div[class^=StyledConsentLayerWrapper-]"],detectCmp:[{exists:"div[aria-labelledby^=pwa-consent-layer-title]"}],detectPopup:[{exists:"div[aria-labelledby^=pwa-consent-layer-title]"}],optOut:[{click:"button[data-test^=pwa-consent-layer-deny-all]"}],optIn:[{click:"button[data-test^=pwa-consent-layer-accept-all"}]},{name:"Mediavine",prehideSelectors:['[data-name="mediavine-gdpr-cmp"]'],detectCmp:[{exists:'[data-name="mediavine-gdpr-cmp"]'}],detectPopup:[{wait:500},{visible:'[data-name="mediavine-gdpr-cmp"]'}],optIn:[{waitForThenClick:'[data-name="mediavine-gdpr-cmp"] [format="primary"]'}],optOut:[{waitForThenClick:'[data-name="mediavine-gdpr-cmp"] [data-view="manageSettings"]'},{waitFor:'[data-name="mediavine-gdpr-cmp"] input[type=checkbox]'},{eval:"EVAL_MEDIAVINE_0",optional:!0},{click:'[data-name="mediavine-gdpr-cmp"] [format="secondary"]'}]},{name:"microsoft.com",prehideSelectors:["#wcpConsentBannerCtrl"],detectCmp:[{exists:"#wcpConsentBannerCtrl"}],detectPopup:[{exists:"#wcpConsentBannerCtrl"}],optOut:[{eval:"EVAL_MICROSOFT_0"}],optIn:[{eval:"EVAL_MICROSOFT_1"}],test:[{eval:"EVAL_MICROSOFT_2"}]},{name:"midway-usa",runContext:{urlPattern:"^https://www\\.midwayusa\\.com/"},cosmetic:!0,prehideSelectors:["#cookie-container"],detectCmp:[{exists:['div[aria-label="Cookie Policy Banner"]']}],detectPopup:[{visible:"#cookie-container"}],optIn:[{click:"button#cookie-btn"}],optOut:[{hide:'div[aria-label="Cookie Policy Banner"]'}]},{name:"moneysavingexpert.com",detectCmp:[{exists:"dialog[data-testid=accept-our-cookies-dialog]"}],detectPopup:[{visible:"dialog[data-testid=accept-our-cookies-dialog]"}],optIn:[{click:"#banner-accept"}],optOut:[{click:"#banner-manage"},{click:"#pc-confirm"}]},{name:"monzo.com",prehideSelectors:[".cookie-alert, cookie-alert__content"],detectCmp:[{exists:'div.cookie-alert[role="dialog"]'},{exists:'a[href*="monzo"]'}],detectPopup:[{visible:".cookie-alert__content"}],optIn:[{click:".js-accept-cookie-policy"}],optOut:[{click:".js-decline-cookie-policy"}]},{name:"Moove",prehideSelectors:["#moove_gdpr_cookie_info_bar"],detectCmp:[{exists:"#moove_gdpr_cookie_info_bar"}],detectPopup:[{visible:"#moove_gdpr_cookie_info_bar"}],optIn:[{waitForThenClick:".moove-gdpr-infobar-allow-all"}],optOut:[{if:{exists:"#moove_gdpr_cookie_info_bar .change-settings-button"},then:[{click:"#moove_gdpr_cookie_info_bar .change-settings-button"},{waitForVisible:"#moove_gdpr_cookie_modal"},{eval:"EVAL_MOOVE_0"},{click:".moove-gdpr-modal-save-settings"}],else:[{hide:"#moove_gdpr_cookie_info_bar"}]}],test:[{visible:"#moove_gdpr_cookie_info_bar",check:"none"}]},{name:"national-lottery.co.uk",detectCmp:[{exists:".cuk_cookie_consent"}],detectPopup:[{visible:".cuk_cookie_consent",check:"any"}],optOut:[{click:".cuk_cookie_consent_manage_pref"},{click:".cuk_cookie_consent_save_pref"},{click:".cuk_cookie_consent_close"}],optIn:[{click:".cuk_cookie_consent_accept_all"}]},{name:"nba.com",runContext:{urlPattern:"^https://(www\\.)?nba.com/"},cosmetic:!0,prehideSelectors:["#onetrust-banner-sdk"],detectCmp:[{exists:"#onetrust-banner-sdk"}],detectPopup:[{visible:"#onetrust-banner-sdk"}],optIn:[{click:"#onetrust-accept-btn-handler"}],optOut:[{hide:"#onetrust-banner-sdk"}]},{name:"netflix.de",detectCmp:[{exists:"#cookie-disclosure"}],detectPopup:[{visible:".cookie-disclosure-message",check:"any"}],optIn:[{click:".btn-accept"}],optOut:[{hide:"#cookie-disclosure"},{click:".btn-reject"}]},{name:"nhs.uk",prehideSelectors:["#nhsuk-cookie-banner"],detectCmp:[{exists:"#nhsuk-cookie-banner"}],detectPopup:[{exists:"#nhsuk-cookie-banner"}],optOut:[{click:"#nhsuk-cookie-banner__link_accept"}],optIn:[{click:"#nhsuk-cookie-banner__link_accept_analytics"}]},{name:"notice-cookie",prehideSelectors:[".button--notice"],cosmetic:!0,detectCmp:[{exists:".notice--cookie"}],detectPopup:[{visible:".notice--cookie"}],optIn:[{click:".button--notice"}],optOut:[{hide:".notice--cookie"}]},{name:"nrk.no",cosmetic:!0,prehideSelectors:[".nrk-masthead__info-banner--cookie"],detectCmp:[{exists:".nrk-masthead__info-banner--cookie"}],detectPopup:[{exists:".nrk-masthead__info-banner--cookie"}],optIn:[{click:"div.nrk-masthead__info-banner--cookie button > span:has(+ svg.nrk-close)"}],optOut:[{hide:".nrk-masthead__info-banner--cookie"}]},{name:"obi.de",prehideSelectors:[".disc-cp--active"],detectCmp:[{exists:".disc-cp-modal__modal"}],detectPopup:[{visible:".disc-cp-modal__modal"}],optIn:[{click:".js-disc-cp-accept-all"}],optOut:[{click:".js-disc-cp-deny-all"}]},{name:"om",vendorUrl:"https://olli-machts.de/en/extension/cookie-manager",prehideSelectors:[".tx-om-cookie-consent"],detectCmp:[{exists:".tx-om-cookie-consent .active[data-omcookie-panel]"}],detectPopup:[{exists:".tx-om-cookie-consent .active[data-omcookie-panel]"}],optIn:[{waitForThenClick:"[data-omcookie-panel-save=all]"}],optOut:[{if:{exists:"[data-omcookie-panel-save=min]"},then:[{waitForThenClick:"[data-omcookie-panel-save=min]"}],else:[{click:"input[data-omcookie-panel-grp]:checked:not(:disabled)",all:!0,optional:!0},{waitForThenClick:"[data-omcookie-panel-save=save]"}]}]},{name:"onlyFans.com",prehideSelectors:["div.b-cookies-informer"],detectCmp:[{exists:"div.b-cookies-informer"}],detectPopup:[{exists:"div.b-cookies-informer"}],optIn:[{click:"div.b-cookies-informer__nav > button:nth-child(2)"}],optOut:[{click:"div.b-cookies-informer__nav > button:nth-child(1)"},{click:'div.b-cookies-informer__switchers > div:nth-child(2) > div[at-attr="checkbox"] > span.b-input-radio__container > input[type="checkbox"]'},{click:"div.b-cookies-informer__nav > button"}]},{name:"openli",vendorUrl:"https://openli.com",prehideSelectors:[".legalmonster-cleanslate"],detectCmp:[{exists:".legalmonster-cleanslate"}],detectPopup:[{visible:".legalmonster-cleanslate #lm-cookie-wall-container",check:"any"}],optIn:[{waitForThenClick:"#lm-accept-all"}],optOut:[{waitForThenClick:"#lm-accept-necessary"}]},{name:"opera.com",vendorUrl:"https://unknown",cosmetic:!1,runContext:{main:!0,frame:!1},intermediate:!1,prehideSelectors:[],detectCmp:[{exists:"#cookie-consent .manage-cookies__btn"}],detectPopup:[{visible:"#cookie-consent .cookie-basic-consent__btn"}],optIn:[{waitForThenClick:"#cookie-consent .cookie-basic-consent__btn"}],optOut:[{waitForThenClick:"#cookie-consent .manage-cookies__btn"},{waitForThenClick:"#cookie-consent .active.marketing_option_switch.cookie-consent__switch",all:!0},{waitForThenClick:"#cookie-consent .cookie-selection__btn"}],test:[{eval:"EVAL_OPERA_0"}]},{name:"osano",prehideSelectors:[".osano-cm-window,.osano-cm-dialog"],detectCmp:[{exists:".osano-cm-window"}],detectPopup:[{visible:".osano-cm-dialog"}],optIn:[{click:".osano-cm-accept-all",optional:!0}],optOut:[{waitForThenClick:".osano-cm-denyAll"}]},{name:"otto.de",prehideSelectors:[".cookieBanner--visibility"],detectCmp:[{exists:".cookieBanner--visibility"}],detectPopup:[{visible:".cookieBanner__wrapper"}],optIn:[{click:".js_cookieBannerPermissionButton"}],optOut:[{click:".js_cookieBannerProhibitionButton"}]},{name:"ourworldindata",vendorUrl:"https://ourworldindata.org/",runContext:{urlPattern:"^https://ourworldindata\\.org/"},prehideSelectors:[".cookie-manager"],detectCmp:[{exists:".cookie-manager"}],detectPopup:[{visible:".cookie-manager .cookie-notice.open"}],optIn:[{waitForThenClick:".cookie-notice [data-test=accept]"}],optOut:[{waitForThenClick:".cookie-notice [data-test=reject]"}]},{name:"pabcogypsum",vendorUrl:"https://unknown",prehideSelectors:[".js-cookie-notice:has(#cookie_settings-form)"],detectCmp:[{exists:".js-cookie-notice #cookie_settings-form"}],detectPopup:[{visible:".js-cookie-notice #cookie_settings-form"}],optIn:[{waitForThenClick:".js-cookie-notice button[value=allow]"}],optOut:[{waitForThenClick:".js-cookie-notice button[value=disable]"}]},{name:"paypal-us",prehideSelectors:["#ccpaCookieContent_wrapper, article.ppvx_modal--overpanel"],detectCmp:[{exists:"#ccpaCookieBanner, .privacy-sheet-content"}],detectPopup:[{exists:"#ccpaCookieBanner, .privacy-sheet-content"}],optIn:[{click:"#acceptAllButton"}],optOut:[{if:{exists:"a#manageCookiesLink"},then:[{click:"a#manageCookiesLink"}],else:[{waitForVisible:".privacy-sheet-content #formContent"},{click:"#formContent .cookiepref-11m2iee-checkbox_base input:checked",all:!0,optional:!0},{click:".confirmCookie #submitCookiesBtn"}]}]},{name:"paypal.com",prehideSelectors:["#gdprCookieBanner"],detectCmp:[{exists:"#gdprCookieBanner"}],detectPopup:[{visible:"#gdprCookieContent_wrapper"}],optIn:[{click:"#acceptAllButton"}],optOut:[{wait:200},{click:".gdprCookieBanner_decline-button"}],test:[{wait:500},{eval:"EVAL_PAYPAL_0"}]},{name:"pinetools.com",cosmetic:!0,prehideSelectors:["#aviso_cookies"],detectCmp:[{exists:"#aviso_cookies"}],detectPopup:[{exists:".lang_en #aviso_cookies"}],optIn:[{click:"#aviso_cookies .a_boton_cerrar"}],optOut:[{hide:"#aviso_cookies"}]},{name:"pmc",cosmetic:!0,prehideSelectors:["#pmc-pp-tou--notice"],detectCmp:[{exists:"#pmc-pp-tou--notice"}],detectPopup:[{visible:"#pmc-pp-tou--notice"}],optIn:[{click:"span.pmc-pp-tou--notice-close-btn"}],optOut:[{hide:"#pmc-pp-tou--notice"}]},{name:"pornhub.com",runContext:{urlPattern:"^https://(www\\.)?pornhub\\.com/"},cosmetic:!0,prehideSelectors:[".cookiesBanner"],detectCmp:[{exists:".cookiesBanner"}],detectPopup:[{visible:".cookiesBanner"}],optIn:[{click:".cookiesBanner .okButton"}],optOut:[{hide:".cookiesBanner"}]},{name:"pornpics.com",cosmetic:!0,prehideSelectors:["#cookie-contract"],detectCmp:[{exists:"#cookie-contract"}],detectPopup:[{visible:"#cookie-contract"}],optIn:[{click:"#cookie-contract .icon-cross"}],optOut:[{hide:"#cookie-contract"}]},{name:"PrimeBox CookieBar",prehideSelectors:["#cookie-bar"],detectCmp:[{exists:"#cookie-bar .cb-enable,#cookie-bar .cb-disable,#cookie-bar .cb-policy"}],detectPopup:[{visible:"#cookie-bar .cb-enable,#cookie-bar .cb-disable,#cookie-bar .cb-policy",check:"any"}],optIn:[{waitForThenClick:"#cookie-bar .cb-enable"}],optOut:[{click:"#cookie-bar .cb-disable",optional:!0},{hide:"#cookie-bar"}],test:[{eval:"EVAL_PRIMEBOX_0"}]},{name:"privacymanager.io",prehideSelectors:["#gdpr-consent-tool-wrapper",'iframe[src^="https://cmp-consent-tool.privacymanager.io"]'],runContext:{urlPattern:"^https://cmp-consent-tool\\.privacymanager\\.io/",main:!1,frame:!0},detectCmp:[{exists:"button#save"}],detectPopup:[{visible:"button#save"}],optIn:[{click:"button#save"}],optOut:[{if:{exists:"#denyAll"},then:[{click:"#denyAll"},{waitForThenClick:".okButton"}],else:[{waitForThenClick:"#manageSettings"},{waitFor:".purposes-overview-list"},{waitFor:"button#saveAndExit"},{click:"span[role=checkbox][aria-checked=true]",all:!0,optional:!0},{click:"button#saveAndExit"}]}]},{name:"productz.com",vendorUrl:"https://productz.com/",runContext:{urlPattern:"^https://productz\\.com/"},prehideSelectors:[],detectCmp:[{exists:".c-modal.is-active"}],detectPopup:[{visible:".c-modal.is-active"}],optIn:[{waitForThenClick:".c-modal.is-active .is-accept"}],optOut:[{waitForThenClick:".c-modal.is-active .is-dismiss"}]},{name:"pubtech",prehideSelectors:["#pubtech-cmp"],detectCmp:[{exists:"#pubtech-cmp"}],detectPopup:[{visible:"#pubtech-cmp #pt-actions"}],optIn:[{if:{exists:"#pt-accept-all"},then:[{click:"#pubtech-cmp #pt-actions #pt-accept-all"}],else:[{click:"#pubtech-cmp #pt-actions button:nth-of-type(2)"}]}],optOut:[{click:"#pubtech-cmp #pt-close"}],test:[{eval:"EVAL_PUBTECH_0"}]},{name:"quantcast",prehideSelectors:["#qc-cmp2-main,#qc-cmp2-container"],detectCmp:[{exists:"#qc-cmp2-container"}],detectPopup:[{visible:"#qc-cmp2-ui"}],optOut:[{click:'.qc-cmp2-summary-buttons > button[mode="secondary"]'},{waitFor:"#qc-cmp2-ui"},{click:'.qc-cmp2-toggle-switch > button[aria-checked="true"]',all:!0,optional:!0},{click:'.qc-cmp2-main button[aria-label="REJECT ALL"]',optional:!0},{waitForThenClick:'.qc-cmp2-main button[aria-label="SAVE & EXIT"],.qc-cmp2-buttons-desktop > button[mode="primary"]',timeout:5e3}],optIn:[{click:'.qc-cmp2-summary-buttons > button[mode="primary"]'}]},{name:"reddit.com",runContext:{urlPattern:"^https://www\\.reddit\\.com/"},prehideSelectors:["[bundlename=reddit_cookie_banner]"],detectCmp:[{exists:"reddit-cookie-banner"}],detectPopup:[{visible:"reddit-cookie-banner"}],optIn:[{waitForThenClick:["reddit-cookie-banner","#accept-all-cookies-button > button"]}],optOut:[{waitForThenClick:["reddit-cookie-banner","#reject-nonessential-cookies-button > button"]}],test:[{eval:"EVAL_REDDIT_0"}]},{name:"rog-forum.asus.com",runContext:{urlPattern:"^https://rog-forum\\.asus\\.com/"},prehideSelectors:["#cookie-policy-info"],detectCmp:[{exists:"#cookie-policy-info"}],detectPopup:[{visible:"#cookie-policy-info"}],optIn:[{click:'div.cookie-btn-box > div[aria-label="Accept"]'}],optOut:[{click:'div.cookie-btn-box > div[aria-label="Reject"]'},{waitForThenClick:'.cookie-policy-lightbox-bottom > div[aria-label="Save Settings"]'}]},{name:"roofingmegastore.co.uk",runContext:{urlPattern:"^https://(www\\.)?roofingmegastore\\.co\\.uk"},prehideSelectors:["#m-cookienotice"],detectCmp:[{exists:"#m-cookienotice"}],detectPopup:[{visible:"#m-cookienotice"}],optIn:[{click:"#accept-cookies"}],optOut:[{click:"#manage-cookies"},{waitForThenClick:"#accept-selected"}]},{name:"samsung.com",runContext:{urlPattern:"^https://www\\.samsung\\.com/"},cosmetic:!0,prehideSelectors:["div.cookie-bar"],detectCmp:[{exists:"div.cookie-bar"}],detectPopup:[{visible:"div.cookie-bar"}],optIn:[{click:"div.cookie-bar__manage > a"}],optOut:[{hide:"div.cookie-bar"}]},{name:"setapp.com",vendorUrl:"https://setapp.com/",cosmetic:!0,runContext:{urlPattern:"^https://setapp\\.com/"},prehideSelectors:[],detectCmp:[{exists:".cookie-banner.js-cookie-banner"}],detectPopup:[{visible:".cookie-banner.js-cookie-banner"}],optIn:[{waitForThenClick:".cookie-banner.js-cookie-banner button"}],optOut:[{hide:".cookie-banner.js-cookie-banner"}]},{name:"sibbo",prehideSelectors:["sibbo-cmp-layout"],detectCmp:[{exists:"sibbo-cmp-layout"}],detectPopup:[{visible:"sibbo-cmp-layout"}],optIn:[{click:"sibbo-cmp-layout [data-accept-all]"}],optOut:[{click:'.sibbo-panel__aside__buttons a[data-nav="purposes"]'},{click:'.sibbo-panel__main__header__actions a[data-focusable="reject-all"]'},{if:{exists:"[data-view=purposes] .sibbo-panel__main__footer__actions [data-save-and-exit]"},then:[],else:[{waitFor:'.sibbo-panel__main__footer__actions a[data-focusable="next"]:not(.sibbo-cmp-button--disabled)'},{click:'.sibbo-panel__main__footer__actions a[data-focusable="next"]'},{click:'.sibbo-panel__main div[data-view="purposesLegInt"] a[data-focusable="reject-all"]'}]},{waitFor:".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"},{click:".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"}],test:[{eval:"EVAL_SIBBO_0"}]},{name:"similarweb.com",cosmetic:!0,prehideSelectors:[".app-cookies-notification"],detectCmp:[{exists:".app-cookies-notification"}],detectPopup:[{exists:".app-layout .app-cookies-notification"}],optIn:[{click:"button.app-cookies-notification__dismiss"}],optOut:[{hide:".app-layout .app-cookies-notification"}]},{name:"Sirdata",cosmetic:!1,prehideSelectors:["#sd-cmp"],detectCmp:[{exists:"#sd-cmp"}],detectPopup:[{visible:"#sd-cmp"}],optIn:[{waitForThenClick:"#sd-cmp .sd-cmp-3cRQ2"}],optOut:[{waitForThenClick:["#sd-cmp","xpath///span[contains(., 'Do not accept') or contains(., 'Acceptera inte') or contains(., 'No aceptar') or contains(., 'Ikke acceptere') or contains(., 'Nicht akzeptieren') or contains(., 'Не приемам') or contains(., 'Να μην γίνει αποδοχή') or contains(., 'Niet accepteren') or contains(., 'Nepřijímat') or contains(., 'Nie akceptuj') or contains(., 'Nu acceptați') or contains(., 'Não aceitar') or contains(., 'Continuer sans accepter') or contains(., 'Non accettare') or contains(., 'Nem fogad el')]"]}]},{name:"snigel",detectCmp:[{exists:".snigel-cmp-framework"}],detectPopup:[{visible:".snigel-cmp-framework"}],optOut:[{click:"#sn-b-custom"},{click:"#sn-b-save"}],test:[{eval:"EVAL_SNIGEL_0"}],optIn:[{click:".snigel-cmp-framework #accept-choices"}]},{name:"steampowered.com",detectCmp:[{exists:".cookiepreferences_popup"},{visible:".cookiepreferences_popup"}],detectPopup:[{visible:".cookiepreferences_popup"}],optOut:[{click:"#rejectAllButton"}],optIn:[{click:"#acceptAllButton"}],test:[{wait:1e3},{eval:"EVAL_STEAMPOWERED_0"}]},{name:"strato.de",prehideSelectors:["#cookie_initial_modal",".modal-backdrop"],runContext:{urlPattern:"^https://www\\.strato\\.de/"},detectCmp:[{exists:"#cookie_initial_modal"}],detectPopup:[{visible:"#cookie_initial_modal"}],optIn:[{click:"button#jss_consent_all_initial_modal"}],optOut:[{click:"button#jss_open_settings_modal"},{click:"button#jss_consent_checked"}]},{name:"svt.se",vendorUrl:"https://www.svt.se/",runContext:{urlPattern:"^https://www\\.svt\\.se/"},prehideSelectors:["[class*=CookieConsent__root___]"],detectCmp:[{exists:"[class*=CookieConsent__root___]"}],detectPopup:[{visible:"[class*=CookieConsent__modal___]"}],optIn:[{waitForThenClick:"[class*=CookieConsent__modal___] > div > button[class*=primary]"}],optOut:[{waitForThenClick:"[class*=CookieConsent__modal___] > div > button[class*=secondary]:nth-child(2)"}],test:[{eval:"EVAL_SVT_TEST"}]},{name:"takealot.com",cosmetic:!0,prehideSelectors:['div[class^="cookies-banner-module_"]'],detectCmp:[{exists:'div[class^="cookies-banner-module_cookie-banner_"]'}],detectPopup:[{exists:'div[class^="cookies-banner-module_cookie-banner_"]'}],optIn:[{click:'button[class*="cookies-banner-module_dismiss-button_"]'}],optOut:[{hide:'div[class^="cookies-banner-module_"]'},{if:{exists:'div[class^="cookies-banner-module_small-cookie-banner_"]'},then:[{eval:"EVAL_TAKEALOT_0"}],else:[]}]},{name:"tarteaucitron.js",prehideSelectors:["#tarteaucitronRoot"],detectCmp:[{exists:"#tarteaucitronRoot"}],detectPopup:[{visible:"#tarteaucitronRoot #tarteaucitronAlertSmall,#tarteaucitronRoot #tarteaucitronAlertBig",check:"any"}],optIn:[{eval:"EVAL_TARTEAUCITRON_1"}],optOut:[{eval:"EVAL_TARTEAUCITRON_0"}],test:[{eval:"EVAL_TARTEAUCITRON_2",comment:"sometimes there are required categories, so we check that at least something is false"}]},{name:"taunton",vendorUrl:"https://www.taunton.com/",prehideSelectors:["#taunton-user-consent__overlay"],detectCmp:[{exists:"#taunton-user-consent__overlay"}],detectPopup:[{exists:"#taunton-user-consent__overlay:not([aria-hidden=true])"}],optIn:[{click:"#taunton-user-consent__toolbar input[type=checkbox]:not(:checked)"},{click:"#taunton-user-consent__toolbar button[type=submit]"}],optOut:[{click:"#taunton-user-consent__toolbar input[type=checkbox]:checked",optional:!0,all:!0},{click:"#taunton-user-consent__toolbar button[type=submit]"}],test:[{eval:"EVAL_TAUNTON_TEST"}]},{name:"Tealium",prehideSelectors:["#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal,#consent-layer"],detectCmp:[{exists:"#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *"},{eval:"EVAL_TEALIUM_0"}],detectPopup:[{visible:"#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *",check:"any"}],optOut:[{eval:"EVAL_TEALIUM_1"},{eval:"EVAL_TEALIUM_DONOTSELL"},{hide:"#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal"},{waitForThenClick:"#cm-acceptNone,.js-accept-essential-cookies",timeout:1e3,optional:!0}],optIn:[{hide:"#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs"},{eval:"EVAL_TEALIUM_2"}],test:[{eval:"EVAL_TEALIUM_3"},{eval:"EVAL_TEALIUM_DONOTSELL_CHECK"},{visible:"#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs",check:"none"}]},{name:"temu",vendorUrl:"https://temu.com",runContext:{urlPattern:"^https://[^/]*temu\\.com/"},prehideSelectors:["._2d-8vq-W,._1UdBUwni"],detectCmp:[{exists:"._3YCsmIaS"}],detectPopup:[{visible:"._3YCsmIaS"}],optIn:[{waitForThenClick:"._3fKiu5wx._3zN5SumS._3tAK973O.IYOfhWEs.VGNGF1pA"}],optOut:[{waitForThenClick:"._3fKiu5wx._1_XToJBF._3tAK973O.IYOfhWEs.VGNGF1pA"}]},{name:"Termly",prehideSelectors:["#termly-code-snippet-support"],detectCmp:[{exists:"#termly-code-snippet-support"}],detectPopup:[{visible:"#termly-code-snippet-support div"}],optIn:[{waitForThenClick:'[data-tid="banner-accept"]'}],optOut:[{if:{exists:'[data-tid="banner-decline"]'},then:[{click:'[data-tid="banner-decline"]'}],else:[{click:".t-preference-button"},{wait:500},{if:{exists:".t-declineAllButton"},then:[{click:".t-declineAllButton"}],else:[{waitForThenClick:".t-preference-modal input[type=checkbox][checked]:not([disabled])",all:!0},{waitForThenClick:".t-saveButton"}]}]}]},{name:"termsfeed",vendorUrl:"https://termsfeed.com",comment:"v4.x.x",prehideSelectors:[".termsfeed-com---nb"],detectCmp:[{exists:".termsfeed-com---nb"}],detectPopup:[{visible:".termsfeed-com---nb"}],optIn:[{waitForThenClick:".cc-nb-okagree"}],optOut:[{waitForThenClick:".cc-nb-reject"}]},{name:"termsfeed3",vendorUrl:"https://termsfeed.com",comment:"v3.x.x",cosmetic:!0,prehideSelectors:[".cc_dialog.cc_css_reboot"],detectCmp:[{exists:".cc_dialog.cc_css_reboot"}],detectPopup:[{visible:".cc_dialog.cc_css_reboot"}],optIn:[{waitForThenClick:".cc_dialog.cc_css_reboot .cc_b_ok"}],optOut:[{hide:".cc_dialog.cc_css_reboot"}]},{name:"Test page cosmetic CMP",cosmetic:!0,prehideSelectors:["#privacy-test-page-cmp-test-prehide"],detectCmp:[{exists:"#privacy-test-page-cmp-test-banner"}],detectPopup:[{visible:"#privacy-test-page-cmp-test-banner"}],optIn:[{waitFor:"#accept-all"},{click:"#accept-all"}],optOut:[{hide:"#privacy-test-page-cmp-test-banner"}],test:[{wait:500},{eval:"EVAL_TESTCMP_COSMETIC_0"}]},{name:"Test page CMP",prehideSelectors:["#reject-all"],detectCmp:[{exists:"#privacy-test-page-cmp-test"}],detectPopup:[{visible:"#privacy-test-page-cmp-test"}],optIn:[{waitFor:"#accept-all"},{click:"#accept-all"}],optOut:[{waitFor:"#reject-all"},{click:"#reject-all"}],test:[{eval:"EVAL_TESTCMP_0"}]},{name:"thalia.de",prehideSelectors:[".consent-banner-box"],detectCmp:[{exists:"consent-banner[component=consent-banner]"}],detectPopup:[{visible:".consent-banner-box"}],optIn:[{click:".button-zustimmen"}],optOut:[{click:"button[data-consent=disagree]"}]},{name:"thefreedictionary.com",prehideSelectors:["#cmpBanner"],detectCmp:[{exists:"#cmpBanner"}],detectPopup:[{visible:"#cmpBanner"}],optIn:[{eval:"EVAL_THEFREEDICTIONARY_1"}],optOut:[{eval:"EVAL_THEFREEDICTIONARY_0"}]},{name:"theverge",runContext:{frame:!1,main:!0,urlPattern:"^https://(www)?\\.theverge\\.com"},intermediate:!1,prehideSelectors:[".duet--cta--cookie-banner"],detectCmp:[{exists:".duet--cta--cookie-banner"}],detectPopup:[{visible:".duet--cta--cookie-banner"}],optIn:[{click:".duet--cta--cookie-banner button.tracking-12",all:!1}],optOut:[{click:".duet--cta--cookie-banner button.tracking-12 > span"}],test:[{eval:"EVAL_THEVERGE_0"}]},{name:"tidbits-com",cosmetic:!0,prehideSelectors:["#eu_cookie_law_widget-2"],detectCmp:[{exists:"#eu_cookie_law_widget-2"}],detectPopup:[{visible:"#eu_cookie_law_widget-2"}],optIn:[{click:"#eu-cookie-law form > input.accept"}],optOut:[{hide:"#eu_cookie_law_widget-2"}]},{name:"tractor-supply",runContext:{urlPattern:"^https://www\\.tractorsupply\\.com/"},cosmetic:!0,prehideSelectors:[".tsc-cookie-banner"],detectCmp:[{exists:".tsc-cookie-banner"}],detectPopup:[{visible:".tsc-cookie-banner"}],optIn:[{click:"#cookie-banner-cancel"}],optOut:[{hide:".tsc-cookie-banner"}]},{name:"trader-joes-com",cosmetic:!0,prehideSelectors:['div.aem-page > div[class^="CookiesAlert_cookiesAlert__"]'],detectCmp:[{exists:'div.aem-page > div[class^="CookiesAlert_cookiesAlert__"]'}],detectPopup:[{visible:'div.aem-page > div[class^="CookiesAlert_cookiesAlert__"]'}],optIn:[{click:'div[class^="CookiesAlert_cookiesAlert__container__"] button'}],optOut:[{hide:'div.aem-page > div[class^="CookiesAlert_cookiesAlert__"]'}]},{name:"transcend",vendorUrl:"https://unknown",cosmetic:!0,prehideSelectors:["#transcend-consent-manager"],detectCmp:[{exists:"#transcend-consent-manager"}],detectPopup:[{visible:"#transcend-consent-manager"}],optIn:[{waitForThenClick:["#transcend-consent-manager","#consentManagerMainDialog .inner-container button"]}],optOut:[{hide:"#transcend-consent-manager"}]},{name:"transip-nl",runContext:{urlPattern:"^https://www\\.transip\\.nl/"},prehideSelectors:["#consent-modal"],detectCmp:[{any:[{exists:"#consent-modal"},{exists:"#privacy-settings-content"}]}],detectPopup:[{any:[{visible:"#consent-modal"},{visible:"#privacy-settings-content"}]}],optIn:[{click:'button[type="submit"]'}],optOut:[{if:{exists:"#privacy-settings-content"},then:[{click:'button[type="submit"]'}],else:[{click:"div.one-modal__action-footer-column--secondary > a"}]}]},{name:"tropicfeel-com",prehideSelectors:["#shopify-section-cookies-controller"],detectCmp:[{exists:"#shopify-section-cookies-controller"}],detectPopup:[{visible:"#shopify-section-cookies-controller #cookies-controller-main-pane",check:"any"}],optIn:[{waitForThenClick:"#cookies-controller-main-pane form[data-form-allow-all] button"}],optOut:[{click:"#cookies-controller-main-pane a[data-tab-target=manage-cookies]"},{waitFor:"#manage-cookies-pane.active"},{click:"#manage-cookies-pane.active input[type=checkbox][checked]:not([disabled])",all:!0},{click:"#manage-cookies-pane.active button[type=submit]"}],test:[]},{name:"true-car",runContext:{urlPattern:"^https://www\\.truecar\\.com/"},cosmetic:!0,prehideSelectors:[['div[aria-labelledby="cookie-banner-heading"]']],detectCmp:[{exists:'div[aria-labelledby="cookie-banner-heading"]'}],detectPopup:[{visible:'div[aria-labelledby="cookie-banner-heading"]'}],optIn:[{click:'div[aria-labelledby="cookie-banner-heading"] > button[aria-label="Close"]'}],optOut:[{hide:'div[aria-labelledby="cookie-banner-heading"]'}]},{name:"truyo",prehideSelectors:["#truyo-consent-module"],detectCmp:[{exists:"#truyo-cookieBarContent"}],detectPopup:[{visible:"#truyo-consent-module"}],optIn:[{click:"button#acceptAllCookieButton"}],optOut:[{click:"button#declineAllCookieButton"}]},{name:"tumblr-com",cosmetic:!0,prehideSelectors:["#cmp-app-container"],detectCmp:[{exists:"#cmp-app-container"}],detectPopup:[{visible:"#cmp-app-container"}],optIn:[{click:"#tumblr #cmp-app-container div.components-modal__frame > iframe > html body > div > div > div.cmp__dialog-footer > div > button.components-button.white-space-normal.is-primary"}],optOut:[{hide:"#cmp-app-container"}]},{name:"twitch-mobile",vendorUrl:"https://m.twitch.tv/",cosmetic:!0,runContext:{urlPattern:"^https?://m\\.twitch\\.tv"},prehideSelectors:[],detectCmp:[{exists:'.ReactModal__Overlay [href="https://www.twitch.tv/p/cookie-policy"]'}],detectPopup:[{visible:'.ReactModal__Overlay [href="https://www.twitch.tv/p/cookie-policy"]'}],optIn:[{waitForThenClick:'.ReactModal__Overlay:has([href="https://www.twitch.tv/p/cookie-policy"]) button'}],optOut:[{hide:'.ReactModal__Overlay:has([href="https://www.twitch.tv/p/cookie-policy"])'}]},{name:"twitch.tv",runContext:{urlPattern:"^https?://(www\\.)?twitch\\.tv"},prehideSelectors:["div:has(> .consent-banner .consent-banner__content--gdpr-v2),.ReactModalPortal:has([data-a-target=consent-modal-save])"],detectCmp:[{exists:".consent-banner .consent-banner__content--gdpr-v2"}],detectPopup:[{visible:".consent-banner .consent-banner__content--gdpr-v2"}],optIn:[{click:'button[data-a-target="consent-banner-accept"]'}],optOut:[{hide:"div:has(> .consent-banner .consent-banner__content--gdpr-v2)"},{click:'button[data-a-target="consent-banner-manage-preferences"]'},{waitFor:"input[type=checkbox][data-a-target=tw-checkbox]"},{click:"input[type=checkbox][data-a-target=tw-checkbox][checked]:not([disabled])",all:!0,optional:!0},{waitForThenClick:"[data-a-target=consent-modal-save]"},{waitForVisible:".ReactModalPortal:has([data-a-target=consent-modal-save])",check:"none"}]},{name:"twitter",runContext:{urlPattern:"^https://([a-z0-9-]+\\.)?twitter\\.com/"},prehideSelectors:['[data-testid="BottomBar"]'],detectCmp:[{exists:'[data-testid="BottomBar"] div'}],detectPopup:[{visible:'[data-testid="BottomBar"] div'}],optIn:[{waitForThenClick:'[data-testid="BottomBar"] > div:has(>div:first-child>div:last-child>span[role=button]) > div:last-child > div[role=button]:first-child'}],optOut:[{waitForThenClick:'[data-testid="BottomBar"] > div:has(>div:first-child>div:last-child>span[role=button]) > div:last-child > div[role=button]:last-child'}],TODOtest:[{eval:"EVAL_document.cookie.includes('d_prefs=MjoxLGNvbnNlbnRfdmVyc2lvbjoy')"}]},{name:"ubuntu.com",prehideSelectors:["dialog.cookie-policy"],detectCmp:[{any:[{exists:"dialog.cookie-policy header"},{exists:'xpath///*[@id="modal"]/div/header'}]}],detectPopup:[{any:[{visible:"dialog header"},{visible:'xpath///*[@id="modal"]/div/header'}]}],optIn:[{any:[{waitForThenClick:"#cookie-policy-button-accept"},{waitForThenClick:'xpath///*[@id="cookie-policy-button-accept"]'}]}],optOut:[{any:[{waitForThenClick:"button.js-manage"},{waitForThenClick:'xpath///*[@id="cookie-policy-content"]/p[4]/button[2]'}]},{waitForThenClick:"dialog.cookie-policy .p-switch__input:checked",optional:!0,all:!0,timeout:500},{any:[{waitForThenClick:"dialog.cookie-policy .js-save-preferences"},{waitForThenClick:'xpath///*[@id="modal"]/div/button'}]}],test:[{eval:"EVAL_UBUNTU_COM_0"}]},{name:"UK Cookie Consent",prehideSelectors:["#catapult-cookie-bar"],cosmetic:!0,detectCmp:[{exists:"#catapult-cookie-bar"}],detectPopup:[{exists:".has-cookie-bar #catapult-cookie-bar"}],optIn:[{click:"#catapultCookie"}],optOut:[{hide:"#catapult-cookie-bar"}],test:[{eval:"EVAL_UK_COOKIE_CONSENT_0"}]},{name:"urbanarmorgear-com",cosmetic:!0,prehideSelectors:['div[class^="Layout__CookieBannerContainer-"]'],detectCmp:[{exists:'div[class^="Layout__CookieBannerContainer-"]'}],detectPopup:[{visible:'div[class^="Layout__CookieBannerContainer-"]'}],optIn:[{click:'button[class^="CookieBanner__AcceptButton"]'}],optOut:[{hide:'div[class^="Layout__CookieBannerContainer-"]'}]},{name:"usercentrics-api",detectCmp:[{exists:"#usercentrics-root"}],detectPopup:[{eval:"EVAL_USERCENTRICS_API_0"},{exists:["#usercentrics-root","[data-testid=uc-container]"]},{waitForVisible:"#usercentrics-root",timeout:2e3}],optIn:[{eval:"EVAL_USERCENTRICS_API_3"},{eval:"EVAL_USERCENTRICS_API_1"},{eval:"EVAL_USERCENTRICS_API_5"}],optOut:[{eval:"EVAL_USERCENTRICS_API_1"},{eval:"EVAL_USERCENTRICS_API_2"}],test:[{eval:"EVAL_USERCENTRICS_API_6"}]},{name:"usercentrics-button",detectCmp:[{exists:"#usercentrics-button"}],detectPopup:[{visible:"#usercentrics-button #uc-btn-accept-banner"}],optIn:[{click:"#usercentrics-button #uc-btn-accept-banner"}],optOut:[{click:"#usercentrics-button #uc-btn-deny-banner"}],test:[{eval:"EVAL_USERCENTRICS_BUTTON_0"}]},{name:"uswitch.com",prehideSelectors:["#cookie-banner-wrapper"],detectCmp:[{exists:"#cookie-banner-wrapper"}],detectPopup:[{visible:"#cookie-banner-wrapper"}],optIn:[{click:"#cookie_banner_accept_mobile"}],optOut:[{click:"#cookie_banner_save"}]},{name:"vodafone.de",runContext:{urlPattern:"^https://www\\.vodafone\\.de/"},prehideSelectors:[".dip-consent,.dip-consent-container"],detectCmp:[{exists:".dip-consent-container"}],detectPopup:[{visible:".dip-consent-content"}],optOut:[{click:'.dip-consent-btn[tabindex="2"]'}],optIn:[{click:'.dip-consent-btn[tabindex="1"]'}]},{name:"waitrose.com",prehideSelectors:["div[aria-labelledby=CookieAlertModalHeading]","section[data-test=initial-waitrose-cookie-consent-banner]","section[data-test=cookie-consent-modal]"],detectCmp:[{exists:"section[data-test=initial-waitrose-cookie-consent-banner]"}],detectPopup:[{visible:"section[data-test=initial-waitrose-cookie-consent-banner]"}],optIn:[{click:"button[data-test=accept-all]"}],optOut:[{click:"button[data-test=manage-cookies]"},{wait:200},{eval:"EVAL_WAITROSE_0"},{click:"button[data-test=submit]"}],test:[{eval:"EVAL_WAITROSE_1"}]},{name:"webflow",vendorUrl:"https://webflow.com/",prehideSelectors:[".fs-cc-components"],detectCmp:[{exists:".fs-cc-components"}],detectPopup:[{visible:".fs-cc-components"},{visible:"[fs-cc=banner]"}],optIn:[{wait:500},{waitForThenClick:"[fs-cc=banner] [fs-cc=allow]"}],optOut:[{wait:500},{waitForThenClick:"[fs-cc=banner] [fs-cc=deny]"}]},{name:"wetransfer.com",detectCmp:[{exists:".welcome__cookie-notice"}],detectPopup:[{visible:".welcome__cookie-notice"}],optIn:[{click:".welcome__button--accept"}],optOut:[{click:".welcome__button--decline"}]},{name:"whitepages.com",runContext:{urlPattern:"^https://www\\.whitepages\\.com/"},cosmetic:!0,prehideSelectors:[".cookie-wrapper, .cookie-overlay"],detectCmp:[{exists:".cookie-wrapper"}],detectPopup:[{visible:".cookie-overlay"}],optIn:[{click:'button[aria-label="Got it"]'}],optOut:[{hide:".cookie-wrapper"}]},{name:"wolframalpha",vendorUrl:"https://www.wolframalpha.com",prehideSelectors:[],cosmetic:!0,runContext:{urlPattern:"^https://www\\.wolframalpha\\.com/"},detectCmp:[{exists:"section._a_yb"}],detectPopup:[{visible:"section._a_yb"}],optIn:[{waitForThenClick:"section._a_yb button"}],optOut:[{hide:"section._a_yb"}]},{name:"woo-commerce-com",prehideSelectors:[".wccom-comp-privacy-banner .wccom-privacy-banner"],detectCmp:[{exists:".wccom-comp-privacy-banner .wccom-privacy-banner"}],detectPopup:[{exists:".wccom-comp-privacy-banner .wccom-privacy-banner"}],optIn:[{click:".wccom-privacy-banner__content-buttons button.is-primary"}],optOut:[{click:".wccom-privacy-banner__content-buttons button.is-secondary"},{waitForThenClick:"input[type=checkbox][checked]:not([disabled])",all:!0},{click:"div.wccom-modal__footer > button"}]},{name:"WP Cookie Notice for GDPR",vendorUrl:"https://wordpress.org/plugins/gdpr-cookie-consent/",prehideSelectors:["#gdpr-cookie-consent-bar"],detectCmp:[{exists:"#gdpr-cookie-consent-bar"}],detectPopup:[{visible:"#gdpr-cookie-consent-bar"}],optIn:[{waitForThenClick:"#gdpr-cookie-consent-bar #cookie_action_accept"}],optOut:[{waitForThenClick:"#gdpr-cookie-consent-bar #cookie_action_reject"}],test:[{eval:"EVAL_WP_COOKIE_NOTICE_0"}]},{name:"wpcc",cosmetic:!0,prehideSelectors:[".wpcc-container"],detectCmp:[{exists:".wpcc-container"}],detectPopup:[{exists:".wpcc-container .wpcc-message"}],optIn:[{click:".wpcc-compliance .wpcc-btn"}],optOut:[{hide:".wpcc-container"}]},{name:"xe.com",vendorUrl:"https://www.xe.com/",runContext:{urlPattern:"^https://www\\.xe\\.com/"},prehideSelectors:["[class*=ConsentBanner]"],detectCmp:[{exists:"[class*=ConsentBanner]"}],detectPopup:[{visible:"[class*=ConsentBanner]"}],optIn:[{waitForThenClick:"[class*=ConsentBanner] .egnScw"}],optOut:[{wait:1e3},{waitForThenClick:"[class*=ConsentBanner] .frDWEu"},{waitForThenClick:"[class*=ConsentBanner] .hXIpFU"}],test:[{eval:"EVAL_XE_TEST"}]},{name:"xhamster-eu",prehideSelectors:[".cookies-modal"],detectCmp:[{exists:".cookies-modal"}],detectPopup:[{exists:".cookies-modal"}],optIn:[{click:"button.cmd-button-accept-all"}],optOut:[{click:"button.cmd-button-reject-all"}]},{name:"xhamster-us",runContext:{urlPattern:"^https://(www\\.)?xhamster\\d?\\.com"},cosmetic:!0,prehideSelectors:[".cookie-announce"],detectCmp:[{exists:".cookie-announce"}],detectPopup:[{visible:".cookie-announce .announce-text"}],optIn:[{click:".cookie-announce button.xh-button"}],optOut:[{hide:".cookie-announce"}]},{name:"xing.com",detectCmp:[{exists:"div[class^=cookie-consent-CookieConsent]"}],detectPopup:[{exists:"div[class^=cookie-consent-CookieConsent]"}],optIn:[{click:"#consent-accept-button"}],optOut:[{click:"#consent-settings-button"},{click:".consent-banner-button-accept-overlay"}],test:[{eval:"EVAL_XING_0"}]},{name:"xnxx-com",cosmetic:!0,prehideSelectors:["#cookies-use-alert"],detectCmp:[{exists:"#cookies-use-alert"}],detectPopup:[{visible:"#cookies-use-alert"}],optIn:[{click:"#cookies-use-alert .close"}],optOut:[{hide:"#cookies-use-alert"}]},{name:"xvideos",vendorUrl:"https://xvideos.com",runContext:{urlPattern:"^https://[^/]*xvideos\\.com/"},prehideSelectors:[],detectCmp:[{exists:".disclaimer-opened #disclaimer-cookies"}],detectPopup:[{visible:".disclaimer-opened #disclaimer-cookies"}],optIn:[{waitForThenClick:"#disclaimer-accept_cookies"}],optOut:[{waitForThenClick:"#disclaimer-reject_cookies"}]},{name:"Yahoo",runContext:{urlPattern:"^https://consent\\.yahoo\\.com/v2/"},prehideSelectors:["#reject-all"],detectCmp:[{exists:"#consent-page"}],detectPopup:[{visible:"#consent-page"}],optIn:[{waitForThenClick:"#consent-page button[value=agree]"}],optOut:[{waitForThenClick:"#consent-page button[value=reject]"}]},{name:"youporn.com",cosmetic:!0,prehideSelectors:[".euCookieModal, #js_euCookieModal"],detectCmp:[{exists:".euCookieModal"}],detectPopup:[{exists:".euCookieModal, #js_euCookieModal"}],optIn:[{click:'button[name="user_acceptCookie"]'}],optOut:[{hide:".euCookieModal"}]},{name:"youtube-desktop",prehideSelectors:["tp-yt-iron-overlay-backdrop.opened","ytd-consent-bump-v2-lightbox"],detectCmp:[{exists:"ytd-consent-bump-v2-lightbox tp-yt-paper-dialog"},{exists:'ytd-consent-bump-v2-lightbox tp-yt-paper-dialog a[href^="https://consent.youtube.com/"]'}],detectPopup:[{visible:"ytd-consent-bump-v2-lightbox tp-yt-paper-dialog"}],optIn:[{waitForThenClick:"ytd-consent-bump-v2-lightbox .eom-buttons .eom-button-row:first-child ytd-button-renderer:last-child #button,ytd-consent-bump-v2-lightbox .eom-buttons .eom-button-row:first-child ytd-button-renderer:last-child button"},{wait:500}],optOut:[{waitForThenClick:"ytd-consent-bump-v2-lightbox .eom-buttons .eom-button-row:first-child ytd-button-renderer:first-child #button,ytd-consent-bump-v2-lightbox .eom-buttons .eom-button-row:first-child ytd-button-renderer:first-child button"},{wait:500}],test:[{wait:500},{eval:"EVAL_YOUTUBE_DESKTOP_0"}]},{name:"youtube-mobile",prehideSelectors:[".consent-bump-v2-lightbox"],detectCmp:[{exists:"ytm-consent-bump-v2-renderer"}],detectPopup:[{visible:"ytm-consent-bump-v2-renderer"}],optIn:[{waitForThenClick:"ytm-consent-bump-v2-renderer .privacy-terms + .one-col-dialog-buttons c3-material-button:first-child button, ytm-consent-bump-v2-renderer .privacy-terms + .one-col-dialog-buttons ytm-button-renderer:first-child button"},{wait:500}],optOut:[{waitForThenClick:"ytm-consent-bump-v2-renderer .privacy-terms + .one-col-dialog-buttons c3-material-button:nth-child(2) button, ytm-consent-bump-v2-renderer .privacy-terms + .one-col-dialog-buttons ytm-button-renderer:nth-child(2) button"},{wait:500}],test:[{wait:500},{eval:"EVAL_YOUTUBE_MOBILE_0"}]},{name:"zdf",prehideSelectors:["#zdf-cmp-banner-sdk"],detectCmp:[{exists:"#zdf-cmp-banner-sdk"}],detectPopup:[{visible:"#zdf-cmp-main.zdf-cmp-show"}],optIn:[{waitForThenClick:"#zdf-cmp-main #zdf-cmp-accept-btn"}],optOut:[{waitForThenClick:"#zdf-cmp-main #zdf-cmp-deny-btn"}],test:[]}],C={"didomi.io":{detectors:[{presentMatcher:{target:{selector:"#didomi-host, #didomi-notice"},type:"css"},showingMatcher:{target:{selector:"body.didomi-popup-open, .didomi-notice-banner"},type:"css"}}],methods:[{action:{target:{selector:".didomi-popup-notice-buttons .didomi-button:not(.didomi-button-highlight), .didomi-notice-banner .didomi-learn-more-button"},type:"click"},name:"OPEN_OPTIONS"},{action:{actions:[{retries:50,target:{selector:"#didomi-purpose-cookies"},type:"waitcss",waitTime:50},{consents:[{description:"Share (everything) with others",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-share_whith_others]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-share_whith_others]:last-child"},type:"click"},type:"X"},{description:"Information storage and access",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-cookies]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-cookies]:last-child"},type:"click"},type:"D"},{description:"Content selection, offers and marketing",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-CL-T1Rgm7]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-CL-T1Rgm7]:last-child"},type:"click"},type:"E"},{description:"Analytics",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-analytics]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-analytics]:last-child"},type:"click"},type:"B"},{description:"Analytics",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-M9NRHJe3G]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-M9NRHJe3G]:last-child"},type:"click"},type:"B"},{description:"Ad and content selection",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-advertising_personalization]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-advertising_personalization]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection",falseAction:{parent:{childFilter:{target:{selector:"#didomi-purpose-pub-ciblee"}},selector:".didomi-consent-popup-data-processing, .didomi-components-accordion-label-container"},target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-pub-ciblee]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-pub-ciblee]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection - basics",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-q4zlJqdcD]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-q4zlJqdcD]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection - partners and subsidiaries",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-partenaire-cAsDe8jC]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-partenaire-cAsDe8jC]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection - social networks",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-p4em9a8m]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-p4em9a8m]:last-child"},type:"click"},type:"F"},{description:"Ad and content selection - others",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-autres-pub]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-autres-pub]:last-child"},type:"click"},type:"F"},{description:"Social networks",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-reseauxsociaux]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-reseauxsociaux]:last-child"},type:"click"},type:"A"},{description:"Social networks",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-social_media]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-social_media]:last-child"},type:"click"},type:"A"},{description:"Content selection",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-content_personalization]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-content_personalization]:last-child"},type:"click"},type:"E"},{description:"Ad delivery",falseAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-ad_delivery]:first-child"},type:"click"},trueAction:{target:{selector:".didomi-components-radio__option[aria-describedby=didomi-purpose-ad_delivery]:last-child"},type:"click"},type:"F"}],type:"consent"},{action:{consents:[{matcher:{childFilter:{target:{selector:":not(.didomi-components-radio__option--selected)"}},type:"css"},trueAction:{target:{selector:":nth-child(2)"},type:"click"},falseAction:{target:{selector:":first-child"},type:"click"},type:"X"}],type:"consent"},target:{selector:".didomi-components-radio"},type:"foreach"}],type:"list"},name:"DO_CONSENT"},{action:{parent:{selector:".didomi-consent-popup-footer .didomi-consent-popup-actions"},target:{selector:".didomi-components-button:first-child"},type:"click"},name:"SAVE_CONSENT"}]},oil:{detectors:[{presentMatcher:{target:{selector:".as-oil-content-overlay"},type:"css"},showingMatcher:{target:{selector:".as-oil-content-overlay"},type:"css"}}],methods:[{action:{actions:[{target:{selector:".as-js-advanced-settings"},type:"click"},{retries:"10",target:{selector:".as-oil-cpc__purpose-container"},type:"waitcss",waitTime:"250"}],type:"list"},name:"OPEN_OPTIONS"},{action:{actions:[{consents:[{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Information storage and access","Opbevaring af og adgang til oplysninger på din enhed"]},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Information storage and access","Opbevaring af og adgang til oplysninger på din enhed"]},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"D"},{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Personlige annoncer","Personalisation"]},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Personlige annoncer","Personalisation"]},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"E"},{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Annoncevalg, levering og rapportering","Ad selection, delivery, reporting"]},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Annoncevalg, levering og rapportering","Ad selection, delivery, reporting"]},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"F"},{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Personalisering af indhold","Content selection, delivery, reporting"]},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:["Personalisering af indhold","Content selection, delivery, reporting"]},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"E"},{matcher:{parent:{childFilter:{target:{selector:".as-oil-cpc__purpose-header",textFilter:["Måling","Measurement"]}},selector:".as-oil-cpc__purpose-container"},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{childFilter:{target:{selector:".as-oil-cpc__purpose-header",textFilter:["Måling","Measurement"]}},selector:".as-oil-cpc__purpose-container"},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"B"},{matcher:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:"Google"},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".as-oil-cpc__purpose-container",textFilter:"Google"},target:{selector:".as-oil-cpc__switch"},type:"click"},type:"F"}],type:"consent"}],type:"list"},name:"DO_CONSENT"},{action:{target:{selector:".as-oil__btn-optin"},type:"click"},name:"SAVE_CONSENT"},{action:{target:{selector:"div.as-oil"},type:"hide"},name:"HIDE_CMP"}]},optanon:{detectors:[{presentMatcher:{target:{selector:"#optanon-menu, .optanon-alert-box-wrapper"},type:"css"},showingMatcher:{target:{displayFilter:!0,selector:".optanon-alert-box-wrapper"},type:"css"}}],methods:[{action:{actions:[{target:{selector:".optanon-alert-box-wrapper .optanon-toggle-display, a[onclick*='OneTrust.ToggleInfoDisplay()'], a[onclick*='Optanon.ToggleInfoDisplay()']"},type:"click"}],type:"list"},name:"OPEN_OPTIONS"},{action:{actions:[{target:{selector:".preference-menu-item #Your-privacy"},type:"click"},{target:{selector:"#optanon-vendor-consent-text"},type:"click"},{action:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"X"}],type:"consent"},target:{selector:"#optanon-vendor-consent-list .vendor-item"},type:"foreach"},{target:{selector:".vendor-consent-back-link"},type:"click"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-performance"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-performance"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-functional"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-functional"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-advertising"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-advertising"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-social"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-social"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Social Media Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Social Media Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Personalisation"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Personalisation"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Site monitoring cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Site monitoring cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Third party privacy-enhanced content"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Third party privacy-enhanced content"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"X"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Performance & Advertising Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Performance & Advertising Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Information storage and access"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Information storage and access"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"D"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Ad selection, delivery, reporting"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Ad selection, delivery, reporting"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Content selection, delivery, reporting"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Content selection, delivery, reporting"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Measurement"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Measurement"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Recommended Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Recommended Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"X"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Unclassified Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Unclassified Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"X"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Analytical Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Analytical Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"B"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Marketing Cookies"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Marketing Cookies"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Personalization"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Personalization"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Ad Selection, Delivery & Reporting"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Ad Selection, Delivery & Reporting"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},type:"ifcss"},{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Content Selection, Delivery & Reporting"},trueAction:{actions:[{parent:{selector:"#optanon-menu, .optanon-menu"},target:{selector:".menu-item-necessary",textFilter:"Content Selection, Delivery & Reporting"},type:"click"},{consents:[{matcher:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status input"},type:"checkbox"},toggleAction:{parent:{selector:"#optanon-popup-body-right"},target:{selector:".optanon-status label"},type:"click"},type:"E"}],type:"consent"}],type:"list"},type:"ifcss"}],type:"list"},name:"DO_CONSENT"},{action:{parent:{selector:".optanon-save-settings-button"},target:{selector:".optanon-white-button-middle"},type:"click"},name:"SAVE_CONSENT"},{action:{actions:[{target:{selector:"#optanon-popup-wrapper"},type:"hide"},{target:{selector:"#optanon-popup-bg"},type:"hide"},{target:{selector:".optanon-alert-box-wrapper"},type:"hide"}],type:"list"},name:"HIDE_CMP"}]},quantcast2:{detectors:[{presentMatcher:{target:{selector:"[data-tracking-opt-in-overlay]"},type:"css"},showingMatcher:{target:{selector:"[data-tracking-opt-in-overlay] [data-tracking-opt-in-learn-more]"},type:"css"}}],methods:[{action:{target:{selector:"[data-tracking-opt-in-overlay] [data-tracking-opt-in-learn-more]"},type:"click"},name:"OPEN_OPTIONS"},{action:{actions:[{type:"wait",waitTime:500},{action:{actions:[{target:{selector:"div",textFilter:["Information storage and access"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"D"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Personalization"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"F"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Ad selection, delivery, reporting"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"F"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Content selection, delivery, reporting"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"E"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Measurement"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"B"}],type:"consent"},type:"ifcss"},{target:{selector:"div",textFilter:["Other Partners"]},trueAction:{consents:[{matcher:{target:{selector:"input"},type:"checkbox"},toggleAction:{target:{selector:"label"},type:"click"},type:"X"}],type:"consent"},type:"ifcss"}],type:"list"},parent:{childFilter:{target:{selector:"input"}},selector:"[data-tracking-opt-in-overlay] > div > div"},target:{childFilter:{target:{selector:"input"}},selector:":scope > div"},type:"foreach"}],type:"list"},name:"DO_CONSENT"},{action:{target:{selector:"[data-tracking-opt-in-overlay] [data-tracking-opt-in-save]"},type:"click"},name:"SAVE_CONSENT"}]},springer:{detectors:[{presentMatcher:{parent:null,target:{selector:".cmp-app_gdpr"},type:"css"},showingMatcher:{parent:null,target:{displayFilter:!0,selector:".cmp-popup_popup"},type:"css"}}],methods:[{action:{actions:[{target:{selector:".cmp-intro_rejectAll"},type:"click"},{type:"wait",waitTime:250},{target:{selector:".cmp-purposes_purposeItem:not(.cmp-purposes_selectedPurpose)"},type:"click"}],type:"list"},name:"OPEN_OPTIONS"},{action:{consents:[{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Przechowywanie informacji na urządzeniu lub dostęp do nich",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Przechowywanie informacji na urządzeniu lub dostęp do nich",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"D"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór podstawowych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór podstawowych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"F"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Tworzenie profilu spersonalizowanych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Tworzenie profilu spersonalizowanych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"F"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór spersonalizowanych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór spersonalizowanych reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"E"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Tworzenie profilu spersonalizowanych treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Tworzenie profilu spersonalizowanych treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"E"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór spersonalizowanych treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Wybór spersonalizowanych treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"B"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Pomiar wydajności reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Pomiar wydajności reklam",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"B"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Pomiar wydajności treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Pomiar wydajności treści",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"B"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Stosowanie badań rynkowych w celu generowania opinii odbiorców",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Stosowanie badań rynkowych w celu generowania opinii odbiorców",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"X"},{matcher:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Opracowywanie i ulepszanie produktów",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch .cmp-switch_isSelected"},type:"css"},toggleAction:{parent:{selector:".cmp-purposes_detailHeader",textFilter:"Opracowywanie i ulepszanie produktów",childFilter:{target:{selector:".cmp-switch_switch"}}},target:{selector:".cmp-switch_switch:not(.cmp-switch_isSelected)"},type:"click"},type:"X"}],type:"consent"},name:"DO_CONSENT"},{action:{target:{selector:".cmp-details_save"},type:"click"},name:"SAVE_CONSENT"}]},wordpressgdpr:{detectors:[{presentMatcher:{parent:null,target:{selector:".wpgdprc-consent-bar"},type:"css"},showingMatcher:{parent:null,target:{displayFilter:!0,selector:".wpgdprc-consent-bar"},type:"css"}}],methods:[{action:{parent:null,target:{selector:".wpgdprc-consent-bar .wpgdprc-consent-bar__settings",textFilter:null},type:"click"},name:"OPEN_OPTIONS"},{action:{actions:[{target:{selector:".wpgdprc-consent-modal .wpgdprc-button",textFilter:"Eyeota"},type:"click"},{consents:[{description:"Eyeota Cookies",matcher:{parent:{selector:".wpgdprc-consent-modal__description",textFilter:"Eyeota"},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".wpgdprc-consent-modal__description",textFilter:"Eyeota"},target:{selector:"label"},type:"click"},type:"X"}],type:"consent"},{target:{selector:".wpgdprc-consent-modal .wpgdprc-button",textFilter:"Advertising"},type:"click"},{consents:[{description:"Advertising Cookies",matcher:{parent:{selector:".wpgdprc-consent-modal__description",textFilter:"Advertising"},target:{selector:"input"},type:"checkbox"},toggleAction:{parent:{selector:".wpgdprc-consent-modal__description",textFilter:"Advertising"},target:{selector:"label"},type:"click"},type:"F"}],type:"consent"}],type:"list"},name:"DO_CONSENT"},{action:{parent:null,target:{selector:".wpgdprc-button",textFilter:"Save my settings"},type:"click"},name:"SAVE_CONSENT"}]}},v={autoconsent:w,consentomatic:C},f=Object.freeze({__proto__:null,autoconsent:w,consentomatic:C,default:v});const A=new class{constructor(e,t=null,o=null){if(this.id=n(),this.rules=[],this.foundCmp=null,this.state={lifecycle:"loading",prehideOn:!1,findCmpAttempts:0,detectedCmps:[],detectedPopups:[],selfTest:null},a.sendContentMessage=e,this.sendContentMessage=e,this.rules=[],this.updateState({lifecycle:"loading"}),this.addDynamicRules(),t)this.initialize(t,o);else{o&&this.parseDeclarativeRules(o);e({type:"init",url:window.location.href}),this.updateState({lifecycle:"waitingForInitResponse"})}this.domActions=new class{constructor(e){this.autoconsentInstance=e}click(e,t=!1){const o=this.elementSelector(e);return this.autoconsentInstance.config.logs.rulesteps&&console.log("[click]",e,t,o),o.length>0&&(t?o.forEach((e=>e.click())):o[0].click()),o.length>0}elementExists(e){return this.elementSelector(e).length>0}elementVisible(e,t){const o=this.elementSelector(e),c=new Array(o.length);return o.forEach(((e,t)=>{c[t]=k(e)})),"none"===t?c.every((e=>!e)):0!==c.length&&("any"===t?c.some((e=>e)):c.every((e=>e)))}waitForElement(e,t=1e4){const o=Math.ceil(t/200);return this.autoconsentInstance.config.logs.rulesteps&&console.log("[waitForElement]",e),h((()=>this.elementSelector(e).length>0),o,200)}waitForVisible(e,t=1e4,o="any"){return h((()=>this.elementVisible(e,o)),Math.ceil(t/200),200)}async waitForThenClick(e,t=1e4,o=!1){return await this.waitForElement(e,t),this.click(e,o)}wait(e){return new Promise((t=>{setTimeout((()=>{t(!0)}),e)}))}hide(e,t){return m(u(),e,t)}prehide(e){const t=u("autoconsent-prehide");return this.autoconsentInstance.config.logs.lifecycle&&console.log("[prehide]",t,location.href),m(t,e,"opacity")}undoPrehide(){const e=u("autoconsent-prehide");return this.autoconsentInstance.config.logs.lifecycle&&console.log("[undoprehide]",e,location.href),e&&e.remove(),!!e}querySingleReplySelector(e,t=document){if(e.startsWith("aria/"))return[];if(e.startsWith("xpath/")){const o=e.slice(6),c=document.evaluate(o,t,null,XPathResult.ANY_TYPE,null);let i=null;const n=[];for(;i=c.iterateNext();)n.push(i);return n}return e.startsWith("text/")||e.startsWith("pierce/")?[]:t.shadowRoot?Array.from(t.shadowRoot.querySelectorAll(e)):Array.from(t.querySelectorAll(e))}querySelectorChain(e){let t,o=document;for(const c of e){if(t=this.querySingleReplySelector(c,o),0===t.length)return[];o=t[0]}return t}elementSelector(e){return"string"==typeof e?this.querySingleReplySelector(e):this.querySelectorChain(e)}}(this)}initialize(e,t){const o=b(e);if(o.logs.lifecycle&&console.log("autoconsent init",window.location.href),this.config=o,o.enabled){if(t&&this.parseDeclarativeRules(t),this.rules=function(e,t){return e.filter((e=>(!t.disabledCmps||!t.disabledCmps.includes(e.name))&&(t.enableCosmeticRules||!e.isCosmetic)))}(this.rules,o),e.enablePrehide)if(document.documentElement)this.prehideElements();else{const e=()=>{window.removeEventListener("DOMContentLoaded",e),this.prehideElements()};window.addEventListener("DOMContentLoaded",e)}if("loading"===document.readyState){const e=()=>{window.removeEventListener("DOMContentLoaded",e),this.start()};window.addEventListener("DOMContentLoaded",e)}else this.start();this.updateState({lifecycle:"initialized"})}else o.logs.lifecycle&&console.log("autoconsent is disabled")}addDynamicRules(){y.forEach((e=>{this.rules.push(new e(this))}))}parseDeclarativeRules(e){Object.keys(e.consentomatic).forEach((t=>{this.addConsentomaticCMP(t,e.consentomatic[t])})),e.autoconsent.forEach((e=>{this.addDeclarativeCMP(e)}))}addDeclarativeCMP(e){this.rules.push(new d(e,this))}addConsentomaticCMP(e,t){this.rules.push(new class{constructor(e,t){this.name=e,this.config=t,this.methods=new Map,this.runContext=l,this.isCosmetic=!1,t.methods.forEach((e=>{e.action&&this.methods.set(e.name,e.action)})),this.hasSelfTest=!1}get isIntermediate(){return!1}checkRunContext(){return!0}async detectCmp(){return this.config.detectors.map((e=>o(e.presentMatcher))).some((e=>!!e))}async detectPopup(){return this.config.detectors.map((e=>o(e.showingMatcher))).some((e=>!!e))}async executeAction(e,t){return!this.methods.has(e)||c(this.methods.get(e),t)}async optOut(){return await this.executeAction("HIDE_CMP"),await this.executeAction("OPEN_OPTIONS"),await this.executeAction("HIDE_CMP"),await this.executeAction("DO_CONSENT",[]),await this.executeAction("SAVE_CONSENT"),!0}async optIn(){return await this.executeAction("HIDE_CMP"),await this.executeAction("OPEN_OPTIONS"),await this.executeAction("HIDE_CMP"),await this.executeAction("DO_CONSENT",["D","A","B","E","F","X"]),await this.executeAction("SAVE_CONSENT"),!0}async openCmp(){return await this.executeAction("HIDE_CMP"),await this.executeAction("OPEN_OPTIONS"),!0}async test(){return!0}}(`com_${e}`,t))}start(){window.requestIdleCallback?window.requestIdleCallback((()=>this._start()),{timeout:500}):this._start()}async _start(){const e=this.config.logs;e.lifecycle&&console.log(`Detecting CMPs on ${window.location.href}`),this.updateState({lifecycle:"started"});const t=await this.findCmp(this.config.detectRetries);if(this.updateState({detectedCmps:t.map((e=>e.name))}),0===t.length)return e.lifecycle&&console.log("no CMP found",location.href),this.config.enablePrehide&&this.undoPrehide(),this.updateState({lifecycle:"nothingDetected"}),!1;this.updateState({lifecycle:"cmpDetected"});const o=[],c=[];for(const e of t)e.isCosmetic?c.push(e):o.push(e);let i=!1,n=await this.detectPopups(o,(async e=>{i=await this.handlePopup(e)}));if(0===n.length&&(n=await this.detectPopups(c,(async e=>{i=await this.handlePopup(e)}))),0===n.length)return e.lifecycle&&console.log("no popup found"),this.config.enablePrehide&&this.undoPrehide(),!1;if(n.length>1){const t={msg:"Found multiple CMPs, check the detection rules.",cmps:n.map((e=>e.name))};e.errors&&console.warn(t.msg,t.cmps),this.sendContentMessage({type:"autoconsentError",details:t})}return i}async findCmp(e){const t=this.config.logs;this.updateState({findCmpAttempts:this.state.findCmpAttempts+1});const o=[];for(const e of this.rules)try{if(!e.checkRunContext())continue;await e.detectCmp()&&(t.lifecycle&&console.log(`Found CMP: ${e.name} ${window.location.href}`),this.sendContentMessage({type:"cmpDetected",url:location.href,cmp:e.name}),o.push(e))}catch(o){t.errors&&console.warn(`error detecting ${e.name}`,o)}return 0===o.length&&e>0?(await this.domActions.wait(500),this.findCmp(e-1)):o}async detectPopup(e){if(await this.waitForPopup(e).catch((t=>(this.config.logs.errors&&console.warn(`error waiting for a popup for ${e.name}`,t),!1))))return this.updateState({detectedPopups:this.state.detectedPopups.concat([e.name])}),this.sendContentMessage({type:"popupFound",cmp:e.name,url:location.href}),e;throw new Error("Popup is not shown")}async detectPopups(e,t){const o=e.map((e=>this.detectPopup(e)));await Promise.any(o).then((e=>{t(e)})).catch((()=>null));const c=await Promise.allSettled(o),i=[];for(const e of c)"fulfilled"===e.status&&i.push(e.value);return i}async handlePopup(e){return this.updateState({lifecycle:"openPopupDetected"}),this.config.enablePrehide&&!this.state.prehideOn&&this.prehideElements(),this.foundCmp=e,"optOut"===this.config.autoAction?await this.doOptOut():"optIn"===this.config.autoAction?await this.doOptIn():(this.config.logs.lifecycle&&console.log("waiting for opt-out signal...",location.href),!0)}async doOptOut(){const e=this.config.logs;let t;return this.updateState({lifecycle:"runningOptOut"}),this.foundCmp?(e.lifecycle&&console.log(`CMP ${this.foundCmp.name}: opt out on ${window.location.href}`),t=await this.foundCmp.optOut(),e.lifecycle&&console.log(`${this.foundCmp.name}: opt out result ${t}`)):(e.errors&&console.log("no CMP to opt out"),t=!1),this.config.enablePrehide&&this.undoPrehide(),this.sendContentMessage({type:"optOutResult",cmp:this.foundCmp?this.foundCmp.name:"none",result:t,scheduleSelfTest:this.foundCmp&&this.foundCmp.hasSelfTest,url:location.href}),t&&!this.foundCmp.isIntermediate?(this.sendContentMessage({type:"autoconsentDone",cmp:this.foundCmp.name,isCosmetic:this.foundCmp.isCosmetic,url:location.href}),this.updateState({lifecycle:"done"})):this.updateState({lifecycle:t?"optOutSucceeded":"optOutFailed"}),t}async doOptIn(){const e=this.config.logs;let t;return this.updateState({lifecycle:"runningOptIn"}),this.foundCmp?(e.lifecycle&&console.log(`CMP ${this.foundCmp.name}: opt in on ${window.location.href}`),t=await this.foundCmp.optIn(),e.lifecycle&&console.log(`${this.foundCmp.name}: opt in result ${t}`)):(e.errors&&console.log("no CMP to opt in"),t=!1),this.config.enablePrehide&&this.undoPrehide(),this.sendContentMessage({type:"optInResult",cmp:this.foundCmp?this.foundCmp.name:"none",result:t,scheduleSelfTest:!1,url:location.href}),t&&!this.foundCmp.isIntermediate?(this.sendContentMessage({type:"autoconsentDone",cmp:this.foundCmp.name,isCosmetic:this.foundCmp.isCosmetic,url:location.href}),this.updateState({lifecycle:"done"})):this.updateState({lifecycle:t?"optInSucceeded":"optInFailed"}),t}async doSelfTest(){const e=this.config.logs;let t;return this.foundCmp?(e.lifecycle&&console.log(`CMP ${this.foundCmp.name}: self-test on ${window.location.href}`),t=await this.foundCmp.test()):(e.errors&&console.log("no CMP to self test"),t=!1),this.sendContentMessage({type:"selfTestResult",cmp:this.foundCmp?this.foundCmp.name:"none",result:t,url:location.href}),this.updateState({selfTest:t}),t}async waitForPopup(e,t=5,o=500){const c=this.config.logs;c.lifecycle&&console.log("checking if popup is open...",e.name);const i=await e.detectPopup().catch((t=>(c.errors&&console.warn(`error detecting popup for ${e.name}`,t),!1)));return!i&&t>0?(await this.domActions.wait(o),this.waitForPopup(e,t-1,o)):(c.lifecycle&&console.log(e.name,"popup is "+(i?"open":"not open")),i)}prehideElements(){const e=this.config.logs,t=this.rules.reduce(((e,t)=>t.prehideSelectors?[...e,...t.prehideSelectors]:e),["#didomi-popup,.didomi-popup-container,.didomi-popup-notice,.didomi-consent-popup-preferences,#didomi-notice,.didomi-popup-backdrop,.didomi-screen-medium"]);return this.updateState({prehideOn:!0}),setTimeout((()=>{this.config.enablePrehide&&this.state.prehideOn&&!["runningOptOut","runningOptIn"].includes(this.state.lifecycle)&&(e.lifecycle&&console.log("Process is taking too long, unhiding elements"),this.undoPrehide())}),this.config.prehideTimeout||2e3),this.domActions.prehide(t.join(","))}undoPrehide(){return this.updateState({prehideOn:!1}),this.domActions.undoPrehide()}updateState(e){Object.assign(this.state,e),this.sendContentMessage({type:"report",instanceId:this.id,url:window.location.href,mainFrame:window.top===window.self,state:this.state})}async receiveMessageCallback(e){const t=this.config?.logs;switch(t?.messages&&console.log("received from background",e,window.location.href),e.type){case"initResp":this.initialize(e.config,e.rules);break;case"optIn":await this.doOptIn();break;case"optOut":await this.doOptOut();break;case"selfTest":await this.doSelfTest();break;case"evalResp":!function(e,t){const o=a.pending.get(e);o?(a.pending.delete(e),o.timer&&window.clearTimeout(o.timer),o.resolve(t)):console.warn("no eval #",e)}(e.id,e.result)}}}((e=>{window.webkit.messageHandlers[e.type]&&window.webkit.messageHandlers[e.type].postMessage(e).then((e=>{A.receiveMessageCallback(e)}))}),null,f);window.autoconsentMessageCallback=e=>{A.receiveMessageCallback(e)}}();
diff --git a/DuckDuckGo/Autofill/ContentOverlayViewController.swift b/DuckDuckGo/Autofill/ContentOverlayViewController.swift
index 93b95b830c..d90b35f71d 100644
--- a/DuckDuckGo/Autofill/ContentOverlayViewController.swift
+++ b/DuckDuckGo/Autofill/ContentOverlayViewController.swift
@@ -253,6 +253,7 @@ extension ContentOverlayViewController: SecureVaultManagerDelegate {
                                    promptUserToAutofillCredentialsForDomain domain: String,
                                    withAccounts accounts: [SecureVaultModels.WebsiteAccount],
                                    withTrigger trigger: AutofillUserScript.GetTriggerType,
+                                   onAccountSelected account: @escaping (SecureVaultModels.WebsiteAccount?) -> Void,
                                    completionHandler: @escaping (SecureVaultModels.WebsiteAccount?) -> Void) {
         // no-op on macOS
     }
@@ -343,7 +344,8 @@ extension ContentOverlayViewController: SecureVaultManagerDelegate {
     }
 
     public func secureVaultManager(_: SecureVaultManager, didRequestRuntimeConfigurationForDomain domain: String, completionHandler: @escaping (String?) -> Void) {
-        let properties = ContentScopeProperties(gpcEnabled: PrivacySecurityPreferences.shared.gpcEnabled,
+        let isGPCEnabled = WebTrackingProtectionPreferences.shared.isGPCEnabled
+        let properties = ContentScopeProperties(gpcEnabled: isGPCEnabled,
                                                 sessionKey: topAutofillUserScript?.sessionKey ?? "",
                                                 featureToggles: ContentScopeFeatureToggles.supportedFeaturesOnMacOS(privacyConfigurationManager.privacyConfig))
 
diff --git a/DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift b/DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift
new file mode 100644
index 0000000000..82e5748c72
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift
@@ -0,0 +1,41 @@
+//
+//  Bookmarks+Tab.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+extension Tab {
+
+    @MainActor
+    static func withContentOfBookmark(folder: BookmarkFolder, burnerMode: BurnerMode) -> [Tab] {
+        folder.children.compactMap { entity in
+            guard let url = (entity as? Bookmark)?.urlObject else { return nil }
+            return Tab(content: .url(url, source: .bookmark), shouldLoadInBackground: true, burnerMode: burnerMode)
+        }
+    }
+
+}
+
+extension TabCollection {
+
+    @MainActor
+    static func withContentOfBookmark(folder: BookmarkFolder, burnerMode: BurnerMode) -> TabCollection {
+        let tabs = Tab.withContentOfBookmark(folder: folder, burnerMode: burnerMode)
+        return TabCollection(tabs: tabs)
+    }
+
+}
diff --git a/DuckDuckGo/Bookmarks/Model/Bookmark.swift b/DuckDuckGo/Bookmarks/Model/Bookmark.swift
index 99ca656b3f..4d3cf399d8 100644
--- a/DuckDuckGo/Bookmarks/Model/Bookmark.swift
+++ b/DuckDuckGo/Bookmarks/Model/Bookmark.swift
@@ -19,29 +19,36 @@
 import Cocoa
 import Bookmarks
 
-internal class BaseBookmarkEntity: Identifiable {
+internal class BaseBookmarkEntity: Identifiable, Equatable, Hashable {
 
     static func singleEntity(with uuid: String) -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K == %@ AND %K == NO", #keyPath(BookmarkEntity.uuid), uuid, #keyPath(BookmarkEntity.isPendingDeletion))
+        request.predicate = NSPredicate(format: "%K == %@ AND %K == NO AND (%K == NO OR %K == nil)",
+                                        #keyPath(BookmarkEntity.uuid), uuid,
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
     static func favorite(with uuid: String, favoritesFolder: BookmarkEntity) -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K == %@ AND %K CONTAINS %@ AND %K == NO AND %K == NO",
+        request.predicate = NSPredicate(format: "%K == %@ AND %K CONTAINS %@ AND %K == NO AND %K == NO AND (%K == NO OR %K == nil)",
                                         #keyPath(BookmarkEntity.uuid),
                                         uuid as CVarArg,
                                         #keyPath(BookmarkEntity.favoriteFolders),
                                         favoritesFolder,
                                         #keyPath(BookmarkEntity.isFolder),
-                                        #keyPath(BookmarkEntity.isPendingDeletion))
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
     static func entities(with identifiers: [String]) -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K IN %@ AND %K == NO", #keyPath(BookmarkEntity.uuid), identifiers, #keyPath(BookmarkEntity.isPendingDeletion))
+        request.predicate = NSPredicate(format: "%K IN %@ AND %K == NO AND (%K == NO OR %K == nil)",
+                                        #keyPath(BookmarkEntity.uuid), identifiers,
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
@@ -92,13 +99,33 @@ internal class BaseBookmarkEntity: Identifiable {
         }
     }
 
+    // Subclasses needs to override to check equality on their properties
+    func isEqual(to instance: BaseBookmarkEntity) -> Bool {
+        id == instance.id &&
+        title == instance.title &&
+        isFolder == instance.isFolder
+    }
+
+    static func == (lhs: BaseBookmarkEntity, rhs: BaseBookmarkEntity) -> Bool {
+        return type(of: lhs) == type(of: rhs) && lhs.isEqual(to: rhs)
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+        hasher.combine(title)
+        hasher.combine(isFolder)
+    }
+
 }
 
 final class BookmarkFolder: BaseBookmarkEntity {
 
     static func bookmarkFoldersFetchRequest() -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K == YES AND %K == NO", #keyPath(BookmarkEntity.isFolder), #keyPath(BookmarkEntity.isPendingDeletion))
+        request.predicate = NSPredicate(format: "%K == YES AND %K == NO AND (%K == NO OR %K == nil)",
+                                        #keyPath(BookmarkEntity.isFolder),
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
@@ -129,13 +156,48 @@ final class BookmarkFolder: BaseBookmarkEntity {
 
         super.init(id: id, title: title, isFolder: true)
     }
+
+    override func isEqual(to instance: BaseBookmarkEntity) -> Bool {
+        guard let folder = instance as? BookmarkFolder else {
+            return false
+        }
+        return id == folder.id &&
+        title == folder.title &&
+        isFolder == folder.isFolder &&
+        isParentFolderEqual(lhs: parentFolderUUID, rhs: folder.parentFolderUUID) &&
+        children == folder.children
+    }
+
+    override func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+        hasher.combine(title)
+        hasher.combine(isFolder)
+        hasher.combine(parentFolderUUID)
+        hasher.combine(children)
+    }
+
+    // In some cases a bookmark folder that is child of the root folder has its `parentFolderUUID` set to `bookmarks_root`. In some other cases is nil. Making sure that comparing a `nil` and a `bookmarks_root` does not return false. Probably would be good idea to remove the optionality of `parentFolderUUID` in the future and set it to `bookmarks_root` when needed.
+    private func isParentFolderEqual(lhs: String?, rhs: String?) -> Bool {
+        switch (lhs, rhs) {
+        case (.none, .none):
+            return true
+        case (.some(let lhsValue), .some(let rhsValue)):
+            return lhsValue == rhsValue
+        case (.some(let value), .none), (.none, .some(let value)):
+            return value == "bookmarks_root"
+        }
+    }
+
 }
 
 final class Bookmark: BaseBookmarkEntity {
 
     static func bookmarksFetchRequest() -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K == NO AND %K == NO", #keyPath(BookmarkEntity.isFolder), #keyPath(BookmarkEntity.isPendingDeletion))
+        request.predicate = NSPredicate(format: "%K == NO AND %K == NO AND (%K == NO OR %K == nil)",
+                                        #keyPath(BookmarkEntity.isFolder),
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
@@ -183,12 +245,33 @@ final class Bookmark: BaseBookmarkEntity {
                   parentFolderUUID: bookmark.parentFolderUUID)
     }
 
-}
+    convenience init(from bookmark: Bookmark, withNewUrl url: String, title: String, isFavorite: Bool) {
+        self.init(id: bookmark.id,
+                  url: url,
+                  title: title,
+                  isFavorite: isFavorite,
+                  parentFolderUUID: bookmark.parentFolderUUID)
+    }
 
-extension BaseBookmarkEntity: Equatable {
+    override func isEqual(to instance: BaseBookmarkEntity) -> Bool {
+        guard let bookmark = instance as? Bookmark else {
+            return false
+        }
+        return id == bookmark.id &&
+        title == bookmark.title &&
+        isFolder == bookmark.isFolder &&
+        url == bookmark.url &&
+        isFavorite == bookmark.isFavorite &&
+        parentFolderUUID == bookmark.parentFolderUUID
+    }
 
-    static func == (lhs: BaseBookmarkEntity, rhs: BaseBookmarkEntity) -> Bool {
-        return lhs.id == rhs.id
+    override func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+        hasher.combine(title)
+        hasher.combine(isFolder)
+        hasher.combine(url)
+        hasher.combine(isFavorite)
+        hasher.combine(parentFolderUUID)
     }
 
 }
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkFolderInfo.swift b/DuckDuckGo/Bookmarks/Model/BookmarkFolderInfo.swift
new file mode 100644
index 0000000000..a4f8004f71
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/Model/BookmarkFolderInfo.swift
@@ -0,0 +1,32 @@
+//
+//  BookmarkFolderInfo.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+protocol BookmarksEntityIdentifiable {
+    var entityId: String { get }
+    var parentId: String? { get }
+}
+
+struct BookmarkEntityInfo: Equatable, BookmarksEntityIdentifiable {
+    let entity: BaseBookmarkEntity
+    let parent: BookmarkFolder?
+
+    var entityId: String { entity.id }
+    var parentId: String? { parent?.id }
+}
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkList.swift b/DuckDuckGo/Bookmarks/Model/BookmarkList.swift
index 2fe7281adb..dcae056327 100644
--- a/DuckDuckGo/Bookmarks/Model/BookmarkList.swift
+++ b/DuckDuckGo/Bookmarks/Model/BookmarkList.swift
@@ -19,10 +19,11 @@
 import Foundation
 import BrowserServicesKit
 import Common
+import Suggestions
 
 struct BookmarkList {
 
-    struct IdentifiableBookmark: Equatable, BrowserServicesKit.Bookmark {
+    struct IdentifiableBookmark: Equatable, Suggestions.Bookmark {
         let id: String
         let url: String
         let urlObject: URL?
@@ -124,6 +125,13 @@ struct BookmarkList {
         }
     }
 
+    mutating func update(bookmark: Bookmark, newURL: String, newTitle: String, newIsFavorite: Bool) -> Bookmark? {
+        guard !bookmark.isFolder else { return nil }
+
+        let newBookmark = Bookmark(from: bookmark, withNewUrl: newURL, title: newTitle, isFavorite: newIsFavorite)
+        return updateBookmarkList(newBookmark: newBookmark, oldBookmark: bookmark)
+    }
+
     mutating func updateUrl(of bookmark: Bookmark, to newURL: String) -> Bookmark? {
         guard !bookmark.isFolder else { return nil }
 
@@ -131,12 +139,25 @@ struct BookmarkList {
             os_log("BookmarkList: Update failed, new url already in bookmark list")
             return nil
         }
+
+        let newBookmark = Bookmark(from: bookmark, with: newURL)
+        return updateBookmarkList(newBookmark: newBookmark, oldBookmark: bookmark)
+    }
+
+    func bookmarks() -> [IdentifiableBookmark] {
+        return allBookmarkURLsOrdered
+    }
+
+}
+
+private extension BookmarkList {
+
+    mutating private func updateBookmarkList(newBookmark: Bookmark, oldBookmark bookmark: Bookmark) -> Bookmark? {
         guard itemsDict[bookmark.url] != nil, let index = allBookmarkURLsOrdered.firstIndex(of: IdentifiableBookmark(from: bookmark)) else {
             os_log("BookmarkList: Update failed, no such item in bookmark list")
             return nil
         }
 
-        let newBookmark = Bookmark(from: bookmark, with: newURL)
         let newIdentifiableBookmark = IdentifiableBookmark(from: newBookmark)
 
         allBookmarkURLsOrdered.remove(at: index)
@@ -146,13 +167,8 @@ struct BookmarkList {
         let updatedBookmarks = existingBookmarks.filter { $0.id != bookmark.id }
 
         itemsDict[bookmark.url] = updatedBookmarks
-        itemsDict[newURL] = (itemsDict[newURL] ?? []) + [bookmark]
+        itemsDict[newBookmark.url] = (itemsDict[newBookmark.url] ?? []) + [newBookmark]
 
         return newBookmark
     }
-
-    func bookmarks() -> [IdentifiableBookmark] {
-        return allBookmarkURLsOrdered
-    }
-
 }
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift b/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift
index ee19960da1..b3172da78e 100644
--- a/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift
+++ b/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift
@@ -35,7 +35,9 @@ protocol BookmarkManager: AnyObject {
     func remove(folder: BookmarkFolder)
     func remove(objectsWithUUIDs uuids: [String])
     func update(bookmark: Bookmark)
+    func update(bookmark: Bookmark, withURL url: URL, title: String, isFavorite: Bool)
     func update(folder: BookmarkFolder)
+    func update(folder: BookmarkFolder, andMoveToParent parent: ParentFolderType)
     @discardableResult func updateUrl(of bookmark: Bookmark, to newUrl: URL) -> Bookmark?
     func add(bookmark: Bookmark, to parent: BookmarkFolder?, completion: @escaping (Error?) -> Void)
     func add(objectsWithUUIDs uuids: [String], to parent: BookmarkFolder?, completion: @escaping (Error?) -> Void)
@@ -211,12 +213,35 @@ final class LocalBookmarkManager: BookmarkManager {
 
     }
 
+    func update(bookmark: Bookmark, withURL url: URL, title: String, isFavorite: Bool) {
+        guard list != nil else { return }
+        guard getBookmark(forUrl: bookmark.url) != nil else {
+            os_log("LocalBookmarkManager: Failed to update bookmark url - not in the list.", type: .error)
+            return
+        }
+
+        guard let newBookmark = list?.update(bookmark: bookmark, newURL: url.absoluteString, newTitle: title, newIsFavorite: isFavorite) else {
+            os_log("LocalBookmarkManager: Failed to update URL of bookmark.", type: .error)
+            return
+        }
+
+        bookmarkStore.update(bookmark: newBookmark)
+        loadBookmarks()
+        requestSync()
+    }
+
     func update(folder: BookmarkFolder) {
         bookmarkStore.update(folder: folder)
         loadBookmarks()
         requestSync()
     }
 
+    func update(folder: BookmarkFolder, andMoveToParent parent: ParentFolderType) {
+        bookmarkStore.update(folder: folder, andMoveToParent: parent)
+        loadBookmarks()
+        requestSync()
+    }
+
     func updateUrl(of bookmark: Bookmark, to newUrl: URL) -> Bookmark? {
         guard list != nil else { return nil }
         guard getBookmark(forUrl: bookmark.url) != nil else {
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkNode.swift b/DuckDuckGo/Bookmarks/Model/BookmarkNode.swift
index 86f24bdc28..4f6b58c10f 100644
--- a/DuckDuckGo/Bookmarks/Model/BookmarkNode.swift
+++ b/DuckDuckGo/Bookmarks/Model/BookmarkNode.swift
@@ -67,11 +67,24 @@ final class BookmarkNode: Hashable {
         return 0
     }
 
-    init(representedObject: AnyObject, parent: BookmarkNode?) {
+    /// Creates an instance of a bookmark node.
+    /// - Parameters:
+    ///   - representedObject: The represented object contained in the node.
+    ///   - parent: An optional parent node.
+    ///   - uniqueId: A unique identifier for the node. This should be used only in unit tests.
+    /// - Attention: Use this initializer only in tests. 
+    init(representedObject: AnyObject, parent: BookmarkNode?, uniqueId: Int) {
         self.representedObject = representedObject
         self.parent = parent
-        self.uniqueID = BookmarkNode.incrementingID
+        self.uniqueID = uniqueId
+    }
 
+    /// Creates an instance of a bookmark node.
+    /// - Parameters:
+    ///   - representedObject: The represented object contained in the node.
+    ///   - parent: An optional parent node.
+    convenience init(representedObject: AnyObject, parent: BookmarkNode?) {
+        self.init(representedObject: representedObject, parent: parent, uniqueId: BookmarkNode.incrementingID)
         BookmarkNode.incrementingID += 1
     }
 
@@ -165,7 +178,7 @@ final class BookmarkNode: Hashable {
         // The Node class will most frequently represent Bookmark entities and PseudoFolders. Because of this, their unique properties are
         // used to derive the hash for the node so that equality can be handled based on the represented object.
         if let entity = self.representedObject as? BaseBookmarkEntity {
-            hasher.combine(entity.id)
+            hasher.combine(entity.hashValue)
         } else if let folder = self.representedObject as? PseudoFolder {
             hasher.combine(folder.name)
         } else {
@@ -176,7 +189,7 @@ final class BookmarkNode: Hashable {
     // MARK: - Equatable
 
     class func == (lhs: BookmarkNode, rhs: BookmarkNode) -> Bool {
-        return lhs === rhs
+        return lhs.uniqueID == rhs.uniqueID && lhs.representedObjectEquals(rhs.representedObject)
     }
 
 }
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift b/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift
index edfcfa6e2e..93a404fa95 100644
--- a/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift
+++ b/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift
@@ -30,10 +30,12 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
     @Published var selectedFolders: [BookmarkFolder] = []
 
     let treeController: BookmarkTreeController
-    var expandedNodesIDs = Set<String>()
+    private(set) var expandedNodesIDs = Set<String>()
 
     private let contentMode: ContentMode
     private let bookmarkManager: BookmarkManager
+    private let showMenuButtonOnHover: Bool
+    private let onMenuRequestedAction: ((BookmarkOutlineCellView) -> Void)?
     private let presentFaviconsFetcherOnboarding: (() -> Void)?
 
     private var favoritesPseudoFolder = PseudoFolder.favorites
@@ -43,11 +45,15 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
         contentMode: ContentMode,
         bookmarkManager: BookmarkManager,
         treeController: BookmarkTreeController,
+        showMenuButtonOnHover: Bool = true,
+        onMenuRequestedAction: ((BookmarkOutlineCellView) -> Void)? = nil,
         presentFaviconsFetcherOnboarding: (() -> Void)? = nil
     ) {
         self.contentMode = contentMode
         self.bookmarkManager = bookmarkManager
         self.treeController = treeController
+        self.showMenuButtonOnHover = showMenuButtonOnHover
+        self.onMenuRequestedAction = onMenuRequestedAction
         self.presentFaviconsFetcherOnboarding = presentFaviconsFetcherOnboarding
 
         super.init()
@@ -123,6 +129,8 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
         }
         let cell = outlineView.makeView(withIdentifier: .init(BookmarkOutlineCellView.className()), owner: self) as? BookmarkOutlineCellView
             ?? BookmarkOutlineCellView(identifier: .init(BookmarkOutlineCellView.className()))
+        cell.shouldShowMenuButton = showMenuButtonOnHover
+        cell.delegate = self
 
         if let bookmark = node.representedObject as? Bookmark {
             cell.update(from: bookmark)
@@ -233,7 +241,7 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
         // Folders cannot be dragged onto any of their descendants:
 
         let containsDescendantOfDestination = draggedFolders.contains { draggedFolder in
-            let folder = BookmarkFolder(id: draggedFolder.id, title: draggedFolder.name)
+            let folder = BookmarkFolder(id: draggedFolder.id, title: draggedFolder.name, parentFolderUUID: draggedFolder.parentFolderUUID, children: draggedFolder.children)
 
             guard let draggedNode = treeController.node(representing: folder) else {
                 return false
@@ -329,3 +337,11 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
     }
 
 }
+
+// MARK: - BookmarkOutlineCellViewDelegate
+
+extension BookmarkOutlineViewDataSource: BookmarkOutlineCellViewDelegate {
+    func outlineCellViewRequestedMenu(_ cell: BookmarkOutlineCellView) {
+        onMenuRequestedAction?(cell)
+    }
+}
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkSidebarTreeController.swift b/DuckDuckGo/Bookmarks/Model/BookmarkSidebarTreeController.swift
index 06167f2356..b8549cad89 100644
--- a/DuckDuckGo/Bookmarks/Model/BookmarkSidebarTreeController.swift
+++ b/DuckDuckGo/Bookmarks/Model/BookmarkSidebarTreeController.swift
@@ -33,19 +33,11 @@ final class BookmarkSidebarTreeController: BookmarkTreeControllerDataSource {
     // MARK: - Private
 
     private func childNodesForRootNode(_ node: BookmarkNode) -> [BookmarkNode] {
-        let favorites = PseudoFolder.favorites
-        let favoritesNode = BookmarkNode(representedObject: favorites, parent: node)
-        favoritesNode.canHaveChildNodes = false
-
-        let blankSpacer = SpacerNode.blank
-        let spacerNode = BookmarkNode(representedObject: blankSpacer, parent: node)
-        spacerNode.canHaveChildNodes = false
-
         let bookmarks = PseudoFolder.bookmarks
         let bookmarksNode = BookmarkNode(representedObject: bookmarks, parent: node)
         bookmarksNode.canHaveChildNodes = true
 
-        return [favoritesNode, spacerNode, bookmarksNode]
+        return [bookmarksNode]
     }
 
     private func childNodes(for parentNode: BookmarkNode) -> [BookmarkNode] {
diff --git a/DuckDuckGo/Bookmarks/Model/PasteboardFolder.swift b/DuckDuckGo/Bookmarks/Model/PasteboardFolder.swift
index ffc3eb9a41..f99f1e040d 100644
--- a/DuckDuckGo/Bookmarks/Model/PasteboardFolder.swift
+++ b/DuckDuckGo/Bookmarks/Model/PasteboardFolder.swift
@@ -26,12 +26,15 @@ struct PasteboardFolder: Hashable {
         static let name = "name"
     }
 
-    let id: String
-    let name: String
+    var id: String { folder.id }
+    var name: String { folder.title }
+    var parentFolderUUID: String? { folder.parentFolderUUID }
+    var children: [BaseBookmarkEntity] { folder.children }
 
-    init(id: String, name: String) {
-        self.id = id
-        self.name = name
+    private let folder: BookmarkFolder
+
+    init(folder: BookmarkFolder) {
+        self.folder = folder
     }
 
     // MARK: - Pasteboard Restoration
@@ -41,7 +44,7 @@ struct PasteboardFolder: Hashable {
             return nil
         }
 
-        self.init(id: id, name: name)
+        self.init(folder: .init(id: id, title: name))
     }
 
     init?(pasteboardItem: NSPasteboardItem) {
@@ -78,19 +81,17 @@ struct PasteboardFolder: Hashable {
     static let folderUTIInternalType = NSPasteboard.PasteboardType(rawValue: folderUTIInternal)
 
     var pasteboardFolder: PasteboardFolder {
-        return PasteboardFolder(id: folderID, name: folderName)
+        return PasteboardFolder(folder: folder)
     }
 
     var internalDictionary: PasteboardAttributes {
         return pasteboardFolder.internalDictionaryRepresentation
     }
 
-    private let folderID: String
-    private let folderName: String
+    private let folder: BookmarkFolder
 
     init(folder: BookmarkFolder) {
-        self.folderID = folder.id
-        self.folderName = folder.title
+        self.folder = folder
     }
 
     // MARK: - NSPasteboardWriting
@@ -102,7 +103,7 @@ struct PasteboardFolder: Hashable {
     func pasteboardPropertyList(forType type: NSPasteboard.PasteboardType) -> Any? {
         switch type {
         case .string:
-            return folderName
+            return folder.title
         case FolderPasteboardWriter.folderUTIInternalType:
             return internalDictionary
         default:
diff --git a/DuckDuckGo/Bookmarks/Model/PseudoFolder.swift b/DuckDuckGo/Bookmarks/Model/PseudoFolder.swift
index c3aed14be7..85cef1888a 100644
--- a/DuckDuckGo/Bookmarks/Model/PseudoFolder.swift
+++ b/DuckDuckGo/Bookmarks/Model/PseudoFolder.swift
@@ -22,7 +22,7 @@ import Foundation
 final class PseudoFolder: Equatable {
 
     static let favorites = PseudoFolder(id: UUID().uuidString, name: UserText.favorites, icon: .favoriteFilledBorder)
-    static let bookmarks = PseudoFolder(id: UUID().uuidString, name: UserText.bookmarks, icon: .folder)
+    static let bookmarks = PseudoFolder(id: UUID().uuidString, name: UserText.bookmarks, icon: .bookmarksFolder)
 
     let id: String
     let name: String
diff --git a/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift b/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift
index 6b7981c96a..3466d1a7fa 100644
--- a/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift
+++ b/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift
@@ -52,6 +52,7 @@ protocol BookmarkStore {
     func remove(objectsWithUUIDs: [String], completion: @escaping (Bool, Error?) -> Void)
     func update(bookmark: Bookmark)
     func update(folder: BookmarkFolder)
+    func update(folder: BookmarkFolder, andMoveToParent parent: ParentFolderType)
     func add(objectsWithUUIDs: [String], to parent: BookmarkFolder?, completion: @escaping (Error?) -> Void)
     func update(objectsWithUUIDs uuids: [String], update: @escaping (BaseBookmarkEntity) -> Void, completion: @escaping (Error?) -> Void)
     func canMoveObjectWithUUID(objectUUID uuid: String, to parent: BookmarkFolder) -> Bool
diff --git a/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift b/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift
index f505891891..2ab57158a9 100644
--- a/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift
+++ b/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift
@@ -46,6 +46,11 @@ public final class BookmarkStoreMock: BookmarkStore {
         self.updateFavoriteIndexCalled = updateFavoriteIndexCalled
     }
 
+    var capturedFolder: BookmarkFolder?
+    var capturedParentFolder: BookmarkFolder?
+    var capturedParentFolderType: ParentFolderType?
+    var capturedBookmark: Bookmark?
+
     var loadAllCalled = false
     var bookmarks: [BaseBookmarkEntity]?
     var loadError: Error?
@@ -60,6 +65,8 @@ public final class BookmarkStoreMock: BookmarkStore {
     func save(bookmark: Bookmark, parent: BookmarkFolder?, index: Int?, completion: @escaping (Bool, Error?) -> Void) {
         saveBookmarkCalled = true
         bookmarks?.append(bookmark)
+        capturedParentFolder = parent
+        capturedBookmark = bookmark
         completion(saveBookmarkSuccess, saveBookmarkError)
     }
 
@@ -68,6 +75,8 @@ public final class BookmarkStoreMock: BookmarkStore {
     var saveFolderError: Error?
     func save(folder: BookmarkFolder, parent: BookmarkFolder?, completion: @escaping (Bool, Error?) -> Void) {
         saveFolderCalled = true
+        capturedFolder = folder
+        capturedParentFolder = parent
         completion(saveFolderSuccess, saveFolderError)
     }
 
@@ -92,11 +101,20 @@ public final class BookmarkStoreMock: BookmarkStore {
         }
 
         updateBookmarkCalled = true
+        capturedBookmark = bookmark
     }
 
     var updateFolderCalled = false
     func update(folder: BookmarkFolder) {
         updateFolderCalled = true
+        capturedFolder = folder
+    }
+
+    var updateFolderAndMoveToParentCalled = false
+    func update(folder: BookmarkFolder, andMoveToParent parent: ParentFolderType) {
+        updateFolderAndMoveToParentCalled = true
+        capturedFolder = folder
+        capturedParentFolderType = parent
     }
 
     var addChildCalled = false
@@ -122,8 +140,11 @@ public final class BookmarkStoreMock: BookmarkStore {
     }
 
     var moveObjectUUIDCalled = false
+    var capturedObjectUUIDs: [String]?
     func move(objectUUIDs: [String], toIndex: Int?, withinParentFolder: ParentFolderType, completion: @escaping (Error?) -> Void) {
         moveObjectUUIDCalled = true
+        capturedObjectUUIDs = objectUUIDs
+        capturedParentFolderType = withinParentFolder
     }
 
     var updateFavoriteIndexCalled = false
@@ -135,4 +156,17 @@ public final class BookmarkStoreMock: BookmarkStore {
     func handleFavoritesAfterDisablingSync() {}
 }
 
+extension ParentFolderType: Equatable {
+    public static func == (lhs: Self, rhs: Self) -> Bool {
+        switch (lhs, rhs) {
+        case (.root, .root):
+            return true
+        case (.parent(let lhsValue), .parent(let rhsValue)):
+            return lhsValue == rhsValue
+        default:
+            return false
+        }
+    }
+}
+
 #endif
diff --git a/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift b/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
index 49f694be2b..f79e265d96 100644
--- a/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
+++ b/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
@@ -18,10 +18,19 @@
 
 import AppKit
 
-struct ContextualMenu {
+enum ContextualMenu {
+
+    static func menu(for objects: [Any]?) -> NSMenu? {
+        menu(for: objects, target: nil)
+    }
+
+    /// Creates an instance of NSMenu for the specified Objects and target.
+    /// - Parameters:
+    ///   - objects: The objects to create the menu for.
+    ///   - target: The target to associate to the `NSMenuItem`
+    /// - Returns: An instance of NSMenu or nil if `objects` is not a `Bookmark` or a `Folder`.
+    static func menu(for objects: [Any]?, target: AnyObject?) -> NSMenu? {
 
-    // Not all contexts support an editing option for bookmarks. The option is displayed by default, but `includeBookmarkEditMenu` can disable it.
-    static func menu(for objects: [Any]?, includeBookmarkEditMenu: Bool = true) -> NSMenu? {
         guard let objects = objects, objects.count > 0 else {
             return menuForNoSelection()
         }
@@ -31,140 +40,183 @@ struct ContextualMenu {
         }
 
         let node = objects.first as? BookmarkNode
-        let object = node?.representedObject ?? objects.first as? BaseBookmarkEntity
+        let object = node?.representedObject as? BaseBookmarkEntity ?? objects.first as? BaseBookmarkEntity
+        let parentFolder = node?.parent?.representedObject as? BookmarkFolder
 
-        if let bookmark = object as? Bookmark {
-            return menu(for: bookmark, includeBookmarkEditMenu: includeBookmarkEditMenu)
-        } else if let folder = object as? BookmarkFolder {
-            return menu(for: folder)
-        } else {
-            return nil
-        }
-    }
+        guard let object else { return nil }
 
-    // MARK: - Single Item Menu Creation
+        let menu = menu(for: object, parentFolder: parentFolder)
 
-    private static func menuForNoSelection() -> NSMenu {
-        let menu = NSMenu(title: "")
-        menu.addItem(newFolderMenuItem())
+        menu?.items.forEach { item in
+            item.target = target
+        }
 
         return menu
     }
 
-    private static func menu(for bookmark: Bookmark, includeBookmarkEditMenu: Bool) -> NSMenu {
-        let menu = NSMenu(title: "")
+    /// Creates an instance of NSMenu for the specified `BaseBookmarkEntity`and parent `BookmarkFolder`.
+    ///
+    /// - Parameters:
+    ///   - entity: The bookmark entity to create the menu for.
+    ///   - parentFolder: An optional `BookmarkFolder`.
+    /// - Returns: An instance of NSMenu or nil if `entity` is not a `Bookmark` or a `Folder`.
+    static func menu(for entity: BaseBookmarkEntity, parentFolder: BookmarkFolder?) -> NSMenu? {
+        let menu: NSMenu?
+        if let bookmark = entity as? Bookmark {
+            menu = self.menu(for: bookmark, parent: parentFolder, isFavorite: bookmark.isFavorite)
+        } else if let folder = entity as? BookmarkFolder {
+            // When the user edits a folder we need to show the parent in the folder picker. Folders directly child of PseudoFolder `Bookmarks` have nil parent because their parent is not an instance of `BookmarkFolder`
+            menu = self.menu(for: folder, parent: parentFolder)
+        } else {
+            menu = nil
+        }
 
-        menu.addItem(openBookmarkInNewTabMenuItem(bookmark: bookmark))
-        menu.addItem(openBookmarkInNewWindowMenuItem(bookmark: bookmark))
-        menu.addItem(NSMenuItem.separator())
+        return menu
+    }
 
-        menu.addItem(addBookmarkToFavoritesMenuItem(bookmark: bookmark))
+    /// Returns an array of `NSMenuItem` to show for a bookmark.
+    ///
+    ///  - Important: The `representedObject` for the `NSMenuItem` returned is `nil`. This function is meant to be used for scenarios where the model is not available at the time of creating the `NSMenu` such as from the BookmarkBarCollectionViewItem.
+    ///
+    /// - Parameter isFavorite: True if the menu item should contain a menu item to add to favorites. False to contain a menu item to remove from favorites.
+    /// - Returns: An array of `NSMenuItem`
+    static func bookmarkMenuItems(isFavorite: Bool) -> [NSMenuItem] {
+        menuItems(for: nil, parent: nil, isFavorite: isFavorite)
+    }
 
-        if includeBookmarkEditMenu {
-            menu.addItem(editBookmarkMenuItem(bookmark: bookmark))
-        }
+    /// Returns an array of `NSMenuItem` to show for a bookmark folder.
+    ///
+    ///  - Important: The `representedObject` for the `NSMenuItem` returned is `nil`. This function is meant to be used for scenarios where the model is not available at the time of creating the `NSMenu` such as from the BookmarkBarCollectionViewItem.
+    ///
+    /// - Returns: An array of `NSMenuItem`
+    static func folderMenuItems() -> [NSMenuItem] {
+       menuItems(for: nil, parent: nil)
+    }
 
-        menu.addItem(NSMenuItem.separator())
+}
 
-        menu.addItem(copyBookmarkMenuItem(bookmark: bookmark))
-        menu.addItem(deleteBookmarkMenuItem(bookmark: bookmark))
-        menu.addItem(NSMenuItem.separator())
+private extension ContextualMenu {
 
-        menu.addItem(newFolderMenuItem())
+    static func menuForNoSelection() -> NSMenu {
+        NSMenu(items: [addFolderMenuItem(folder: nil)])
+    }
 
-        return menu
+    static func menu(for bookmark: Bookmark?, parent: BookmarkFolder?, isFavorite: Bool) -> NSMenu {
+        NSMenu(items: menuItems(for: bookmark, parent: parent, isFavorite: isFavorite))
     }
 
-    private static func menu(for folder: BookmarkFolder) -> NSMenu {
-        let menu = NSMenu(title: "")
+    static func menu(for folder: BookmarkFolder?, parent: BookmarkFolder?) -> NSMenu {
+       NSMenu(items: menuItems(for: folder, parent: parent))
+    }
 
-        menu.addItem(renameFolderMenuItem(folder: folder))
-        menu.addItem(deleteFolderMenuItem(folder: folder))
-        menu.addItem(NSMenuItem.separator())
+    static func menuItems(for bookmark: Bookmark?, parent: BookmarkFolder?, isFavorite: Bool) -> [NSMenuItem] {
+        [
+            openBookmarkInNewTabMenuItem(bookmark: bookmark),
+            openBookmarkInNewWindowMenuItem(bookmark: bookmark),
+            NSMenuItem.separator(),
+            addBookmarkToFavoritesMenuItem(isFavorite: isFavorite, bookmark: bookmark),
+            NSMenuItem.separator(),
+            editBookmarkMenuItem(bookmark: bookmark),
+            copyBookmarkMenuItem(bookmark: bookmark),
+            deleteBookmarkMenuItem(bookmark: bookmark),
+            moveToEndMenuItem(entity: bookmark, parent: parent),
+            NSMenuItem.separator(),
+            addFolderMenuItem(folder: parent),
+            manageBookmarksMenuItem(),
+        ]
+    }
 
-        menu.addItem(openInNewTabsMenuItem(folder: folder))
+    static func menuItems(for folder: BookmarkFolder?, parent: BookmarkFolder?) -> [NSMenuItem] {
+        [
+            openInNewTabsMenuItem(folder: folder),
+            openAllInNewWindowMenuItem(folder: folder),
+            NSMenuItem.separator(),
+            editFolderMenuItem(folder: folder, parent: parent),
+            deleteFolderMenuItem(folder: folder),
+            moveToEndMenuItem(entity: folder, parent: parent),
+            NSMenuItem.separator(),
+            addFolderMenuItem(folder: folder),
+            manageBookmarksMenuItem(),
+        ]
+    }
 
-        return menu
+    static func menuItem(_ title: String, _ action: Selector, _ representedObject: Any? = nil) -> NSMenuItem {
+        let item = NSMenuItem(title: title, action: action, keyEquivalent: "")
+        item.representedObject = representedObject
+        return item
     }
 
-    // MARK: - Menu Items
+    // MARK: - Single Bookmark Menu Items
 
-    static func newFolderMenuItem() -> NSMenuItem {
-        return menuItem(UserText.newFolder, #selector(FolderMenuItemSelectors.newFolder(_:)))
+    static func openBookmarkInNewTabMenuItem(bookmark: Bookmark?) -> NSMenuItem {
+        menuItem(UserText.openInNewTab, #selector(BookmarkMenuItemSelectors.openBookmarkInNewTab(_:)), bookmark)
     }
 
-    static func renameFolderMenuItem(folder: BookmarkFolder) -> NSMenuItem {
-        return menuItem(UserText.renameFolder, #selector(FolderMenuItemSelectors.renameFolder(_:)), folder)
+    static func openBookmarkInNewWindowMenuItem(bookmark: Bookmark?) -> NSMenuItem {
+        menuItem(UserText.openInNewWindow, #selector(BookmarkMenuItemSelectors.openBookmarkInNewWindow(_:)), bookmark)
     }
 
-    static func deleteFolderMenuItem(folder: BookmarkFolder) -> NSMenuItem {
-        return menuItem(UserText.deleteFolder, #selector(FolderMenuItemSelectors.deleteFolder(_:)), folder)
+    static func manageBookmarksMenuItem() -> NSMenuItem {
+        menuItem(UserText.bookmarksManageBookmarks, #selector(BookmarkMenuItemSelectors.manageBookmarks(_:)))
     }
 
-    static func openInNewTabsMenuItem(folder: BookmarkFolder) -> NSMenuItem {
-        return menuItem(UserText.bookmarksOpenInNewTabs, #selector(FolderMenuItemSelectors.openInNewTabs(_:)), folder)
+    static func addBookmarkToFavoritesMenuItem(isFavorite: Bool, bookmark: Bookmark?) -> NSMenuItem {
+        let title = isFavorite ? UserText.removeFromFavorites : UserText.addToFavorites
+        return menuItem(title, #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), bookmark)
     }
 
-    static func openBookmarksInNewTabsMenuItem(bookmarks: [Bookmark]) -> NSMenuItem {
-        return menuItem(UserText.bookmarksOpenInNewTabs, #selector(FolderMenuItemSelectors.openInNewTabs(_:)), bookmarks)
+    static func addBookmarksToFavoritesMenuItem(bookmarks: [Bookmark], allFavorites: Bool) -> NSMenuItem {
+        let title = allFavorites ? UserText.removeFromFavorites : UserText.addToFavorites
+        return menuItem(title, #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), bookmarks)
     }
 
-    static func openBookmarkInNewTabMenuItem(bookmark: Bookmark) -> NSMenuItem {
-        return menuItem(UserText.openInNewTab, #selector(BookmarkMenuItemSelectors.openBookmarkInNewTab(_:)), bookmark)
+    static func editBookmarkMenuItem(bookmark: Bookmark?) -> NSMenuItem {
+        menuItem(UserText.editBookmark, #selector(BookmarkMenuItemSelectors.editBookmark(_:)), bookmark)
     }
 
-    static func openBookmarkInNewWindowMenuItem(bookmark: Bookmark) -> NSMenuItem {
-        return menuItem(UserText.openInNewWindow, #selector(BookmarkMenuItemSelectors.openBookmarkInNewWindow(_:)), bookmark)
+    static func copyBookmarkMenuItem(bookmark: Bookmark?) -> NSMenuItem {
+        menuItem(UserText.copy, #selector(BookmarkMenuItemSelectors.copyBookmark(_:)), bookmark)
     }
 
-    static func addBookmarkToFavoritesMenuItem(bookmark: Bookmark) -> NSMenuItem {
-        let title: String
-
-        if bookmark.isFavorite {
-            title = UserText.removeFromFavorites
-        } else {
-            title = UserText.addToFavorites
-        }
-
-        return menuItem(title, #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), bookmark)
+    static func deleteBookmarkMenuItem(bookmark: Bookmark?) -> NSMenuItem {
+        menuItem(UserText.bookmarksBarContextMenuDelete, #selector(BookmarkMenuItemSelectors.deleteBookmark(_:)), bookmark)
     }
 
-    static func addBookmarksToFavoritesMenuItem(bookmarks: [Bookmark], allFavorites: Bool) -> NSMenuItem {
-        let title: String
+    static func moveToEndMenuItem(entity: BaseBookmarkEntity?, parent: BookmarkFolder?) -> NSMenuItem {
+        let bookmarkEntityInfo = entity.flatMap { BookmarkEntityInfo(entity: $0, parent: parent) }
+        return menuItem(UserText.bookmarksBarContextMenuMoveToEnd, #selector(BookmarkMenuItemSelectors.moveToEnd(_:)), bookmarkEntityInfo)
+    }
 
-        if allFavorites {
-            title = UserText.removeFromFavorites
-        } else {
-            title = UserText.addToFavorites
-        }
+    // MARK: - Bookmark Folder Menu Items
 
-        return menuItem(title, #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), bookmarks)
+    static func openInNewTabsMenuItem(folder: BookmarkFolder?) -> NSMenuItem {
+        menuItem(UserText.openAllInNewTabs, #selector(FolderMenuItemSelectors.openInNewTabs(_:)), folder)
     }
 
-    static func editBookmarkMenuItem(bookmark: Bookmark) -> NSMenuItem {
-        let title = NSLocalizedString("Edit…", comment: "Command")
-        return menuItem(title, #selector(BookmarkMenuItemSelectors.editBookmark(_:)), bookmark)
+    static func openAllInNewWindowMenuItem(folder: BookmarkFolder?) -> NSMenuItem {
+        menuItem(UserText.openAllTabsInNewWindow, #selector(FolderMenuItemSelectors.openAllInNewWindow(_:)), folder)
     }
 
-    static func copyBookmarkMenuItem(bookmark: Bookmark) -> NSMenuItem {
-        let title = NSLocalizedString("Copy", comment: "Command")
-        return menuItem(title, #selector(BookmarkMenuItemSelectors.copyBookmark(_:)), bookmark)
+    static func addFolderMenuItem(folder: BookmarkFolder?) -> NSMenuItem {
+        menuItem(UserText.addFolder, #selector(FolderMenuItemSelectors.newFolder(_:)), folder)
     }
 
-    static func deleteBookmarkMenuItem(bookmark: Bookmark) -> NSMenuItem {
-        let title = NSLocalizedString("Delete", comment: "Command")
-        return menuItem(title, #selector(BookmarkMenuItemSelectors.deleteBookmark(_:)), bookmark)
+    static func editFolderMenuItem(folder: BookmarkFolder?, parent: BookmarkFolder?) -> NSMenuItem {
+        let folderEntityInfo = folder.flatMap { BookmarkEntityInfo(entity: $0, parent: parent) }
+        return menuItem(UserText.editBookmark, #selector(FolderMenuItemSelectors.editFolder(_:)), folderEntityInfo)
     }
 
-    static func menuItem(_ title: String, _ action: Selector, _ representedObject: Any? = nil) -> NSMenuItem {
-        let item = NSMenuItem(title: title, action: action, keyEquivalent: "")
-        item.representedObject = representedObject
-        return item
+    static func deleteFolderMenuItem(folder: BookmarkFolder?) -> NSMenuItem {
+        menuItem(UserText.bookmarksBarContextMenuDelete, #selector(FolderMenuItemSelectors.deleteFolder(_:)), folder)
     }
 
     // MARK: - Multi-Item Menu Creation
 
-    private static func menu(for entities: [BaseBookmarkEntity]) -> NSMenu {
+    static func openBookmarksInNewTabsMenuItem(bookmarks: [Bookmark]) -> NSMenuItem {
+        menuItem(UserText.bookmarksOpenInNewTabs, #selector(FolderMenuItemSelectors.openInNewTabs(_:)), bookmarks)
+    }
+
+    static func menu(for entities: [BaseBookmarkEntity]) -> NSMenu {
         let menu = NSMenu(title: "")
         var menuItems: [NSMenuItem] = []
 
@@ -185,8 +237,7 @@ struct ContextualMenu {
             menuItems.append(NSMenuItem.separator())
         }
 
-        let title = NSLocalizedString("Delete", comment: "Command")
-        let deleteItem = NSMenuItem(title: title, action: #selector(BookmarkMenuItemSelectors.deleteEntities(_:)), keyEquivalent: "")
+        let deleteItem = NSMenuItem(title: UserText.bookmarksBarContextMenuDelete, action: #selector(BookmarkMenuItemSelectors.deleteEntities(_:)), keyEquivalent: "")
         deleteItem.representedObject = entities
         menuItems.append(deleteItem)
 
diff --git a/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift b/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift
index 307d16cc5d..e2be507a44 100644
--- a/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift
+++ b/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift
@@ -391,18 +391,27 @@ final class LocalBookmarkStore: BookmarkStore {
     }
 
     func update(folder: BookmarkFolder) {
-
         do {
-            _ = try applyChangesAndSave(changes: { context in
-                let folderFetchRequest = BaseBookmarkEntity.singleEntity(with: folder.id)
-                let folderFetchRequestResults = try? context.fetch(folderFetchRequest)
-
-                guard let bookmarkFolderMO = folderFetchRequestResults?.first else {
-                    assertionFailure("LocalBookmarkStore: Failed to get BookmarkEntity from the context")
-                    throw BookmarkStoreError.missingEntity
+            _ = try applyChangesAndSave(changes: { [weak self] context in
+                guard let self = self else {
+                    throw BookmarkStoreError.storeDeallocated
                 }
+                try update(folder: folder, in: context)
+            })
+        } catch {
+            let error = error as NSError
+            commonOnSaveErrorHandler(error)
+        }
+    }
 
-                bookmarkFolderMO.update(with: folder)
+    func update(folder: BookmarkFolder, andMoveToParent parent: ParentFolderType) {
+        do {
+            _ = try applyChangesAndSave(changes: { [weak self] context in
+                guard let self = self else {
+                    throw BookmarkStoreError.storeDeallocated
+                }
+                let folderEntity = try update(folder: folder, in: context)
+                try move(entities: [folderEntity], toIndex: nil, withinParentFolderType: parent, in: context)
             })
         } catch {
             let error = error as NSError
@@ -566,10 +575,6 @@ final class LocalBookmarkStore: BookmarkStore {
                 throw BookmarkStoreError.storeDeallocated
             }
 
-            guard let rootFolder = self.bookmarksRoot(in: context) else {
-                throw BookmarkStoreError.missingRoot
-            }
-
             // Guarantee that bookmarks are fetched in the same order as the UUIDs. In the future, this should fetch all objects at once with a
             // batch fetch request and have them sorted in the correct order.
             let bookmarkManagedObjects: [BookmarkEntity] = objectUUIDs.compactMap { uuid in
@@ -577,28 +582,8 @@ final class LocalBookmarkStore: BookmarkStore {
                 return (try? context.fetch(entityFetchRequest))?.first
             }
 
-            let newParentFolder: BookmarkEntity
-
-            switch type {
-            case .root: newParentFolder = rootFolder
-            case .parent(let newParentUUID):
-                let bookmarksFetchRequest = BaseBookmarkEntity.singleEntity(with: newParentUUID)
+            try move(entities: bookmarkManagedObjects, toIndex: index, withinParentFolderType: type, in: context)
 
-                if let fetchedParent = try context.fetch(bookmarksFetchRequest).first, fetchedParent.isFolder {
-                    newParentFolder = fetchedParent
-                } else {
-                    throw BookmarkStoreError.missingEntity
-                }
-            }
-
-            if let index = index, index < newParentFolder.childrenArray.count {
-                self.move(entities: bookmarkManagedObjects, to: index, within: newParentFolder)
-            } else {
-                for bookmarkManagedObject in bookmarkManagedObjects {
-                    bookmarkManagedObject.parent = nil
-                    newParentFolder.addToChildren(bookmarkManagedObject)
-                }
-            }
         }, onError: { [weak self] error in
             self?.commonOnSaveErrorHandler(error)
             DispatchQueue.main.async { completion(error) }
@@ -996,6 +981,53 @@ final class LocalBookmarkStore: BookmarkStore {
 
 }
 
+private extension LocalBookmarkStore {
+
+    @discardableResult
+    func update(folder: BookmarkFolder, in context: NSManagedObjectContext) throws -> BookmarkEntity {
+        let folderFetchRequest = BaseBookmarkEntity.singleEntity(with: folder.id)
+        let folderFetchRequestResults = try? context.fetch(folderFetchRequest)
+
+        guard let bookmarkFolderMO = folderFetchRequestResults?.first else {
+            assertionFailure("LocalBookmarkStore: Failed to get BookmarkEntity from the context")
+            throw BookmarkStoreError.missingEntity
+        }
+
+        bookmarkFolderMO.update(with: folder)
+        return bookmarkFolderMO
+    }
+
+    func move(entities: [BookmarkEntity], toIndex index: Int?, withinParentFolderType type: ParentFolderType, in context: NSManagedObjectContext) throws {
+        guard let rootFolder = bookmarksRoot(in: context) else {
+            throw BookmarkStoreError.missingRoot
+        }
+
+        let newParentFolder: BookmarkEntity
+
+        switch type {
+        case .root: newParentFolder = rootFolder
+        case .parent(let newParentUUID):
+            let bookmarksFetchRequest = BaseBookmarkEntity.singleEntity(with: newParentUUID)
+
+            if let fetchedParent = try context.fetch(bookmarksFetchRequest).first, fetchedParent.isFolder {
+                newParentFolder = fetchedParent
+            } else {
+                throw BookmarkStoreError.missingEntity
+            }
+        }
+
+        if let index = index, index < newParentFolder.childrenArray.count {
+            self.move(entities: entities, to: index, within: newParentFolder)
+        } else {
+            for bookmarkManagedObject in entities {
+                bookmarkManagedObject.parent = nil
+                newParentFolder.addToChildren(bookmarkManagedObject)
+            }
+        }
+    }
+
+}
+
 extension LocalBookmarkStore.BookmarkStoreError: CustomNSError {
 
     var errorCode: Int {
diff --git a/DuckDuckGo/Bookmarks/Services/MenuItemSelectors.swift b/DuckDuckGo/Bookmarks/Services/MenuItemSelectors.swift
index 44114fc9d8..393b22de8e 100644
--- a/DuckDuckGo/Bookmarks/Services/MenuItemSelectors.swift
+++ b/DuckDuckGo/Bookmarks/Services/MenuItemSelectors.swift
@@ -18,7 +18,13 @@
 
 import AppKit
 
-@objc protocol BookmarkMenuItemSelectors {
+@objc protocol BookmarksMenuItemSelectors {
+    func newFolder(_ sender: NSMenuItem)
+    func moveToEnd(_ sender: NSMenuItem)
+    @objc optional func manageBookmarks(_ sender: NSMenuItem)
+}
+
+@objc protocol BookmarkMenuItemSelectors: BookmarksMenuItemSelectors {
 
     func openBookmarkInNewTab(_ sender: NSMenuItem)
     func openBookmarkInNewWindow(_ sender: NSMenuItem)
@@ -30,11 +36,11 @@ import AppKit
 
 }
 
-@objc protocol FolderMenuItemSelectors {
+@objc protocol FolderMenuItemSelectors: BookmarksMenuItemSelectors {
 
-    func newFolder(_ sender: NSMenuItem)
-    func renameFolder(_ sender: NSMenuItem)
+    func editFolder(_ sender: NSMenuItem)
     func deleteFolder(_ sender: NSMenuItem)
     func openInNewTabs(_ sender: NSMenuItem)
+    func openAllInNewWindow(_ sender: NSMenuItem)
 
 }
diff --git a/DuckDuckGo/Bookmarks/View/AddBookmarkFolderModalView.swift b/DuckDuckGo/Bookmarks/View/AddBookmarkFolderModalView.swift
deleted file mode 100644
index 31cc06dc04..0000000000
--- a/DuckDuckGo/Bookmarks/View/AddBookmarkFolderModalView.swift
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-//  AddBookmarkFolderModalView.swift
-//
-//  Copyright © 2024 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import SwiftUI
-
-struct AddBookmarkFolderModalView: ModalView {
-
-    @State var model: AddBookmarkFolderModalViewModel = .init()
-    @Environment(\.dismiss) private var dismiss
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 16) {
-            Text(model.title)
-                .fontWeight(.semibold)
-
-            HStack(spacing: 16) {
-                Text(UserText.newBookmarkDialogBookmarkNameTitle)
-                    .frame(height: 22)
-
-                TextField("", text: $model.folderName)
-                    .accessibilityIdentifier("Title Text Field")
-                    .textFieldStyle(.roundedBorder)
-                    .disableAutocorrection(true)
-            }
-            .padding(.bottom, 4)
-
-            HStack {
-                Spacer()
-
-                Button(UserText.cancel) {
-                    model.cancel(dismiss: dismiss.callAsFunction)
-                }
-                .keyboardShortcut(.cancelAction)
-
-                Button(model.addButtonTitle) {
-                    model.addFolder(dismiss: dismiss.callAsFunction)
-                }
-                .keyboardShortcut(.defaultAction)
-                .disabled(model.isAddButtonDisabled)
-
-            }
-        }
-        .font(.system(size: 13))
-        .padding()
-        .frame(width: 450, height: 131)
-    }
-
-}
-
-#Preview {
-    AddBookmarkFolderModalView()
-}
diff --git a/DuckDuckGo/Bookmarks/View/AddBookmarkFolderPopoverView.swift b/DuckDuckGo/Bookmarks/View/AddBookmarkFolderPopoverView.swift
index a0ab50c89a..f15465df36 100644
--- a/DuckDuckGo/Bookmarks/View/AddBookmarkFolderPopoverView.swift
+++ b/DuckDuckGo/Bookmarks/View/AddBookmarkFolderPopoverView.swift
@@ -23,59 +23,27 @@ struct AddBookmarkFolderPopoverView: ModalView {
     @ObservedObject var model: AddBookmarkFolderPopoverViewModel
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 16) {
-            Text(UserText.newFolder)
-                .bold()
-
-            VStack(alignment: .leading, spacing: 7) {
-                Text("Location:", comment: "Add Folder popover: parent folder picker title")
-
-                BookmarkFolderPicker(folders: model.folders, selectedFolder: $model.parent)
-                .accessibilityIdentifier("bookmark.folder.folder.dropdown")
-                .disabled(model.isDisabled)
-            }
-
-            VStack(alignment: .leading, spacing: 7) {
-                Text(UserText.newFolderDialogFolderNameTitle)
-
-                TextField("", text: $model.folderName)
-                    .focusedOnAppear()
-                    .accessibilityIdentifier("bookmark.folder.name.textfield")
-                    .textFieldStyle(RoundedBorderTextFieldStyle())
-                    .disabled(model.isDisabled)
-            }
-            .padding(.bottom, 16)
-
-            HStack {
-                Spacer()
-
-                Button(action: {
-                    model.cancel()
-                }) {
-                    Text(UserText.cancel)
-                }
-                .accessibilityIdentifier("bookmark.add.cancel.button")
-                .disabled(model.isDisabled)
-
-                Button(action: {
-                    model.addFolder()
-                }) {
-                    Text("Add Folder", comment: "Add Folder popover: Create folder button")
-                }
-                .keyboardShortcut(.defaultAction)
-                .accessibilityIdentifier("bookmark.add.add.folder.button")
-                .disabled(model.isAddFolderButtonDisabled || model.isDisabled)
-            }
-        }
+        AddEditBookmarkFolderView(
+            title: model.title,
+            buttonsState: .expanded,
+            folders: model.folders,
+            folderName: $model.folderName,
+            selectedFolder: $model.parent,
+            cancelActionTitle: model.cancelActionTitle,
+            isCancelActionDisabled: model.isCancelActionDisabled,
+            cancelAction: { _ in model.cancel() },
+            defaultActionTitle: model.defaultActionTitle,
+            isDefaultActionDisabled: model.isDefaultActionButtonDisabled,
+            defaultAction: { _ in model.addFolder() }
+        )
+        .padding(.vertical, 16.0)
         .font(.system(size: 13))
-        .padding()
-        .frame(width: 300, height: 229)
-        .background(Color(.popoverBackground))
+        .frame(width: 320)
     }
 }
 
 #if DEBUG
-#Preview {
+#Preview("Add Folder - Light") {
     let bkman = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: [
         BookmarkFolder(id: "1", title: "Folder 1", children: [
             BookmarkFolder(id: "2", title: "Nested Folder with a name that in theory won‘t fit into the picker", children: [
@@ -94,5 +62,17 @@ struct AddBookmarkFolderPopoverView: ModalView {
     return AddBookmarkFolderPopoverView(model: AddBookmarkFolderPopoverViewModel(bookmarkManager: bkman) {
         print("CompletionHandler:", $0?.title ?? "<nil>")
     })
+    .preferredColorScheme(.light)
+}
+
+#Preview("Add Folder - Dark") {
+    let bkman = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: []))
+    bkman.loadBookmarks()
+    customAssertionFailure = { _, _, _ in }
+
+    return AddBookmarkFolderPopoverView(model: AddBookmarkFolderPopoverViewModel(bookmarkManager: bkman) {
+        print("CompletionHandler:", $0?.title ?? "<nil>")
+    })
+    .preferredColorScheme(.dark)
 }
 #endif
diff --git a/DuckDuckGo/Bookmarks/View/AddBookmarkModalView.swift b/DuckDuckGo/Bookmarks/View/AddBookmarkModalView.swift
deleted file mode 100644
index 56941737fd..0000000000
--- a/DuckDuckGo/Bookmarks/View/AddBookmarkModalView.swift
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-//  AddBookmarkModalView.swift
-//
-//  Copyright © 2024 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import AppKit
-import SwiftUI
-
-struct AddBookmarkModalView: ModalView {
-
-    @State private(set) var model: AddBookmarkModalViewModel
-    @Environment(\.dismiss) private var dismiss
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 16) {
-            Text(model.title)
-                .fontWeight(.semibold)
-
-            HStack(spacing: 16) {
-                VStack(alignment: .leading) {
-                    Text("Title:", comment: "Add Bookmark dialog bookmark title field heading")
-                        .frame(height: 22)
-                    Text("Address:", comment: "Add Bookmark dialog bookmark url field heading")
-                        .frame(height: 22)
-                }
-
-                VStack {
-                    TextField("", text: $model.bookmarkTitle)
-                        .accessibilityIdentifier("Title Text Field")
-                        .textFieldStyle(.roundedBorder)
-                    TextField("", text: $model.bookmarkAddress)
-                        .accessibilityIdentifier("URL Text Field")
-                        .textFieldStyle(.roundedBorder)
-                        .disableAutocorrection(true)
-                }
-            }
-            .padding(.bottom, 4)
-
-            HStack {
-                Spacer()
-
-                Button(UserText.cancel) {
-                    model.cancel(dismiss: dismiss.callAsFunction)
-                }
-                .keyboardShortcut(.cancelAction)
-
-                Button(model.addButtonTitle) {
-                    model.addOrSave(dismiss: dismiss.callAsFunction)
-                }
-                .keyboardShortcut(.defaultAction)
-                .disabled(model.isAddButtonDisabled)
-
-            }
-        }
-        .font(.system(size: 13))
-        .padding()
-        .frame(width: 437, height: 164)
-    }
-
-}
-
-#Preview {
-    AddBookmarkModalView(model: AddBookmarkModalViewModel())
-}
diff --git a/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift b/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift
index c8d9cadcbd..fba84b44bc 100644
--- a/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift
+++ b/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift
@@ -38,82 +38,32 @@ struct AddBookmarkPopoverView: View {
 
     @MainActor
     private var addBookmarkView: some View {
-        VStack(alignment: .leading, spacing: 19) {
-            Text("Bookmark Added", comment: "Bookmark Added popover title")
-                .fontWeight(.bold)
-                .padding(.bottom, 4)
-
-            VStack(alignment: .leading, spacing: 10) {
-                TextField("", text: $model.bookmarkTitle)
-                    .focusedOnAppear()
-                    .accessibilityIdentifier("bookmark.add.name.textfield")
-                    .textFieldStyle(RoundedBorderTextFieldStyle())
-                    .font(.system(size: 14))
-
-                HStack {
-                    BookmarkFolderPicker(folders: model.folders,
-                                         selectedFolder: $model.selectedFolder)
-                    .accessibilityIdentifier("bookmark.add.folder.dropdown")
-
-                    Button {
-                        model.addFolderButtonAction()
-                    } label: {
-                        Image(.addFolder)
-                    }
-                    .accessibilityIdentifier("bookmark.add.new.folder.button")
-                    .buttonStyle(StandardButtonStyle())
-                }
-            }
-
-            Divider()
-
-            Button {
-                model.favoritesButtonAction()
-            } label: {
-                HStack(spacing: 8) {
-                    if model.bookmark.isFavorite {
-                        Image(.favoriteFilled)
-                        Text(UserText.removeFromFavorites)
-                    } else {
-                        Image(.favorite)
-                        Text(UserText.addToFavorites)
-                    }
-                }
-            }
-            .accessibilityIdentifier("bookmark.add.add.to.favorites.button")
-            .buttonStyle(.borderless)
-            .foregroundColor(Color.button)
-
-            HStack {
-                Spacer()
-
-                Button {
-                    model.removeButtonAction(dismiss: dismiss.callAsFunction)
-                } label: {
-                    Text("Remove", comment: "Remove bookmark button title")
-                }
-                .accessibilityIdentifier("bookmark.add.remove.button")
-
-                Button {
-                    model.doneButtonAction(dismiss: dismiss.callAsFunction)
-                } label: {
-                    Text(UserText.done)
-                }
-                .keyboardShortcut(.defaultAction)
-                .accessibilityIdentifier("bookmark.add.done.button")
-            }
-
-        }
+        AddEditBookmarkView(
+            title: UserText.Bookmarks.Dialog.Title.addedBookmark,
+            buttonsState: .expanded,
+            bookmarkName: $model.bookmarkTitle,
+            bookmarkURLPath: nil,
+            isBookmarkFavorite: $model.isBookmarkFavorite,
+            folders: model.folders,
+            selectedFolder: $model.selectedFolder,
+            isURLFieldHidden: true,
+            addFolderAction: model.addFolderButtonAction,
+            otherActionTitle: UserText.remove,
+            isOtherActionDisabled: false,
+            otherAction: model.removeButtonAction,
+            defaultActionTitle: UserText.done,
+            isDefaultActionDisabled: model.isDefaultActionButtonDisabled,
+            defaultAction: model.doneButtonAction
+        )
+        .padding(.vertical, 16.0)
         .font(.system(size: 13))
-        .padding(EdgeInsets(top: 19, leading: 19, bottom: 19, trailing: 19))
-        .frame(width: 300, height: 229)
-        .background(Color(.popoverBackground))
+        .frame(width: 320)
     }
 
 }
 
 #if DEBUG
-#Preview { {
+#Preview("Bookmark Added - Light") {
     let bkm = Bookmark(id: "n", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: false, parentFolderUUID: "1")
     let bkman = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: [
         BookmarkFolder(id: "1", title: "Folder with a name that shouldn‘t fit into the picker", children: [
@@ -133,5 +83,16 @@ struct AddBookmarkPopoverView: View {
     customAssertionFailure = { _, _, _ in }
 
     return AddBookmarkPopoverView(model: AddBookmarkPopoverViewModel(bookmark: bkm, bookmarkManager: bkman))
-}() }
+        .preferredColorScheme(.light)
+}
+
+#Preview("Bookmark Added - Dark") {
+    let bkm = Bookmark(id: "n", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: false, parentFolderUUID: "1")
+    let bkman = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: [
+        BookmarkFolder(id: "1", title: "Folder with a name that shouldn‘t fit into the picker", children: [])]))
+    bkman.loadBookmarks()
+
+    return AddBookmarkPopoverView(model: AddBookmarkPopoverViewModel(bookmark: bkm, bookmarkManager: bkman))
+        .preferredColorScheme(.dark)
+}
 #endif
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkFolderPicker.swift b/DuckDuckGo/Bookmarks/View/BookmarkFolderPicker.swift
index c0aeab9bec..e7de655e8c 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkFolderPicker.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkFolderPicker.swift
@@ -32,7 +32,7 @@ struct BookmarkFolderPicker: View {
             return popUpButton
         } content: {
 
-            PopupButtonItem(icon: .folder, title: UserText.bookmarks)
+            PopupButtonItem(icon: .bookmarksFolder, title: UserText.bookmarks)
 
             PopupButtonItem.separator()
 
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift
index 541ad955b6..c405c23f61 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift
@@ -63,6 +63,9 @@ final class BookmarkListViewController: NSViewController {
             contentMode: .bookmarksAndFolders,
             bookmarkManager: bookmarkManager,
             treeController: treeController,
+            onMenuRequestedAction: { [weak self] cell in
+                self?.showContextMenu(for: cell)
+            },
             presentFaviconsFetcherOnboarding: { [weak self] in
                 guard let self, let window = self.view.window else {
                     return
@@ -334,23 +337,18 @@ final class BookmarkListViewController: NSViewController {
     }
 
     @objc func newBookmarkButtonClicked(_ sender: AnyObject) {
-        delegate?.popover(shouldPreventClosure: true)
-        AddBookmarkModalView(model: AddBookmarkModalViewModel(currentTabWebsite: currentTabWebsite) { [weak delegate] _ in
-            delegate?.popover(shouldPreventClosure: false)
-        }).show(in: parent?.view.window)
+        let view = BookmarksDialogViewFactory.makeAddBookmarkView(currentTab: currentTabWebsite)
+        showDialog(view: view)
     }
 
     @objc func newFolderButtonClicked(_ sender: AnyObject) {
-        delegate?.popover(shouldPreventClosure: true)
-        AddBookmarkFolderModalView()
-            .show(in: parent?.view.window) { [weak delegate] in
-                delegate?.popover(shouldPreventClosure: false)
-            }
+        let parentFolder = sender.representedObject as? BookmarkFolder
+        let view = BookmarksDialogViewFactory.makeAddBookmarkFolderView(parentFolder: parentFolder)
+        showDialog(view: view)
     }
 
     @objc func openManagementInterface(_ sender: NSButton) {
-        WindowControllersManager.shared.showBookmarksTab()
-        delegate?.popoverShouldClose(self)
+        showManageBookmarks()
     }
 
     @objc func handleClick(_ sender: NSOutlineView) {
@@ -425,6 +423,35 @@ final class BookmarkListViewController: NSViewController {
         outlineView.selectRowIndexes(indexes, byExtendingSelection: false)
     }
 
+    private func showContextMenu(for cell: BookmarkOutlineCellView) {
+        let row = outlineView.row(for: cell)
+        guard
+            let item = outlineView.item(atRow: row),
+            let contextMenu = ContextualMenu.menu(for: [item], target: self)
+        else {
+            return
+        }
+
+        contextMenu.popUpAtMouseLocation(in: view)
+    }
+
+}
+
+private extension BookmarkListViewController {
+
+    func showDialog(view: any ModalView) {
+        delegate?.popover(shouldPreventClosure: true)
+
+        view.show(in: parent?.view.window) { [weak delegate] in
+            delegate?.popover(shouldPreventClosure: false)
+        }
+    }
+
+    func showManageBookmarks() {
+        WindowControllersManager.shared.showBookmarksTab()
+        delegate?.popoverShouldClose(self)
+    }
+
 }
 
 // MARK: - Menu Item Selectors
@@ -439,11 +466,11 @@ extension BookmarkListViewController: NSMenuDelegate {
         }
 
         if outlineView.selectedRowIndexes.contains(row) {
-            return ContextualMenu.menu(for: outlineView.selectedItems, includeBookmarkEditMenu: false)
+            return ContextualMenu.menu(for: outlineView.selectedItems)
         }
 
         if let item = outlineView.item(atRow: row) {
-            return ContextualMenu.menu(for: [item], includeBookmarkEditMenu: false)
+            return ContextualMenu.menu(for: [item])
         } else {
             return nil
         }
@@ -498,7 +525,13 @@ extension BookmarkListViewController: BookmarkMenuItemSelectors {
     }
 
     func editBookmark(_ sender: NSMenuItem) {
-        // Unsupported in the list view for the initial release.
+        guard let bookmark = sender.representedObject as? Bookmark else {
+            assertionFailure("Failed to retrieve Bookmark from Edit Bookmark context menu item")
+            return
+        }
+
+        let view = BookmarksDialogViewFactory.makeEditBookmarkView(bookmark: bookmark)
+        showDialog(view: view)
     }
 
     func copyBookmark(_ sender: NSMenuItem) {
@@ -527,6 +560,20 @@ extension BookmarkListViewController: BookmarkMenuItemSelectors {
         bookmarkManager.remove(objectsWithUUIDs: uuids)
     }
 
+    func manageBookmarks(_ sender: NSMenuItem) {
+        showManageBookmarks()
+    }
+
+    func moveToEnd(_ sender: NSMenuItem) {
+        guard let bookmarkEntity = sender.representedObject as? BookmarksEntityIdentifiable else {
+            assertionFailure("Failed to cast menu item's represented object to BookmarkEntity")
+            return
+        }
+
+        let parentFolderType: ParentFolderType = bookmarkEntity.parentId.flatMap { .parent(uuid: $0) } ?? .root
+        bookmarkManager.move(objectUUIDs: [bookmarkEntity.entityId], toIndex: nil, withinParentFolder: parentFolderType) { _ in }
+    }
+
 }
 
 extension BookmarkListViewController: FolderMenuItemSelectors {
@@ -535,18 +582,16 @@ extension BookmarkListViewController: FolderMenuItemSelectors {
         newFolderButtonClicked(sender)
     }
 
-    func renameFolder(_ sender: NSMenuItem) {
-        guard let folder = sender.representedObject as? BookmarkFolder else {
-            assertionFailure("Failed to retrieve Bookmark from Rename Folder context menu item")
+    func editFolder(_ sender: NSMenuItem) {
+        guard let bookmarkEntityInfo = sender.representedObject as? BookmarkEntityInfo,
+              let folder = bookmarkEntityInfo.entity as? BookmarkFolder
+        else {
+            assertionFailure("Failed to retrieve Bookmark from Edit Folder context menu item")
             return
         }
 
-        delegate?.popover(shouldPreventClosure: true)
-
-        AddBookmarkFolderModalView(model: AddBookmarkFolderModalViewModel(folder: folder))
-            .show(in: parent?.view.window) { [weak delegate] in
-                delegate?.popover(shouldPreventClosure: false)
-            }
+        let view = BookmarksDialogViewFactory.makeEditBookmarkFolderView(folder: folder, parentFolder: bookmarkEntityInfo.parent)
+        showDialog(view: view)
     }
 
     func deleteFolder(_ sender: NSMenuItem) {
@@ -560,15 +605,28 @@ extension BookmarkListViewController: FolderMenuItemSelectors {
 
     func openInNewTabs(_ sender: NSMenuItem) {
         guard let tabCollection = WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController.tabCollectionViewModel,
-              let children = (sender.representedObject as? BookmarkFolder)?.children else {
-            assertionFailure("Cannot open in new tabs")
+              let folder = sender.representedObject as? BookmarkFolder
+        else {
+            assertionFailure("Cannot open all in new tabs")
             return
         }
 
-        let tabs = children.compactMap { ($0 as? Bookmark)?.urlObject }.map { Tab(content: .url($0, source: .bookmark), shouldLoadInBackground: true, burnerMode: tabCollection.burnerMode) }
+        let tabs = Tab.withContentOfBookmark(folder: folder, burnerMode: tabCollection.burnerMode)
         tabCollection.append(tabs: tabs)
     }
 
+    func openAllInNewWindow(_ sender: NSMenuItem) {
+        guard let tabCollection = WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController.tabCollectionViewModel,
+              let folder = sender.representedObject as? BookmarkFolder
+        else {
+            assertionFailure("Cannot open all in new window")
+            return
+        }
+
+        let newTabCollection = TabCollection.withContentOfBookmark(folder: folder, burnerMode: tabCollection.burnerMode)
+        WindowsManager.openNewWindow(with: newTabCollection, isBurner: tabCollection.isBurner)
+    }
+
 }
 
 // MARK: - BookmarkListPopover
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift
index a9b03ede97..ecc643b33d 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift
@@ -32,12 +32,10 @@ private struct EditedBookmarkMetadata {
 
 final class BookmarkManagementDetailViewController: NSViewController, NSMenuItemValidation {
 
-    fileprivate enum Constants {
-        static let animationSpeed: TimeInterval = 0.3
-    }
-
+    private let toolbarButtonsStackView = NSStackView()
     private lazy var newBookmarkButton = MouseOverButton(title: "  " + UserText.newBookmark, target: self, action: #selector(presentAddBookmarkModal))
     private lazy var newFolderButton = MouseOverButton(title: "  " + UserText.newFolder, target: self, action: #selector(presentAddFolderModal))
+    private lazy var deleteItemsButton = MouseOverButton(title: "  " + UserText.bookmarksBarContextMenuDelete, target: self, action: #selector(delete))
 
     private lazy var separator = NSBox()
     private lazy var scrollView = NSScrollView()
@@ -54,32 +52,10 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
     private let bookmarkManager: BookmarkManager
     private var selectionState: BookmarkManagementSidebarViewController.SelectionState = .empty {
         didSet {
-            editingBookmarkIndex = nil
             reloadData()
         }
     }
 
-    private var isEditing: Bool {
-        return editingBookmarkIndex != nil
-    }
-
-    private var editingBookmarkIndex: EditedBookmarkMetadata? {
-        didSet {
-            NSAnimationContext.runAnimationGroup { context in
-                context.allowsImplicitAnimation = true
-                context.duration = Constants.animationSpeed
-
-                NSAppearance.withAppAppearance {
-                    if editingBookmarkIndex != nil {
-                        view.animator().layer?.backgroundColor = NSColor.backgroundSecondary.cgColor
-                    } else {
-                        view.animator().layer?.backgroundColor = NSColor.bookmarkPageBackground.cgColor
-                    }
-                }
-            }
-        }
-    }
-
     func update(selectionState: BookmarkManagementSidebarViewController.SelectionState) {
         self.selectionState = selectionState
     }
@@ -101,34 +77,16 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
         view.addSubview(separator)
         view.addSubview(scrollView)
         view.addSubview(emptyState)
-        view.addSubview(newBookmarkButton)
-        view.addSubview(newFolderButton)
-
-        newBookmarkButton.bezelStyle = .shadowlessSquare
-        newBookmarkButton.cornerRadius = 4
-        newBookmarkButton.normalTintColor = .button
-        newBookmarkButton.mouseDownColor = .buttonMouseDown
-        newBookmarkButton.mouseOverColor = .buttonMouseOver
-        newBookmarkButton.imageHugsTitle = true
-        newBookmarkButton.setContentHuggingPriority(.defaultHigh, for: .vertical)
-        newBookmarkButton.translatesAutoresizingMaskIntoConstraints = false
-        newBookmarkButton.alignment = .center
-        newBookmarkButton.font = .systemFont(ofSize: 13)
-        newBookmarkButton.image = .addBookmark
-        newBookmarkButton.imagePosition = .imageLeading
-
-        newFolderButton.bezelStyle = .shadowlessSquare
-        newFolderButton.cornerRadius = 4
-        newFolderButton.normalTintColor = .button
-        newFolderButton.mouseDownColor = .buttonMouseDown
-        newFolderButton.mouseOverColor = .buttonMouseOver
-        newFolderButton.imageHugsTitle = true
-        newFolderButton.setContentHuggingPriority(.defaultHigh, for: .vertical)
-        newFolderButton.translatesAutoresizingMaskIntoConstraints = false
-        newFolderButton.alignment = .center
-        newFolderButton.font = .systemFont(ofSize: 13)
-        newFolderButton.image = .addFolder
-        newFolderButton.imagePosition = .imageLeading
+        view.addSubview(toolbarButtonsStackView)
+        toolbarButtonsStackView.addArrangedSubview(newBookmarkButton)
+        toolbarButtonsStackView.addArrangedSubview(newFolderButton)
+        toolbarButtonsStackView.addArrangedSubview(deleteItemsButton)
+        toolbarButtonsStackView.translatesAutoresizingMaskIntoConstraints = false
+        toolbarButtonsStackView.distribution = .fill
+
+        configureToolbar(button: newBookmarkButton, image: .addBookmark, isHidden: false)
+        configureToolbar(button: newFolderButton, image: .addFolder, isHidden: false)
+        configureToolbar(button: deleteItemsButton, image: .trash, isHidden: true)
 
         emptyState.addSubview(emptyStateImageView)
         emptyState.addSubview(emptyStateTitle)
@@ -137,32 +95,27 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
 
         emptyState.isHidden = true
         emptyState.translatesAutoresizingMaskIntoConstraints = false
+        importButton.translatesAutoresizingMaskIntoConstraints = false
 
-        emptyStateTitle.isEditable = false
-        emptyStateTitle.setContentHuggingPriority(.defaultHigh, for: .vertical)
-        emptyStateTitle.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
-        emptyStateTitle.translatesAutoresizingMaskIntoConstraints = false
-        emptyStateTitle.alignment = .center
-        emptyStateTitle.drawsBackground = false
-        emptyStateTitle.isBordered = false
-        emptyStateTitle.font = .systemFont(ofSize: 15, weight: .semibold)
-        emptyStateTitle.textColor = .labelColor
-        emptyStateTitle.attributedStringValue = NSAttributedString.make(UserText.bookmarksEmptyStateTitle,
-                                                                        lineHeight: 1.14,
-                                                                        kern: -0.23)
-
-        emptyStateMessage.isEditable = false
-        emptyStateMessage.setContentHuggingPriority(.defaultHigh, for: .vertical)
-        emptyStateMessage.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
-        emptyStateMessage.translatesAutoresizingMaskIntoConstraints = false
-        emptyStateMessage.alignment = .center
-        emptyStateMessage.drawsBackground = false
-        emptyStateMessage.isBordered = false
-        emptyStateMessage.font = .systemFont(ofSize: 13)
-        emptyStateMessage.textColor = .labelColor
-        emptyStateMessage.attributedStringValue = NSAttributedString.make(UserText.bookmarksEmptyStateMessage,
-                                                                          lineHeight: 1.05,
-                                                                          kern: -0.08)
+        configureEmptyState(
+            label: emptyStateTitle,
+            font: .systemFont(ofSize: 15, weight: .semibold),
+            attributedTitle: .make(
+                UserText.bookmarksEmptyStateTitle,
+                lineHeight: 1.14,
+                kern: -0.23
+            )
+        )
+
+        configureEmptyState(
+            label: emptyStateMessage,
+            font: .systemFont(ofSize: 13),
+            attributedTitle: .make(
+                UserText.bookmarksEmptyStateMessage,
+                lineHeight: 1.05,
+                kern: -0.08
+            )
+        )
 
         emptyStateImageView.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
         emptyStateImageView.setContentHuggingPriority(.init(rawValue: 251), for: .vertical)
@@ -195,7 +148,6 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
         tableView.selectionHighlightStyle = .none
         tableView.allowsMultipleSelection = true
         tableView.usesAutomaticRowHeights = true
-        tableView.action = #selector(handleClick)
         tableView.doubleAction = #selector(handleDoubleClick)
         tableView.delegate = self
         tableView.dataSource = self
@@ -209,47 +161,47 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
     }
 
     private func setupLayout() {
-        newBookmarkButton.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 48).isActive = true
-        view.trailingAnchor.constraint(equalTo: scrollView.trailingAnchor, constant: 48).isActive = true
-        separator.topAnchor.constraint(equalTo: newBookmarkButton.bottomAnchor, constant: 24).isActive = true
-        emptyState.centerYAnchor.constraint(equalTo: view.centerYAnchor, constant: 20).isActive = true
-        scrollView.topAnchor.constraint(equalTo: separator.bottomAnchor).isActive = true
-
-        view.bottomAnchor.constraint(equalTo: scrollView.bottomAnchor).isActive = true
-        view.trailingAnchor.constraint(greaterThanOrEqualTo: newFolderButton.trailingAnchor, constant: 20).isActive = true
-        view.trailingAnchor.constraint(equalTo: separator.trailingAnchor, constant: 58).isActive = true
-        newFolderButton.leadingAnchor.constraint(equalTo: newBookmarkButton.trailingAnchor, constant: 16).isActive = true
-        emptyState.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true
-        newFolderButton.centerYAnchor.constraint(equalTo: newBookmarkButton.centerYAnchor).isActive = true
-        separator.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 58).isActive = true
-        newBookmarkButton.topAnchor.constraint(equalTo: view.topAnchor, constant: 32).isActive = true
-        emptyState.topAnchor.constraint(greaterThanOrEqualTo: separator.bottomAnchor, constant: 8).isActive = true
-        scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 48).isActive = true
-        emptyState.centerXAnchor.constraint(equalTo: separator.centerXAnchor).isActive = true
-
-        newBookmarkButton.heightAnchor.constraint(equalToConstant: 24).isActive = true
-
-        newFolderButton.heightAnchor.constraint(equalToConstant: 24).isActive = true
-
-        emptyStateMessage.centerXAnchor.constraint(equalTo: emptyState.centerXAnchor).isActive = true
+        NSLayoutConstraint.activate([
+            toolbarButtonsStackView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 48),
+            view.trailingAnchor.constraint(equalTo: scrollView.trailingAnchor, constant: 48),
+            separator.topAnchor.constraint(equalTo: toolbarButtonsStackView.bottomAnchor, constant: 24),
+            emptyState.centerYAnchor.constraint(equalTo: view.centerYAnchor, constant: 20),
+            scrollView.topAnchor.constraint(equalTo: separator.bottomAnchor),
 
-        importButton.translatesAutoresizingMaskIntoConstraints = false
-        importButton.topAnchor.constraint(equalTo: emptyStateMessage.bottomAnchor, constant: 8).isActive = true
-        emptyState.heightAnchor.constraint(equalToConstant: 218).isActive = true
-        emptyStateMessage.topAnchor.constraint(equalTo: emptyStateTitle.bottomAnchor, constant: 8).isActive = true
-        importButton.centerXAnchor.constraint(equalTo: emptyState.centerXAnchor).isActive = true
-        emptyStateImageView.centerXAnchor.constraint(equalTo: emptyState.centerXAnchor).isActive = true
-        emptyState.widthAnchor.constraint(equalToConstant: 224).isActive = true
-        emptyStateImageView.topAnchor.constraint(equalTo: emptyState.topAnchor).isActive = true
-        emptyStateTitle.centerXAnchor.constraint(equalTo: emptyState.centerXAnchor).isActive = true
-        emptyStateTitle.topAnchor.constraint(equalTo: emptyStateImageView.bottomAnchor, constant: 8).isActive = true
+            view.bottomAnchor.constraint(equalTo: scrollView.bottomAnchor),
+            view.trailingAnchor.constraint(greaterThanOrEqualTo: toolbarButtonsStackView.trailingAnchor, constant: 20),
+            view.trailingAnchor.constraint(equalTo: separator.trailingAnchor, constant: 58),
+            emptyState.centerXAnchor.constraint(equalTo: view.centerXAnchor),
+            separator.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 58),
+            toolbarButtonsStackView.topAnchor.constraint(equalTo: view.topAnchor, constant: 32),
+            emptyState.topAnchor.constraint(greaterThanOrEqualTo: separator.bottomAnchor, constant: 8),
+            scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 48),
+            emptyState.centerXAnchor.constraint(equalTo: separator.centerXAnchor),
+
+            newBookmarkButton.heightAnchor.constraint(equalToConstant: 24),
+            newFolderButton.heightAnchor.constraint(equalToConstant: 24),
+            deleteItemsButton.heightAnchor.constraint(equalToConstant: 24),
 
-        emptyStateMessage.widthAnchor.constraint(equalToConstant: 192).isActive = true
+            emptyStateMessage.centerXAnchor.constraint(equalTo: emptyState.centerXAnchor),
 
-        emptyStateTitle.widthAnchor.constraint(equalToConstant: 192).isActive = true
+            importButton.topAnchor.constraint(equalTo: emptyStateMessage.bottomAnchor, constant: 8),
+            emptyState.heightAnchor.constraint(equalToConstant: 218),
+            emptyStateMessage.topAnchor.constraint(equalTo: emptyStateTitle.bottomAnchor, constant: 8),
+            importButton.centerXAnchor.constraint(equalTo: emptyState.centerXAnchor),
+            emptyStateImageView.centerXAnchor.constraint(equalTo: emptyState.centerXAnchor),
+            emptyState.widthAnchor.constraint(equalToConstant: 224),
+            emptyStateImageView.topAnchor.constraint(equalTo: emptyState.topAnchor),
+            emptyStateTitle.centerXAnchor.constraint(equalTo: emptyState.centerXAnchor),
+            emptyStateTitle.topAnchor.constraint(equalTo: emptyStateImageView.bottomAnchor, constant: 8),
+
+            emptyStateMessage.widthAnchor.constraint(equalToConstant: 192),
+
+            emptyStateTitle.widthAnchor.constraint(equalToConstant: 192),
+
+            emptyStateImageView.widthAnchor.constraint(equalToConstant: 128),
+            emptyStateImageView.heightAnchor.constraint(equalToConstant: 96),
+        ])
 
-        emptyStateImageView.widthAnchor.constraint(equalToConstant: 128).isActive = true
-        emptyStateImageView.heightAnchor.constraint(equalToConstant: 96).isActive = true
     }
 
     override func viewDidLoad() {
@@ -264,15 +216,9 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
 
     override func viewDidDisappear() {
         super.viewDidDisappear()
-        editingBookmarkIndex = nil
         reloadData()
     }
 
-    override func mouseUp(with event: NSEvent) {
-        // Clicking anywhere outside of the table view should end editing mode for a given cell.
-        updateEditingState(forRowAt: -1)
-    }
-
     override func keyDown(with event: NSEvent) {
         if event.charactersIgnoringModifiers == String(UnicodeScalar(NSDeleteCharacter)!) {
             deleteSelectedItems()
@@ -280,15 +226,13 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
     }
 
     fileprivate func reloadData() {
-        guard editingBookmarkIndex == nil else {
-            // If the table view is editing, the reload will be deferred until after the cell animation has completed.
-            return
-        }
         emptyState.isHidden = !(bookmarkManager.list?.topLevelEntities.isEmpty ?? true)
 
         let scrollPosition = tableView.visibleRect.origin
         tableView.reloadData()
         tableView.scroll(scrollPosition)
+
+        updateToolbarButtons()
     }
 
     @objc func onImportClicked(_ sender: NSButton) {
@@ -306,7 +250,7 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
 
         let index = sender.clickedRow
 
-        guard index != -1, editingBookmarkIndex?.index != index, let entity = fetchEntity(at: index) else {
+        guard index != -1, let entity = fetchEntity(at: index) else {
             return
         }
 
@@ -324,21 +268,13 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
         }
     }
 
-    @objc func handleClick(_ sender: NSTableView) {
-        let index = sender.clickedRow
-
-        if index != editingBookmarkIndex?.index {
-            endEditing()
-        }
-    }
-
     @objc func presentAddBookmarkModal(_ sender: Any) {
-        AddBookmarkModalView(model: AddBookmarkModalViewModel(parent: selectionState.folder))
+        BookmarksDialogViewFactory.makeAddBookmarkView(parent: selectionState.folder)
             .show(in: view.window)
     }
 
     @objc func presentAddFolderModal(_ sender: Any) {
-        AddBookmarkFolderModalView(model: AddBookmarkFolderModalViewModel(parent: selectionState.folder))
+        BookmarksDialogViewFactory.makeAddBookmarkFolderView(parentFolder: selectionState.folder)
             .show(in: view.window)
     }
 
@@ -354,53 +290,6 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
         return true
     }
 
-    private func endEditing() {
-        if let editingIndex = editingBookmarkIndex?.index {
-            self.editingBookmarkIndex = nil
-            animateEditingState(forRowAt: editingIndex, editing: false)
-        }
-    }
-
-    private func updateEditingState(forRowAt index: Int) {
-        guard index != -1 else {
-            endEditing()
-            return
-        }
-
-        if editingBookmarkIndex?.index == nil || editingBookmarkIndex?.index != index {
-            endEditing()
-        }
-
-        if let entity = fetchEntity(at: index) {
-            editingBookmarkIndex = EditedBookmarkMetadata(uuid: entity.id, index: index)
-            animateEditingState(forRowAt: index, editing: true)
-        } else {
-            assertionFailure("\(#file): Failed to find entity when updating editing state")
-        }
-    }
-
-    private func animateEditingState(forRowAt index: Int, editing: Bool, completion: (() -> Void)? = nil) {
-        if let cell = tableView.view(atColumn: 0, row: index, makeIfNecessary: false) as? BookmarkTableCellView,
-           let row = tableView.rowView(atRow: index, makeIfNecessary: false) as? BookmarkTableRowView {
-
-            tableView.beginUpdates()
-            NSAnimationContext.runAnimationGroup { context in
-                context.allowsImplicitAnimation = true
-                context.duration = Constants.animationSpeed
-                context.completionHandler = completion
-
-                cell.editing = editing
-                row.editing = editing
-
-                row.layoutSubtreeIfNeeded()
-                cell.layoutSubtreeIfNeeded()
-                tableView.noteHeightOfRows(withIndexesChanged: IndexSet(arrayLiteral: 0, index))
-            }
-
-            tableView.endUpdates()
-        }
-    }
-
     private func totalRows() -> Int {
         switch selectionState {
         case .empty:
@@ -444,12 +333,6 @@ extension BookmarkManagementDetailViewController: NSTableViewDelegate, NSTableVi
         let rowView = BookmarkTableRowView()
         rowView.onSelectionChanged = onSelectionChanged
 
-        let entity = fetchEntity(at: row)
-
-        if let uuid = editingBookmarkIndex?.uuid, uuid == entity?.id {
-            rowView.editing = true
-        }
-
         return rowView
     }
 
@@ -463,14 +346,12 @@ extension BookmarkManagementDetailViewController: NSTableViewDelegate, NSTableVi
 
         if let bookmark = entity as? Bookmark {
             cell.update(from: bookmark)
-            cell.editing = bookmark.id == editingBookmarkIndex?.uuid
 
             if bookmark.favicon(.small) == nil {
                 faviconsFetcherOnboarding?.presentOnboardingIfNeeded()
             }
         } else if let folder = entity as? BookmarkFolder {
             cell.update(from: folder)
-            cell.editing = folder.id == editingBookmarkIndex?.uuid
         } else {
             assertionFailure("Failed to cast bookmark")
         }
@@ -573,6 +454,17 @@ extension BookmarkManagementDetailViewController: NSTableViewDelegate, NSTableVi
         }
     }
 
+    private func fetchEntityAndParent(at row: Int) -> (entity: BaseBookmarkEntity?, parentFolder: BookmarkFolder?) {
+        switch selectionState {
+        case .empty:
+            return (bookmarkManager.list?.topLevelEntities[safe: row], nil)
+        case .folder(let folder):
+            return (folder.children[safe: row], folder)
+        case .favorites:
+            return (bookmarkManager.list?.favoriteBookmarks[safe: row], nil)
+        }
+    }
+
     private func index(for entity: Bookmark) -> Int? {
         switch selectionState {
         case .empty:
@@ -610,11 +502,25 @@ extension BookmarkManagementDetailViewController: NSTableViewDelegate, NSTableVi
     }
 
     func onSelectionChanged() {
-        resetSelections()
-        let indexes = tableView.selectedRowIndexes
-        indexes.forEach {
-            let cell = self.tableView.view(atColumn: 0, row: $0, makeIfNecessary: false) as? BookmarkTableCellView
-            cell?.isSelected = true
+        func updateCellSelections() {
+            resetSelections()
+            tableView.selectedRowIndexes.forEach {
+                let cell = self.tableView.view(atColumn: 0, row: $0, makeIfNecessary: false) as? BookmarkTableCellView
+                cell?.isSelected = true
+            }
+        }
+
+        updateCellSelections()
+        updateToolbarButtons()
+    }
+
+    private func updateToolbarButtons() {
+        let shouldShowDeleteButton = tableView.selectedRowIndexes.count > 1
+        NSAnimationContext.runAnimationGroup { context in
+            context.duration = 0.25
+            deleteItemsButton.animator().isHidden = !shouldShowDeleteButton
+            newBookmarkButton.animator().isHidden = shouldShowDeleteButton
+            newFolderButton.animator().isHidden = shouldShowDeleteButton
         }
     }
 
@@ -633,13 +539,45 @@ extension BookmarkManagementDetailViewController: NSTableViewDelegate, NSTableVi
     }
 }
 
+// MARK: - Private
+
+private extension BookmarkManagementDetailViewController {
+
+    func configureToolbar(button: MouseOverButton, image: NSImage, isHidden: Bool) {
+        button.bezelStyle = .shadowlessSquare
+        button.cornerRadius = 4
+        button.normalTintColor = .button
+        button.mouseDownColor = .buttonMouseDown
+        button.mouseOverColor = .buttonMouseOver
+        button.imageHugsTitle = true
+        button.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        button.alignment = .center
+        button.font = .systemFont(ofSize: 13)
+        button.image = image
+        button.imagePosition = .imageLeading
+        button.isHidden = isHidden
+    }
+
+    func configureEmptyState(label: NSTextField, font: NSFont, attributedTitle: NSAttributedString) {
+        label.isEditable = false
+        label.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        label.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
+        label.translatesAutoresizingMaskIntoConstraints = false
+        label.alignment = .center
+        label.drawsBackground = false
+        label.isBordered = false
+        label.font = font
+        label.textColor = .labelColor
+        label.attributedStringValue = attributedTitle
+    }
+
+}
+
 // MARK: - BookmarkTableCellViewDelegate
 
 extension BookmarkManagementDetailViewController: BookmarkTableCellViewDelegate {
 
     func bookmarkTableCellViewRequestedMenu(_ sender: NSButton, cell: BookmarkTableCellView) {
-        guard !isEditing else { return }
-
         let row = tableView.row(for: cell)
 
         guard let bookmark = fetchEntity(at: row) as? Bookmark else {
@@ -647,45 +585,8 @@ extension BookmarkManagementDetailViewController: BookmarkTableCellViewDelegate
             return
         }
 
-        if let contextMenu = ContextualMenu.menu(for: [bookmark]), let cursorLocation = self.view.window?.mouseLocationOutsideOfEventStream {
-            let convertedLocation = self.view.convert(cursorLocation, from: nil)
-            contextMenu.items.forEach { item in
-                item.target = self
-            }
-
-            contextMenu.popUp(positioning: nil, at: convertedLocation, in: self.view)
-        }
-    }
-
-    func bookmarkTableCellViewToggledFavorite(cell: BookmarkTableCellView) {
-        let row = tableView.row(for: cell)
-
-        guard let bookmark = fetchEntity(at: row) as? Bookmark else {
-            assertionFailure("BookmarkManagementDetailViewController: Tried to favorite object which is not bookmark")
-            return
-        }
-
-        bookmark.isFavorite.toggle()
-        bookmarkManager.update(bookmark: bookmark)
-    }
-
-    func bookmarkTableCellView(_ cell: BookmarkTableCellView, updatedBookmarkWithUUID uuid: String, newTitle: String, newUrl: String) {
-        let row = tableView.row(for: cell)
-        defer {
-            endEditing()
-        }
-        guard var bookmark = fetchEntity(at: row) as? Bookmark, bookmark.id == uuid else {
-            return
-        }
-
-        if let url = newUrl.url, url.absoluteString != bookmark.url {
-            bookmark = bookmarkManager.updateUrl(of: bookmark, to: url) ?? bookmark
-        }
-        let bookmarkTitle = (newTitle.isEmpty ? bookmark.title : newTitle).trimmingWhitespace()
-        if bookmark.title != bookmarkTitle {
-            bookmark.title = bookmarkTitle
-            bookmarkManager.update(bookmark: bookmark)
-        }
+        guard let contextMenu = ContextualMenu.menu(for: [bookmark], target: self) else { return }
+        contextMenu.popUpAtMouseLocation(in: view)
     }
 
 }
@@ -695,20 +596,21 @@ extension BookmarkManagementDetailViewController: BookmarkTableCellViewDelegate
 extension BookmarkManagementDetailViewController: NSMenuDelegate {
 
     func contextualMenuForClickedRows() -> NSMenu? {
-        guard !isEditing else { return nil }
-
         let row = tableView.clickedRow
 
         guard row != -1 else {
             return ContextualMenu.menu(for: nil)
         }
 
-        if tableView.selectedRowIndexes.contains(row) {
+        // If only one item is selected try to get the item and its parent folder otherwise show the menu for multiple items.
+        if tableView.selectedRowIndexes.contains(row), tableView.selectedRowIndexes.count > 1  {
             return ContextualMenu.menu(for: self.selectedItems())
         }
 
-        if let item = fetchEntity(at: row) {
-            return ContextualMenu.menu(for: [item])
+        let (item, parent) = fetchEntityAndParent(at: row)
+
+        if let item {
+            return ContextualMenu.menu(for: item, parentFolder: parent)
         } else {
             return nil
         }
@@ -738,13 +640,15 @@ extension BookmarkManagementDetailViewController: FolderMenuItemSelectors {
         presentAddFolderModal(sender)
     }
 
-    func renameFolder(_ sender: NSMenuItem) {
-        guard let folder = sender.representedObject as? BookmarkFolder else {
+    func editFolder(_ sender: NSMenuItem) {
+        guard let bookmarkEntityInfo = sender.representedObject as? BookmarkEntityInfo,
+              let folder = bookmarkEntityInfo.entity as? BookmarkFolder
+        else {
             assertionFailure("Failed to cast menu represented object to BookmarkFolder")
             return
         }
 
-        AddBookmarkFolderModalView(model: AddBookmarkFolderModalViewModel(folder: folder))
+        BookmarksDialogViewFactory.makeEditBookmarkFolderView(folder: folder, parentFolder: bookmarkEntityInfo.parent)
             .show(in: view.window)
     }
 
@@ -757,6 +661,16 @@ extension BookmarkManagementDetailViewController: FolderMenuItemSelectors {
         bookmarkManager.remove(folder: folder)
     }
 
+    func moveToEnd(_ sender: NSMenuItem) {
+        guard let bookmarkEntity = sender.representedObject as? BookmarksEntityIdentifiable else {
+            assertionFailure("Failed to cast menu item's represented object to BookmarkEntity")
+            return
+        }
+
+        let parentFolderType: ParentFolderType = bookmarkEntity.parentId.flatMap { .parent(uuid: $0) } ?? .root
+        bookmarkManager.move(objectUUIDs: [bookmarkEntity.entityId], toIndex: nil, withinParentFolder: parentFolderType) { _ in }
+    }
+
     func openInNewTabs(_ sender: NSMenuItem) {
         if let children = (sender.representedObject as? BookmarkFolder)?.children {
             let bookmarks = children.compactMap { $0 as? Bookmark }
@@ -768,6 +682,18 @@ extension BookmarkManagementDetailViewController: FolderMenuItemSelectors {
         }
     }
 
+    func openAllInNewWindow(_ sender: NSMenuItem) {
+        guard let tabCollection = WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController.tabCollectionViewModel,
+              let folder = sender.representedObject as? BookmarkFolder
+        else {
+            assertionFailure("Cannot open all in new window")
+            return
+        }
+
+        let newTabCollection = TabCollection.withContentOfBookmark(folder: folder, burnerMode: tabCollection.burnerMode)
+        WindowsManager.openNewWindow(with: newTabCollection, isBurner: tabCollection.isBurner)
+    }
+
 }
 
 extension BookmarkManagementDetailViewController: BookmarkMenuItemSelectors {
@@ -811,8 +737,10 @@ extension BookmarkManagementDetailViewController: BookmarkMenuItemSelectors {
     }
 
     func editBookmark(_ sender: NSMenuItem) {
-        guard let bookmark = sender.representedObject as? Bookmark, let bookmarkIndex = index(for: bookmark) else { return }
-        updateEditingState(forRowAt: bookmarkIndex)
+        guard let bookmark = sender.representedObject as? Bookmark else { return }
+
+        BookmarksDialogViewFactory.makeEditBookmarkView(bookmark: bookmark)
+            .show(in: view.window)
     }
 
     func copyBookmark(_ sender: NSMenuItem) {
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift
index 6d0fdd6860..53e502383b 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift
@@ -51,7 +51,7 @@ final class BookmarkManagementSidebarViewController: NSViewController {
     private lazy var outlineView = BookmarksOutlineView(frame: scrollView.frame)
 
     private lazy var treeController = BookmarkTreeController(dataSource: treeControllerDataSource)
-    private lazy var dataSource = BookmarkOutlineViewDataSource(contentMode: .foldersOnly, bookmarkManager: bookmarkManager, treeController: treeController)
+    private lazy var dataSource = BookmarkOutlineViewDataSource(contentMode: .foldersOnly, bookmarkManager: bookmarkManager, treeController: treeController, showMenuButtonOnHover: false)
 
     private var cancellables = Set<AnyCancellable>()
 
@@ -211,6 +211,13 @@ final class BookmarkManagementSidebarViewController: NSViewController {
     // MARK: NSOutlineView Configuration
 
     private func expandAndRestore(selectedNodes: [BookmarkNode]) {
+        // OutlineView doesn't allow multiple selections so there should be only one selected node at time.
+        let selectedNode = selectedNodes.first
+        // As the data source reloaded we need to refresh the previously selected nodes.
+        // Lets consider the scenario where we add a folder to a subfolder.
+        // When the folder is added we need to "refresh" the node because the previously selected node folder has changed (it has a child folder now).
+        var refreshedSelectedNodes: [BookmarkNode] = []
+
         treeController.visitNodes { node in
             if let objectID = (node.representedObject as? BaseBookmarkEntity)?.id {
                 if dataSource.expandedNodesIDs.contains(objectID) {
@@ -218,6 +225,11 @@ final class BookmarkManagementSidebarViewController: NSViewController {
                 } else {
                     outlineView.collapseItem(node)
                 }
+
+                // Add the node if it contains previously selected folder
+                if let folder = selectedNode?.representedObject as? BookmarkFolder, folder.id == objectID {
+                    refreshedSelectedNodes.append(node)
+                }
             }
 
             // Expand the Bookmarks pseudo folder automatically.
@@ -226,7 +238,7 @@ final class BookmarkManagementSidebarViewController: NSViewController {
             }
         }
 
-        restoreSelection(to: selectedNodes)
+        restoreSelection(to: refreshedSelectedNodes)
     }
 
     private func restoreSelection(to nodes: [BookmarkNode]) {
@@ -292,16 +304,20 @@ extension BookmarkManagementSidebarViewController: NSMenuDelegate {
 extension BookmarkManagementSidebarViewController: FolderMenuItemSelectors {
 
     func newFolder(_ sender: NSMenuItem) {
-        AddBookmarkFolderModalView().show(in: view.window)
+        let parent = sender.representedObject as? BookmarkFolder
+        BookmarksDialogViewFactory.makeAddBookmarkFolderView(parentFolder: parent)
+            .show(in: view.window)
     }
 
-    func renameFolder(_ sender: NSMenuItem) {
-        guard let folder = sender.representedObject as? BookmarkFolder else {
-            assertionFailure("Failed to retrieve Bookmark from Rename Folder context menu item")
+    func editFolder(_ sender: NSMenuItem) {
+        guard let bookmarkEntityInfo = sender.representedObject as? BookmarkEntityInfo,
+              let folder = bookmarkEntityInfo.entity as? BookmarkFolder
+        else {
+            assertionFailure("Failed to cast menu represented object to BookmarkFolder")
             return
         }
 
-        AddBookmarkFolderModalView(model: AddBookmarkFolderModalViewModel(folder: folder))
+        BookmarksDialogViewFactory.makeEditBookmarkFolderView(folder: folder, parentFolder: bookmarkEntityInfo.parent)
             .show(in: view.window)
     }
 
@@ -314,17 +330,40 @@ extension BookmarkManagementSidebarViewController: FolderMenuItemSelectors {
         bookmarkManager.remove(folder: folder)
     }
 
+    func moveToEnd(_ sender: NSMenuItem) {
+        guard let bookmarkEntity = sender.representedObject as? BookmarksEntityIdentifiable else {
+            assertionFailure("Failed to cast menu item's represented object to BookmarkEntity")
+            return
+        }
+
+        let parentFolderType: ParentFolderType = bookmarkEntity.parentId.flatMap { .parent(uuid: $0) } ?? .root
+        bookmarkManager.move(objectUUIDs: [bookmarkEntity.entityId], toIndex: nil, withinParentFolder: parentFolderType) { _ in }
+    }
+
     func openInNewTabs(_ sender: NSMenuItem) {
         guard let tabCollection = WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController.tabCollectionViewModel,
-              let children = (sender.representedObject as? BookmarkFolder)?.children else {
-            assertionFailure("Cannot open in new tabs")
+              let folder = sender.representedObject as? BookmarkFolder
+        else {
+            assertionFailure("Cannot open all in new tabs")
             return
         }
 
-        let tabs = children.compactMap { ($0 as? Bookmark)?.urlObject }.map { Tab(content: .url($0, source: .bookmark), shouldLoadInBackground: true, burnerMode: tabCollection.burnerMode) }
+        let tabs = Tab.withContentOfBookmark(folder: folder, burnerMode: tabCollection.burnerMode)
         tabCollection.append(tabs: tabs)
     }
 
+    func openAllInNewWindow(_ sender: NSMenuItem) {
+        guard let tabCollection = WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController.tabCollectionViewModel,
+              let folder = sender.representedObject as? BookmarkFolder
+        else {
+            assertionFailure("Cannot open all in new window")
+            return
+        }
+
+        let newTabCollection = TabCollection.withContentOfBookmark(folder: folder, burnerMode: tabCollection.burnerMode)
+        WindowsManager.openNewWindow(with: newTabCollection, isBurner: tabCollection.isBurner)
+    }
+
 }
 
 #if DEBUG
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkOutlineCellView.swift b/DuckDuckGo/Bookmarks/View/BookmarkOutlineCellView.swift
index 08e6c56953..603849bbbf 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkOutlineCellView.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkOutlineCellView.swift
@@ -19,11 +19,24 @@
 import AppKit
 import Foundation
 
+protocol BookmarkOutlineCellViewDelegate: AnyObject {
+    func outlineCellViewRequestedMenu(_ cell: BookmarkOutlineCellView)
+}
+
 final class BookmarkOutlineCellView: NSTableCellView {
 
     private lazy var faviconImageView = NSImageView()
     private lazy var titleLabel = NSTextField(string: "Bookmark/Folder")
     private lazy var countLabel = NSTextField(string: "42")
+    private lazy var menuButton = NSButton(title: "", image: .settings, target: self, action: #selector(cellMenuButtonClicked))
+    private lazy var favoriteImageView = NSImageView()
+    private lazy var trackingArea: NSTrackingArea = {
+        NSTrackingArea(rect: .zero, options: [.inVisibleRect, .activeAlways, .mouseEnteredAndExited], owner: self, userInfo: nil)
+    }()
+
+    var shouldShowMenuButton = false
+
+    weak var delegate: BookmarkOutlineCellViewDelegate?
 
     init(identifier: NSUserInterfaceItemIdentifier) {
         super.init(frame: .zero)
@@ -34,10 +47,35 @@ final class BookmarkOutlineCellView: NSTableCellView {
         fatalError("\(type(of: self)): Bad initializer")
     }
 
+    override func updateTrackingAreas() {
+        super.updateTrackingAreas()
+
+        guard !trackingAreas.contains(trackingArea), shouldShowMenuButton else { return }
+        addTrackingArea(trackingArea)
+    }
+
+    override func mouseEntered(with event: NSEvent) {
+        guard shouldShowMenuButton else { return }
+        countLabel.isHidden = true
+        favoriteImageView.isHidden = true
+        menuButton.isHidden = false
+    }
+
+    override func mouseExited(with event: NSEvent) {
+        guard shouldShowMenuButton else { return }
+        menuButton.isHidden = true
+        countLabel.isHidden = false
+        favoriteImageView.isHidden = false
+    }
+
+    // MARK: - Private
+
     private func setupUI() {
         addSubview(faviconImageView)
         addSubview(titleLabel)
         addSubview(countLabel)
+        addSubview(menuButton)
+        addSubview(favoriteImageView)
 
         faviconImageView.translatesAutoresizingMaskIntoConstraints = false
         faviconImageView.image = .bookmarkDefaultFavicon
@@ -64,40 +102,74 @@ final class BookmarkOutlineCellView: NSTableCellView {
         countLabel.textColor = .blackWhite60
         countLabel.lineBreakMode = .byClipping
 
+        menuButton.translatesAutoresizingMaskIntoConstraints = false
+        menuButton.contentTintColor = .button
+        menuButton.imagePosition = .imageTrailing
+        menuButton.isBordered = false
+        menuButton.isHidden = true
+
+        favoriteImageView.translatesAutoresizingMaskIntoConstraints = false
+        favoriteImageView.imageScaling = .scaleProportionallyDown
         setupLayout()
     }
 
     private func setupLayout() {
-        faviconImageView.heightAnchor.constraint(equalToConstant: 16).isActive = true
-        faviconImageView.widthAnchor.constraint(equalToConstant: 16).isActive = true
-        faviconImageView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 5).isActive = true
-        faviconImageView.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
+        NSLayoutConstraint.activate([
+            faviconImageView.heightAnchor.constraint(equalToConstant: 16),
+            faviconImageView.widthAnchor.constraint(equalToConstant: 16),
+            faviconImageView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 5),
+            faviconImageView.centerYAnchor.constraint(equalTo: centerYAnchor),
+
+            titleLabel.leadingAnchor.constraint(equalTo: faviconImageView.trailingAnchor, constant: 10),
+            bottomAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 6),
+            titleLabel.topAnchor.constraint(equalTo: topAnchor, constant: 6),
+
+            countLabel.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
+            countLabel.leadingAnchor.constraint(equalTo: titleLabel.trailingAnchor, constant: 5),
+            trailingAnchor.constraint(equalTo: countLabel.trailingAnchor),
+
+            menuButton.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
+           menuButton.leadingAnchor.constraint(greaterThanOrEqualTo: titleLabel.trailingAnchor, constant: 5),
+            menuButton.trailingAnchor.constraint(equalTo: trailingAnchor),
+            menuButton.topAnchor.constraint(equalTo: topAnchor),
+            menuButton.bottomAnchor.constraint(equalTo: bottomAnchor),
+            menuButton.widthAnchor.constraint(equalToConstant: 28),
+
+            favoriteImageView.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
+            favoriteImageView.leadingAnchor.constraint(greaterThanOrEqualTo: titleLabel.trailingAnchor, constant: 5),
+            favoriteImageView.trailingAnchor.constraint(equalTo: menuButton.trailingAnchor),
+            favoriteImageView.heightAnchor.constraint(equalToConstant: 15),
+            favoriteImageView.widthAnchor.constraint(equalToConstant: 15),
+        ])
+
         faviconImageView.setContentHuggingPriority(NSLayoutConstraint.Priority(rawValue: 251), for: .horizontal)
         faviconImageView.setContentHuggingPriority(NSLayoutConstraint.Priority(rawValue: 251), for: .vertical)
 
-        titleLabel.leadingAnchor.constraint(equalTo: faviconImageView.trailingAnchor, constant: 10).isActive = true
-        bottomAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 6).isActive = true
-        titleLabel.topAnchor.constraint(equalTo: topAnchor, constant: 6).isActive = true
         titleLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         titleLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
         titleLabel.setContentHuggingPriority(.init(rawValue: 200), for: .horizontal)
 
-        countLabel.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor).isActive = true
-        countLabel.leadingAnchor.constraint(equalTo: titleLabel.trailingAnchor, constant: 5).isActive = true
-        trailingAnchor.constraint(equalTo: countLabel.trailingAnchor).isActive = true
         countLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
         countLabel.setContentHuggingPriority(.required, for: .horizontal)
     }
 
+    @objc private func cellMenuButtonClicked() {
+        delegate?.outlineCellViewRequestedMenu(self)
+    }
+
+    // MARK: - Public
+
     func update(from bookmark: Bookmark) {
         faviconImageView.image = bookmark.favicon(.small) ?? .bookmarkDefaultFavicon
         titleLabel.stringValue = bookmark.title
         countLabel.stringValue = ""
+        favoriteImageView.image = bookmark.isFavorite ? .favoriteFilledBorder : nil
     }
 
     func update(from folder: BookmarkFolder) {
         faviconImageView.image = .folder
         titleLabel.stringValue = folder.title
+        favoriteImageView.image = nil
 
         let totalChildBookmarks = folder.totalChildBookmarks
         if totalChildBookmarks > 0 {
@@ -111,10 +183,13 @@ final class BookmarkOutlineCellView: NSTableCellView {
         faviconImageView.image = pseudoFolder.icon
         titleLabel.stringValue = pseudoFolder.name
         countLabel.stringValue = pseudoFolder.count > 0 ? String(pseudoFolder.count) : ""
+        favoriteImageView.image = nil
     }
 
 }
 
+// MARK: - Preview
+
 #if DEBUG
 @available(macOS 14.0, *)
 #Preview {
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkTableCellView.swift b/DuckDuckGo/Bookmarks/View/BookmarkTableCellView.swift
index 195ad48845..8bfdc3c4fb 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkTableCellView.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkTableCellView.swift
@@ -22,8 +22,6 @@ import Foundation
 @objc protocol BookmarkTableCellViewDelegate: AnyObject {
 
     func bookmarkTableCellViewRequestedMenu(_ sender: NSButton, cell: BookmarkTableCellView)
-    func bookmarkTableCellViewToggledFavorite(cell: BookmarkTableCellView)
-    func bookmarkTableCellView(_ cellView: BookmarkTableCellView, updatedBookmarkWithUUID uuid: String, newTitle: String, newUrl: String)
 
 }
 
@@ -33,53 +31,18 @@ final class BookmarkTableCellView: NSTableCellView {
 
     private lazy var titleLabel = NSTextField(string: "Bookmark")
     private lazy var bookmarkURLLabel = NSTextField(string: "URL")
-    private lazy var favoriteButton = NSButton(title: "", image: .favoriteFilledBorder, target: self, action: #selector(favoriteButtonClicked))
     private lazy var accessoryImageView = NSImageView(image: .forward)
 
-    private var favoriteButtonBottomConstraint: NSLayoutConstraint!
-    private var favoriteButtonTrailingConstraint: NSLayoutConstraint!
-
     private lazy var containerView = NSView()
-    private lazy var shadowView = NSBox()
 
     private lazy var menuButton = NSButton(title: "", image: .settings, target: self, action: #selector(cellMenuButtonClicked))
 
-    // Shadow view constraints:
-
-    private var shadowViewTopConstraint: NSLayoutConstraint!
-    private var shadowViewBottomConstraint: NSLayoutConstraint!
-
-    // Container view constraints:
-
-    private var titleLabelTopConstraint: NSLayoutConstraint!
-    private var titleLabelBottomConstraint: NSLayoutConstraint!
-
     @objc func cellMenuButtonClicked(_ sender: NSButton) {
         delegate?.bookmarkTableCellViewRequestedMenu(sender, cell: self)
     }
 
-    @objc func favoriteButtonClicked(_ sender: NSButton) {
-        guard entity is Bookmark else {
-            assertionFailure("\(#file): Tried to favorite non-Bookmark object")
-            return
-        }
-
-        delegate?.bookmarkTableCellViewToggledFavorite(cell: self)
-    }
-
     weak var delegate: BookmarkTableCellViewDelegate?
 
-    var editing: Bool = false {
-        didSet {
-            if editing {
-                enterEditingMode()
-            } else {
-                exitEditingMode()
-            }
-            updateColors()
-        }
-    }
-
     var isSelected = false {
         didSet {
             updateColors()
@@ -96,16 +59,14 @@ final class BookmarkTableCellView: NSTableCellView {
                 return
             }
 
-            accessoryImageView.isHidden = mouseInside || editing
-            menuButton.isHidden = !mouseInside || editing
+            accessoryImageView.isHidden = mouseInside
+            menuButton.isHidden = !mouseInside
 
-            if !mouseInside && !editing {
+            if !mouseInside {
                 resetAppearanceFromBookmark()
             }
 
-            if !editing {
-                updateTitleLabelValue()
-            }
+            updateTitleLabelValue()
         }
     }
 
@@ -130,36 +91,16 @@ final class BookmarkTableCellView: NSTableCellView {
         fatalError("\(type(of: self)): Bad initializer")
     }
 
-    // swiftlint:disable:next function_body_length
     private func setupUI() {
         autoresizingMask = [.width, .height]
 
-        addSubview(shadowView)
         addSubview(containerView)
 
-        shadowView.boxType = .custom
-        shadowView.borderColor = .clear
-        shadowView.borderWidth = 1
-        shadowView.cornerRadius = 4
-        shadowView.fillColor = .tableCellEditing
-        shadowView.translatesAutoresizingMaskIntoConstraints = false
-        shadowView.wantsLayer = true
-        shadowView.layer?.backgroundColor = NSColor.tableCellEditing.cgColor
-        shadowView.layer?.cornerRadius = 6
-
-        let shadow = NSShadow()
-        shadow.shadowOffset = NSSize(width: 0, height: -1)
-        shadow.shadowColor = NSColor.black.withAlphaComponent(0.2)
-        shadow.shadowBlurRadius = 2.0
-        shadowView.shadow = shadow
-
         containerView.translatesAutoresizingMaskIntoConstraints = false
         containerView.addSubview(faviconImageView)
         containerView.addSubview(titleLabel)
         containerView.addSubview(menuButton)
         containerView.addSubview(accessoryImageView)
-        containerView.addSubview(bookmarkURLLabel)
-        containerView.addSubview(favoriteButton)
 
         faviconImageView.contentTintColor = .suggestionIcon
         faviconImageView.wantsLayer = true
@@ -176,92 +117,50 @@ final class BookmarkTableCellView: NSTableCellView {
         titleLabel.font = .systemFont(ofSize: 13)
         titleLabel.textColor = .labelColor
         titleLabel.lineBreakMode = .byTruncatingTail
-        titleLabel.cell?.sendsActionOnEndEditing = true
         titleLabel.cell?.usesSingleLineMode = true
         titleLabel.translatesAutoresizingMaskIntoConstraints = false
         titleLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         titleLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
         titleLabel.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
-        titleLabel.delegate = self
-
-        bookmarkURLLabel.focusRingType = .none
-        bookmarkURLLabel.isEditable = false
-        bookmarkURLLabel.isSelectable = false
-        bookmarkURLLabel.isBordered = false
-        bookmarkURLLabel.drawsBackground = false
-        bookmarkURLLabel.font = .systemFont(ofSize: 13)
-        bookmarkURLLabel.textColor = .secondaryLabelColor
-        bookmarkURLLabel.lineBreakMode = .byClipping
-        bookmarkURLLabel.translatesAutoresizingMaskIntoConstraints = false
-        bookmarkURLLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
-        bookmarkURLLabel.setContentHuggingPriority(.required, for: .vertical)
-        bookmarkURLLabel.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
-        bookmarkURLLabel.delegate = self
 
         accessoryImageView.translatesAutoresizingMaskIntoConstraints = false
-        accessoryImageView.widthAnchor.constraint(equalToConstant: 22).isActive = true
-        accessoryImageView.heightAnchor.constraint(equalToConstant: 32).isActive = true
 
         menuButton.contentTintColor = .button
         menuButton.translatesAutoresizingMaskIntoConstraints = false
         menuButton.isBordered = false
         menuButton.isHidden = true
-
-        favoriteButton.translatesAutoresizingMaskIntoConstraints = false
-        favoriteButton.isBordered = false
     }
 
     private func setupLayout() {
+        NSLayoutConstraint.activate([
+        trailingAnchor.constraint(equalTo: containerView.trailingAnchor, constant: 3),
+        containerView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 3),
+        bottomAnchor.constraint(equalTo: containerView.bottomAnchor, constant: 3),
+        containerView.topAnchor.constraint(equalTo: topAnchor, constant: 3),
 
-        trailingAnchor.constraint(equalTo: shadowView.trailingAnchor, constant: 3).isActive = true
-        shadowView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 3).isActive = true
-        containerView.leadingAnchor.constraint(equalTo: shadowView.leadingAnchor).isActive = true
-        containerView.bottomAnchor.constraint(equalTo: shadowView.bottomAnchor).isActive = true
-        containerView.topAnchor.constraint(equalTo: shadowView.topAnchor).isActive = true
-        containerView.trailingAnchor.constraint(equalTo: shadowView.trailingAnchor).isActive = true
+        menuButton.leadingAnchor.constraint(equalTo: titleLabel.trailingAnchor, constant: 8),
+        faviconImageView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor, constant: 6),
 
-        bookmarkURLLabel.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 10).isActive = true
-        favoriteButtonTrailingConstraint = trailingAnchor.constraint(equalTo: favoriteButton.trailingAnchor, constant: 3)
-        favoriteButtonTrailingConstraint.isActive = true
+        accessoryImageView.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
+        titleLabel.leadingAnchor.constraint(equalTo: faviconImageView.trailingAnchor, constant: 8),
+        trailingAnchor.constraint(equalTo: accessoryImageView.trailingAnchor, constant: 3),
+        faviconImageView.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
+        trailingAnchor.constraint(equalTo: menuButton.trailingAnchor, constant: 2),
 
-        menuButton.leadingAnchor.constraint(equalTo: titleLabel.trailingAnchor, constant: 8).isActive = true
-        faviconImageView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor, constant: 6).isActive = true
-        favoriteButton.topAnchor.constraint(equalTo: bookmarkURLLabel.bottomAnchor).isActive = true
+        menuButton.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
 
-        accessoryImageView.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor).isActive = true
-        titleLabel.leadingAnchor.constraint(equalTo: faviconImageView.trailingAnchor, constant: 8).isActive = true
-        trailingAnchor.constraint(equalTo: accessoryImageView.trailingAnchor, constant: 3).isActive = true
-        faviconImageView.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor).isActive = true
-        trailingAnchor.constraint(equalTo: menuButton.trailingAnchor, constant: 2).isActive = true
-        bookmarkURLLabel.leadingAnchor.constraint(equalTo: titleLabel.leadingAnchor).isActive = true
-        trailingAnchor.constraint(equalTo: bookmarkURLLabel.trailingAnchor, constant: 16).isActive = true
-        menuButton.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor).isActive = true
+        menuButton.heightAnchor.constraint(equalToConstant: 32),
+        menuButton.widthAnchor.constraint(equalToConstant: 28),
 
-        favoriteButton.widthAnchor.constraint(equalToConstant: 24).isActive = true
-        favoriteButton.heightAnchor.constraint(equalToConstant: 24).isActive = true
+        faviconImageView.heightAnchor.constraint(equalToConstant: 16),
+        faviconImageView.widthAnchor.constraint(equalToConstant: 16),
 
-        menuButton.heightAnchor.constraint(equalToConstant: 32).isActive = true
-        menuButton.widthAnchor.constraint(equalToConstant: 28).isActive = true
+        bottomAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 8),
+        titleLabel.topAnchor.constraint(equalTo: containerView.topAnchor, constant: 5),
 
-        faviconImageView.heightAnchor.constraint(equalToConstant: 16).isActive = true
-        faviconImageView.widthAnchor.constraint(equalToConstant: 16).isActive = true
-
-        shadowViewTopConstraint = shadowView.topAnchor.constraint(equalTo: topAnchor, constant: 3)
-        shadowViewTopConstraint.isActive = true
-
-        shadowViewBottomConstraint = bottomAnchor.constraint(equalTo: shadowView.bottomAnchor, constant: 3)
-        shadowViewBottomConstraint.isActive = true
-
-        titleLabelBottomConstraint = bottomAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 8)
-        titleLabelBottomConstraint.priority = .init(rawValue: 250)
-        titleLabelBottomConstraint.isActive = true
-
-        favoriteButtonBottomConstraint = bottomAnchor.constraint(equalTo: favoriteButton.bottomAnchor, constant: 8)
-        favoriteButtonBottomConstraint.priority = .init(rawValue: 750)
-        favoriteButtonBottomConstraint.isActive = true
-
-        titleLabelTopConstraint = titleLabel.topAnchor.constraint(equalTo: containerView.topAnchor, constant: 5)
-        titleLabelTopConstraint.isActive = true
+        accessoryImageView.widthAnchor.constraint(equalToConstant: 22),
+        accessoryImageView.heightAnchor.constraint(equalToConstant: 32),
+        ])
     }
 
     override var backgroundStyle: NSView.BackgroundStyle {
@@ -314,84 +213,28 @@ final class BookmarkTableCellView: NSTableCellView {
             accessoryImageView.isHidden = false
         }
 
-        accessoryImageView.image = bookmark.isFavorite ? .favorite : nil
-        favoriteButton.image = bookmark.isFavorite ? .favoriteFilledBorder : .favorite
+        accessoryImageView.image = bookmark.isFavorite ? .favoriteFilledBorder : nil
         titleLabel.stringValue = bookmark.title
         primaryTitleLabelValue = bookmark.title
         tertiaryTitleLabelValue = bookmark.url
-        bookmarkURLLabel.stringValue = bookmark.url
     }
 
     func update(from folder: BookmarkFolder) {
         self.entity = folder
 
         faviconImageView.image = .folder
-        accessoryImageView.image = .chevronNext16
+        accessoryImageView.image = .chevronMediumRight16
         primaryTitleLabelValue = folder.title
         tertiaryTitleLabelValue = nil
     }
 
     private func resetCellState() {
         self.entity = nil
-        editing = false
         mouseInside = false
-        bookmarkURLLabel.isHidden = true
-        favoriteButton.isHidden = true
-        titleLabelBottomConstraint.priority = .required
-    }
-
-    private func enterEditingMode() {
-        titleLabel.isEditable = true
-        bookmarkURLLabel.isEditable = true
-
-        shadowViewTopConstraint.constant = 10
-        shadowViewBottomConstraint.constant = 10
-        titleLabelTopConstraint.constant = 12
-        favoriteButtonTrailingConstraint.constant = 11
-        favoriteButtonBottomConstraint.constant = 18
-        shadowView.isHidden = false
-        faviconImageView.isHidden = true
-
-        bookmarkURLLabel.isHidden = false
-        favoriteButton.isHidden = false
-        titleLabelBottomConstraint.priority = .defaultLow
-
-        hideTertiaryValueInTitleLabel()
-
-        // Reluctantly use GCD as a workaround for a rare label layout issue, in which the text field shows no text upon becoming first responder.
-        DispatchQueue.main.async {
-            self.titleLabel.becomeFirstResponder()
-        }
-    }
-
-    private func exitEditingMode() {
-        window?.makeFirstResponder(nil)
-
-        titleLabel.isEditable = false
-        bookmarkURLLabel.isEditable = false
-
-        titleLabelTopConstraint.constant = 5
-        shadowViewTopConstraint.constant = 3
-        shadowViewBottomConstraint.constant = 3
-        favoriteButtonTrailingConstraint.constant = 3
-        favoriteButtonBottomConstraint.constant = 8
-        shadowView.isHidden = true
-        faviconImageView.isHidden = false
-
-        bookmarkURLLabel.isHidden = true
-        favoriteButton.isHidden = true
-        titleLabelBottomConstraint.priority = .required
-
-        if let editedBookmark = self.entity as? Bookmark {
-            delegate?.bookmarkTableCellView(self,
-                                            updatedBookmarkWithUUID: editedBookmark.id,
-                                            newTitle: titleLabel.stringValue,
-                                            newUrl: bookmarkURLLabel.stringValue)
-        }
     }
 
     private func updateColors() {
-        titleLabel.textColor = isSelected && !editing ? .white : .controlTextColor
+        titleLabel.textColor = isSelected ? .white : .controlTextColor
         menuButton.contentTintColor = isSelected ? .white : .button
         faviconImageView.contentTintColor = isSelected ? .white : .suggestionIcon
         accessoryImageView.contentTintColor = isSelected ? .white : .suggestionIcon
@@ -428,11 +271,7 @@ final class BookmarkTableCellView: NSTableCellView {
     }
 
     private func updateTitleLabelValue() {
-        guard !editing else {
-            return
-        }
-
-        if let tertiaryValue = tertiaryTitleLabelValue, mouseInside, !editing {
+        if let tertiaryValue = tertiaryTitleLabelValue, mouseInside {
             showTertiaryValueInTitleLabel(tertiaryValue)
         } else {
             hideTertiaryValueInTitleLabel()
@@ -467,26 +306,6 @@ final class BookmarkTableCellView: NSTableCellView {
 
 }
 
-extension BookmarkTableCellView: NSTextFieldDelegate {
-
-    func control(_ control: NSControl, textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {
-        switch commandSelector {
-        case #selector(cancelOperation) where self.editing:
-            self.resetAppearanceFromBookmark()
-            self.editing = false
-            return true
-
-        case #selector(insertNewline) where self.editing:
-            self.editing = false
-            return true
-
-        default: break
-        }
-        return false
-    }
-
-}
-
 #if DEBUG
 @available(macOS 14.0, *)
 #Preview {
@@ -517,19 +336,10 @@ extension BookmarkTableCellView {
             fatalError("init(coder:) has not been implemented")
         }
 
-        func bookmarkTableCellViewRequestedMenu(_ sender: NSButton, cell: BookmarkTableCellView) {
-            cell.editing.toggle()
-        }
+        func bookmarkTableCellViewRequestedMenu(_ sender: NSButton, cell: BookmarkTableCellView) {}
 
         func bookmarkTableCellViewToggledFavorite(cell: BookmarkTableCellView) {
             (cell.entity as? Bookmark)?.isFavorite.toggle()
-            cell.editing = false
-        }
-
-        func bookmarkTableCellView(_ cellView: BookmarkTableCellView, updatedBookmarkWithUUID uuid: String, newTitle: String, newUrl: String) {
-            if cell.editing {
-                cell.editing = false
-            }
         }
     }
 }
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkTableRowView.swift b/DuckDuckGo/Bookmarks/View/BookmarkTableRowView.swift
index ebd3a9f318..0f06f84788 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkTableRowView.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkTableRowView.swift
@@ -16,14 +16,12 @@
 //  limitations under the License.
 //
 
-import Foundation
+import AppKit
 
 final class BookmarkTableRowView: NSTableRowView {
 
     var onSelectionChanged: (() -> Void)?
 
-    var editing = false
-
     var hasPrevious = false {
         didSet {
             needsDisplay = true
@@ -56,7 +54,7 @@ final class BookmarkTableRowView: NSTableRowView {
         backgroundColor.setFill()
         bounds.fill()
 
-        if mouseInside && !editing {
+        if mouseInside {
             let path = NSBezierPath(roundedRect: bounds, xRadius: 6, yRadius: 6)
             NSColor.rowHover.setFill()
             path.fill()
@@ -68,8 +66,6 @@ final class BookmarkTableRowView: NSTableRowView {
     }
 
     override func drawSelection(in dirtyRect: NSRect) {
-        guard !editing else { return }
-
         var roundedCorners = [NSBezierPath.Corners]()
 
         if !hasPrevious {
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift
new file mode 100644
index 0000000000..2c0256bba4
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift
@@ -0,0 +1,123 @@
+//
+//  AddEditBookmarkDialogView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+struct AddEditBookmarkDialogView: ModalView {
+    @ObservedObject private var viewModel: AddEditBookmarkDialogCoordinatorViewModel<AddEditBookmarkDialogViewModel, AddEditBookmarkFolderDialogViewModel>
+
+    init(viewModel: AddEditBookmarkDialogCoordinatorViewModel<AddEditBookmarkDialogViewModel, AddEditBookmarkFolderDialogViewModel>) {
+        self.viewModel = viewModel
+    }
+
+    var body: some View {
+        Group {
+            switch viewModel.viewState {
+            case .bookmark:
+                addEditBookmarkView
+            case .folder:
+                addFolderView
+            }
+        }
+        .font(.system(size: 13))
+    }
+
+    private var addEditBookmarkView: some View {
+        AddEditBookmarkView(
+            title: viewModel.bookmarkModel.title,
+            buttonsState: .compressed,
+            bookmarkName: $viewModel.bookmarkModel.bookmarkName,
+            bookmarkURLPath: $viewModel.bookmarkModel.bookmarkURLPath,
+            isBookmarkFavorite: $viewModel.bookmarkModel.isBookmarkFavorite,
+            folders: viewModel.bookmarkModel.folders,
+            selectedFolder: $viewModel.bookmarkModel.selectedFolder,
+            isURLFieldHidden: false,
+            addFolderAction: viewModel.addFolderAction,
+            otherActionTitle: viewModel.bookmarkModel.cancelActionTitle,
+            isOtherActionDisabled: viewModel.bookmarkModel.isOtherActionDisabled,
+            otherAction: viewModel.bookmarkModel.cancel,
+            defaultActionTitle: viewModel.bookmarkModel.defaultActionTitle,
+            isDefaultActionDisabled: viewModel.bookmarkModel.isDefaultActionDisabled,
+            defaultAction: viewModel.bookmarkModel.addOrSave
+        )
+        .frame(width: 448, height: 288)
+    }
+
+    private var addFolderView: some View {
+        AddEditBookmarkFolderView(
+            title: viewModel.folderModel.title,
+            buttonsState: .compressed,
+            folders: viewModel.folderModel.folders,
+            folderName: $viewModel.folderModel.folderName,
+            selectedFolder: $viewModel.folderModel.selectedFolder,
+            cancelActionTitle: viewModel.folderModel.cancelActionTitle,
+            isCancelActionDisabled: viewModel.folderModel.isOtherActionDisabled,
+            cancelAction: { _ in
+                viewModel.dismissAction()
+            },
+            defaultActionTitle: viewModel.folderModel.defaultActionTitle,
+            isDefaultActionDisabled: viewModel.folderModel.isDefaultActionDisabled,
+            defaultAction: { _ in
+                viewModel.folderModel.addOrSave {
+                    viewModel.dismissAction()
+                }
+            }
+        )
+        .frame(width: 448, height: 210)
+    }
+}
+
+// MARK: - Previews
+
+#if DEBUG
+#Preview("Add Bookmark - Light Mode") {
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: []))
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeAddBookmarkView(parent: nil, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.light)
+}
+
+#Preview("Add Bookmark - Dark Mode") {
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: []))
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeAddBookmarkView(parent: nil, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.dark)
+}
+
+#Preview("Edit Bookmark - Light Mode") {
+    let parentFolder = BookmarkFolder(id: "7", title: "DuckDuckGo")
+    let bookmark = Bookmark(id: "1", url: "www.duckduckgo.com", title: "DuckDuckGo", isFavorite: true, parentFolderUUID: "7")
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: [bookmark, parentFolder]))
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeEditBookmarkView(bookmark: bookmark, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.light)
+}
+
+#Preview("Edit Bookmark - Dark Mode") {
+    let parentFolder = BookmarkFolder(id: "7", title: "DuckDuckGo")
+    let bookmark = Bookmark(id: "1", url: "www.duckduckgo.com", title: "DuckDuckGo", isFavorite: true, parentFolderUUID: "7")
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: [bookmark, parentFolder]))
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeEditBookmarkView(bookmark: bookmark, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.dark)
+}
+#endif
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkFolderDialogView.swift b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkFolderDialogView.swift
new file mode 100644
index 0000000000..f859311335
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkFolderDialogView.swift
@@ -0,0 +1,107 @@
+//
+//  AddEditBookmarkFolderDialogView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+struct AddEditBookmarkFolderDialogView: ModalView {
+    @ObservedObject private var viewModel: AddEditBookmarkFolderDialogViewModel
+
+    init(viewModel: AddEditBookmarkFolderDialogViewModel) {
+        self.viewModel = viewModel
+    }
+
+    var body: some View {
+        AddEditBookmarkFolderView(
+            title: viewModel.title,
+            buttonsState: .compressed,
+            folders: viewModel.folders,
+            folderName: $viewModel.folderName,
+            selectedFolder: $viewModel.selectedFolder,
+            cancelActionTitle: viewModel.cancelActionTitle,
+            isCancelActionDisabled: viewModel.isOtherActionDisabled,
+            cancelAction: viewModel.cancel,
+            defaultActionTitle: viewModel.defaultActionTitle,
+            isDefaultActionDisabled: viewModel.isDefaultActionDisabled,
+            defaultAction: viewModel.addOrSave
+        )
+        .font(.system(size: 13))
+        .frame(width: 448, height: 210)
+    }
+}
+
+// MARK: - Previews
+#if DEBUG
+#Preview("Add Folder To Bookmarks - Light") {
+    let bookmarkFolder = BookmarkFolder(id: "1", title: "DuckDuckGo", children: [])
+    let store = BookmarkStoreMock(bookmarks: [bookmarkFolder])
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: store)
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeAddBookmarkFolderView(parentFolder: nil, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.light)
+}
+
+#Preview("Add Folder To Bookmarks Subfolder - Light") {
+    let bookmarkFolder = BookmarkFolder(id: "1", title: "DuckDuckGo", children: [])
+    let store = BookmarkStoreMock(bookmarks: [bookmarkFolder])
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: store)
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeAddBookmarkFolderView(parentFolder: bookmarkFolder, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.light)
+}
+
+#Preview("Edit Folder - Light") {
+    let bookmarkFolder = BookmarkFolder(id: "1", title: "DuckDuckGo", children: [])
+    let store = BookmarkStoreMock(bookmarks: [bookmarkFolder])
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: store)
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeEditBookmarkFolderView(folder: bookmarkFolder, parentFolder: nil, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.light)
+}
+
+#Preview("Add Folder To Bookmarks - Dark") {
+    let store = BookmarkStoreMock(bookmarks: [])
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: store)
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeAddBookmarkFolderView(parentFolder: nil, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.dark)
+}
+
+#Preview("Add Folder To Bookmarks Subfolder - Dark") {
+    let bookmarkFolder = BookmarkFolder(id: "1", title: "DuckDuckGo", children: [])
+    let store = BookmarkStoreMock(bookmarks: [bookmarkFolder])
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: store)
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeAddBookmarkFolderView(parentFolder: bookmarkFolder, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.dark)
+}
+
+#Preview("Edit Folder in Subfolder - Dark") {
+    let bookmarkFolder = BookmarkFolder(id: "1", title: "DuckDuckGo", children: [])
+    let store = BookmarkStoreMock(bookmarks: [bookmarkFolder])
+    let bookmarkManager = LocalBookmarkManager(bookmarkStore: store)
+    bookmarkManager.loadBookmarks()
+
+    return BookmarksDialogViewFactory.makeEditBookmarkFolderView(folder: bookmarkFolder, parentFolder: bookmarkFolder, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.dark)
+}
+#endif
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkFolderView.swift b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkFolderView.swift
new file mode 100644
index 0000000000..d89cfc7c93
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkFolderView.swift
@@ -0,0 +1,132 @@
+//
+//  AddEditBookmarkFolderView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+struct AddEditBookmarkFolderView: View {
+    enum ButtonsState {
+        case compressed
+        case expanded
+    }
+
+    let title: String
+    let buttonsState: ButtonsState
+    let folders: [FolderViewModel]
+    @Binding var folderName: String
+    @Binding var selectedFolder: BookmarkFolder?
+
+    let cancelActionTitle: String
+    let isCancelActionDisabled: Bool
+    let cancelAction: @MainActor (_ dismiss: () -> Void) -> Void
+
+    let defaultActionTitle: String
+    let isDefaultActionDisabled: Bool
+    let defaultAction: @MainActor (_ dismiss: () -> Void) -> Void
+
+    var body: some View {
+        BookmarkDialogContainerView(
+            title: title,
+            middleSection: {
+                BookmarkDialogStackedContentView(
+                    .init(
+                        title: UserText.Bookmarks.Dialog.Field.name,
+                        content: TextField("", text: $folderName)
+                            .focusedOnAppear()
+                            .accessibilityIdentifier("bookmark.add.name.textfield")
+                            .textFieldStyle(RoundedBorderTextFieldStyle())
+                            .font(.system(size: 14))
+                    ),
+                    .init(
+                        title: UserText.Bookmarks.Dialog.Field.location,
+                        content: BookmarkFolderPicker(
+                            folders: folders,
+                            selectedFolder: $selectedFolder
+                        )
+                        .accessibilityIdentifier("bookmark.folder.folder.dropdown")
+                    )
+                )
+            },
+            bottomSection: {
+                BookmarkDialogButtonsView(
+                    viewState: .init(buttonsState),
+                    otherButtonAction: .init(
+                        title: cancelActionTitle,
+                        keyboardShortCut: .cancelAction,
+                        isDisabled: isCancelActionDisabled,
+                        action: cancelAction
+                    ), defaultButtonAction: .init(
+                        title: defaultActionTitle,
+                        keyboardShortCut: .defaultAction,
+                        isDisabled: isDefaultActionDisabled,
+                        action: defaultAction
+                    )
+                )
+            }
+        )
+    }
+}
+
+private extension BookmarkDialogButtonsView.ViewState {
+
+    init(_ state: AddEditBookmarkFolderView.ButtonsState) {
+        switch state {
+        case .compressed:
+            self = .compressed
+        case .expanded:
+            self = .expanded
+        }
+    }
+}
+
+#Preview("Compressed") {
+    @State var folderName = ""
+    @State var selectedFolder: BookmarkFolder?
+
+    return AddEditBookmarkFolderView(
+        title: "Test Title",
+        buttonsState: .compressed,
+        folders: [],
+        folderName: $folderName,
+        selectedFolder: $selectedFolder,
+        cancelActionTitle: UserText.cancel,
+        isCancelActionDisabled: false,
+        cancelAction: { _ in },
+        defaultActionTitle: UserText.save,
+        isDefaultActionDisabled: false,
+        defaultAction: { _ in }
+    )
+}
+
+#Preview("Expanded") {
+    @State var folderName = ""
+    @State var selectedFolder: BookmarkFolder?
+
+    return AddEditBookmarkFolderView(
+        title: "Test Title",
+        buttonsState: .expanded,
+        folders: [],
+        folderName: $folderName,
+        selectedFolder: $selectedFolder,
+        cancelActionTitle: UserText.cancel,
+        isCancelActionDisabled: false,
+        cancelAction: { _ in },
+        defaultActionTitle: UserText.save,
+        isDefaultActionDisabled: false,
+        defaultAction: { _ in }
+    )
+}
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkView.swift b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkView.swift
new file mode 100644
index 0000000000..8d34889432
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkView.swift
@@ -0,0 +1,113 @@
+//
+//  AddEditBookmarkView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+struct AddEditBookmarkView: View {
+    let title: String
+    let buttonsState: BookmarksDialogButtonsState
+
+    @Binding var bookmarkName: String
+    var bookmarkURLPath: Binding<String>?
+    @Binding var isBookmarkFavorite: Bool
+
+    let folders: [FolderViewModel]
+    @Binding var selectedFolder: BookmarkFolder?
+
+    let isURLFieldHidden: Bool
+
+    let addFolderAction: () -> Void
+
+    let otherActionTitle: String
+    let isOtherActionDisabled: Bool
+    let otherAction: @MainActor (_ dismiss: () -> Void) -> Void
+
+    let defaultActionTitle: String
+    let isDefaultActionDisabled: Bool
+    let defaultAction: @MainActor (_ dismiss: () -> Void) -> Void
+
+    var body: some View {
+        BookmarkDialogContainerView(
+            title: title,
+            middleSection: {
+                BookmarkDialogStackedContentView(
+                    .init(
+                        title: UserText.Bookmarks.Dialog.Field.name,
+                        content: TextField("", text: $bookmarkName)
+                            .focusedOnAppear()
+                            .accessibilityIdentifier("bookmark.add.name.textfield")
+                            .textFieldStyle(RoundedBorderTextFieldStyle())
+                            .font(.system(size: 14))
+                    ),
+                    .init(
+                        title: UserText.Bookmarks.Dialog.Field.url,
+                        content: TextField("", text: bookmarkURLPath ?? .constant(""))
+                            .accessibilityIdentifier("bookmark.add.url.textfield")
+                            .textFieldStyle(RoundedBorderTextFieldStyle())
+                            .font(.system(size: 14)),
+                        isContentViewHidden: isURLFieldHidden
+                    ),
+                    .init(
+                        title: UserText.Bookmarks.Dialog.Field.location,
+                        content: BookmarkDialogFolderManagementView(
+                            folders: folders,
+                            selectedFolder: $selectedFolder,
+                            onActionButton: addFolderAction
+                        )
+                    )
+                )
+                BookmarkFavoriteView(isFavorite: $isBookmarkFavorite)
+            },
+            bottomSection: {
+                BookmarkDialogButtonsView(
+                    viewState: .init(buttonsState),
+                    otherButtonAction: .init(
+                        title: otherActionTitle,
+                        isDisabled: isOtherActionDisabled,
+                        action: otherAction
+                    ),
+                    defaultButtonAction: .init(
+                        title: defaultActionTitle,
+                        keyboardShortCut: .defaultAction,
+                        isDisabled: isDefaultActionDisabled,
+                        action: defaultAction
+                    )
+                )
+            }
+        )
+    }
+
+}
+
+// MARK: - BookmarksDialogButtonsState
+
+enum BookmarksDialogButtonsState {
+    case compressed
+    case expanded
+}
+
+extension BookmarkDialogButtonsView.ViewState {
+    init(_ state: BookmarksDialogButtonsState) {
+        switch state {
+        case .compressed:
+            self = .compressed
+        case .expanded:
+            self = .expanded
+        }
+    }
+}
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogButtonsView.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogButtonsView.swift
new file mode 100644
index 0000000000..d55f6dd34f
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogButtonsView.swift
@@ -0,0 +1,186 @@
+//
+//  BookmarkDialogButtonsView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+struct BookmarkDialogButtonsView: View {
+    private let viewState: ViewState
+    private let otherButtonAction: Action
+    private let defaultButtonAction: Action
+    @Environment(\.dismiss) private var dismiss
+
+    init(
+        viewState: ViewState,
+        otherButtonAction: Action,
+        defaultButtonAction: Action
+    ) {
+        self.viewState = viewState
+        self.otherButtonAction = otherButtonAction
+        self.defaultButtonAction = defaultButtonAction
+    }
+
+    var body: some View {
+        HStack {
+            if viewState == .compressed {
+                Spacer()
+            }
+
+            actionButton(action: otherButtonAction, viewState: viewState)
+
+            actionButton(action: defaultButtonAction, viewState: viewState).accessibilityIdentifier("BookmarkDialogButtonsView.defaultButton")
+        }
+    }
+
+    @MainActor
+    private func actionButton(action: Action, viewState: ViewState) -> some View {
+        Button {
+            action.action(dismiss.callAsFunction)
+        } label: {
+            Text(action.title)
+                .frame(height: viewState.height)
+                .frame(maxWidth: viewState.maxWidth)
+        }
+        .keyboardShortcut(action.keyboardShortCut)
+        .disabled(action.isDisabled)
+        .ifLet(action.accessibilityIdentifier) { view, value in
+            view.accessibilityIdentifier(value)
+        }
+    }
+}
+
+// MARK: - BookmarkDialogButtonsView + Types
+
+extension BookmarkDialogButtonsView {
+
+    enum ViewState: Equatable {
+        case compressed
+        case expanded
+    }
+
+    struct Action {
+        let title: String
+        let keyboardShortCut: KeyboardShortcut?
+        let accessibilityIdentifier: String?
+        let isDisabled: Bool
+        let action: @MainActor (_ dismiss: () -> Void) -> Void
+
+        init(
+            title: String,
+            accessibilityIdentifier: String? = nil,
+            keyboardShortCut: KeyboardShortcut? = nil,
+            isDisabled: Bool  = false,
+            action: @MainActor @escaping (_ dismiss: () -> Void) -> Void
+        ) {
+            self.title = title
+            self.keyboardShortCut = keyboardShortCut
+            self.accessibilityIdentifier = accessibilityIdentifier
+            self.isDisabled = isDisabled
+            self.action = action
+        }
+    }
+}
+
+// MARK: - BookmarkDialogButtonsView.ViewState
+
+private extension BookmarkDialogButtonsView.ViewState {
+
+    var maxWidth: CGFloat? {
+        switch self {
+        case .compressed:
+            return nil
+        case .expanded:
+            return .infinity
+        }
+    }
+
+    var height: CGFloat? {
+        switch self {
+        case .compressed:
+            return nil
+        case .expanded:
+            return 28.0
+        }
+    }
+
+}
+
+// MARK: - Preview
+
+#Preview("Compressed - Disable Default Button") {
+    BookmarkDialogButtonsView(
+        viewState: .compressed,
+        otherButtonAction: .init(
+            title: "Left",
+            action: { _ in }
+        ),
+        defaultButtonAction: .init(
+            title: "Right",
+            isDisabled: true,
+            action: {_ in }
+        )
+    )
+    .frame(width: 320, height: 50)
+}
+
+#Preview("Compressed - Enabled Default Button") {
+    BookmarkDialogButtonsView(
+        viewState: .compressed,
+        otherButtonAction: .init(
+            title: "Left",
+            action: { _ in }
+        ),
+        defaultButtonAction: .init(
+            title: "Right",
+            isDisabled: false,
+            action: {_ in }
+        )
+    )
+    .frame(width: 320, height: 50)
+}
+
+#Preview("Expanded - Disable Default Button") {
+    BookmarkDialogButtonsView(
+        viewState: .expanded,
+        otherButtonAction: .init(
+            title: "Left",
+            action: { _ in }
+        ),
+        defaultButtonAction: .init(
+            title: "Right",
+            isDisabled: true,
+            action: {_ in }
+        )
+    )
+    .frame(width: 320, height: 50)
+}
+
+#Preview("Expanded - Enable Default Button") {
+    BookmarkDialogButtonsView(
+        viewState: .expanded,
+        otherButtonAction: .init(
+            title: "Left",
+            action: { _ in }
+        ),
+        defaultButtonAction: .init(
+            title: "Right",
+            isDisabled: false,
+            action: {_ in }
+        )
+    )
+    .frame(width: 320, height: 50)
+}
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogContainerView.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogContainerView.swift
new file mode 100644
index 0000000000..ea49712abb
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogContainerView.swift
@@ -0,0 +1,50 @@
+//
+//  BookmarkDialogContainerView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import SwiftUIExtensions
+
+struct BookmarkDialogContainerView<Content: View, Buttons: View>: View {
+    private let title: String
+    @ViewBuilder private let middleSection: () -> Content
+    @ViewBuilder private let bottomSection: () -> Buttons
+
+    init(
+        title: String,
+        @ViewBuilder middleSection: @escaping () -> Content,
+        @ViewBuilder bottomSection: @escaping () -> Buttons
+    ) {
+        self.title = title
+        self.middleSection = middleSection
+        self.bottomSection = bottomSection
+    }
+
+    var body: some View {
+        TieredDialogView(
+            verticalSpacing: 16.0,
+            horizontalPadding: 20.0,
+            top: {
+                Text(title)
+                    .foregroundColor(.primary)
+                    .fontWeight(.semibold)
+            },
+            center: middleSection,
+            bottom: bottomSection
+        )
+    }
+}
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogFolderManagementView.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogFolderManagementView.swift
new file mode 100644
index 0000000000..8081abc14d
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogFolderManagementView.swift
@@ -0,0 +1,76 @@
+//
+//  BookmarkDialogFolderManagementView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import SwiftUIExtensions
+
+struct BookmarkDialogFolderManagementView: View {
+    private let folders: [FolderViewModel]
+    private var selectedFolder: Binding<BookmarkFolder?>
+    private let onActionButton: @MainActor () -> Void
+
+    init(
+        folders: [FolderViewModel],
+        selectedFolder: Binding<BookmarkFolder?>,
+        onActionButton: @escaping @MainActor () -> Void
+    ) {
+        self.folders = folders
+        self.selectedFolder = selectedFolder
+        self.onActionButton = onActionButton
+    }
+
+    var body: some View {
+        HStack {
+            BookmarkFolderPicker(
+                folders: folders,
+                selectedFolder: selectedFolder
+            )
+            .accessibilityIdentifier("bookmark.add.folder.dropdown")
+
+            Button {
+                onActionButton()
+            } label: {
+                Image(.addFolder)
+            }
+            .accessibilityIdentifier("bookmark.add.new.folder.button")
+            .buttonStyle(StandardButtonStyle())
+        }
+    }
+}
+
+#Preview {
+    @State var selectedFolder: BookmarkFolder? = BookmarkFolder(id: "1", title: "Nested Folder", children: [])
+    let folderViewModels: [FolderViewModel] = [
+        .init(
+            entity: .init(
+                id: "1",
+                title: "Nested Folder",
+                parentFolderUUID: nil,
+                children: []
+            ),
+            level: 1
+        )
+    ]
+
+    return BookmarkDialogFolderManagementView(
+        folders: folderViewModels,
+        selectedFolder: $selectedFolder,
+        onActionButton: {}
+    )
+    .frame(width: 400)
+}
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogStackedContentView.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogStackedContentView.swift
new file mode 100644
index 0000000000..864b0cdb13
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogStackedContentView.swift
@@ -0,0 +1,111 @@
+//
+//  BookmarkDialogStackedContentView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import SwiftUIExtensions
+
+struct BookmarkDialogStackedContentView: View {
+    private let items: [Item]
+
+    init(_ items: Item...) {
+        self.items = items
+    }
+
+    init(_ items: [Item]) {
+        self.items = items
+    }
+
+    var body: some View {
+        TwoColumnsListView(
+            horizontalSpacing: 16.0,
+            verticalSpacing: 20.0,
+            rowHeight: 22.0,
+            leftColumn: {
+                ForEach(items, id: \.title) { item in
+                    if !item.isContentViewHidden {
+                        Text(item.title)
+                            .foregroundColor(.primary)
+                            .fontWeight(.medium)
+                    }
+                }
+            },
+            rightColumn: {
+                ForEach(items, id: \.title) { item in
+                    if !item.isContentViewHidden {
+                        item.content
+                    }
+                }
+            }
+        )
+    }
+}
+
+// MARK: - BookmarkModalStackedContentView + Item
+
+extension BookmarkDialogStackedContentView {
+    struct Item {
+        fileprivate let title: String
+        fileprivate let content: AnyView
+        fileprivate let isContentViewHidden: Bool
+
+        init(title: String, content: any View, isContentViewHidden: Bool = false) {
+            self.title = title
+            self.content = AnyView(content)
+            self.isContentViewHidden = isContentViewHidden
+        }
+    }
+}
+
+// MARK: - Preview
+
+#Preview {
+    @State var name: String = "DuckDuckGo"
+    @State var url: String = "https://www.duckduckgo.com"
+    @State var selectedFolder: BookmarkFolder?
+
+    return BookmarkDialogStackedContentView(
+        .init(
+            title: "Name",
+            content:
+                TextField("", text: $name)
+                .textFieldStyle(.roundedBorder)
+                .textFieldStyle(RoundedBorderTextFieldStyle())
+                .font(.system(size: 14))
+
+        ),
+        .init(
+            title: "URL",
+            content:
+                TextField("", text: $url)
+                .textFieldStyle(.roundedBorder)
+                .textFieldStyle(RoundedBorderTextFieldStyle())
+                .font(.system(size: 14))
+        ),
+        .init(
+            title: "Location",
+            content:
+                BookmarkDialogFolderManagementView(
+                    folders: [],
+                    selectedFolder: $selectedFolder,
+                    onActionButton: { }
+                )
+        )
+    )
+    .padding([.horizontal, .vertical])
+    .frame(width: 400)
+}
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkFavoriteView.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkFavoriteView.swift
new file mode 100644
index 0000000000..9778ab0d5c
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkFavoriteView.swift
@@ -0,0 +1,47 @@
+//
+//  BookmarkFavoriteView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import SwiftUIExtensions
+import PreferencesViews
+
+struct BookmarkFavoriteView: View {
+    @Binding var isFavorite: Bool
+
+    var body: some View {
+        Toggle(isOn: $isFavorite) {
+            HStack(spacing: 6) {
+                Image(.favoriteFilledBorder)
+                Text(UserText.addToFavorites)
+                    .foregroundColor(.primary)
+            }
+        }
+        .toggleStyle(.checkbox)
+        .accessibilityIdentifier("bookmark.add.add.to.favorites.button")
+    }
+}
+
+#Preview("Favorite") {
+    BookmarkFavoriteView(isFavorite: .constant(true))
+        .frame(width: 300)
+}
+
+#Preview("Not Favorite") {
+    BookmarkFavoriteView(isFavorite: .constant(false))
+        .frame(width: 300)
+}
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarksDialogViewFactory.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarksDialogViewFactory.swift
new file mode 100644
index 0000000000..b29b50bbbb
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarksDialogViewFactory.swift
@@ -0,0 +1,93 @@
+//
+//  BookmarksDialogViewFactory.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+@MainActor
+enum BookmarksDialogViewFactory {
+
+    /// Creates an instance of AddEditBookmarkFolderDialogView for adding a Bookmark Folder.
+    /// - Parameters:
+    ///   - parentFolder: An optional `BookmarkFolder`. When adding a folder to the root bookmark folder pass `nil`. For any other folder pass the `BookmarkFolder` the new folder should be within.
+    ///   - bookmarkManager: An instance of `BookmarkManager`. This should be used for `#previews` only.
+    /// - Returns: An instance of AddEditBookmarkFolderDialogView.
+    static func makeAddBookmarkFolderView(parentFolder: BookmarkFolder?, bookmarkManager: LocalBookmarkManager = .shared) -> AddEditBookmarkFolderDialogView {
+        let viewModel = AddEditBookmarkFolderDialogViewModel(mode: .add(parentFolder: parentFolder), bookmarkManager: bookmarkManager)
+        return AddEditBookmarkFolderDialogView(viewModel: viewModel)
+    }
+
+    /// Creates an instance of AddEditBookmarkFolderDialogView for editing a Bookmark Folder.
+    /// - Parameters:
+    ///   - folder: The `BookmarkFolder` to edit.
+    ///   - parentFolder: An optional `BookmarkFolder`. When editing a folder within the root bookmark folder pass `nil`. For any other folder pass the `BookmarkFolder` the folder belongs to.
+    ///   - bookmarkManager: An instance of `BookmarkManager`. This should be used for `#previews` only.
+    /// - Returns: An instance of AddEditBookmarkFolderDialogView.
+    static func makeEditBookmarkFolderView(folder: BookmarkFolder, parentFolder: BookmarkFolder?, bookmarkManager: LocalBookmarkManager = .shared) -> AddEditBookmarkFolderDialogView {
+        let viewModel = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: folder, parentFolder: parentFolder), bookmarkManager: bookmarkManager)
+        return AddEditBookmarkFolderDialogView(viewModel: viewModel)
+    }
+
+    /// Creates an instance of AddEditBookmarkDialogView for adding a Bookmark with the specified web page.
+    /// - Parameters:
+    ///   - currentTab: An optional `WebsiteInfo`. When adding a bookmark from the bookmark shortcut panel, if the `Tab` has loaded a web page pass the information via the `currentTab`. If the `Tab` has not loaded a tab pass `nil`. If adding a `Bookmark` from the `Manage Bookmark` settings page, pass `nil`.
+    ///  - bookmarkManager: An instance of `BookmarkManager`. This should be used for `#previews` only.
+    /// - Returns: An instance of AddEditBookmarkDialogView.
+    static func makeAddBookmarkView(currentTab: WebsiteInfo?, bookmarkManager: LocalBookmarkManager = .shared) -> AddEditBookmarkDialogView {
+        let viewModel = AddEditBookmarkDialogViewModel(mode: .add(tabWebsite: currentTab), bookmarkManager: bookmarkManager)
+        return makeAddEditBookmarkDialogView(viewModel: viewModel, bookmarkManager: bookmarkManager)
+    }
+
+    /// Creates an instance of AddEditBookmarkDialogView for adding a Bookmark with the specified parent folder.
+    /// - Parameters:
+    ///  - parentFolder: An optional `BookmarkFolder`. When adding a bookmark from the bookmark management view, if the user select a parent folder pass this value won't be `nil`. Otherwise, if no folder is selected this value will be `nil`.
+    ///  - bookmarkManager: An instance of `BookmarkManager`. This should be used for `#previews` only.
+    /// - Returns: An instance of AddEditBookmarkDialogView.
+    static func makeAddBookmarkView(parent: BookmarkFolder?, bookmarkManager: LocalBookmarkManager = .shared) -> AddEditBookmarkDialogView {
+        let viewModel = AddEditBookmarkDialogViewModel(mode: .add(parentFolder: parent), bookmarkManager: bookmarkManager)
+        return makeAddEditBookmarkDialogView(viewModel: viewModel, bookmarkManager: bookmarkManager)
+    }
+
+    /// Creates an instance of AddEditBookmarkDialogView for adding a Bookmark from the Favorites view in the empty Tab.
+    /// - Parameter bookmarkManager: An instance of `BookmarkManager`. This should be used for `#previews` only.
+    /// - Returns: An instance of AddEditBookmarkDialogView,
+    static func makeAddFavoriteView(bookmarkManager: LocalBookmarkManager = .shared) -> AddEditBookmarkDialogView {
+        let viewModel = AddEditBookmarkDialogViewModel(mode: .add(shouldPresetFavorite: true), bookmarkManager: bookmarkManager)
+        return makeAddEditBookmarkDialogView(viewModel: viewModel, bookmarkManager: bookmarkManager)
+    }
+
+    /// Creates an instance of AddEditBookmarkDialogView for editing a Bookmark.
+    /// - Parameters:
+    ///   - bookmark: The `Bookmark` to edit.
+    ///   - bookmarkManager: An instance of `BookmarkManager`. This should be used for `#previews` only.
+    /// - Returns: An instance of AddEditBookmarkDialogView.
+    static func makeEditBookmarkView(bookmark: Bookmark, bookmarkManager: LocalBookmarkManager = .shared) -> AddEditBookmarkDialogView {
+        let viewModel = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        return makeAddEditBookmarkDialogView(viewModel: viewModel, bookmarkManager: bookmarkManager)
+    }
+
+}
+
+private extension BookmarksDialogViewFactory {
+
+    private static func makeAddEditBookmarkDialogView(viewModel: AddEditBookmarkDialogViewModel, bookmarkManager: BookmarkManager) -> AddEditBookmarkDialogView {
+        let addFolderViewModel = AddEditBookmarkFolderDialogViewModel(mode: .add(parentFolder: nil), bookmarkManager: bookmarkManager)
+        let viewModel = AddEditBookmarkDialogCoordinatorViewModel(bookmarkModel: viewModel, folderModel: addFolderViewModel)
+        return AddEditBookmarkDialogView(viewModel: viewModel)
+    }
+
+}
diff --git a/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkFolderModalViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkFolderModalViewModel.swift
deleted file mode 100644
index ac2701e3ca..0000000000
--- a/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkFolderModalViewModel.swift
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-//  AddBookmarkFolderModalViewModel.swift
-//
-//  Copyright © 2024 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import Foundation
-
-struct AddBookmarkFolderModalViewModel {
-
-    let bookmarkManager: BookmarkManager
-
-    let title: String
-    let addButtonTitle: String
-    let originalFolder: BookmarkFolder?
-    let parent: BookmarkFolder?
-
-    var folderName: String = ""
-
-    var isAddButtonDisabled: Bool {
-        folderName.trimmingWhitespace().isEmpty
-    }
-
-    init(folder: BookmarkFolder,
-         bookmarkManager: BookmarkManager = LocalBookmarkManager.shared,
-         completionHandler: @escaping (BookmarkFolder?) -> Void = { _ in }) {
-        self.bookmarkManager = bookmarkManager
-        self.folderName = folder.title
-        self.originalFolder = folder
-        self.parent = nil
-        self.title = UserText.renameFolder
-        self.addButtonTitle = UserText.save
-    }
-
-    init(parent: BookmarkFolder? = nil,
-         bookmarkManager: BookmarkManager = LocalBookmarkManager.shared,
-         completionHandler: @escaping (BookmarkFolder?) -> Void = { _ in }) {
-        self.bookmarkManager = bookmarkManager
-        self.originalFolder = nil
-        self.parent = parent
-        self.title = UserText.newFolder
-        self.addButtonTitle = UserText.newFolderDialogAdd
-    }
-
-    func cancel(dismiss: () -> Void) {
-        dismiss()
-    }
-
-    func addFolder(dismiss: () -> Void) {
-        guard !folderName.isEmpty else {
-            assertionFailure("folderName is empty, button should be disabled")
-            return
-        }
-
-        let folderName = folderName.trimmingWhitespace()
-        if let folder = originalFolder {
-            folder.title = folderName
-            bookmarkManager.update(folder: folder)
-
-        } else {
-            bookmarkManager.makeFolder(for: folderName, parent: parent, completion: { _ in })
-        }
-
-        dismiss()
-    }
-
-}
diff --git a/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkFolderPopoverViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkFolderPopoverViewModel.swift
index c16625a362..a1359fa61b 100644
--- a/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkFolderPopoverViewModel.swift
+++ b/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkFolderPopoverViewModel.swift
@@ -22,15 +22,30 @@ import Foundation
 final class AddBookmarkFolderPopoverViewModel: ObservableObject {
 
     private let bookmarkManager: BookmarkManager
-
     let folders: [FolderViewModel]
-    @Published var parent: BookmarkFolder?
+    private let completionHandler: (BookmarkFolder?) -> Void
 
+    @Published var parent: BookmarkFolder?
     @Published var folderName: String = ""
-
     @Published private(set) var isDisabled = false
 
-    private let completionHandler: (BookmarkFolder?) -> Void
+    var title: String {
+        UserText.Bookmarks.Dialog.Title.addFolder
+    }
+
+    var cancelActionTitle: String {
+        UserText.cancel
+    }
+
+    var defaultActionTitle: String {
+        UserText.Bookmarks.Dialog.Action.addFolder
+    }
+
+    let isCancelActionDisabled = false
+
+    var isDefaultActionButtonDisabled: Bool {
+        folderName.trimmingWhitespace().isEmpty || isDisabled
+    }
 
     init(bookmark: Bookmark? = nil,
          folderName: String = "",
diff --git a/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkModalViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkModalViewModel.swift
deleted file mode 100644
index 15554afcbc..0000000000
--- a/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkModalViewModel.swift
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-//  AddBookmarkModalViewModel.swift
-//
-//  Copyright © 2024 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import Foundation
-
-struct AddBookmarkModalViewModel {
-
-    let bookmarkManager: BookmarkManager
-
-    let title: String
-    let addButtonTitle: String
-    var isFavorite: Bool
-
-    private let originalBookmark: Bookmark?
-    private let parent: BookmarkFolder?
-
-    private let completionHandler: (Bookmark?) -> Void
-
-    var bookmarkTitle: String = ""
-    var bookmarkAddress: String = ""
-
-    private var hasValidInput: Bool {
-        guard let url = bookmarkAddress.url else { return false }
-
-        return !bookmarkTitle.trimmingWhitespace().isEmpty && url.isValid
-    }
-
-    var isAddButtonDisabled: Bool { !hasValidInput }
-
-    func cancel(dismiss: () -> Void) {
-        completionHandler(nil)
-        dismiss()
-    }
-
-    func addOrSave(dismiss: () -> Void) {
-        guard let url = bookmarkAddress.url else {
-            assertionFailure("invalid URL, button should be disabled")
-            return
-        }
-
-        var result: Bookmark?
-        let bookmarkTitle = bookmarkTitle.trimmingWhitespace()
-        if var bookmark = originalBookmark ?? bookmarkManager.getBookmark(for: url) {
-
-            if url.absoluteString != bookmark.url {
-                bookmark = bookmarkManager.updateUrl(of: bookmark, to: url) ?? bookmark
-            }
-            if bookmark.title != bookmarkTitle || bookmark.isFavorite != isFavorite {
-                bookmark.title = bookmarkTitle
-                bookmark.isFavorite = isFavorite
-                bookmarkManager.update(bookmark: bookmark)
-            }
-
-            result = bookmark
-
-        } else if !bookmarkManager.isUrlBookmarked(url: url) {
-            result = bookmarkManager.makeBookmark(for: url, title: bookmarkTitle, isFavorite: isFavorite, index: nil, parent: parent)
-        }
-
-        completionHandler(result)
-        dismiss()
-    }
-
-    init(isFavorite: Bool = false,
-         bookmarkManager: BookmarkManager = LocalBookmarkManager.shared,
-         currentTabWebsite website: WebsiteInfo? = nil,
-         parent: BookmarkFolder? = nil,
-         completionHandler: @escaping (Bookmark?) -> Void = { _ in }) {
-
-        self.bookmarkManager = bookmarkManager
-
-        self.isFavorite = isFavorite
-        self.title = isFavorite ? UserText.addFavorite : UserText.newBookmark
-        self.addButtonTitle = UserText.bookmarkDialogAdd
-
-        if let website,
-           !LocalBookmarkManager.shared.isUrlBookmarked(url: website.url) {
-            bookmarkTitle = website.title ?? ""
-            bookmarkAddress = website.url.absoluteString
-        }
-        self.parent = parent
-        self.originalBookmark = nil
-
-        self.completionHandler = completionHandler
-    }
-
-    init(bookmarkManager: BookmarkManager = LocalBookmarkManager.shared,
-         originalBookmark: Bookmark?,
-         isFavorite: Bool = false,
-         completionHandler: @escaping (Bookmark?) -> Void = { _ in }) {
-
-        self.bookmarkManager = bookmarkManager
-
-        self.isFavorite = isFavorite
-        if originalBookmark != nil {
-            self.title = isFavorite ? UserText.editFavorite : UserText.updateBookmark
-            self.addButtonTitle = UserText.save
-        } else {
-            self.title = isFavorite ? UserText.addFavorite : UserText.newBookmark
-            self.addButtonTitle = UserText.bookmarkDialogAdd
-        }
-
-        self.parent = nil
-        self.originalBookmark = originalBookmark
-
-        bookmarkTitle = originalBookmark?.title ?? ""
-        bookmarkAddress = originalBookmark?.url ?? ""
-
-        self.completionHandler = completionHandler
-    }
-
-}
diff --git a/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkPopoverViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkPopoverViewModel.swift
index b474e148b3..88168901ed 100644
--- a/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkPopoverViewModel.swift
+++ b/DuckDuckGo/Bookmarks/ViewModel/AddBookmarkPopoverViewModel.swift
@@ -38,8 +38,24 @@ final class AddBookmarkPopoverViewModel: ObservableObject {
         }
     }
 
+    @Published var isBookmarkFavorite: Bool {
+        didSet {
+            bookmark.isFavorite = isBookmarkFavorite
+            bookmarkManager.update(bookmark: bookmark)
+        }
+    }
+
+    @Published var bookmarkTitle: String {
+        didSet {
+            bookmark.title = bookmarkTitle.trimmingWhitespace()
+            bookmarkManager.update(bookmark: bookmark)
+        }
+    }
+
     @Published var addFolderViewModel: AddBookmarkFolderPopoverViewModel?
 
+    let isDefaultActionButtonDisabled: Bool = false
+
     private var bookmarkListCancellable: AnyCancellable?
 
     init(bookmark: Bookmark,
@@ -47,6 +63,7 @@ final class AddBookmarkPopoverViewModel: ObservableObject {
         self.bookmarkManager = bookmarkManager
         self.bookmark = bookmark
         self.bookmarkTitle = bookmark.title
+        self.isBookmarkFavorite = bookmark.isFavorite
 
         bookmarkListCancellable = bookmarkManager.listPublisher
             .receive(on: DispatchQueue.main)
@@ -74,12 +91,6 @@ final class AddBookmarkPopoverViewModel: ObservableObject {
         dismiss()
     }
 
-    func favoritesButtonAction() {
-        bookmark.isFavorite.toggle()
-
-        bookmarkManager.update(bookmark: bookmark)
-    }
-
     func addFolderButtonAction() {
         addFolderViewModel = .init(bookmark: bookmark, bookmarkManager: bookmarkManager) { [bookmark, bookmarkManager, weak self] newFolder in
             if let newFolder {
@@ -98,14 +109,6 @@ final class AddBookmarkPopoverViewModel: ObservableObject {
         addFolderViewModel = nil
     }
 
-    @Published var bookmarkTitle: String {
-        didSet {
-            bookmark.title = bookmarkTitle.trimmingWhitespace()
-
-            bookmarkManager.update(bookmark: bookmark)
-        }
-    }
-
 }
 
 struct FolderViewModel: Identifiable, Equatable {
diff --git a/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkDialogCoordinatorViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkDialogCoordinatorViewModel.swift
new file mode 100644
index 0000000000..27fc0c64e5
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkDialogCoordinatorViewModel.swift
@@ -0,0 +1,74 @@
+//
+//  AddEditBookmarkDialogCoordinatorViewModel.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import Combine
+
+final class AddEditBookmarkDialogCoordinatorViewModel<BookmarkViewModel: BookmarkDialogEditing, AddFolderViewModel: BookmarkFolderDialogEditing>: ObservableObject {
+    @ObservedObject var bookmarkModel: BookmarkViewModel
+    @ObservedObject var folderModel: AddFolderViewModel
+    @Published var viewState: ViewState
+
+    private var cancellables: Set<AnyCancellable> = []
+
+    init(bookmarkModel: BookmarkViewModel, folderModel: AddFolderViewModel) {
+        self.bookmarkModel = bookmarkModel
+        self.folderModel = folderModel
+        viewState = .bookmark
+        bind()
+    }
+
+    func dismissAction() {
+        viewState = .bookmark
+    }
+
+    func addFolderAction() {
+        folderModel.selectedFolder = bookmarkModel.selectedFolder
+        viewState = .folder
+    }
+
+    private func bind() {
+        bookmarkModel.objectWillChange
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                self?.objectWillChange.send()
+            }
+            .store(in: &cancellables)
+
+        folderModel.objectWillChange
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                self?.objectWillChange.send()
+            }
+            .store(in: &cancellables)
+
+        folderModel.addFolderPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] bookmarkFolder in
+                self?.bookmarkModel.selectedFolder = bookmarkFolder
+            }
+            .store(in: &cancellables)
+    }
+}
+
+extension AddEditBookmarkDialogCoordinatorViewModel {
+    enum ViewState {
+        case bookmark
+        case folder
+    }
+}
diff --git a/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkDialogViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkDialogViewModel.swift
new file mode 100644
index 0000000000..0aa03eade1
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkDialogViewModel.swift
@@ -0,0 +1,216 @@
+//
+//  AddEditBookmarkDialogViewModel.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import Combine
+
+@MainActor
+protocol BookmarkDialogEditing: BookmarksDialogViewModel {
+    var bookmarkName: String { get set }
+    var bookmarkURLPath: String { get set }
+    var isBookmarkFavorite: Bool { get set }
+
+    var isURLFieldHidden: Bool { get }
+}
+
+@MainActor
+final class AddEditBookmarkDialogViewModel: BookmarkDialogEditing {
+
+    /// The type of operation to perform on a bookmark.
+    enum Mode {
+        /// Add a new bookmark. Bookmarks can have a parent folder but not necessarily.
+        /// If the users add a bookmark to the root `Bookmarks` folder, then the parent folder is `nil`.
+        /// If the users add a bookmark to a different folder then the parent folder is not `nil`.
+        /// If the users add a bookmark from the bookmark shortcut and `Tab` has a page loaded, then the `tabWebsite` is not `nil`.
+        /// When adding a bookmark from favorite screen the `shouldPresetFavorite` flag should be set to `true`.
+        case add(tabWebsite: WebsiteInfo? = nil, parentFolder: BookmarkFolder? = nil, shouldPresetFavorite: Bool = false)
+        /// Edit an existing bookmark.
+        case edit(bookmark: Bookmark)
+    }
+
+    @Published var bookmarkName: String
+    @Published var bookmarkURLPath: String
+    @Published var isBookmarkFavorite: Bool
+
+    @Published private(set) var folders: [FolderViewModel]
+    @Published var selectedFolder: BookmarkFolder?
+
+    private var folderCancellable: AnyCancellable?
+
+    var title: String {
+        mode.title
+    }
+
+    let isURLFieldHidden: Bool = false
+
+    var cancelActionTitle: String {
+        mode.cancelActionTitle
+    }
+
+    var defaultActionTitle: String {
+        mode.defaultActionTitle
+    }
+
+    private var hasValidInput: Bool {
+        guard let url = bookmarkURLPath.url else { return false }
+        return !bookmarkName.trimmingWhitespace().isEmpty && url.isValid
+    }
+
+    let isOtherActionDisabled: Bool = false
+
+    var isDefaultActionDisabled: Bool { !hasValidInput }
+
+    private let mode: Mode
+    private let bookmarkManager: BookmarkManager
+
+    init(mode: Mode, bookmarkManager: LocalBookmarkManager = .shared) {
+        let isFavorite = mode.bookmarkURL.flatMap(bookmarkManager.isUrlFavorited) ?? false
+        self.mode = mode
+        self.bookmarkManager = bookmarkManager
+        folders = .init(bookmarkManager.list)
+        switch mode {
+        case let .add(websiteInfo, parentFolder, shouldPresetFavorite):
+            // When adding a new bookmark with website info we need to show the bookmark name and URL only if the bookmark is not bookmarked already.
+            // Scenario we click on the "Add Bookmark" button from Bookmarks shortcut Panel. If Tab has a Bookmark loaded we present the dialog with prepopulated name and URL from the tab.
+            // If we save and click again on the "Add Bookmark" button we don't want to try re-add the same bookmark. Hence we present a dialog that is not pre-populated.
+            let isAlreadyBookmarked = websiteInfo.flatMap { bookmarkManager.isUrlBookmarked(url: $0.url) } ?? false
+            let websiteName = isAlreadyBookmarked ? "" : websiteInfo?.title ?? ""
+            let websiteURLPath = isAlreadyBookmarked ? "" : websiteInfo?.url.absoluteString ?? ""
+            bookmarkName = websiteName
+            bookmarkURLPath = websiteURLPath
+            isBookmarkFavorite = shouldPresetFavorite ? true : isFavorite
+            selectedFolder = parentFolder
+        case let .edit(bookmark):
+            bookmarkName = bookmark.title
+            bookmarkURLPath = bookmark.urlObject?.absoluteString ?? ""
+            isBookmarkFavorite = isFavorite
+            selectedFolder = folders.first(where: { $0.id == bookmark.parentFolderUUID })?.entity
+        }
+
+        bind()
+    }
+
+    func cancel(dismiss: () -> Void) {
+        dismiss()
+    }
+
+    func addOrSave(dismiss: () -> Void) {
+        guard let url = bookmarkURLPath.url else {
+            assertionFailure("Invalid URL, default action button should be disabled.")
+            return
+        }
+
+        let trimmedBookmarkName = bookmarkName.trimmingWhitespace()
+
+        switch mode {
+        case .add:
+            addBookmark(withURL: url, name: trimmedBookmarkName, isFavorite: isBookmarkFavorite, to: selectedFolder)
+        case let .edit(bookmark):
+            updateBookmark(bookmark, url: url, name: trimmedBookmarkName, isFavorite: isBookmarkFavorite, location: selectedFolder)
+        }
+        dismiss()
+    }
+}
+
+private extension AddEditBookmarkDialogViewModel {
+
+    func bind() {
+        folderCancellable = bookmarkManager.listPublisher
+            .receive(on: DispatchQueue.main)
+            .sink(receiveValue: { [weak self] bookmarkList in
+                self?.folders = .init(bookmarkList)
+            })
+    }
+
+    func updateBookmark(_ bookmark: Bookmark, url: URL, name: String, isFavorite: Bool, location: BookmarkFolder?) {
+        // If the URL or Title or Favorite is changed update bookmark
+        if bookmark.url != url.absoluteString || bookmark.title != name || bookmark.isFavorite != isBookmarkFavorite {
+            bookmarkManager.update(bookmark: bookmark, withURL: url, title: name, isFavorite: isFavorite)
+        }
+
+        // If the bookmark changed parent location, move it.
+        if shouldMove(bookmark: bookmark) {
+            let parentFolder: ParentFolderType = selectedFolder.flatMap { .parent(uuid: $0.id) } ?? .root
+            bookmarkManager.move(objectUUIDs: [bookmark.id], toIndex: nil, withinParentFolder: parentFolder, completion: { _ in })
+        }
+    }
+
+    func addBookmark(withURL url: URL, name: String, isFavorite: Bool, to parent: BookmarkFolder?) {
+        // If a bookmark already exist with the new URL, update it
+        if let existingBookmark = bookmarkManager.getBookmark(for: url) {
+            updateBookmark(existingBookmark, url: url, name: name, isFavorite: isFavorite, location: parent)
+        } else {
+            bookmarkManager.makeBookmark(for: url, title: name, isFavorite: isFavorite, index: nil, parent: parent)
+        }
+    }
+
+    func shouldMove(bookmark: Bookmark) -> Bool {
+        // There's a discrepancy in representing the root folder. A bookmark belonging to the root folder has `parentFolderUUID` equal to `bookmarks_root`.
+        // There's no `BookmarkFolder` to represent the root folder, so the root folder is represented by a nil selectedFolder.
+        // Move Bookmarks if its parent folder is != from the selected folder but ONLY if:
+        //   - The selected folder is not nil. This ensure we're comparing a subfolder with any bookmark parent folder.
+        //   - The selected folder is nil and the bookmark parent folder is not the root folder. This ensure we're not unnecessarily moving the items within the same root folder.
+        bookmark.parentFolderUUID != selectedFolder?.id && (selectedFolder != nil || selectedFolder == nil && !bookmark.isParentFolderRoot)
+    }
+}
+
+private extension AddEditBookmarkDialogViewModel.Mode {
+
+    var title: String {
+        switch self {
+        case .add:
+            return UserText.Bookmarks.Dialog.Title.addBookmark
+        case .edit:
+            return UserText.Bookmarks.Dialog.Title.editBookmark
+        }
+    }
+
+    var cancelActionTitle: String {
+        switch self {
+        case .add, .edit:
+            return UserText.cancel
+        }
+    }
+
+    var defaultActionTitle: String {
+        switch self {
+        case .add:
+            return UserText.Bookmarks.Dialog.Action.addBookmark
+        case .edit:
+            return UserText.save
+        }
+    }
+
+    var bookmarkURL: URL? {
+        switch self {
+        case let .add(tabInfo, _, _):
+            return tabInfo?.url
+        case let .edit(bookmark):
+            return bookmark.urlObject
+        }
+    }
+
+}
+
+private extension Bookmark {
+
+    var isParentFolderRoot: Bool {
+        parentFolderUUID == "bookmarks_root"
+    }
+
+}
diff --git a/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkFolderDialogViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkFolderDialogViewModel.swift
new file mode 100644
index 0000000000..62c1e0356c
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkFolderDialogViewModel.swift
@@ -0,0 +1,181 @@
+//
+//  AddEditBookmarkFolderDialogViewModel.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import Combine
+
+@MainActor
+protocol BookmarkFolderDialogEditing: BookmarksDialogViewModel {
+    var addFolderPublisher: AnyPublisher<BookmarkFolder, Never> { get }
+    var folderName: String { get set }
+}
+
+@MainActor
+final class AddEditBookmarkFolderDialogViewModel: BookmarkFolderDialogEditing {
+
+    /// The type of operation to perform on a folder
+    enum Mode {
+        /// Add a new folder. Folders can have a parent folder but not necessarily.
+        /// If the users add a folder to a folder whose parent is the root `Bookmarks` folder, then the parent folder is `nil`.
+        /// If the users add a folder to a folder whose parent is not the root `Bookmarks` folder, then the parent folder is not `nil`.
+        case add(parentFolder: BookmarkFolder? = nil)
+        /// Edit an existing folder. Existing folder can have a parent folder but not necessarily.
+        /// If the users edit a  folder whose parent is the root `Bookmarks` folder, then the parent folder is `nil`
+        /// If the users edit a folder whose parent is not the root `Bookmarks` folder, then the parent folder is not `nil`.
+        case edit(folder: BookmarkFolder, parentFolder: BookmarkFolder?)
+    }
+
+    @Published var folderName: String
+    @Published var selectedFolder: BookmarkFolder?
+
+    let folders: [FolderViewModel]
+
+    var title: String {
+        mode.title
+    }
+
+    var cancelActionTitle: String {
+        mode.cancelActionTitle
+    }
+
+    var defaultActionTitle: String {
+        mode.defaultActionTitle
+    }
+
+    let isOtherActionDisabled = false
+
+    var isDefaultActionDisabled: Bool {
+        folderName.trimmingWhitespace().isEmpty
+    }
+
+    var addFolderPublisher: AnyPublisher<BookmarkFolder, Never> {
+        addFolderSubject.eraseToAnyPublisher()
+    }
+
+    private let mode: Mode
+    private let bookmarkManager: BookmarkManager
+    private let addFolderSubject: PassthroughSubject<BookmarkFolder, Never> = .init()
+
+    init(mode: Mode, bookmarkManager: BookmarkManager = LocalBookmarkManager.shared) {
+        self.mode = mode
+        self.bookmarkManager = bookmarkManager
+        folderName = mode.folderName
+        folders = .init(bookmarkManager.list)
+        selectedFolder = mode.parentFolder
+    }
+
+    func cancel(dismiss: () -> Void) {
+        dismiss()
+    }
+
+    func addOrSave(dismiss: () -> Void) {
+        defer { dismiss() }
+
+        guard !folderName.isEmpty else {
+            assertionFailure("folderName is empty, button should be disabled")
+            return
+        }
+
+        let folderName = folderName.trimmingWhitespace()
+
+        switch mode {
+        case let .edit(folder, originalParent):
+            // If there are no pending changes dismiss
+            guard folder.title != folderName || selectedFolder?.id != originalParent?.id else { return }
+            // Otherwise update Folder.
+            update(folder: folder, originalParent: originalParent, newParent: selectedFolder)
+        case .add:
+            add(folderWithName: folderName, to: selectedFolder)
+        }
+    }
+
+}
+
+// MARK: - Private
+
+private extension AddEditBookmarkFolderDialogViewModel {
+
+    func update(folder: BookmarkFolder, originalParent: BookmarkFolder?, newParent: BookmarkFolder?) {
+        // If the original location of the folder changed move it to the new folder.
+        if selectedFolder?.id != originalParent?.id {
+            // Update the title anyway.
+            folder.title = folderName
+            let parentFolderType: ParentFolderType = newParent.flatMap { ParentFolderType.parent(uuid: $0.id) } ?? .root
+            bookmarkManager.update(folder: folder, andMoveToParent: parentFolderType)
+        } else if folder.title != folderName { // If only title changed just update the folder title without updating its parent.
+            folder.title = folderName
+            bookmarkManager.update(folder: folder)
+        }
+    }
+
+    func add(folderWithName name: String, to parent: BookmarkFolder?) {
+        bookmarkManager.makeFolder(for: name, parent: parent) { [weak self] bookmarkFolder in
+            self?.addFolderSubject.send(bookmarkFolder)
+        }
+    }
+
+}
+
+// MARK: - AddEditBookmarkFolderDialogViewModel.Mode
+
+private extension AddEditBookmarkFolderDialogViewModel.Mode {
+
+    var title: String {
+        switch self {
+        case .add:
+            return UserText.Bookmarks.Dialog.Title.addFolder
+        case .edit:
+            return UserText.Bookmarks.Dialog.Title.editFolder
+        }
+    }
+
+    var cancelActionTitle: String {
+        switch self {
+        case .add, .edit:
+            return UserText.cancel
+        }
+    }
+
+    var defaultActionTitle: String {
+        switch self {
+        case .add:
+            return UserText.Bookmarks.Dialog.Action.addFolder
+        case .edit:
+            return UserText.save
+        }
+    }
+
+    var folderName: String {
+        switch self {
+        case .add:
+            return ""
+        case let .edit(folder, _):
+            return folder.title
+        }
+    }
+
+    var parentFolder: BookmarkFolder? {
+        switch self {
+        case let .add(parentFolder):
+            return parentFolder
+        case let .edit(_, parentFolder):
+            return parentFolder
+        }
+    }
+
+}
diff --git a/DuckDuckGo/Bookmarks/ViewModel/BookmarksDialogViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/BookmarksDialogViewModel.swift
new file mode 100644
index 0000000000..08ef2cc47d
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/ViewModel/BookmarksDialogViewModel.swift
@@ -0,0 +1,35 @@
+//
+//  BookmarksDialogViewModel.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+@MainActor
+protocol BookmarksDialogViewModel: ObservableObject {
+    var title: String { get }
+
+    var folders: [FolderViewModel] { get }
+    var selectedFolder: BookmarkFolder? { get set }
+
+    var cancelActionTitle: String { get }
+    var isOtherActionDisabled: Bool { get }
+    var defaultActionTitle: String { get }
+    var isDefaultActionDisabled: Bool { get }
+
+    func cancel(dismiss: () -> Void)
+    func addOrSave(dismiss: () -> Void)
+}
diff --git a/DuckDuckGo/BookmarksBar/View/BookmarksBarCollectionViewItem.swift b/DuckDuckGo/BookmarksBar/View/BookmarksBarCollectionViewItem.swift
index 61c0ec7630..dd9d2e617f 100644
--- a/DuckDuckGo/BookmarksBar/View/BookmarksBarCollectionViewItem.swift
+++ b/DuckDuckGo/BookmarksBar/View/BookmarksBarCollectionViewItem.swift
@@ -24,11 +24,13 @@ protocol BookmarksBarCollectionViewItemDelegate: AnyObject {
 
     func bookmarksBarCollectionViewItemOpenInNewTabAction(_ item: BookmarksBarCollectionViewItem)
     func bookmarksBarCollectionViewItemOpenInNewWindowAction(_ item: BookmarksBarCollectionViewItem)
-    func bookmarksBarCollectionViewItemAddToFavoritesAction(_ item: BookmarksBarCollectionViewItem)
+    func bookmarksBarCollectionViewItemToggleFavoritesAction(_ item: BookmarksBarCollectionViewItem)
     func bookmarksBarCollectionViewEditAction(_ item: BookmarksBarCollectionViewItem)
     func bookmarksBarCollectionViewItemMoveToEndAction(_ item: BookmarksBarCollectionViewItem)
     func bookmarksBarCollectionViewItemCopyBookmarkURLAction(_ item: BookmarksBarCollectionViewItem)
     func bookmarksBarCollectionViewItemDeleteEntityAction(_ item: BookmarksBarCollectionViewItem)
+    func bookmarksBarCollectionViewItemAddEntityAction(_ item: BookmarksBarCollectionViewItem)
+    func bookmarksBarCollectionViewItemManageBookmarksAction(_ item: BookmarksBarCollectionViewItem)
 
 }
 
@@ -128,114 +130,72 @@ extension BookmarksBarCollectionViewItem: NSMenuDelegate {
 
         switch entityType {
         case .bookmark(_, _, _, let isFavorite):
-            menu.items = createBookmarkMenuItems(isFavorite: isFavorite)
+            menu.items = ContextualMenu.bookmarkMenuItems(isFavorite: isFavorite)
         case .folder:
-            menu.items = createFolderMenuItems()
+            menu.items = ContextualMenu.folderMenuItems()
         }
     }
 
 }
 
-extension BookmarksBarCollectionViewItem {
+extension BookmarksBarCollectionViewItem: BookmarkMenuItemSelectors {
 
-    // MARK: Bookmark Menu Items
-
-    func createBookmarkMenuItems(isFavorite: Bool) -> [NSMenuItem] {
-        let items = [
-            openBookmarkInNewTabMenuItem(),
-            openBookmarkInNewWindowMenuItem(),
-            NSMenuItem.separator(),
-            addToFavoritesMenuItem(isFavorite: isFavorite),
-            editItem(),
-            moveToEndMenuItem(),
-            NSMenuItem.separator(),
-            copyBookmarkURLMenuItem(),
-            deleteEntityMenuItem()
-        ].compactMap { $0 }
-
-        return items
-    }
-
-    func openBookmarkInNewTabMenuItem() -> NSMenuItem {
-        return menuItem(UserText.openInNewTab, #selector(openBookmarkInNewTabMenuItemSelected(_:)))
-    }
-
-    @objc
-    func openBookmarkInNewTabMenuItemSelected(_ sender: NSMenuItem) {
+    func openBookmarkInNewTab(_ sender: NSMenuItem) {
         delegate?.bookmarksBarCollectionViewItemOpenInNewTabAction(self)
     }
 
-    func openBookmarkInNewWindowMenuItem() -> NSMenuItem {
-        return menuItem(UserText.openInNewWindow, #selector(openBookmarkInNewWindowMenuItemSelected(_:)))
-    }
-
-    @objc
-    func openBookmarkInNewWindowMenuItemSelected(_ sender: NSMenuItem) {
+    func openBookmarkInNewWindow(_ sender: NSMenuItem) {
         delegate?.bookmarksBarCollectionViewItemOpenInNewWindowAction(self)
     }
 
-    func addToFavoritesMenuItem(isFavorite: Bool) -> NSMenuItem? {
-        guard !isFavorite else {
-            return nil
-        }
-
-        return menuItem(UserText.addToFavorites, #selector(addToFavoritesMenuItemSelected(_:)))
-    }
-
-    @objc
-    func addToFavoritesMenuItemSelected(_ sender: NSMenuItem) {
-        delegate?.bookmarksBarCollectionViewItemAddToFavoritesAction(self)
+    func toggleBookmarkAsFavorite(_ sender: NSMenuItem) {
+        delegate?.bookmarksBarCollectionViewItemToggleFavoritesAction(self)
     }
 
-    func editItem() -> NSMenuItem {
-        return menuItem("Edit…", #selector(editItemSelected(_:)))
+    func editBookmark(_ sender: NSMenuItem) {
+        delegate?.bookmarksBarCollectionViewEditAction(self)
     }
 
-    @objc
-    func editItemSelected(_ sender: NSMenuItem) {
-        delegate?.bookmarksBarCollectionViewEditAction(self)
+    func copyBookmark(_ sender: NSMenuItem) {
+        delegate?.bookmarksBarCollectionViewItemCopyBookmarkURLAction(self)
     }
 
-    func moveToEndMenuItem() -> NSMenuItem {
-        return menuItem(UserText.bookmarksBarContextMenuMoveToEnd, #selector(moveToEndMenuItemSelected(_:)))
+    func deleteBookmark(_ sender: NSMenuItem) {
+        delegate?.bookmarksBarCollectionViewItemDeleteEntityAction(self)
     }
 
-    @objc
-    func moveToEndMenuItemSelected(_ sender: NSMenuItem) {
+    func moveToEnd(_ sender: NSMenuItem) {
         delegate?.bookmarksBarCollectionViewItemMoveToEndAction(self)
     }
 
-    func copyBookmarkURLMenuItem() -> NSMenuItem {
-        return menuItem(UserText.bookmarksBarContextMenuCopy, #selector(copyBookmarkURLMenuItemSelected(_:)))
+    func deleteEntities(_ sender: NSMenuItem) {}
+
+    func manageBookmarks(_ sender: NSMenuItem) {
+        delegate?.bookmarksBarCollectionViewItemManageBookmarksAction(self)
     }
 
-    @objc
-    func copyBookmarkURLMenuItemSelected(_ sender: NSMenuItem) {
-        delegate?.bookmarksBarCollectionViewItemCopyBookmarkURLAction(self)
+}
+
+extension BookmarksBarCollectionViewItem: FolderMenuItemSelectors {
+
+    func newFolder(_ sender: NSMenuItem) {
+        delegate?.bookmarksBarCollectionViewItemAddEntityAction(self)
     }
 
-    func deleteEntityMenuItem() -> NSMenuItem {
-        return menuItem(UserText.bookmarksBarContextMenuDelete, #selector(deleteMenuItemSelected(_:)))
+    func editFolder(_ sender: NSMenuItem) {
+        delegate?.bookmarksBarCollectionViewEditAction(self)
     }
 
-    @objc
-    func deleteMenuItemSelected(_ sender: NSMenuItem) {
+    func deleteFolder(_ sender: NSMenuItem) {
         delegate?.bookmarksBarCollectionViewItemDeleteEntityAction(self)
     }
 
-    // MARK: Folder Menu Items
-
-    func createFolderMenuItems() -> [NSMenuItem] {
-        return [
-            editItem(),
-            moveToEndMenuItem(),
-            NSMenuItem.separator(),
-            deleteEntityMenuItem()
-        ]
+    func openInNewTabs(_ sender: NSMenuItem) {
+        delegate?.bookmarksBarCollectionViewItemOpenInNewTabAction(self)
     }
 
-    func menuItem(_ title: String, _ action: Selector) -> NSMenuItem {
-        return NSMenuItem(title: title, action: action, keyEquivalent: "")
+    func openAllInNewWindow(_ sender: NSMenuItem) {
+        delegate?.bookmarksBarCollectionViewItemOpenInNewWindowAction(self)
     }
 
 }
diff --git a/DuckDuckGo/BookmarksBar/View/BookmarksBarMenuFactory.swift b/DuckDuckGo/BookmarksBar/View/BookmarksBarMenuFactory.swift
index 56eff5f57a..c8d9f6c016 100644
--- a/DuckDuckGo/BookmarksBar/View/BookmarksBarMenuFactory.swift
+++ b/DuckDuckGo/BookmarksBar/View/BookmarksBarMenuFactory.swift
@@ -34,6 +34,13 @@ struct BookmarksBarMenuFactory {
         menu.addItem(makeMenuItem(prefs))
     }
 
+    static func addToMenuWithManageBookmarksSection(_ menu: NSMenu, target: AnyObject, addFolderSelector: Selector, manageBookmarksSelector: Selector, prefs: AppearancePreferences = .shared) {
+        addToMenu(menu, prefs)
+        menu.addItem(.separator())
+        menu.addItem(NSMenuItem(title: UserText.addFolder, action: addFolderSelector, target: target))
+        menu.addItem(NSMenuItem(title: UserText.bookmarksManageBookmarks, action: manageBookmarksSelector, target: target))
+    }
+
     private static func makeMenuItem( _ prefs: AppearancePreferences) -> NSMenuItem {
         let item = NSMenuItem(title: UserText.showBookmarksBar, action: nil, keyEquivalent: "B")
         item.submenu = NSMenu(items: [
diff --git a/DuckDuckGo/BookmarksBar/View/BookmarksBarViewController.swift b/DuckDuckGo/BookmarksBar/View/BookmarksBarViewController.swift
index ea9b61e496..e298a6335e 100644
--- a/DuckDuckGo/BookmarksBar/View/BookmarksBarViewController.swift
+++ b/DuckDuckGo/BookmarksBar/View/BookmarksBarViewController.swift
@@ -223,59 +223,113 @@ extension BookmarksBarViewController: BookmarksBarViewModelDelegate {
         bookmarksBarCollectionView.reloadData()
     }
 
-    private func handle(_ action: BookmarksBarViewModel.BookmarksBarItemAction, for bookmark: Bookmark) {
+}
+
+// MARK: - Private
+
+private extension BookmarksBarViewController {
+
+    func handle(_ action: BookmarksBarViewModel.BookmarksBarItemAction, for bookmark: Bookmark) {
         switch action {
         case .openInNewTab:
-            guard let url = bookmark.urlObject else { return }
-            tabCollectionViewModel.appendNewTab(with: .url(url, source: .bookmark), selected: true)
+            openInNewTab(bookmark: bookmark)
         case .openInNewWindow:
-            guard let url = bookmark.urlObject else { return }
-            WindowsManager.openNewWindow(with: url, source: .bookmark, isBurner: false)
+            openInNewWindow(bookmark: bookmark)
         case .clickItem:
             WindowControllersManager.shared.open(bookmark: bookmark)
-        case .addToFavorites:
-            bookmark.isFavorite = true
+        case .toggleFavorites:
+            bookmark.isFavorite.toggle()
             bookmarkManager.update(bookmark: bookmark)
         case .edit:
-            AddBookmarkModalView(model: AddBookmarkModalViewModel(originalBookmark: bookmark))
-                .show(in: view.window)
+            showDialog(view: BookmarksDialogViewFactory.makeEditBookmarkView(bookmark: bookmark))
         case .moveToEnd:
             bookmarkManager.move(objectUUIDs: [bookmark.id], toIndex: nil, withinParentFolder: .root) { _ in }
         case .copyURL:
             bookmark.copyUrlToPasteboard()
         case .deleteEntity:
             bookmarkManager.remove(bookmark: bookmark)
+        case .addFolder:
+            addFolder(inParent: nil)
+        case .manageBookmarks:
+            manageBookmarks()
         }
     }
 
-    private func handle(_ action: BookmarksBarViewModel.BookmarksBarItemAction, for folder: BookmarkFolder, item: BookmarksBarCollectionViewItem) {
+    func handle(_ action: BookmarksBarViewModel.BookmarksBarItemAction, for folder: BookmarkFolder, item: BookmarksBarCollectionViewItem) {
         switch action {
         case .clickItem:
-            let childEntities = folder.children
-            let viewModels = childEntities.map { BookmarkViewModel(entity: $0) }
-            let menuItems = viewModel.bookmarksTreeMenuItems(from: viewModels, topLevel: true)
-            let menu = bookmarkFolderMenu(items: menuItems)
-
-            menu.popUp(positioning: nil, at: CGPoint(x: 0, y: item.view.frame.minY - 7), in: item.view)
+            showSubmenuFor(folder: folder, fromView: item.view)
         case .edit:
-            AddBookmarkFolderModalView(model: AddBookmarkFolderModalViewModel(folder: folder))
-                .show(in: view.window)
+            showDialog(view: BookmarksDialogViewFactory.makeEditBookmarkFolderView(folder: folder, parentFolder: nil))
         case .moveToEnd:
             bookmarkManager.move(objectUUIDs: [folder.id], toIndex: nil, withinParentFolder: .root) { _ in }
         case .deleteEntity:
             bookmarkManager.remove(folder: folder)
+        case .addFolder:
+            addFolder(inParent: folder)
+        case .openInNewTab:
+            openAllInNewTabs(folder: folder)
+        case .openInNewWindow:
+            openAllInNewWindow(folder: folder)
+        case .manageBookmarks:
+            manageBookmarks()
         default:
             assertionFailure("Received unexpected action for bookmark folder")
         }
     }
 
-    private func bookmarkFolderMenu(items: [NSMenuItem]) -> NSMenu {
+    func bookmarkFolderMenu(items: [NSMenuItem]) -> NSMenu {
         let menu = NSMenu()
         menu.items = items.isEmpty ? [NSMenuItem.empty] : items
         menu.autoenablesItems = false
         return menu
     }
 
+    func openInNewTab(bookmark: Bookmark) {
+        guard let url = bookmark.urlObject else { return }
+        tabCollectionViewModel.appendNewTab(with: .url(url, source: .bookmark), selected: true)
+    }
+
+    func openInNewWindow(bookmark: Bookmark) {
+        guard let url = bookmark.urlObject else { return }
+        WindowsManager.openNewWindow(with: url, source: .bookmark, isBurner: false)
+    }
+
+    func openAllInNewTabs(folder: BookmarkFolder) {
+        let tabs = Tab.withContentOfBookmark(folder: folder, burnerMode: tabCollectionViewModel.burnerMode)
+        tabCollectionViewModel.append(tabs: tabs)
+    }
+
+    func openAllInNewWindow(folder: BookmarkFolder) {
+        let tabCollection = TabCollection.withContentOfBookmark(folder: folder, burnerMode: tabCollectionViewModel.burnerMode)
+        WindowsManager.openNewWindow(with: tabCollection, isBurner: tabCollectionViewModel.isBurner)
+    }
+
+    func showSubmenuFor(folder: BookmarkFolder, fromView view: NSView) {
+        let childEntities = folder.children
+        let viewModels = childEntities.map { BookmarkViewModel(entity: $0) }
+        let menuItems = viewModel.bookmarksTreeMenuItems(from: viewModels, topLevel: true)
+        let menu = bookmarkFolderMenu(items: menuItems)
+
+        menu.popUp(positioning: nil, at: CGPoint(x: 0, y: view.frame.minY - 7), in: view)
+    }
+
+    func addFolder(inParent parent: BookmarkFolder?) {
+        showDialog(view: BookmarksDialogViewFactory.makeAddBookmarkFolderView(parentFolder: parent))
+    }
+
+    func showDialog(view: any ModalView) {
+        view.show(in: self.view.window)
+    }
+
+    @objc func manageBookmarks() {
+        WindowControllersManager.shared.showBookmarksTab()
+    }
+
+    @objc func addFolder(sender: NSMenuItem) {
+        addFolder(inParent: nil)
+    }
+
 }
 
 // MARK: - Menu
@@ -284,7 +338,12 @@ extension BookmarksBarViewController: NSMenuDelegate {
 
     public func menuNeedsUpdate(_ menu: NSMenu) {
         menu.removeAllItems()
-        BookmarksBarMenuFactory.addToMenu(menu)
+        BookmarksBarMenuFactory.addToMenuWithManageBookmarksSection(
+            menu,
+            target: self,
+            addFolderSelector: #selector(addFolder(sender:)),
+            manageBookmarksSelector: #selector(manageBookmarks)
+        )
     }
 
 }
diff --git a/DuckDuckGo/BookmarksBar/View/BookmarksBarViewModel.swift b/DuckDuckGo/BookmarksBar/View/BookmarksBarViewModel.swift
index 2dc81a1596..1c82b4c576 100644
--- a/DuckDuckGo/BookmarksBar/View/BookmarksBarViewModel.swift
+++ b/DuckDuckGo/BookmarksBar/View/BookmarksBarViewModel.swift
@@ -47,11 +47,13 @@ final class BookmarksBarViewModel: NSObject {
         case clickItem
         case openInNewTab
         case openInNewWindow
-        case addToFavorites
+        case toggleFavorites
         case edit
         case moveToEnd
         case copyURL
         case deleteEntity
+        case addFolder
+        case manageBookmarks
     }
 
     struct BookmarksBarItem {
@@ -482,8 +484,8 @@ extension BookmarksBarViewModel: BookmarksBarCollectionViewItemDelegate {
         delegate?.bookmarksBarViewModelReceived(action: .openInNewWindow, for: item)
     }
 
-    func bookmarksBarCollectionViewItemAddToFavoritesAction(_ item: BookmarksBarCollectionViewItem) {
-        delegate?.bookmarksBarViewModelReceived(action: .addToFavorites, for: item)
+    func bookmarksBarCollectionViewItemToggleFavoritesAction(_ item: BookmarksBarCollectionViewItem) {
+        delegate?.bookmarksBarViewModelReceived(action: .toggleFavorites, for: item)
     }
 
     func bookmarksBarCollectionViewEditAction(_ item: BookmarksBarCollectionViewItem) {
@@ -502,4 +504,12 @@ extension BookmarksBarViewModel: BookmarksBarCollectionViewItemDelegate {
         delegate?.bookmarksBarViewModelReceived(action: .deleteEntity, for: item)
     }
 
+    func bookmarksBarCollectionViewItemAddEntityAction(_ item: BookmarksBarCollectionViewItem) {
+        delegate?.bookmarksBarViewModelReceived(action: .addFolder, for: item)
+    }
+
+    func bookmarksBarCollectionViewItemManageBookmarksAction(_ item: BookmarksBarCollectionViewItem) {
+        delegate?.bookmarksBarViewModelReceived(action: .manageBookmarks, for: item)
+    }
+
 }
diff --git a/DuckDuckGo/Common/Extensions/BundleExtension.swift b/DuckDuckGo/Common/Extensions/BundleExtension.swift
index 0a9fbafcf6..b3c7a629f5 100644
--- a/DuckDuckGo/Common/Extensions/BundleExtension.swift
+++ b/DuckDuckGo/Common/Extensions/BundleExtension.swift
@@ -95,17 +95,7 @@ extension Bundle {
 #endif
 
     func appGroup(bundle: BundleGroup) -> String {
-        var appGroupName: String
-
-        switch bundle {
-        case .dbp:
-            appGroupName = "DBP_APP_GROUP"
-        case .netP:
-            appGroupName = "NETP_APP_GROUP"
-        case .subs:
-            appGroupName = "SUBSCRIPTION_APP_GROUP"
-        }
-
+        let appGroupName = bundle.appGroupKey
         guard let appGroup = object(forInfoDictionaryKey: appGroupName) as? String else {
             fatalError("Info.plist is missing \(appGroupName)")
         }
@@ -131,4 +121,15 @@ enum BundleGroup {
     case netP
     case dbp
     case subs
+
+    var appGroupKey: String {
+        switch self {
+        case .dbp:
+            return "DBP_APP_GROUP"
+        case .netP:
+            return "NETP_APP_GROUP"
+        case .subs:
+            return "SUBSCRIPTION_APP_GROUP"
+        }
+    }
 }
diff --git a/DuckDuckGo/Common/Extensions/NSAlertExtension.swift b/DuckDuckGo/Common/Extensions/NSAlertExtension.swift
index 8aa901b548..554ce896e5 100644
--- a/DuckDuckGo/Common/Extensions/NSAlertExtension.swift
+++ b/DuckDuckGo/Common/Extensions/NSAlertExtension.swift
@@ -38,8 +38,10 @@ extension NSAlert {
         alert.informativeText = UserText.clearAllDataDescription
         alert.alertStyle = .warning
         alert.icon = .burnAlert
-        alert.addButton(withTitle: UserText.clear)
-        alert.addButton(withTitle: UserText.cancel)
+        let clearButton = alert.addButton(withTitle: UserText.clear)
+        let cancelButton = alert.addButton(withTitle: UserText.cancel)
+        clearButton.setAccessibilityIdentifier("ClearAllHistoryAndDataAlert.clearButton")
+        cancelButton.setAccessibilityIdentifier("ClearAllHistoryAndDataAlert.cancelButton")
         return alert
     }
 
@@ -88,11 +90,11 @@ extension NSAlert {
 
     static func resetNetworkProtectionAlert() -> NSAlert {
         let alert = NSAlert()
-        alert.messageText = "Reset Network Protection?"
+        alert.messageText = "Reset VPN?"
         alert.informativeText = """
         This will remove your stored network configuration (including private key) and disable the VPN.
 
-        You can re-enable the VPN from the Network Protection view.
+        You can re-enable the VPN from the status view.
         """
         alert.alertStyle = .warning
         alert.addButton(withTitle: "Reset")
@@ -108,7 +110,7 @@ extension NSAlert {
         let sysExText = ""
 #endif
         alert.messageText = "Uninstall \(sysExText)Login Items?"
-        alert.informativeText = "This will remove the Network Protection \(sysExText)Status Menu icon and disable the VPN."
+        alert.informativeText = "This will remove the VPN \(sysExText)Status Menu icon and disable the VPN."
         alert.alertStyle = .warning
         alert.addButton(withTitle: "Uninstall")
         alert.addButton(withTitle: UserText.cancel)
diff --git a/DuckDuckGo/Common/Extensions/NSMenuExtension.swift b/DuckDuckGo/Common/Extensions/NSMenuExtension.swift
index 69043e9a3b..6790d5c4f7 100644
--- a/DuckDuckGo/Common/Extensions/NSMenuExtension.swift
+++ b/DuckDuckGo/Common/Extensions/NSMenuExtension.swift
@@ -58,4 +58,14 @@ extension NSMenu {
         insertItem(newItem, at: index)
     }
 
+    /// Pops up the menu at the current mouse location.
+    ///
+    /// - Parameter view: The view to display the menu item over.
+    /// - Attention: If the view is not currently installed in a window, this function does not show any pop up menu.
+    func popUpAtMouseLocation(in view: NSView) {
+        guard let cursorLocation = view.window?.mouseLocationOutsideOfEventStream else { return }
+        let convertedLocation = view.convert(cursorLocation, from: nil)
+        popUp(positioning: nil, at: convertedLocation, in: view)
+    }
+
 }
diff --git a/DuckDuckGo/Common/Extensions/NSMenuItemExtension.swift b/DuckDuckGo/Common/Extensions/NSMenuItemExtension.swift
index bfa2e24e09..b3f0870252 100644
--- a/DuckDuckGo/Common/Extensions/NSMenuItemExtension.swift
+++ b/DuckDuckGo/Common/Extensions/NSMenuItemExtension.swift
@@ -104,6 +104,12 @@ extension NSMenuItem {
         return self
     }
 
+    @discardableResult
+    func withAccessibilityIdentifier(_ accessibilityIdentifier: String) -> NSMenuItem {
+        self.setAccessibilityIdentifier(accessibilityIdentifier)
+        return self
+    }
+
     @discardableResult
     func withImage(_ image: NSImage?) -> NSMenuItem {
         self.image = image
diff --git a/DuckDuckGo/Common/Extensions/URLExtension.swift b/DuckDuckGo/Common/Extensions/URLExtension.swift
index 1e367e4e6c..3f5b12e8f7 100644
--- a/DuckDuckGo/Common/Extensions/URLExtension.swift
+++ b/DuckDuckGo/Common/Extensions/URLExtension.swift
@@ -340,13 +340,21 @@ extension URL {
     }
 
     static var cookieConsentPopUpManagement: URL {
-        return URL(string: "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#cookie-consent-pop-up-management")!
+        return URL(string: "https://duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#cookie-pop-up-management")!
     }
 
     static var gpcLearnMore: URL {
         return URL(string: "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/gpc/")!
     }
 
+    static var privateSearchLearnMore: URL {
+        return URL(string: "https://duckduckgo.com/duckduckgo-help-pages/search-privacy/")!
+    }
+
+    static var searchSettings: URL {
+        return URL(string: "https://duckduckgo.com/settings/")!
+    }
+
     static var ddgLearnMore: URL {
         return URL(string: "https://duckduckgo.com/duckduckgo-help-pages/get-duckduckgo/get-duckduckgo-browser-on-mac/")!
     }
@@ -362,6 +370,7 @@ extension URL {
     static var duckDuckGoEmail = URL(string: "https://duckduckgo.com/email-protection")!
     static var duckDuckGoEmailLogin = URL(string: "https://duckduckgo.com/email")!
 
+    static var duckDuckGoEmailInfo = URL(string: "https://duckduckgo.com/duckduckgo-help-pages/email-protection/what-is-duckduckgo-email-protection/")!
     static var duckDuckGoMorePrivacyInfo = URL(string: "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/atb/")!
 
     var isDuckDuckGo: Bool {
diff --git a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
index 8653bba9e2..69d36bb228 100644
--- a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
+++ b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
@@ -21,37 +21,39 @@ import Foundation
 extension UserText {
 
     // "network.protection.tunnel.name" - The name of the NetP VPN that will be visible in the system to the user
-    static let networkProtectionTunnelName = "DuckDuckGo Network Protection"
-    // "network.protection" - Menu item for opening Network Protection
-    static let networkProtection = "Network Protection"
+    static let networkProtectionTunnelName = "DuckDuckGo VPN"
+    // "network.protection" - Menu item for opening the VPN
+    static let networkProtection = "VPN"
 
     // MARK: - Navigation Bar
     // "network.protection.status.button.tooltip" - The tooltip for NetP's nav bar button
-    static let networkProtectionButtonTooltip = "Network Protection"
+    static let networkProtectionButtonTooltip = "VPN"
 
     // MARK: - Invite Code
-    // "network.protection.invite.dialog.title" - Title for the network protection invite dialog
+    // "network.protection.invite.dialog.title" - Title for the VPN invite dialog
     static let networkProtectionInviteDialogTitle = "Enter your invite code"
-    // "network.protection.invite.dialog.message" - Message for the network protection invite dialog
+    // "network.protection.invite.dialog.message" - Message for the VPN invite dialog
     static let networkProtectionInviteDialogMessage = "Enter your invite code to get started."
-    // "network.protection.invite.field.prompt" - Prompt for the network protection invite code text field
+    // "network.protection.invite.field.prompt" - Prompt for the VPN invite code text field
     static let networkProtectionInviteFieldPrompt = "Code"
-    // "network.protection.invite.success.title" - Title for the network protection invite success view
+    // "network.protection.invite.success.title" - Title for the VPN invite success view
     static let networkProtectionInviteSuccessTitle = "Success! You’re in."
-    // "network.protection.invite.success.title" - Message for the network protection invite success view
+    // "network.protection.invite.success.title" - Message for the VPN invite success view
     static let networkProtectionInviteSuccessMessage = "DuckDuckGo's VPN secures all of your device's Internet traffic anytime, anywhere."
 
     // MARK: - Navigation Bar Status View
-    // "network.protection.navbar.status.view.share.feedback" - Menu item for 'Send VPN Feedback' in the Network Protection status view that's shown in the navigation bar
+    // "network.protection.navbar.status.view.share.feedback" - Menu item for 'Send VPN Feedback' in the VPN status view that's shown in the navigation bar
     static let networkProtectionNavBarStatusViewShareFeedback = "Send VPN Feedback…"
     // "network.protection.status.menu.vpn.settings" - The status menu 'VPN Settings' menu item
     static let networkProtectionNavBarStatusMenuVPNSettings = "VPN Settings…"
+    // "network.protection.status.menu.faq" - The status menu 'FAQ' menu item
+    static let networkProtectionNavBarStatusMenuFAQ = "Frequently Asked Questions…"
 
     // MARK: - System Extension Installation Messages
-    // "network.protection.configuration.system-settings.legacy" - Text for a label in the Network Protection popover, displayed after attempting to enable Network Protection for the first time while using macOS 12 and below
-    private static let networkProtectionSystemSettingsLegacy = "Go to Security & Privacy in System Preferences to allow Network Protection to activate"
-    // "network.protection.configuration.system-settings.modern" - Text for a label in the Network Protection popover, displayed after attempting to enable Network Protection for the first time while using macOS 13 and above
-    private static let networkProtectionSystemSettingsModern = "Go to Privacy & Security in System Settings to allow Network Protection to activate"
+    // "network.protection.configuration.system-settings.legacy" - Text for a label in the VPN popover, displayed after attempting to enable the VPN for the first time while using macOS 12 and below
+    private static let networkProtectionSystemSettingsLegacy = "Go to Security & Privacy in System Preferences to allow DuckDuckGo VPN to activate"
+    // "network.protection.configuration.system-settings.modern" - Text for a label in the VPN popover, displayed after attempting to enable the VPN for the first time while using macOS 13 and above
+    private static let networkProtectionSystemSettingsModern = "Go to Privacy & Security in System Settings to allow DuckDuckGo VPN to activate"
 
     // Dynamically selected based on macOS version, not directly convertible to static string
     static var networkProtectionSystemSettings: String {
@@ -65,161 +67,161 @@ extension UserText {
     // "network.protection.system.extension.unknown.activation.error" - Message shown to users when they try to enable NetP and there is an unexpected activation error.
     static let networkProtectionUnknownActivationError = "There as an unexpected error. Please try again."
     // "network.protection.system.extension.please.reboot" - Message shown to users when they try to enable NetP and they need to reboot the computer to complete the installation
-    static let networkProtectionPleaseReboot = "Please reboot to activate Network Protection"
+    static let networkProtectionPleaseReboot = "Please reboot to activate the VPN"
 }
 
-// MARK: - Network Protection Waitlist
+// MARK: - VPN Waitlist
 
 extension UserText {
 
-    // "network-protection.waitlist.notification.title" - Title for Network Protection waitlist notification
-    static let networkProtectionWaitlistNotificationTitle = "Network Protection beta is ready!"
-    // "network-protection.waitlist.notification.text" - Title for Network Protection waitlist notification
+    // "network-protection.waitlist.notification.title" - Title for VPN waitlist notification
+    static let networkProtectionWaitlistNotificationTitle = "DuckDuckGo VPN beta is ready!"
+    // "network-protection.waitlist.notification.text" - Title for VPN waitlist notification
     static let networkProtectionWaitlistNotificationText = "Open your invite"
 
-    // "network-protection.waitlist.join.title" - Title for Network Protection join waitlist screen
-    static let networkProtectionWaitlistJoinTitle = "Network Protection Beta"
-    // "network-protection.waitlist.join.subtitle.1" - First subtitle for Network Protection join waitlist screen
-    static let networkProtectionWaitlistJoinSubtitle1 = "Secure your connection anytime, anywhere with Network Protection, the VPN from DuckDuckGo."
-    // "network-protection.waitlist.join.subtitle.2" - Second subtitle for Network Protection join waitlist screen
+    // "network-protection.waitlist.join.title" - Title for VPN join waitlist screen
+    static let networkProtectionWaitlistJoinTitle = "DuckDuckGo VPN Beta"
+    // "network-protection.waitlist.join.subtitle.1" - First subtitle for VPN join waitlist screen
+    static let networkProtectionWaitlistJoinSubtitle1 = "Secure your connection anytime, anywhere with DuckDuckGo VPN."
+    // "network-protection.waitlist.join.subtitle.2" - Second subtitle for VPN join waitlist screen
     static let networkProtectionWaitlistJoinSubtitle2 = "Join the waitlist, and we’ll notify you when it’s your turn."
 
-    // "network-protection.waitlist.joined.title" - Title for Network Protection joined waitlist screen
+    // "network-protection.waitlist.joined.title" - Title for VPN joined waitlist screen
     static let networkProtectionWaitlistJoinedTitle = "You’re on the list!"
-    // "network-protection.waitlist.joined.with-notifications.subtitle.1" - Subtitle 1 for Network Protection joined waitlist screen when notifications are enabled
+    // "network-protection.waitlist.joined.with-notifications.subtitle.1" - Subtitle 1 for VPN joined waitlist screen when notifications are enabled
     static let networkProtectionWaitlistJoinedWithNotificationsSubtitle1 = "New invites are sent every few days, on a first come, first served basis."
-    // "network-protection.waitlist.joined.with-notifications.subtitle.2" - Subtitle 2 for Network Protection joined waitlist screen when notifications are enabled
+    // "network-protection.waitlist.joined.with-notifications.subtitle.2" - Subtitle 2 for VPN joined waitlist screen when notifications are enabled
     static let networkProtectionWaitlistJoinedWithNotificationsSubtitle2 = "We’ll notify you when your invite is ready."
-    // "network-protection.waitlist.enable-notifications" - Enable notifications prompt for Network Protection joined waitlist screen
-    static let networkProtectionWaitlistEnableNotifications = "Want to get a notification when your Network Protection invite is ready?"
+    // "network-protection.waitlist.enable-notifications" - Enable notifications prompt for VPN joined waitlist screen
+    static let networkProtectionWaitlistEnableNotifications = "Want to get a notification when your VPN invite is ready?"
 
-    // "network-protection.waitlist.invited.title" - Title for Network Protection invited screen
-    static let networkProtectionWaitlistInvitedTitle = "You’re invited to try\nNetwork Protection beta!"
-    // "network-protection.waitlist.invited.subtitle" - Subtitle for Network Protection invited screen
+    // "network-protection.waitlist.invited.title" - Title for VPN invited screen
+    static let networkProtectionWaitlistInvitedTitle = "You’re invited to try\nDuckDuckGo VPN beta!"
+    // "network-protection.waitlist.invited.subtitle" - Subtitle for VPN invited screen
     static let networkProtectionWaitlistInvitedSubtitle = "Get an extra layer of protection online with the VPN built for speed and simplicity. Encrypt your internet connection across your entire device and hide your location and IP address from sites you visit."
 
-    // "network-protection.waitlist.invited.section-1.title" - Title for section 1 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-1.title" - Title for section 1 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection1Title = "Full-device coverage"
-    // "network-protection.waitlist.invited.section-1.subtitle" - Subtitle for section 1 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-1.subtitle" - Subtitle for section 1 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection1Subtitle = "Encrypt online traffic across your browsers and apps."
 
-    // "network-protection.waitlist.invited.section-2.title" - Title for section 2 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-2.title" - Title for section 2 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection2Title = "Fast, reliable, and easy to use"
-    // "network-protection.waitlist.invited.section-2.subtitle" - Subtitle for section 2 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-2.subtitle" - Subtitle for section 2 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection2Subtitle = "No need for a separate app. Connect in one click and see your connection status at a glance."
 
-    // "network-protection.waitlist.invited.section-3.title" - Title for section 3 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-3.title" - Title for section 3 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection3Title = "Strict no-logging policy"
-    // "network-protection.waitlist.invited.section-3.subtitle" - Subtitle for section 3 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-3.subtitle" - Subtitle for section 3 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection3Subtitle = "We do not log or save any data that can connect you to your online activity."
 
-    // "network-protection.waitlist.enable.title" - Title for Network Protection enable screen
-    static let networkProtectionWaitlistEnableTitle = "Ready to enable Network Protection?"
-    // "network-protection.waitlist.enable.subtitle" - Subtitle for Network Protection enable screen
-    static let networkProtectionWaitlistEnableSubtitle = "Look for the globe icon in the browser toolbar or in the Mac menu bar.\n\nYou'll be asked to Allow a VPN connection once when setting up Network Protection the first time."
+    // "network-protection.waitlist.enable.title" - Title for VPN enable screen
+    static let networkProtectionWaitlistEnableTitle = "Ready to enable DuckDuckGo VPN?"
+    // "network-protection.waitlist.enable.subtitle" - Subtitle for VPN enable screen
+    static let networkProtectionWaitlistEnableSubtitle = "Look for the globe icon in the browser toolbar or in the Mac menu bar.\n\nYou'll be asked to Allow a VPN connection once when setting up DuckDuckGo VPN the first time."
 
-    // "network-protection.waitlist.availability-disclaimer" - Availability disclaimer for Network Protection join waitlist screen
-    static let networkProtectionWaitlistAvailabilityDisclaimer = "Network Protection is free to use during the beta."
+    // "network-protection.waitlist.availability-disclaimer" - Availability disclaimer for VPN join waitlist screen
+    static let networkProtectionWaitlistAvailabilityDisclaimer = "DuckDuckGo VPN is free to use during the beta."
 
-    // "network-protection.waitlist.button.close" - Close button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.close" - Close button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonClose = "Close"
-    // "network-protection.waitlist.button.done" - Close button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.done" - Close button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonDone = "Done"
-    // "network-protection.waitlist.button.dismiss" - Dismiss button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.dismiss" - Dismiss button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonDismiss = "Dismiss"
-    // "network-protection.waitlist.button.cancel" - Cancel button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.cancel" - Cancel button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonCancel = "Cancel"
-    // "network-protection.waitlist.button.no-thanks" - No Thanks button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.no-thanks" - No Thanks button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonNoThanks = "No Thanks"
-    // "network-protection.waitlist.button.get-started" - Get Started button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.get-started" - Get Started button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonGetStarted = "Get Started"
-    // "network-protection.waitlist.button.got-it" - Got It button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.got-it" - Got It button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonGotIt = "Got It"
-    // "network-protection.waitlist.button.enable-notifications" - Enable Notifications button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.enable-notifications" - Enable Notifications button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonEnableNotifications = "Enable Notifications"
-    // "network-protection.waitlist.button.join-waitlist" - Join Waitlist button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.join-waitlist" - Join Waitlist button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonJoinWaitlist = "Join the Waitlist"
-    // "network-protection.waitlist.button.agree-and-continue" - Agree and Continue button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.agree-and-continue" - Agree and Continue button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonAgreeAndContinue = "Agree and Continue"
 }
 
-// MARK: - Network Protection Terms of Service
+// MARK: - VPN Terms of Service
 
 extension UserText {
 
-    // "network-protection.privacy-policy.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicyTitle = "Privacy Policy"
 
-    // "network-protection.privacy-policy.section.1.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.1.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection1Title = "We don’t ask for any personal information from you in order to use this beta service."
-    // "network-protection.privacy-policy.section.1.list" - Privacy Policy list for Network Protection (Markdown version)
+    // "network-protection.privacy-policy.section.1.list" - Privacy Policy list for VPN (Markdown version)
     static let networkProtectionPrivacyPolicySection1ListMarkdown = "This Privacy Policy is for our limited waitlist beta VPN product.\n\nOur main [Privacy Policy](https://duckduckgo.com/privacy) also applies here."
-    // "network-protection.privacy-policy.section.1.list" - Privacy Policy list for Network Protection (Non-Markdown version)
+    // "network-protection.privacy-policy.section.1.list" - Privacy Policy list for VPN (Non-Markdown version)
     static let networkProtectionPrivacyPolicySection1ListNonMarkdown = "This Privacy Policy is for our limited waitlist beta VPN product.\n\nOur main Privacy Policy also applies here."
 
-    // "network-protection.privacy-policy.section.2.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.2.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection2Title = "We don’t keep any logs of your online activity."
-    // "network-protection.privacy-policy.section.2.list" - Privacy Policy list for Network Protection
+    // "network-protection.privacy-policy.section.2.list" - Privacy Policy list for VPN
     static let networkProtectionPrivacyPolicySection2List = "That means we have no way to tie what you do online to you as an individual and we don’t have any record of things like:\n    • Website visits\n    • DNS requests\n    • Connections made\n    • IP addresses used\n    • Session lengths"
 
-    // "network-protection.privacy-policy.section.3.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.3.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection3Title = "We only keep anonymous performance metrics that we cannot connect to your online activity."
-    // "network-protection.privacy-policy.section.3.list" - Privacy Policy list for Network Protection
+    // "network-protection.privacy-policy.section.3.list" - Privacy Policy list for VPN
     static let networkProtectionPrivacyPolicySection3List = "Our servers store generic usage (for example, CPU load) and diagnostic data (for example, errors), but none of that data is connected to any individual’s activity.\n\nWe use this non-identifying information to monitor and ensure the performance and quality of the service, for example to make sure servers aren’t overloaded."
 
-    // "network-protection.privacy-policy.section.4.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.4.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection4Title = "We use dedicated servers for all VPN traffic."
-    // "network-protection.privacy-policy.section.4.list" - Privacy Policy list for Network Protection
+    // "network-protection.privacy-policy.section.4.list" - Privacy Policy list for VPN
     static let networkProtectionPrivacyPolicySection4List = "Dedicated servers means they are not shared with anyone else.\n\nWe rent our servers from providers we carefully selected because they meet our privacy requirements.\n\nWe have strict access controls in place so that only limited DuckDuckGo team members have access to our servers."
 
-    // "network-protection.privacy-policy.section.5.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.5.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection5Title = "We protect and limit use of your data when you communicate directly with DuckDuckGo."
-    // "network-protection.privacy-policy.section.5.list" - Privacy Policy list for Network Protection
+    // "network-protection.privacy-policy.section.5.list" - Privacy Policy list for VPN
     static let networkProtectionPrivacyPolicySection5List = "If you reach out to us for support by submitting a bug report or through email and agree to be contacted to troubleshoot the issue, we’ll contact you using the information you provide.\n\nIf you participate in a voluntary product survey or questionnaire and agree to provide further feedback, we may contact you using the information you provide.\n\nWe will permanently delete all personal information you provided to us (email, contact information), within 30 days after closing a support case or, in the case of follow up feedback, within 60 days after ending this beta service."
 
-    // "network-protection.terms-of-service.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceTitle = "Terms of Service"
 
-    // "network-protection.terms-of-service.section.1.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.1.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection1Title = "The service is for limited and personal use only."
-    // "network-protection.terms-of-service.section.1.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.1.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection1List = "This service is provided for your personal use only.\n\nYou are responsible for all activity in the service that occurs on or through your device.\n\nThis service may only be used through the DuckDuckGo app on the device on which you are given access. If you delete the DuckDuckGo app, you will lose access to the service.\n\nYou may not use this service through a third-party client."
 
-    // "network-protection.terms-of-service.section.2.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.2.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection2Title = "You agree to comply with all applicable laws, rules, and regulations."
-    // "network-protection.terms-of-service.section.2.list" - Terms of Service list for Network Protection (Markdown version)
+    // "network-protection.terms-of-service.section.2.list" - Terms of Service list for VPN (Markdown version)
     static let networkProtectionTermsOfServiceSection2ListMarkdown = "You agree that you will not use the service for any unlawful, illicit, criminal, or fraudulent purpose, or in any manner that could give rise to civil or criminal liability under applicable law.\n\nYou agree to comply with our [DuckDuckGo Terms of Service](https://duckduckgo.com/terms), which are incorporated by reference."
-    // "network-protection.terms-of-service.section.2.list" - Terms of Service list for Network Protection (Non-Markdown version)
+    // "network-protection.terms-of-service.section.2.list" - Terms of Service list for VPN (Non-Markdown version)
     static let networkProtectionTermsOfServiceSection2ListNonMarkdown = "You agree that you will not use the service for any unlawful, illicit, criminal, or fraudulent purpose, or in any manner that could give rise to civil or criminal liability under applicable law.\n\nYou agree to comply with our DuckDuckGo Terms of Service, which are incorporated by reference."
 
-    // "network-protection.terms-of-service.section.3.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.3.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection3Title = "You must be eligible to use this service."
-    // "network-protection.terms-of-service.section.3.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.3.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection3List = "Access to this beta is randomly awarded. You are responsible for ensuring eligibility.\n\nYou must be at least 18 years old and live in a location where use of a VPN is legal in order to be eligible to use this service."
 
-    // "network-protection.terms-of-service.section.4.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.4.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection4Title = "We provide this beta service as-is and without warranty."
-    // "network-protection.terms-of-service.section.4.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.4.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection4List = "This service is provided as-is and without warranties or guarantees of any kind.\n\nTo the extent possible under applicable law, DuckDuckGo will not be liable for any damage or loss arising from your use of the service. In any event, the total aggregate liability of DuckDuckGo shall not exceed $25 or the equivalent in your local currency.\n\nWe may in the future transfer responsibility for the service to a subsidiary of DuckDuckGo. If that happens, you agree that references to “DuckDuckGo” will refer to our subsidiary, which will then become responsible for providing the service and for any liabilities relating to it."
 
-    // "network-protection.terms-of-service.section.5.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.5.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection5Title = "We may terminate access at any time."
-    // "network-protection.terms-of-service.section.5.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.5.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection5List = "We reserve the right to revoke access to the service at any time in our sole discretion.\n\nWe may also terminate access for violation of these terms, including for repeated infringement of the intellectual property rights of others."
 
-    // "network-protection.terms-of-service.section.6.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.6.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection6Title = "The service is free during the beta period."
-    // "network-protection.terms-of-service.section.6.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.6.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection6List = "Access to this service is currently free of charge, but that is limited to this beta period.\n\nYou understand and agree that this service is provided on a temporary, testing basis only."
 
-    // "network-protection.terms-of-service.section.7.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.7.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection7Title = "We are continually updating the service."
-    // "network-protection.terms-of-service.section.7.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.7.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection7List = "The service is in beta, and we are regularly changing it.\n\nService coverage, speed, server locations, and quality may vary without warning."
 
-    // "network-protection.terms-of-service.section.8.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.8.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection8Title = "We need your feedback."
-    // "network-protection.terms-of-service.section.8.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.8.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection8List = "You may be asked during the beta period to provide feedback about your experience. Doing so is optional and your feedback may be used to improve the service.\n\nIf you have enabled notifications for the DuckDuckGo app, we may use notifications to ask about your experience. You can disable notifications if you do not want to receive them."
 
     // MARK: - Feedback Form
@@ -383,3 +385,23 @@ extension UserText {
     static let dataBrokerProtectionWaitlistButtonAgreeAndContinue = "Agree and Continue"
 }
 #endif
+
+// MARK: - Thank You Modals
+
+extension UserText {
+    static let dbpThankYouTitle = "Personal Information Removal early access is over"
+    static let dbpThankYouSubtitle = "Thank you for being a tester!"
+    static let dbpThankYouBody1 = "To continue using Personal Information Removal, subscribe to DuckDuckGo Privacy Pro and get 40% off with promo code THANKYOU"
+
+    static let vpnThankYouTitle = "DuckDuckGo VPN early access is over"
+    static let vpnThankYouSubtitle = "Thank you for being a tester!"
+    static let vpnThankYouBody1 = "To continue using the VPN, subscribe to DuckDuckGo Privacy Pro and get 40% off with promo code THANKYOU"
+
+#if APPSTORE
+    static let dbpThankYouBody2 = "Offer redeemable for a limited time only in the desktop version of the DuckDuckGo browser by U.S. testers when you download from duckduckgo.com/app"
+    static let vpnThankYouBody2 = "Offer redeemable for a limited time only in the desktop version of the DuckDuckGo browser by U.S. testers when you download from duckduckgo.com/app"
+#else
+    static let dbpThankYouBody2 = "Offer redeemable for a limited time in the desktop version of the DuckDuckGo browser by U.S. beta testers only."
+    static let vpnThankYouBody2 = "Offer redeemable for a limited time in the desktop version of the DuckDuckGo browser by U.S. beta testers only."
+#endif
+}
diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
index 8fad1dff04..66e81e8608 100644
--- a/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -329,10 +329,12 @@ struct UserText {
                                                                 value: "Fireproofing this site will keep you signed in after using the Fire Button.",
                                                                 comment: "Fireproof confirmation message")
     static let webTrackingProtectionSettingsTitle = NSLocalizedString("web.tracking.protection.title", value: "Web Tracking Protection", comment: "Web tracking protection settings section title")
-    static let webTrackingProtectionExplenation = NSLocalizedString("web.tracking.protection.explenation", value: "DuckDuckGo automatically blocks hidden trackers as you browse the web.", comment: "feature explanation in settings")
-    static let autoconsentSettingsTitle = NSLocalizedString("autoconsent.title", value: "Cookie Pop-ups", comment: "Autoconsent settings section title")
+    static let webTrackingProtectionExplenation = NSLocalizedString("web.tracking.protection.explenation", value: "DuckDuckGo automatically blocks hidden trackers as you browse the web.", comment: "Privacy feature explanation in the browser settings")
     static let autoconsentCheckboxTitle = NSLocalizedString("autoconsent.checkbox.title", value: "Automatically handle cookie pop-ups", comment: "Autoconsent settings checkbox title")
     static let autoconsentExplanation = NSLocalizedString("autoconsent.explanation", value: "DuckDuckGo will try to select the most private settings available and hide these pop-ups for you.", comment: "Autoconsent feature explanation in settings")
+    static let privateSearchExplanation = NSLocalizedString("private.search.explenation", value: "DuckDuckGo Private Search is your default search engine, so you can search the web without being tracked.", comment: "feature explanation in settings")
+    static let webTrackingProtectionExplanation = NSLocalizedString("web.tracking.protection.explanation", value: "DuckDuckGo automatically blocks hidden trackers as you browse the web.", comment: "feature explanation in settings")
+    static let emailProtectionExplanation = NSLocalizedString("email.protection.explanation", value: "Block email trackers and hide your address without switching your email provider.", comment: "Email protection feature explanation in settings. The feature blocks email trackers and hides original email address.")
 
     // Misc
 
@@ -342,7 +344,6 @@ struct UserText {
     static let duckPlayerOff = NSLocalizedString("duck-player.off", value: "Never use Duck Player", comment: "Private YouTube Player option")
     static let duckPlayerExplanation = NSLocalizedString("duck-player.explanation", value: "Duck Player provides a clean viewing experience without personalized ads and prevents viewing activity from influencing your YouTube recommendations.", comment: "Private YouTube Player explanation in settings")
 
-    static let gpcSettingsTitle = NSLocalizedString("gpc.title", value: "Global Privacy Control (GPC)", comment: "GPC settings title")
     static let gpcCheckboxTitle = NSLocalizedString("gpc.checkbox.title", value: "Enable Global Privacy Control", comment: "GPC settings checkbox title")
     static let gpcExplanation = NSLocalizedString("gpc.explanation", value: "Tells participating websites not to sell or share your data.", comment: "GPC explanation in settings")
     static let learnMore = NSLocalizedString("learnmore.link", value: "Learn More", comment: "Learn More link")
@@ -426,7 +427,6 @@ struct UserText {
     static let addToFavorites = NSLocalizedString("add.to.favorites", value: "Add to Favorites", comment: "Button for adding bookmarks to favorites")
     static let addFavorite = NSLocalizedString("add.favorite", value: "Add Favorite", comment: "Button for adding a favorite bookmark")
     static let editFavorite = NSLocalizedString("edit.favorite", value: "Edit Favorite", comment: "Header of the view that edits a favorite bookmark")
-    static let editFolder = NSLocalizedString("edit.folder", value: "Edit Folder", comment: "Header of the view that edits a bookmark folder")
     static let removeFromFavorites = NSLocalizedString("remove.from.favorites", value: "Remove from Favorites", comment: "Button for removing bookmarks from favorites")
     static let bookmarkThisPage = NSLocalizedString("bookmark.this.page", value: "Bookmark This Page", comment: "Menu item for bookmarking current page")
     static let bookmarksShowToolbarPanel = NSLocalizedString("bookmarks.show-toolbar-panel", value: "Open Bookmarks Panel", comment: "Menu item for opening the bookmarks panel")
@@ -459,7 +459,6 @@ struct UserText {
     static let newFolder = NSLocalizedString("folder.optionsMenu.newFolder", value: "New Folder", comment: "Option for creating a new folder")
     static let renameFolder = NSLocalizedString("folder.optionsMenu.renameFolder", value: "Rename Folder", comment: "Option for renaming a folder")
     static let deleteFolder = NSLocalizedString("folder.optionsMenu.deleteFolder", value: "Delete Folder", comment: "Option for deleting a folder")
-    static let newFolderDialogFolderNameTitle = NSLocalizedString("add.folder.name", value: "Name:", comment: "Add Folder popover: folder name text field title")
     static let newBookmarkDialogBookmarkNameTitle = NSLocalizedString("add.bookmark.name", value: "Name:", comment: "New bookmark folder dialog folder name field heading")
 
     static let updateBookmark = NSLocalizedString("bookmark.update", value: "Update Bookmark", comment: "Option for updating a bookmark")
@@ -518,8 +517,8 @@ struct UserText {
 
     static let settings = NSLocalizedString("settings", value: "Settings", comment: "Menu item for opening settings")
 
-    static let general = NSLocalizedString("preferences.general", value: "General", comment: "Show general preferences")
-    static let sync = NSLocalizedString("preferences.sync", value: "Sync & Backup", comment: "Show sync preferences")
+    static let general = NSLocalizedString("preferences.general", value: "General", comment: "Title of the option to show the General preferences")
+    static let sync = NSLocalizedString("preferences.sync", value: "Sync & Backup", comment: "Title of the option to show the Sync preferences")
     static let syncAutoLockPrompt = NSLocalizedString("preferences.sync.auto-lock-prompt", value:"Unlock device to setup Sync & Backup", comment: "Reason for auth when setting up Sync")
     static let syncBookmarkPausedAlertTitle = NSLocalizedString("alert.sync-bookmarks-paused-title", value: "Bookmarks Sync is Paused", comment: "Title for alert shown when sync bookmarks paused for too many items")
     static let syncBookmarkPausedAlertDescription = NSLocalizedString("alert.sync-bookmarks-paused-description", value: "You have exceeded the bookmarks sync limit. Try deleting some bookmarks. Until this is resolved your bookmarks will not be backed up.", comment: "Description for alert shown when sync bookmarks paused for too many items")
@@ -528,14 +527,29 @@ struct UserText {
     static let syncPausedTitle = NSLocalizedString("alert.sync.warning.sync-paused", value: "Sync & Backup is Paused", comment: "Title of the warning message")
     static let syncUnavailableMessage = NSLocalizedString("alert.sync.warning.sync-unavailable-message", value: "Sorry, but Sync & Backup is currently unavailable. Please try again later.", comment: "Data syncing unavailable warning message")
     static let syncUnavailableMessageUpgradeRequired = NSLocalizedString("alert.sync.warning.data-syncing-disabled-upgrade-required", value: "Sorry, but Sync & Backup is no longer available in this app version. Please update DuckDuckGo to the latest version to continue.", comment: "Data syncing unavailable warning message")
-    static let defaultBrowser = NSLocalizedString("preferences.default-browser", value: "Default Browser", comment: "Show default browser preferences")
-    static let appearance = NSLocalizedString("preferences.appearance", value: "Appearance", comment: "Show appearance preferences")
-    static let privacy = NSLocalizedString("preferences.privacy", value: "Privacy", comment: "Show privacy browser preferences")
-    static let vpn = NSLocalizedString("preferences.vpn", value: "VPN", comment: "Show VPN preferences")
-    static let duckPlayer = NSLocalizedString("preferences.duck-player", value: "Duck Player", comment: "Show Duck Player browser preferences")
-    static let about = NSLocalizedString("preferences.about", value: "About", comment: "Show about screen")
-
-    static let downloads = NSLocalizedString("preferences.downloads", value: "Downloads", comment: "Show downloads browser preferences")
+    static let privacyProtections = NSLocalizedString("preferences.privacy-protections", value: "Privacy Protections", comment: "The section header in Preferences representing browser features related to privacy protection")
+    static let mainSettings = NSLocalizedString("preferences.main-settings", value: "Main Settings", comment: "Section header in Preferences for main settings")
+    static let preferencesOn = NSLocalizedString("preferences.on", value: "On", comment: "Status indicator of a browser privacy protection feature.")
+    static let preferencesOff = NSLocalizedString("preferences.off", value: "Off", comment: "Status indicator of a browser privacy protection feature.")
+    static let preferencesAlwaysOn = NSLocalizedString("preferences.always-on", value: "Always On", comment: "Status indicator of a browser privacy protection feature.")
+    static let duckduckgoOnOtherPlatforms = NSLocalizedString("preferences.duckduckgo-on-other-platforms", value: "DuckDuckGo on Other Platforms", comment: "Button presented to users to navigate them to our product page which presents all other products for other platforms")
+    static let defaultBrowser = NSLocalizedString("preferences.default-browser", value: "Default Browser", comment: "Title of the option to show the Default Browser Preferences")
+    static let privateSearch = NSLocalizedString("preferences.private-search", value: "Private Search", comment: "Title of the option to show the Private Search preferences")
+    static let appearance = NSLocalizedString("preferences.appearance", value: "Appearance", comment: "Title of the option to show the Appearance preferences")
+    static let dataClearing = NSLocalizedString("preferences.data-clearing", value: "Data Clearing", comment: "Title of the option to show the Data Clearing preferences")
+    static let webTrackingProtection = NSLocalizedString("preferences.web-tracking-protection", value: "Web Tracking Protection", comment: "Title of the option to show the Web Tracking Protection preferences")
+    static let emailProtectionPreferences = NSLocalizedString("preferences.email-protection", value: "Email Protection", comment: "Title of the option to show the Email Protection preferences")
+    static let autofillEnabledFor = NSLocalizedString("preferences.autofill-enabled-for", value: "Autofill enabled in this browser for:", comment: "Label presented before the email account in email protection preferences")
+
+    static let vpn = NSLocalizedString("preferences.vpn", value: "VPN", comment: "Title of the option to show the VPN preferences")
+    static let duckPlayer = NSLocalizedString("preferences.duck-player", value: "Duck Player", comment: "Title of the option to show the Duck Player browser preferences")
+    static let about = NSLocalizedString("preferences.about", value: "About", comment: "Title of the option to show the About screen")
+
+    static let accessibility = NSLocalizedString("preferences.accessibility", value: "Accessibility", comment: "Title of the option to show the Accessibility browser preferences")
+    static let cookiePopUpProtection = NSLocalizedString("preferences.cookie-pop-up-protection", value: "Cookie Pop-Up Protection", comment: "Title of the option to show the Cookie Pop-Up Protection preferences")
+    static let downloads = NSLocalizedString("preferences.downloads", value: "Downloads", comment: "Title of the downloads browser preferences")
+    static let support = NSLocalizedString("preferences.support", value: "Support", comment: "Open support page")
+
     static let isDefaultBrowser = NSLocalizedString("preferences.default-browser.active", value: "DuckDuckGo is your default browser", comment: "Indicate that the browser is the default")
     static let isNotDefaultBrowser = NSLocalizedString("preferences.default-browser.inactive", value: "DuckDuckGo is not your default browser.", comment: "Indicate that the browser is not the default")
     static let makeDefaultBrowser = NSLocalizedString("preferences.default-browser.button.make-default", value: "Make DuckDuckGo Default…", comment: "represents a prompt message asking the user to make DuckDuckGo their default browser.")
@@ -570,10 +584,9 @@ struct UserText {
     static let addressBar = NSLocalizedString("preferences.appearance.address-bar", value: "Address Bar", comment: "Theme preferences")
     static let showFullWebsiteAddress = NSLocalizedString("preferences.appearance.show-full-url", value: "Full website address", comment: "Option to show full URL in the address bar")
     static let showAutocompleteSuggestions = NSLocalizedString("preferences.appearance.show-autocomplete-suggestions", value: "Autocomplete suggestions", comment: "Option to show autocomplete suggestions in the address bar")
-    static let zoomSettingTitle = NSLocalizedString("preferences.appearance.zoom", value: "Zoom", comment: "Zoom settings section title")
     static let zoomPickerTitle = NSLocalizedString("preferences.appearance.zoom-picker", value: "Default page zoom", comment: "Default page zoom picker title")
     static let defaultZoomPageMoreOptionsItem = NSLocalizedString("more-options.zoom.default-zoom-page", value: "Change Default Page Zoom…", comment: "Default page zoom picker title")
-    static let autofill = NSLocalizedString("preferences.autofill", value: "Autofill", comment: "Show Autofill preferences")
+    static let autofill = NSLocalizedString("preferences.autofill", value: "Passwords", comment: "Show Autofill preferences")
 
     static let aboutDuckDuckGo = NSLocalizedString("preferences.about.about-duckduckgo", value: "About DuckDuckGo", comment: "About screen")
     static let privacySimplified = NSLocalizedString("preferences.about.privacy-simplified", value: "Privacy, simplified.", comment: "About screen")
@@ -974,23 +987,23 @@ struct UserText {
     static let newTabSetUpImportCardTitle = NSLocalizedString("newTab.setup.import.title", value: "Bring Your Stuff", comment: "Title of the Import card of the Set Up section in the home page")
     static let newTabSetUpDuckPlayerCardTitle = NSLocalizedString("newTab.setup.duck.player.title", value: "Clean Up YouTube", comment: "Title of the Duck Player card of the Set Up section in the home page")
     static let newTabSetUpEmailProtectionCardTitle = NSLocalizedString("newTab.setup.email.protection.title", value: "Protect Your Inbox", comment: "Title of the Email Protection card of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay0CardTitle = NSLocalizedString("newTab.setup.survey.day.0.title", value: "Tell Us What Brought You Here", comment: "Title of the Day 0 durvey of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay7CardTitle = NSLocalizedString("newTab.setup.survey.day.7.title", value: "Help Us Improve", comment: "Title of the Day 7 durvey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay0CardTitle = NSLocalizedString("newTab.setup.survey.day.0.title", value: "Share Your Thoughts With Us", comment: "Title of the Day 0 durvey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay14CardTitle = NSLocalizedString("newTab.setup.survey.day.14.title", value: "Share Your Thoughts With Us", comment: "Title of the Day 14 durvey of the Set Up section in the home page")
 
     static let newTabSetUpDefaultBrowserAction = NSLocalizedString("newTab.setup.default.browser.action", value: "Make Default Browser", comment: "Action title on the action menu of the Default Browser card")
     static let newTabSetUpImportAction = NSLocalizedString("newTab.setup.Import.action", value: "Import Now", comment: "Action title on the action menu of the Import card of the Set Up section in the home page")
     static let newTabSetUpDuckPlayerAction = NSLocalizedString("newTab.setup.duck.player.action", value: "Try Duck Player", comment: "Action title on the action menu of the Duck Player card of the Set Up section in the home page")
     static let newTabSetUpEmailProtectionAction = NSLocalizedString("newTab.setup.email.protection.action", value: "Get a Duck Address", comment: "Action title on the action menu of the Email Protection card of the Set Up section in the home page")
     static let newTabSetUpRemoveItemAction = NSLocalizedString("newTab.setup.remove.item", value: "Dismiss", comment: "Action title on the action menu of the set up cards card of the SetUp section in the home page to remove the item")
-    static let newTabSetUpSurveyDay0Action = NSLocalizedString("newTab.setup.survey.day.0.action", value: "Share Your Thoughts", comment: "Action title of the Day 0 durvey of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay7Action = NSLocalizedString("newTab.setup.survey.day.7.action", value: "Share Your Thoughts", comment: "Action title of the Day 7 durvey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay0Action = NSLocalizedString("newTab.setup.survey.day.0.action", value: "Sign Up To Participate", comment: "Action title of the Day 0 survey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay14Action = NSLocalizedString("newTab.setup.survey.day.14.action", value: "Sign Up To Participate", comment: "Action title of the Day 14 survey of the Set Up section in the home page")
 
     static let newTabSetUpDefaultBrowserSummary = NSLocalizedString("newTab.setup.default.browser.summary", value: "We automatically block trackers as you browse. It's privacy, simplified.", comment: "Summary of the Default Browser card")
     static let newTabSetUpImportSummary = NSLocalizedString("newTab.setup.import.summary", value: "Import bookmarks, favorites, and passwords from your old browser.", comment: "Summary of the Import card of the Set Up section in the home page")
     static let newTabSetUpDuckPlayerSummary = NSLocalizedString("newTab.setup.duck.player.summary", value: "Enjoy a clean viewing experience without personalized ads.", comment: "Summary of the Duck Player card of the Set Up section in the home page")
     static let newTabSetUpEmailProtectionSummary = NSLocalizedString("newTab.setup.email.protection.summary", value: "Generate custom @duck.com addresses that clean trackers from incoming email.", comment: "Summary of the Email Protection card of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay0Summary = NSLocalizedString("newTab.setup.survey.day.0.summary", value: "Take our short survey and help us build the best browser.", comment: "Summary of the Day 0 durvey of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay7Summary = NSLocalizedString("newTab.setup.survey.day.7.summary", value: "Take our short survey and help us build the best browser.", comment: "Summary of the Day 7 durvey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay0Summary = NSLocalizedString("newTab.setup.survey.day.0.summary", value: "Join an interview with a member of our research team to help us build the best browser.", comment: "Summary of the card on the new tab page that invites users to partecipate to a survey")
+    static let newTabSetUpSurveyDay14Summary = NSLocalizedString("newTab.setup.survey.day.14.summary", value: "Join an interview with a member of our research team to help us build the best browser.", comment: "Summary of the card on the new tab page that invites users to partecipate to a survey")
 
     // Recent Activity
     static let newTabRecentActivitySectionTitle = NSLocalizedString("newTab.recent.activity.section.title", value: "Recent Activity", comment: "Title of the RecentActivity section in the home page")
@@ -1008,7 +1021,6 @@ struct UserText {
 
     // "data-broker-protection.optionsMenu" - Menu item data broker protection feature
     static let dataBrokerProtectionOptionsMenuItem = "Personal Information Removal"
-    static let dataBrokerProtectionScanOptionsMenuItem = "Personal Information Removal Scan"
     // "tab.dbp.title" - Tab data broker protection title
     static let tabDataBrokerProtectionTitle = "Personal Information Removal"
 
@@ -1049,9 +1061,9 @@ struct UserText {
     enum Bookmarks {
         enum Dialog {
             enum Title {
-                static let addBookmark = NSLocalizedString("bookmarks.dialog.title.add", value: "Add bookmark", comment: "Bookmark creation dialog title")
+                static let addBookmark = NSLocalizedString("bookmarks.dialog.title.add", value: "Add Bookmark", comment: "Bookmark creation dialog title")
                 static let addedBookmark = NSLocalizedString("bookmarks.dialog.title.added", value: "Bookmark Added", comment: "Bookmark added popover title")
-                static let editBookmark = NSLocalizedString("bookmarks.dialog.title.edit", value: "Edit bookmark", comment: "Bookmark edit dialog title")
+                static let editBookmark = NSLocalizedString("bookmarks.dialog.title.edit", value: "Edit Bookmark", comment: "Bookmark edit dialog title")
                 static let addFolder = NSLocalizedString("bookmarks.dialog.folder.title.add", value: "Add Folder", comment: "Bookmark folder creation dialog title")
                 static let editFolder = NSLocalizedString("bookmarks.dialog.folder.title.edit", value: "Edit Folder", comment: "Bookmark folder edit dialog title")
             }
diff --git a/DuckDuckGo/Common/Logging/Logging.swift b/DuckDuckGo/Common/Logging/Logging.swift
index e6c9d18b36..70b37f76b7 100644
--- a/DuckDuckGo/Common/Logging/Logging.swift
+++ b/DuckDuckGo/Common/Logging/Logging.swift
@@ -41,7 +41,7 @@ extension OSLog {
         case duckPlayer = "Duck Player"
         case tabSnapshots = "Tab Snapshots"
         case sync = "Sync"
-        case networkProtection = "Network Protection"
+        case networkProtection = "VPN"
         case dbp = "dbp"
     }
 
diff --git a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
index 272d63cca0..2d7d25f85e 100644
--- a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
+++ b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
@@ -23,6 +23,7 @@ extension UserDefaults {
     /// The app group's shared UserDefaults
     static let netP = UserDefaults(suiteName: Bundle.main.appGroup(bundle: .netP))!
     static let dbp = UserDefaults(suiteName: Bundle.main.appGroup(bundle: .dbp))!
+    static let subs = UserDefaults(suiteName: Bundle.main.appGroup(bundle: .subs))!
 }
 
 @propertyWrapper
@@ -111,8 +112,10 @@ public struct UserDefaultsWrapper<T> {
         case homePageShowDuckPlayer = "home.page.show.duck.player"
         case homePageShowEmailProtection = "home.page.show.email.protection"
         case homePageShowSurveyDay0 = "home.page.show.survey.0"
+        case homePageShowSurveyDay0in10Percent = "home.page.show.survey.0.in.10.pervent"
+        case homePageShowSurveyDay14in10Percent = "home.page.show.survey.0.in.14.pervent"
         case homePageUserInteractedWithSurveyDay0 = "home.page.user.interacted.with.survey.0"
-        case homePageShowSurveyDay7 = "home.page.show.survey.7"
+        case homePageShowSurveyDay14 = "home.page.show.survey.14"
         case homePageShowPageTitles = "home.page.show.page.titles"
         case homePageShowRecentlyVisited = "home.page.show.recently.visited"
         case homePageContinueSetUpImport = "home.page.continue.set.up.import"
@@ -146,13 +149,13 @@ public struct UserDefaultsWrapper<T> {
         case dataBrokerProtectionTermsAndConditionsAccepted = "data-broker-protection.waitlist-terms-and-conditions.accepted"
         case shouldShowDBPWaitlistInvitedCardUI = "shouldShowDBPWaitlistInvitedCardUI"
 
-        // Network Protection
+        // VPN
 
         case networkProtectionExcludedRoutes = "netp.excluded-routes"
         case networkProtectionTermsAndConditionsAccepted = "network-protection.waitlist-terms-and-conditions.accepted"
         case networkProtectionWaitlistSignUpPromptDismissed = "network-protection.waitlist.sign-up-prompt-dismissed"
 
-        // Network Protection: Shared Defaults
+        // VPN: Shared Defaults
         // ---
         // Please note that shared defaults MUST have a name that matches exactly their value,
         // or else KVO will just not work as of 2023-08-07
diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
index 427b2983c2..f73cdd744c 100644
--- a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
+++ b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"b9487380b1490e67513c650e9497a28c\""
-        public static let embeddedDataSHA = "79590d4f2a9713b20eb127a29f862130fdc964145917004031022beaecf80fd0"
+        public static let embeddedDataETag = "\"3e4949b5cf69c1851158e419dd4f175e\""
+        public static let embeddedDataSHA = "8bedb31a111891d59112279e19bfbc2ba585dbf768f2f622e9c76ed5235a8e59"
     }
 
     var embeddedDataEtag: String {
diff --git a/DuckDuckGo/ContentBlocker/ContentBlocking.swift b/DuckDuckGo/ContentBlocker/ContentBlocking.swift
index dee72a7514..795f5ec581 100644
--- a/DuckDuckGo/ContentBlocker/ContentBlocking.swift
+++ b/DuckDuckGo/ContentBlocker/ContentBlocking.swift
@@ -86,7 +86,7 @@ final class AppContentBlocking {
                                                   privacyConfigurationManager: privacyConfigurationManager,
                                                   trackerDataManager: trackerDataManager,
                                                   configStorage: configStorage,
-                                                  privacySecurityPreferences: PrivacySecurityPreferences.shared,
+                                                  webTrackingProtectionPreferences: WebTrackingProtectionPreferences.shared,
                                                   tld: tld)
 
         adClickAttributionRulesProvider = AdClickAttributionRulesProvider(config: adClickAttribution,
diff --git a/DuckDuckGo/ContentBlocker/ScriptSourceProviding.swift b/DuckDuckGo/ContentBlocker/ScriptSourceProviding.swift
index 4013498fff..979ecaf469 100644
--- a/DuckDuckGo/ContentBlocker/ScriptSourceProviding.swift
+++ b/DuckDuckGo/ContentBlocker/ScriptSourceProviding.swift
@@ -37,7 +37,7 @@ protocol ScriptSourceProviding {
 // refactor: ScriptSourceProvider to be passed to init methods as `some ScriptSourceProviding`, DefaultScriptSourceProvider to be killed
 // swiftlint:disable:next identifier_name
 func DefaultScriptSourceProvider() -> ScriptSourceProviding {
-    ScriptSourceProvider(configStorage: ConfigurationStore.shared, privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager, privacySettings: PrivacySecurityPreferences.shared, contentBlockingManager: ContentBlocking.shared.contentBlockingManager, trackerDataManager: ContentBlocking.shared.trackerDataManager, tld: ContentBlocking.shared.tld)
+    ScriptSourceProvider(configStorage: ConfigurationStore.shared, privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager, webTrackingProtectionPreferences: WebTrackingProtectionPreferences.shared, contentBlockingManager: ContentBlocking.shared.contentBlockingManager, trackerDataManager: ContentBlocking.shared.trackerDataManager, tld: ContentBlocking.shared.tld)
 }
 
 struct ScriptSourceProvider: ScriptSourceProviding {
@@ -52,19 +52,19 @@ struct ScriptSourceProvider: ScriptSourceProviding {
     let privacyConfigurationManager: PrivacyConfigurationManaging
     let contentBlockingManager: ContentBlockerRulesManagerProtocol
     let trackerDataManager: TrackerDataManager
-    let privacySettings: PrivacySecurityPreferences
+    let webTrakcingProtectionPreferences: WebTrackingProtectionPreferences
     let tld: TLD
 
     init(configStorage: ConfigurationStoring,
          privacyConfigurationManager: PrivacyConfigurationManaging,
-         privacySettings: PrivacySecurityPreferences,
+         webTrackingProtectionPreferences: WebTrackingProtectionPreferences,
          contentBlockingManager: ContentBlockerRulesManagerProtocol,
          trackerDataManager: TrackerDataManager,
          tld: TLD) {
 
         self.configStorage = configStorage
         self.privacyConfigurationManager = privacyConfigurationManager
-        self.privacySettings = privacySettings
+        self.webTrakcingProtectionPreferences = webTrackingProtectionPreferences
         self.contentBlockingManager = contentBlockingManager
         self.trackerDataManager = trackerDataManager
         self.tld = tld
@@ -83,7 +83,7 @@ struct ScriptSourceProvider: ScriptSourceProviding {
     public func buildAutofillSource() -> AutofillUserScriptSourceProvider {
         let privacyConfig = self.privacyConfigurationManager.privacyConfig
         return DefaultAutofillSourceProvider.Builder(privacyConfigurationManager: privacyConfigurationManager,
-                                                     properties: ContentScopeProperties(gpcEnabled: privacySettings.gpcEnabled,
+                                                     properties: ContentScopeProperties(gpcEnabled: webTrakcingProtectionPreferences.isGPCEnabled,
                                                                                         sessionKey: self.sessionKey ?? "",
                                                                                         featureToggles: ContentScopeFeatureToggles.supportedFeaturesOnMacOS(privacyConfig)),
                                                      isDebug: AutofillPreferences().debugScriptEnabled)
diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json
index 57da7cd02e..ca3abe4d41 100644
--- a/DuckDuckGo/ContentBlocker/macos-config.json
+++ b/DuckDuckGo/ContentBlocker/macos-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1710170291349,
+    "version": 1711567148287,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -77,9 +77,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -114,7 +111,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "a92fae2cdccf479cc1bbe840cd32627b"
+            "hash": "51b76aa7b92d78ad52106b04ac809843"
         },
         "androidBrowserConfig": {
             "exceptions": [],
@@ -255,9 +252,6 @@
                 {
                     "domain": "metro.co.uk"
                 },
-                {
-                    "domain": "youtube.com"
-                },
                 {
                     "domain": "newsmax.com"
                 },
@@ -265,10 +259,19 @@
                     "domain": "meneame.net"
                 },
                 {
-                    "domain": "earth.google.com"
+                    "domain": "usaa.com"
                 },
                 {
-                    "domain": "instructure.com"
+                    "domain": "publico.es"
+                },
+                {
+                    "domain": "leboncoin.fr"
+                },
+                {
+                    "domain": "www.ffbb.com"
+                },
+                {
+                    "domain": "earth.google.com"
                 },
                 {
                     "domain": "iscorp.com"
@@ -283,11 +286,12 @@
             "settings": {
                 "disabledCMPs": [
                     "generic-cosmetic",
-                    "termsfeed3"
+                    "termsfeed3",
+                    "strato.de"
                 ]
             },
             "state": "enabled",
-            "hash": "8458a9cc012a9613e1497204003be946"
+            "hash": "d5b59105cdef6fcc34e8697940e42762"
         },
         "autofill": {
             "exceptions": [
@@ -906,9 +910,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -934,16 +935,13 @@
                 }
             },
             "state": "disabled",
-            "hash": "9c70121360bcdfeb63770d8d9aeee770"
+            "hash": "36e8971fa9bb204b78a5929a14a108dd"
         },
         "clickToPlay": {
             "exceptions": [
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -964,12 +962,15 @@
                 }
             },
             "state": "enabled",
-            "hash": "fac8ee1d06f89e1c93ca9287c095b055"
+            "hash": "f1b7de266435cd2e414f50deb2c9234a"
         },
         "clientBrandHint": {
             "exceptions": [],
+            "settings": {
+                "domains": []
+            },
             "state": "disabled",
-            "hash": "728493ef7a1488e4781656d3f9db84aa"
+            "hash": "d35dd75140cdfe166762013e59eb076d"
         },
         "contentBlocking": {
             "state": "enabled",
@@ -995,9 +996,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -1008,7 +1006,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "910e25ffe4d683b3c708a1578d097a16"
+            "hash": "e37447d42ee8194f185e35e40f577f41"
         },
         "cookie": {
             "settings": {
@@ -1053,9 +1051,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -1067,7 +1062,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "7c7ceca9eeb664059750ea96938669b0"
+            "hash": "37a27966915571085613911b47e6e2eb"
         },
         "customUserAgent": {
             "settings": {
@@ -1104,6 +1099,10 @@
                     {
                         "domain": "spectrum.net",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1876"
+                    },
+                    {
+                        "domain": "web.de",
+                        "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1931"
                     }
                 ],
                 "webViewDefault": [
@@ -1127,7 +1126,7 @@
             },
             "exceptions": [],
             "state": "enabled",
-            "hash": "150400f9bcd5a8d7eb6fa7589047fe45"
+            "hash": "7edfa8344fd2577b31426130696d8b23"
         },
         "dbp": {
             "state": "enabled",
@@ -1227,9 +1226,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -1677,6 +1673,14 @@
                     {
                         "selector": "#ez-content-blocker-container",
                         "type": "hide"
+                    },
+                    {
+                        "selector": ".m-balloon-header--ad",
+                        "type": "hide-empty"
+                    },
+                    {
+                        "selector": ".m-in-content-ad-row",
+                        "type": "hide-empty"
                     }
                 ],
                 "styleTagExceptions": [
@@ -1719,6 +1723,7 @@
                     "advertisementcontinue reading the main story",
                     "advertisement\ncontinue reading the main story",
                     "advertisement\n\ncontinue reading the main story",
+                    "advertisement - continue reading below",
                     "advertisement\n\nhide ad",
                     "advertisementhide ad",
                     "advertisement - scroll to continue",
@@ -1732,6 +1737,7 @@
                     "anzeige",
                     "close ad",
                     "close this ad",
+                    "content continues below",
                     "x",
                     "_",
                     "sponsored",
@@ -1811,6 +1817,33 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "accuweather.com",
+                        "rules": [
+                            {
+                                "selector": ".glacier-ad",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "#connatix",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".adhesion-header",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".header-placeholder.has-alerts.has-adhesion",
+                                "type": "modify-style",
+                                "values": [
+                                    {
+                                        "property": "height",
+                                        "value": "76px"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
                     {
                         "domain": "acidadeon.com",
                         "rules": [
@@ -2048,6 +2081,31 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "clevelandclinic.org",
+                        "rules": [
+                            {
+                                "selector": "[data-identity='adhesive-ad']",
+                                "type": "closest-empty"
+                            },
+                            {
+                                "selector": "[data-identity='billboard-ad']",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[data-identity='leaderboard-ad']",
+                                "type": "hide"
+                            },
+                            {
+                                "selector": "[data-identity='sticky-leaderboard-ad']",
+                                "type": "hide"
+                            },
+                            {
+                                "selector": "[data-identity='leaderboard-ad-page-header-placeholder']",
+                                "type": "hide"
+                            }
+                        ]
+                    },
                     {
                         "domain": "cnbc.com",
                         "rules": [
@@ -2066,6 +2124,31 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "comicbook.com",
+                        "rules": [
+                            {
+                                "selector": "body:not(.skybox-loaded)>header",
+                                "type": "modify-style",
+                                "values": [
+                                    {
+                                        "property": "top",
+                                        "value": "0px"
+                                    }
+                                ]
+                            },
+                            {
+                                "selector": "body.pcm-public:not(.skybox-loaded)",
+                                "type": "modify-style",
+                                "values": [
+                                    {
+                                        "property": "margin-top",
+                                        "value": "90px"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
                     {
                         "domain": "corriere.it",
                         "rules": [
@@ -2932,6 +3015,23 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "n4g.com",
+                        "rules": [
+                            {
+                                "selector": ".top-ads-container-outer",
+                                "type": "closest-empty"
+                            },
+                            {
+                                "selector": ".f-item-ad",
+                                "type": "closest-empty"
+                            },
+                            {
+                                "selector": ".f-item-ad-inhouse",
+                                "type": "closest-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "nasdaq.com",
                         "rules": [
@@ -3241,6 +3341,14 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "prajwaldesai.com",
+                        "rules": [
+                            {
+                                "type": "disable-default"
+                            }
+                        ]
+                    },
                     {
                         "domain": "primagames.com",
                         "rules": [
@@ -3282,6 +3390,26 @@
                             {
                                 "selector": "#marquee-ad",
                                 "type": "closest-empty"
+                            },
+                            {
+                                "selector": ".js_sticky-top-ad",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".js_sticky-footer",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "#leftrail_dynamic_ad_wrapper",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "#splashy-ad-container-top",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".ad-mobile",
+                                "type": "closest-empty"
                             }
                         ]
                     },
@@ -3358,6 +3486,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "runnersworld.com",
+                        "rules": [
+                            {
+                                "selector": ".ad-disclaimer",
+                                "type": "closest-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "scmp.com",
                         "rules": [
@@ -3583,6 +3720,18 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "thetvdb.com",
+                        "rules": [
+                            {
+                                "type": "disable-default"
+                            },
+                            {
+                                "selector": "[data-aa-adunit]",
+                                "type": "hide"
+                            }
+                        ]
+                    },
                     {
                         "domain": "thewindowsclub.com",
                         "rules": [
@@ -3704,6 +3853,14 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "tumblr.com",
+                        "rules": [
+                            {
+                                "type": "disable-default"
+                            }
+                        ]
+                    },
                     {
                         "domain": "tvtropes.org",
                         "rules": [
@@ -3858,6 +4015,22 @@
                             {
                                 "selector": "#YDC-Lead-Stack",
                                 "type": "hide-empty"
+                            },
+                            {
+                                "selector": "#topAd",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "#neoLeadAdMobile",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".caas-da",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".gam-placeholder",
+                                "type": "closest-empty"
                             }
                         ]
                     },
@@ -3904,6 +4077,23 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "uzone.id",
+                        "rules": [
+                            {
+                                "selector": "[class^='box-ads']",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[class^='section-ads']",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".parallax-container",
+                                "type": "hide-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "washingtontimes.com",
                         "rules": [
@@ -3984,16 +4174,13 @@
                 ]
             },
             "state": "enabled",
-            "hash": "3dc2d5b9a38827f46503a3b5882c7e33"
+            "hash": "f5eedb77e30d600d3cd81f92ceebee36"
         },
         "exceptionHandler": {
             "exceptions": [
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4005,7 +4192,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "2b0b6ee567814d75aa2646d494a45a78"
+            "hash": "5e792dd491428702bc0104240fbce0ce"
         },
         "fingerprintingAudio": {
             "state": "disabled",
@@ -4016,9 +4203,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4029,7 +4213,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "40b13d6ca36cd3de287345ab9e5839fb"
+            "hash": "f25a8f2709e865c2bd743828c7ee2f77"
         },
         "fingerprintingBattery": {
             "exceptions": [
@@ -4039,9 +4223,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4053,7 +4234,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "651cfc12aec9ff9a1caac0f817b58c3c"
+            "hash": "4085f1593faff2feac2093533b819a41"
         },
         "fingerprintingCanvas": {
             "settings": {
@@ -4147,9 +4328,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4161,7 +4339,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "98b5e91ff539dfb6c81699e32b76f70c"
+            "hash": "ea4c565bae27996f0d651300d757594c"
         },
         "fingerprintingHardware": {
             "settings": {
@@ -4216,9 +4394,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4263,7 +4438,7 @@
                 }
             ],
             "state": "enabled",
-            "hash": "d58f56954556ee2a4a32855edbf6e224"
+            "hash": "37e16df501e3e68416a13f991b4e4147"
         },
         "fingerprintingScreenSize": {
             "settings": {
@@ -4306,9 +4481,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4320,7 +4492,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "84897737f8a85968b246fdb80a84e671"
+            "hash": "466b85680f138657de9bfd222c440887"
         },
         "fingerprintingTemporaryStorage": {
             "exceptions": [
@@ -4336,9 +4508,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4350,16 +4519,13 @@
                 }
             ],
             "state": "disabled",
-            "hash": "dd1b1fb96c2f932048f1767f949e4453"
+            "hash": "f858697949c90842c450daee64a1dc30"
         },
         "googleRejected": {
             "exceptions": [
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4371,7 +4537,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "2b0b6ee567814d75aa2646d494a45a78"
+            "hash": "5e792dd491428702bc0104240fbce0ce"
         },
         "gpc": {
             "state": "enabled",
@@ -4409,9 +4575,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4431,7 +4594,7 @@
                     "privacy-test-pages.site"
                 ]
             },
-            "hash": "99ec2ffa33009050831feba194452790"
+            "hash": "1a1373bcf16647d63220659fce650a83"
         },
         "harmfulApis": {
             "settings": {
@@ -4536,9 +4699,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4550,7 +4710,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "9d0f5f4f8c02e79246e2d809cada2fdb"
+            "hash": "44d3e707cba3ee0a3578f52dc2ce2aa4"
         },
         "history": {
             "state": "disabled",
@@ -4572,9 +4732,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4585,7 +4742,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "ea6d5ad048e35c75c451bff6fe58cb11"
+            "hash": "f772808ed34cc9ea8cbcbb7cdaf74429"
         },
         "incontextSignup": {
             "exceptions": [],
@@ -4625,9 +4782,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4646,7 +4800,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "f8dc40f1f5687f403f381452d66eb0d0"
+            "hash": "698de7b963d7d7942c5c5d1e986bb1b1"
         },
         "networkProtection": {
             "state": "enabled",
@@ -4691,10 +4845,11 @@
             "exceptions": [],
             "state": "enabled",
             "settings": {
-                "surveyCardDay0": "disabled",
-                "surveyCardDay7": "disabled"
+                "surveyCardDay0": "enabled",
+                "surveyCardDay7": "disabled",
+                "surveyCardDay14": "enabled"
             },
-            "hash": "2904635973a1cc6e9521cec3c29b93ea"
+            "hash": "eb826d9079211f30d624211f44aed184"
         },
         "nonTracking3pCookies": {
             "settings": {
@@ -4705,7 +4860,23 @@
                     "domain": "earth.google.com"
                 },
                 {
-                    "domain": "instructure.com"
+                    "domain": "iscorp.com"
+                },
+                {
+                    "domain": "marvel.com"
+                },
+                {
+                    "domain": "sundancecatalog.com"
+                }
+            ],
+            "state": "disabled",
+            "hash": "841fa92b9728c9754f050662678f82c7"
+        },
+        "performanceMetrics": {
+            "state": "enabled",
+            "exceptions": [
+                {
+                    "domain": "earth.google.com"
                 },
                 {
                     "domain": "iscorp.com"
@@ -4717,8 +4888,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "state": "disabled",
-            "hash": "d07b5bf740e4d648c94e1ac65c4305d9"
+            "hash": "38558d5e7b231d4b27e7dd76814387a7"
         },
         "privacyDashboard": {
             "exceptions": [],
@@ -4730,7 +4900,7 @@
                     }
                 },
                 "toggleReports": {
-                    "state": "internal",
+                    "state": "enabled",
                     "rollout": {
                         "steps": [
                             {
@@ -4741,7 +4911,29 @@
                 }
             },
             "state": "enabled",
-            "hash": "0d76cb4a367fc6738f7c4aa6a66f0a04"
+            "hash": "f7cce63c16c142db4ff5764b542a6c52"
+        },
+        "privacyPro": {
+            "state": "enabled",
+            "exceptions": [],
+            "features": {
+                "isLaunched": {
+                    "state": "disabled"
+                },
+                "isLaunchedOverride": {
+                    "state": "disabled"
+                },
+                "allowPurchase": {
+                    "state": "enabled"
+                },
+                "isLaunchedStripe": {
+                    "state": "disabled"
+                },
+                "allowPurchaseStripe": {
+                    "state": "enabled"
+                }
+            },
+            "hash": "c9153c5cc3b6b7eba024c6c597e15edb"
         },
         "privacyProtectionsPopup": {
             "state": "disabled",
@@ -4771,9 +4963,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4785,7 +4974,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "1679be76968fe50858b3cc664b8fcbad"
+            "hash": "0d3df0f7c24ebde89d2dced4e2d34322"
         },
         "requestFilterer": {
             "state": "disabled",
@@ -4793,9 +4982,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4809,7 +4995,7 @@
             "settings": {
                 "windowInMs": 0
             },
-            "hash": "219a51a9aafbc9c1bae4bad55d7ce437"
+            "hash": "0fff8017d8ea4b5609b8f5c110be1401"
         },
         "runtimeChecks": {
             "state": "disabled",
@@ -4817,9 +5003,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4831,16 +5014,13 @@
                 }
             ],
             "settings": {},
-            "hash": "e2246d7c78df2167134e1428b04d51ca"
+            "hash": "800a19533c728bbec7e31e466f898268"
         },
         "serviceworkerInitiatedRequests": {
             "exceptions": [
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -4852,7 +5032,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "2b0b6ee567814d75aa2646d494a45a78"
+            "hash": "5e792dd491428702bc0104240fbce0ce"
         },
         "sync": {
             "state": "enabled",
@@ -4878,6 +5058,16 @@
             "state": "enabled",
             "settings": {
                 "allowlistedTrackers": {
+                    "2mdn.net": {
+                        "rules": [
+                            {
+                                "rule": "2mdn.net",
+                                "domains": [
+                                    "crunchyroll.com"
+                                ]
+                            }
+                        ]
+                    },
                     "3lift.com": {
                         "rules": [
                             {
@@ -5060,9 +5250,10 @@
                     "advertising.com": {
                         "rules": [
                             {
-                                "rule": "adserver.adtech.advertising.com/pubapi/3.0/1/54669.7/0/0/ADTECH;v=2;cmd=bid;cors=yes",
+                                "rule": "adserver.adtech.advertising.com/pubapi/3.0/1/",
                                 "domains": [
-                                    "collider.com"
+                                    "collider.com",
+                                    "si.com"
                                 ]
                             }
                         ]
@@ -5124,6 +5315,7 @@
                                 "rule": "c.amazon-adsystem.com/aax2/apstag.js",
                                 "domains": [
                                     "applesfera.com",
+                                    "fattoincasadabenedetta.it",
                                     "inquirer.com",
                                     "thesurfersview.com",
                                     "wildrivers.lostcoastoutpost.com"
@@ -5853,6 +6045,12 @@
                                     "<all>"
                                 ]
                             },
+                            {
+                                "rule": "go.ezodn.com",
+                                "domains": [
+                                    "airplaneacademy.com"
+                                ]
+                            },
                             {
                                 "rule": "ezodn.com",
                                 "domains": [
@@ -6013,22 +6211,11 @@
                     "fwmrm.net": {
                         "rules": [
                             {
-                                "rule": "2a7e9.v.fwmrm.net/ad/g/1",
+                                "rule": "v.fwmrm.net/ad",
                                 "domains": [
+                                    "6play.fr",
                                     "channel4.com"
                                 ]
-                            },
-                            {
-                                "rule": "2a7e9.v.fwmrm.net/ad/l/1",
-                                "domains": [
-                                    "channel4.com"
-                                ]
-                            },
-                            {
-                                "rule": "7cbf2.v.fwmrm.net/ad/g/1",
-                                "domains": [
-                                    "6play.fr"
-                                ]
                             }
                         ]
                     },
@@ -6197,6 +6384,7 @@
                                 "domains": [
                                     "arkadium.com",
                                     "bloomberg.com",
+                                    "crunchyroll.com",
                                     "gamak.tv",
                                     "games.washingtonpost.com",
                                     "metro.co.uk",
@@ -6234,6 +6422,7 @@
                                     "hscprojects.com",
                                     "kits4beats.com",
                                     "magicgameworld.com",
+                                    "ncaa.com",
                                     "rocketnews24.com",
                                     "youmath.it",
                                     "zefoy.com"
@@ -6990,6 +7179,12 @@
                                 "domains": [
                                     "<all>"
                                 ]
+                            },
+                            {
+                                "rule": "cdn.optimizely.com/js/24096340716.js",
+                                "domains": [
+                                    "hgtv.com"
+                                ]
                             }
                         ]
                     },
@@ -7213,6 +7408,12 @@
                                 "domains": [
                                     "newser.com"
                                 ]
+                            },
+                            {
+                                "rule": "a.pub.network/core/prebid-universal-creative.js",
+                                "domains": [
+                                    "titantv.com"
+                                ]
                             }
                         ]
                     },
@@ -7365,6 +7566,22 @@
                             }
                         ]
                     },
+                    "scorecardresearch.com": {
+                        "rules": [
+                            {
+                                "rule": "sb.scorecardresearch.com/c2/plugins/streamingtag_plugin_jwplayer.js",
+                                "domains": [
+                                    "<all>"
+                                ]
+                            },
+                            {
+                                "rule": "sb.scorecardresearch.com/internal-c2/default/streamingtag_plugin_jwplayer.js",
+                                "domains": [
+                                    "<all>"
+                                ]
+                            }
+                        ]
+                    },
                     "searchspring.io": {
                         "rules": [
                             {
@@ -7933,9 +8150,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -7946,7 +8160,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "4325ed151d126936fbeb9a608d77da86"
+            "hash": "653d70e261a24982bd23a0b107608d13"
         },
         "trackingCookies1p": {
             "settings": {
@@ -7959,9 +8173,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -7973,7 +8184,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "bfd8b32efe8d633fe670bf6ab1b00240"
+            "hash": "4dddf681372a2aea9788090b13db6e6f"
         },
         "trackingCookies3p": {
             "settings": {
@@ -7983,9 +8194,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -7997,7 +8205,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "d07b5bf740e4d648c94e1ac65c4305d9"
+            "hash": "841fa92b9728c9754f050662678f82c7"
         },
         "trackingParameters": {
             "exceptions": [
@@ -8007,9 +8215,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -8051,7 +8256,7 @@
             },
             "state": "enabled",
             "minSupportedVersion": "0.22.3",
-            "hash": "12e223e9f9327015be71e620e0ab4ccb"
+            "hash": "9a0282376084874f0245c421d6943841"
         },
         "userAgentRotation": {
             "settings": {
@@ -8061,9 +8266,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -8075,7 +8277,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "4498ff835bed7ce27ff2a568db599155"
+            "hash": "f65d10dfdf6739feab99a08d42734747"
         },
         "voiceSearch": {
             "exceptions": [],
@@ -8087,9 +8289,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -8361,7 +8560,7 @@
                     }
                 ]
             },
-            "hash": "f85196ca319a430ae50cd654b3230148"
+            "hash": "151d7ee40451c4aac4badfcc829ea0b5"
         },
         "windowsPermissionUsage": {
             "exceptions": [],
@@ -8373,9 +8572,6 @@
                 {
                     "domain": "earth.google.com"
                 },
-                {
-                    "domain": "instructure.com"
-                },
                 {
                     "domain": "iscorp.com"
                 },
@@ -8387,7 +8583,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "2b0b6ee567814d75aa2646d494a45a78"
+            "hash": "5e792dd491428702bc0104240fbce0ce"
         },
         "windowsWaitlist": {
             "exceptions": [],
diff --git a/DuckDuckGo/DBP/DBPHomeViewController.swift b/DuckDuckGo/DBP/DBPHomeViewController.swift
index af30a4d7ce..641b81f587 100644
--- a/DuckDuckGo/DBP/DBPHomeViewController.swift
+++ b/DuckDuckGo/DBP/DBPHomeViewController.swift
@@ -33,6 +33,7 @@ public extension Notification.Name {
 final class DBPHomeViewController: NSViewController {
     private var presentedWindowController: NSWindowController?
     private let dataBrokerProtectionManager: DataBrokerProtectionManager
+    private let pixelHandler: EventMapping<DataBrokerProtectionPixels> = DataBrokerProtectionPixelsHandler()
 
     lazy var dataBrokerProtectionViewController: DataBrokerProtectionViewController = {
         let privacyConfigurationManager = PrivacyFeatures.contentBlocking.privacyConfigurationManager
@@ -46,9 +47,9 @@ final class DBPHomeViewController: NSViewController {
                                                   inlineIconCredentials: false,
                                                   thirdPartyCredentialsProvider: false)
 
-        let privacySettings = PrivacySecurityPreferences.shared
+        let isGPCEnabled = WebTrackingProtectionPreferences.shared.isGPCEnabled
         let sessionKey = UUID().uuidString
-        let prefs = ContentScopeProperties(gpcEnabled: privacySettings.gpcEnabled,
+        let prefs = ContentScopeProperties(gpcEnabled: isGPCEnabled,
                                            sessionKey: sessionKey,
                                            featureToggles: features)
 
@@ -90,6 +91,7 @@ final class DBPHomeViewController: NSViewController {
             }
         } catch {
             os_log("DBPHomeViewController error: viewDidLoad, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DBPHomeViewController.viewDidLoad"))
         }
     }
 
@@ -150,6 +152,11 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
             switch event {
             case .error(let error, _):
                 Pixel.fire(.debug(event: .pixelKitEvent(event), error: error))
+            case .generalError(let error, _),
+                    .secureVaultInitError(let error),
+                    .secureVaultError(let error):
+                // We can't use .debug directly because it modifies the pixel name and clobbers the params
+                Pixel.fire(.pixelKitEvent(DebugEvent(event, error: error)))
             case .ipcServerOptOutAllBrokersCompletion(error: let error),
                     .ipcServerScanAllBrokersCompletion(error: let error),
                     .ipcServerRunQueuedOperationsCompletion(error: let error):
@@ -167,6 +174,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .optOutValidate,
                     .optOutFinish,
                     .optOutSubmitSuccess,
+                    .optOutFillForm,
                     .optOutSuccess,
                     .optOutFailure,
                     .backgroundAgentStarted,
@@ -194,7 +202,11 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .dataBrokerProtectionNotificationOpenedAllRecordsRemoved,
                     .dailyActiveUser,
                     .weeklyActiveUser,
-                    .monthlyActiveUser:
+                    .monthlyActiveUser,
+                    .weeklyReportScanning,
+                    .weeklyReportRemovals,
+                    .scanningEventNewMatch,
+                    .scanningEventReAppearance:
                 Pixel.fire(.pixelKitEvent(event))
             }
         }
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift b/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
index fe949f0edc..4c5b0591e1 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
@@ -35,7 +35,11 @@ struct DataBrokerProtectionAppEvents {
         let loginItemsManager = LoginItemsManager()
         let featureVisibility = DefaultDataBrokerProtectionFeatureVisibility()
 
-        guard featureVisibility.isFeatureVisible() else {
+        guard !featureVisibility.cleanUpDBPForPrivacyProIfNecessary() else { return }
+
+        /// If the user is not in the waitlist and Privacy Pro flag is false, we want to remove the data for waitlist users
+        /// since the waitlist flag might have been turned off
+        if !featureVisibility.isFeatureVisible() && !featureVisibility.isPrivacyProEnabled() {
             featureVisibility.disableAndDeleteForWaitlistUsers()
             return
         }
@@ -58,7 +62,11 @@ struct DataBrokerProtectionAppEvents {
     func applicationDidBecomeActive() {
         let featureVisibility = DefaultDataBrokerProtectionFeatureVisibility()
 
-        guard featureVisibility.isFeatureVisible() else {
+        guard !featureVisibility.cleanUpDBPForPrivacyProIfNecessary() else { return }
+
+        /// If the user is not in the waitlist and Privacy Pro flag is false, we want to remove the data for waitlist users
+        /// since the waitlist flag might have been turned off
+        if !featureVisibility.isFeatureVisible() && !featureVisibility.isPrivacyProEnabled() {
             featureVisibility.disableAndDeleteForWaitlistUsers()
             return
         }
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift b/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift
index 44bbfad4b1..355d6d8d8d 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift
@@ -204,9 +204,15 @@ final class DataBrokerProtectionDebugMenu: NSMenu {
         os_log("Running queued operations...", log: .dataBrokerProtection)
         let showWebView = sender.representedObject as? Bool ?? false
 
-        DataBrokerProtectionManager.shared.scheduler.runQueuedOperations(showWebView: showWebView) { error in
-            if let error = error {
-                os_log("Queued operations finished,  error: %{public}@", log: .dataBrokerProtection, error.localizedDescription)
+        DataBrokerProtectionManager.shared.scheduler.runQueuedOperations(showWebView: showWebView) { errors in
+            if let errors = errors {
+                if let oneTimeError = errors.oneTimeError {
+                    os_log("Queued operations finished,  error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                }
+                if let operationErrors = errors.operationErrors,
+                          operationErrors.count != 0 {
+                    os_log("Queued operations finished, operation errors count: %{public}@", log: .dataBrokerProtection, operationErrors.count)
+                }
             } else {
                 os_log("Queued operations finished", log: .dataBrokerProtection)
             }
@@ -217,11 +223,17 @@ final class DataBrokerProtectionDebugMenu: NSMenu {
         os_log("Running scan operations...", log: .dataBrokerProtection)
         let showWebView = sender.representedObject as? Bool ?? false
 
-        DataBrokerProtectionManager.shared.scheduler.scanAllBrokers(showWebView: showWebView) { error in
-            if let error = error {
-                os_log("Scan operations finished,  error: %{public}@", log: .dataBrokerProtection, error.localizedDescription)
+        DataBrokerProtectionManager.shared.scheduler.scanAllBrokers(showWebView: showWebView) { errors in
+            if let errors = errors {
+                if let oneTimeError = errors.oneTimeError {
+                    os_log("scan operations finished,  error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                }
+                if let operationErrors = errors.operationErrors,
+                          operationErrors.count != 0 {
+                    os_log("scan operations finished, operation errors count: %{public}@", log: .dataBrokerProtection, operationErrors.count)
+                }
             } else {
-                os_log("Scan operations finished", log: .dataBrokerProtection)
+                os_log("scan operations finished", log: .dataBrokerProtection)
             }
         }
     }
@@ -230,9 +242,15 @@ final class DataBrokerProtectionDebugMenu: NSMenu {
         os_log("Running Optout operations...", log: .dataBrokerProtection)
         let showWebView = sender.representedObject as? Bool ?? false
 
-        DataBrokerProtectionManager.shared.scheduler.optOutAllBrokers(showWebView: showWebView) { error in
-            if let error = error {
-                os_log("Optout operations finished,  error: %{public}@", log: .dataBrokerProtection, error.localizedDescription)
+        DataBrokerProtectionManager.shared.scheduler.optOutAllBrokers(showWebView: showWebView) { errors in
+            if let errors = errors {
+                if let oneTimeError = errors.oneTimeError {
+                    os_log("Optout operations finished,  error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                }
+                if let operationErrors = errors.operationErrors,
+                          operationErrors.count != 0 {
+                    os_log("Optout operations finished, operation errors count: %{public}@", log: .dataBrokerProtection, operationErrors.count)
+                }
             } else {
                 os_log("Optout operations finished", log: .dataBrokerProtection)
             }
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift b/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
index bf31c199b2..d66ed38247 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
@@ -35,7 +35,7 @@ struct DataBrokerProtectionFeatureDisabler: DataBrokerProtectionFeatureDisabling
     private let dataManager: InMemoryDataCacheDelegate
 
     init(scheduler: DataBrokerProtectionLoginItemScheduler = DataBrokerProtectionManager.shared.scheduler,
-         dataManager: InMemoryDataCacheDelegate = DataBrokerProtectionDataManager()) {
+         dataManager: InMemoryDataCacheDelegate = DataBrokerProtectionManager.shared.dataManager) {
         self.dataManager = dataManager
         self.scheduler = scheduler
     }
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionFeatureVisibility.swift b/DuckDuckGo/DBP/DataBrokerProtectionFeatureVisibility.swift
index 9065dfcaf0..051b2e4e71 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionFeatureVisibility.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionFeatureVisibility.swift
@@ -22,27 +22,49 @@ import Foundation
 import BrowserServicesKit
 import Common
 import DataBrokerProtection
+import Subscription
 
 protocol DataBrokerProtectionFeatureVisibility {
     func isFeatureVisible() -> Bool
     func disableAndDeleteForAllUsers()
     func disableAndDeleteForWaitlistUsers()
+    func isPrivacyProEnabled() -> Bool
+    func isEligibleForThankYouMessage() -> Bool
 }
 
 struct DefaultDataBrokerProtectionFeatureVisibility: DataBrokerProtectionFeatureVisibility {
     private let privacyConfigurationManager: PrivacyConfigurationManaging
     private let featureDisabler: DataBrokerProtectionFeatureDisabling
     private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    private let userDefaults: UserDefaults
+    private let waitlistStorage: WaitlistStorage
+    private let subscriptionAvailability: SubscriptionFeatureAvailability
+
+    private let dataBrokerProtectionKey = "data-broker-protection.cleaned-up-from-waitlist-to-privacy-pro"
+    private var dataBrokerProtectionCleanedUpFromWaitlistToPrivacyPro: Bool {
+        get {
+            return userDefaults.bool(forKey: dataBrokerProtectionKey)
+        }
+        nonmutating set {
+            userDefaults.set(newValue, forKey: dataBrokerProtectionKey)
+        }
+    }
 
     /// Temporary code to use while we have both redeem flow for diary study users. Should be removed later
     static var bypassWaitlist = false
 
     init(privacyConfigurationManager: PrivacyConfigurationManaging = ContentBlocking.shared.privacyConfigurationManager,
          featureDisabler: DataBrokerProtectionFeatureDisabling = DataBrokerProtectionFeatureDisabler(),
-         pixelHandler: EventMapping<DataBrokerProtectionPixels> = DataBrokerProtectionPixelsHandler()) {
+         pixelHandler: EventMapping<DataBrokerProtectionPixels> = DataBrokerProtectionPixelsHandler(),
+         userDefaults: UserDefaults = .standard,
+         waitlistStorage: WaitlistStorage = DataBrokerProtectionWaitlist().waitlistStorage,
+         subscriptionAvailability: SubscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability()) {
         self.privacyConfigurationManager = privacyConfigurationManager
         self.featureDisabler = featureDisabler
         self.pixelHandler = pixelHandler
+        self.userDefaults = userDefaults
+        self.waitlistStorage = waitlistStorage
+        self.subscriptionAvailability = subscriptionAvailability
     }
 
     var waitlistIsOngoing: Bool {
@@ -61,10 +83,9 @@ struct DefaultDataBrokerProtectionFeatureVisibility: DataBrokerProtectionFeature
             regionCode = "US"
         }
 
-        #if DEBUG // Always assume US for debug builds
+#if DEBUG // Always assume US for debug builds
         regionCode = "US"
-        #endif
-
+#endif
         return (regionCode ?? "US") == "US"
     }
 
@@ -81,7 +102,19 @@ struct DefaultDataBrokerProtectionFeatureVisibility: DataBrokerProtectionFeature
     }
 
     private var isWaitlistUser: Bool {
-        DataBrokerProtectionWaitlist().waitlistStorage.isWaitlistUser
+        waitlistStorage.isWaitlistUser
+    }
+
+    private var wasWaitlistUser: Bool {
+        waitlistStorage.getWaitlistInviteCode() != nil
+    }
+
+    func isPrivacyProEnabled() -> Bool {
+        return subscriptionAvailability.isFeatureAvailable
+    }
+
+    func isEligibleForThankYouMessage() -> Bool {
+        return wasWaitlistUser && isPrivacyProEnabled()
     }
 
     func disableAndDeleteForAllUsers() {
@@ -99,6 +132,17 @@ struct DefaultDataBrokerProtectionFeatureVisibility: DataBrokerProtectionFeature
         featureDisabler.disableAndDelete()
     }
 
+    /// Returns true if a cleanup was performed, false otherwise
+    func cleanUpDBPForPrivacyProIfNecessary() -> Bool {
+        if isPrivacyProEnabled() && wasWaitlistUser && !dataBrokerProtectionCleanedUpFromWaitlistToPrivacyPro {
+            disableAndDeleteForWaitlistUsers()
+            dataBrokerProtectionCleanedUpFromWaitlistToPrivacyPro = true
+            return true
+        } else {
+            return false
+        }
+    }
+
     /// If we want to prevent new users from joining the waitlist while still allowing waitlist users to continue using it,
     /// we should set isWaitlistEnabled to false and isWaitlistBetaActive to true.
     /// To remove it from everyone, isWaitlistBetaActive should be set to false
@@ -116,5 +160,4 @@ struct DefaultDataBrokerProtectionFeatureVisibility: DataBrokerProtectionFeature
         }
     }
 }
-
 #endif
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionLoginItemScheduler.swift b/DuckDuckGo/DBP/DataBrokerProtectionLoginItemScheduler.swift
index feb254562a..34dafab63f 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionLoginItemScheduler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionLoginItemScheduler.swift
@@ -55,7 +55,8 @@ extension DataBrokerProtectionLoginItemScheduler: DataBrokerProtectionScheduler
         ipcScheduler.statusPublisher
     }
 
-    func scanAllBrokers(showWebView: Bool, completion: ((Error?) -> Void)?) {
+    func scanAllBrokers(showWebView: Bool,
+                        completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
         enableLoginItem()
         ipcScheduler.scanAllBrokers(showWebView: showWebView, completion: completion)
     }
@@ -69,7 +70,8 @@ extension DataBrokerProtectionLoginItemScheduler: DataBrokerProtectionScheduler
         ipcScheduler.stopScheduler()
     }
 
-    func optOutAllBrokers(showWebView: Bool, completion: ((Error?) -> Void)?) {
+    func optOutAllBrokers(showWebView: Bool,
+                          completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
         ipcScheduler.optOutAllBrokers(showWebView: showWebView, completion: completion)
     }
 
@@ -77,7 +79,8 @@ extension DataBrokerProtectionLoginItemScheduler: DataBrokerProtectionScheduler
         ipcScheduler.runAllOperations(showWebView: showWebView)
     }
 
-    func runQueuedOperations(showWebView: Bool, completion: ((Error?) -> Void)?) {
+    func runQueuedOperations(showWebView: Bool,
+                             completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
         ipcScheduler.runQueuedOperations(showWebView: showWebView, completion: completion)
     }
 }
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionManager.swift b/DuckDuckGo/DBP/DataBrokerProtectionManager.swift
index 29ce721418..adb20e4aee 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionManager.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionManager.swift
@@ -36,7 +36,7 @@ public final class DataBrokerProtectionManager {
     private let dataBrokerProtectionWaitlistDataSource: WaitlistActivationDateStore = DefaultWaitlistActivationDateStore(source: .dbp)
 
     lazy var dataManager: DataBrokerProtectionDataManager = {
-        let dataManager = DataBrokerProtectionDataManager(fakeBrokerFlag: fakeBrokerFlag)
+        let dataManager = DataBrokerProtectionDataManager(pixelHandler: pixelHandler, fakeBrokerFlag: fakeBrokerFlag)
         dataManager.delegate = self
         return dataManager
     }()
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionSubscriptionEventHandler.swift b/DuckDuckGo/DBP/DataBrokerProtectionSubscriptionEventHandler.swift
index b57b77e846..08ec829fb1 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionSubscriptionEventHandler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionSubscriptionEventHandler.swift
@@ -27,7 +27,7 @@ final class DataBrokerProtectionSubscriptionEventHandler {
     private let authRepository: AuthenticationRepository
     private let featureDisabler: DataBrokerProtectionFeatureDisabling
 
-    init(accountManager: AccountManaging = AccountManager(),
+    init(accountManager: AccountManaging = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)),
          authRepository: AuthenticationRepository = KeychainAuthenticationData(),
          featureDisabler: DataBrokerProtectionFeatureDisabling = DataBrokerProtectionFeatureDisabler()) {
         self.accountManager = accountManager
diff --git a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumKeychainPrompt.swift b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumKeychainPrompt.swift
index 3c30a50f90..4e473eada8 100644
--- a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumKeychainPrompt.swift
+++ b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumKeychainPrompt.swift
@@ -43,6 +43,10 @@ final class ChromiumKeychainPrompt: ChromiumKeychainPrompting {
             kSecMatchLimit as String: kSecMatchLimitOne] as [String: Any]
 
         var dataFromKeychain: AnyObject?
+
+        // Fire Pixel to help measure rate of password prompt denied actions
+        Pixel.fire(.passwordImportKeychainPrompt)
+
         let status: OSStatus = SecItemCopyMatching(query as CFDictionary, &dataFromKeychain)
 
         if status == noErr, let passwordData = dataFromKeychain as? Data {
diff --git a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumLoginReader.swift b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumLoginReader.swift
index 2c5b36ba8e..c423ec9025 100644
--- a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumLoginReader.swift
+++ b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumLoginReader.swift
@@ -65,9 +65,9 @@ final class ChromiumLoginReader {
     private let decryptionKey: String?
     private let decryptionKeyPrompt: ChromiumKeychainPrompting
 
-    private static let sqlSelectWithPasswordTimestamp = "SELECT signon_realm, username_value, password_value, date_password_modified FROM logins;"
-    private static let sqlSelectWithCreatedTimestamp = "SELECT signon_realm, username_value, password_value, date_created FROM logins;"
-    private static let sqlSelectWithoutTimestamp = "SELECT signon_realm, username_value, password_value FROM logins;"
+    private static let sqlSelectWithPasswordTimestamp = "SELECT signon_realm, username_value, password_value, date_password_modified, blacklisted_by_user FROM logins WHERE blacklisted_by_user != 1;"
+    private static let sqlSelectWithCreatedTimestamp = "SELECT signon_realm, username_value, password_value, date_created, blacklisted_by_user FROM logins WHERE blacklisted_by_user != 1;"
+    private static let sqlSelectWithoutTimestamp = "SELECT signon_realm, username_value, password_value, blacklisted_by_user FROM logins WHERE blacklisted_by_user != 1;"
 
     private let source: DataImport.Source
 
diff --git a/DuckDuckGo/DataImport/Model/DataImportViewModel.swift b/DuckDuckGo/DataImport/Model/DataImportViewModel.swift
index c0c7f1343e..1a2d1eef7b 100644
--- a/DuckDuckGo/DataImport/Model/DataImportViewModel.swift
+++ b/DuckDuckGo/DataImport/Model/DataImportViewModel.swift
@@ -286,7 +286,7 @@ struct DataImportViewModel {
             switch error {
             // chromium user denied keychain prompt error
             case let error as ChromiumLoginReader.ImportError where error.type == .userDeniedKeychainPrompt:
-                Pixel.fire(.dataImportFailed(source: importSource, sourceVersion: importSource.installedAppsMajorVersionDescription(selectedProfile: selectedProfile), error: error))
+                Pixel.fire(.passwordImportKeychainPromptDenied)
                 // stay on the same screen
                 return true
 
diff --git a/DuckDuckGo/DuckDuckGo.entitlements b/DuckDuckGo/DuckDuckGo.entitlements
index 98e0dcda6d..23abe2e6ab 100644
--- a/DuckDuckGo/DuckDuckGo.entitlements
+++ b/DuckDuckGo/DuckDuckGo.entitlements
@@ -13,8 +13,9 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(NETP_APP_GROUP)</string>
 		<string>$(DBP_APP_GROUP)</string>
+		<string>$(NETP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 	</array>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
diff --git a/DuckDuckGo/DuckDuckGoAppStore.entitlements b/DuckDuckGo/DuckDuckGoAppStore.entitlements
index b4153637dd..7b07bc92d8 100644
--- a/DuckDuckGo/DuckDuckGoAppStore.entitlements
+++ b/DuckDuckGo/DuckDuckGoAppStore.entitlements
@@ -2,12 +2,18 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.networking.networkextension</key>
+	<array>
+		<string>packet-tunnel-provider</string>
+		<string>app-proxy-provider</string>
+	</array>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>$(DBP_APP_GROUP)</string>
 		<string>$(NETP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 	</array>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
@@ -19,11 +25,6 @@
 	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
-	<key>com.apple.developer.networking.networkextension</key>
-	<array>
-		<string>packet-tunnel-provider</string>
-		<string>app-proxy-provider</string>
-	</array>
 	<key>com.apple.security.network.client</key>
 	<true/>
 	<key>com.apple.security.personal-information.location</key>
diff --git a/DuckDuckGo/DuckDuckGoAppStoreCI.entitlements b/DuckDuckGo/DuckDuckGoAppStoreCI.entitlements
index 13ea43d233..8779a3f306 100644
--- a/DuckDuckGo/DuckDuckGoAppStoreCI.entitlements
+++ b/DuckDuckGo/DuckDuckGoAppStoreCI.entitlements
@@ -7,6 +7,8 @@
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>$(NETP_APP_GROUP)</string>
+		<string>$(DBP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 	</array>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
diff --git a/DuckDuckGo/DuckDuckGoDebug.entitlements b/DuckDuckGo/DuckDuckGoDebug.entitlements
index 688dc7b6d3..e5efc9872c 100644
--- a/DuckDuckGo/DuckDuckGoDebug.entitlements
+++ b/DuckDuckGo/DuckDuckGoDebug.entitlements
@@ -13,8 +13,9 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(NETP_APP_GROUP)</string>
 		<string>$(DBP_APP_GROUP)</string>
+		<string>$(NETP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 	</array>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
diff --git a/DuckDuckGo/Email/EmailUrlExtensions.swift b/DuckDuckGo/Email/EmailUrlExtensions.swift
index 0055748b94..6b86f032c6 100644
--- a/DuckDuckGo/Email/EmailUrlExtensions.swift
+++ b/DuckDuckGo/Email/EmailUrlExtensions.swift
@@ -25,6 +25,7 @@ extension EmailUrls {
         static let emailProtectionLink = "https://duckduckgo.com/email"
         static let emailProtectionInContextSignupLink = "https://duckduckgo.com/email/start-incontext"
         static let emailProtectionAccountLink = "https://duckduckgo.com/email/settings/account"
+        static let emailProtectionSupportLink = "https://duckduckgo.com/email/settings/support"
     }
 
     var emailProtectionLink: URL {
@@ -39,6 +40,10 @@ extension EmailUrls {
         return URL(string: Url.emailProtectionAccountLink)!
     }
 
+    var emailProtectionSupportLink: URL {
+        return URL(string: Url.emailProtectionSupportLink)!
+    }
+
     func isDuckDuckGoEmailProtection(url: URL) -> Bool {
         return url.absoluteString.starts(with: Url.emailProtectionLink)
     }
diff --git a/DuckDuckGo/FindInPage/FindInPageViewController.swift b/DuckDuckGo/FindInPage/FindInPageViewController.swift
index 985c634777..142d9c1f18 100644
--- a/DuckDuckGo/FindInPage/FindInPageViewController.swift
+++ b/DuckDuckGo/FindInPage/FindInPageViewController.swift
@@ -59,6 +59,14 @@ final class FindInPageViewController: NSViewController {
         closeButton.toolTip = UserText.findInPageCloseTooltip
         nextButton.toolTip = UserText.findInPageNextTooltip
         previousButton.toolTip = UserText.findInPagePreviousTooltip
+
+        nextButton.setAccessibilityIdentifier("FindInPageController.nextButton")
+        closeButton.setAccessibilityIdentifier("FindInPageController.closeButton")
+        previousButton.setAccessibilityIdentifier("FindInPageController.previousButton")
+        textField.setAccessibilityIdentifier("FindInPageController.textField")
+        textField.setAccessibilityRole(.textField)
+        statusField.setAccessibilityIdentifier("FindInPageController.statusField")
+        statusField.setAccessibilityRole(.textField)
     }
 
     @IBAction func findInPageNext(_ sender: Any?) {
diff --git a/DuckDuckGo/Fire/View/FireViewController.swift b/DuckDuckGo/Fire/View/FireViewController.swift
index a107578fef..1529734b5b 100644
--- a/DuckDuckGo/Fire/View/FireViewController.swift
+++ b/DuckDuckGo/Fire/View/FireViewController.swift
@@ -27,7 +27,7 @@ final class FireViewController: NSViewController {
         static let animationName = "01_Fire_really_small"
     }
 
-    private var fireViewModel: FireViewModel
+    private(set) var fireViewModel: FireViewModel
     private let tabCollectionViewModel: TabCollectionViewModel
     private var cancellables = Set<AnyCancellable>()
 
@@ -119,6 +119,7 @@ final class FireViewController: NSViewController {
         fakeFireButton.wantsLayer = true
         fakeFireButton.layer?.backgroundColor = NSColor.buttonMouseDown.cgColor
 
+        fakeFireButton.setAccessibilityIdentifier("FireViewController.fakeFireButton")
         subscribeToIsBurning()
     }
 
diff --git a/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift b/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
index af5658727d..6fb1869064 100644
--- a/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
+++ b/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
@@ -51,10 +51,10 @@ extension HomePage.Models {
             }
             return false
         }
-        var isDay7SurveyEnabled: Bool {
+        var isDay14SurveyEnabled: Bool {
             let newTabContinueSetUpSettings = privacyConfigurationManager.privacyConfig.settings(for: .newTabContinueSetUp)
-            if let day7SurveyString =  newTabContinueSetUpSettings["surveyCardDay7"] as? String {
-                if day7SurveyString == "enabled" {
+            if let day14SurveyString =  newTabContinueSetUpSettings["surveyCardDay14"] as? String {
+                if day14SurveyString == "enabled" {
                     return true
                 }
             }
@@ -64,15 +64,15 @@ extension HomePage.Models {
             let duckPlayerSettings = privacyConfigurationManager.privacyConfig.settings(for: .duckPlayer)
             return duckPlayerSettings["tryDuckPlayerLink"] as? String ?? "https://www.youtube.com/watch?v=yKWIA-Pys4c"
         }
-        var day0SurveyURL: String = "https://selfserve.decipherinc.com/survey/selfserve/32ab/230701?list=1"
-        var day7SurveyURL: String = "https://selfserve.decipherinc.com/survey/selfserve/32ab/230702?list=1"
+        var day0SurveyURL: String = "https://selfserve.decipherinc.com/survey/selfserve/32ab/240300?list=1"
+        var day14SurveyURL: String = "https://selfserve.decipherinc.com/survey/selfserve/32ab/240300?list=2"
 
         private let defaultBrowserProvider: DefaultBrowserProvider
         private let dataImportProvider: DataImportStatusProviding
         private let tabCollectionViewModel: TabCollectionViewModel
         private let emailManager: EmailManager
-        private let privacyPreferences: PrivacySecurityPreferences
         private let duckPlayerPreferences: DuckPlayerPreferencesPersistor
+        private let randomNumberGenerator: RandomNumberGenerating
 
         @UserDefaultsWrapper(key: .homePageShowAllFeatures, defaultValue: false)
         var shouldShowAllFeatures: Bool {
@@ -102,12 +102,18 @@ extension HomePage.Models {
         @UserDefaultsWrapper(key: .shouldShowDBPWaitlistInvitedCardUI, defaultValue: false)
         private var shouldShowDBPWaitlistInvitedCardUI: Bool
 
-        @UserDefaultsWrapper(key: .homePageShowSurveyDay7, defaultValue: true)
-        private var shouldShowSurveyDay7: Bool
+        @UserDefaultsWrapper(key: .homePageShowSurveyDay14, defaultValue: true)
+        private var shouldShowSurveyDay14: Bool
 
         @UserDefaultsWrapper(key: .homePageIsFirstSession, defaultValue: true)
         private var isFirstSession: Bool
 
+        @UserDefaultsWrapper(key: .homePageShowSurveyDay0in10Percent, defaultValue: nil)
+        private var isPartOfSurveyDay0On10Percent: Bool?
+
+        @UserDefaultsWrapper(key: .homePageShowSurveyDay14in10Percent, defaultValue: nil)
+        private var isPartOfSurveyDay14On10Percent: Bool?
+
         @UserDefaultsWrapper(key: .firstLaunchDate, defaultValue: Calendar.current.date(byAdding: .month, value: -1, to: Date())!)
         private var firstLaunchDate: Date
 
@@ -121,6 +127,8 @@ extension HomePage.Models {
 
         lazy var statisticsStore: StatisticsStore = LocalStatisticsStore()
 
+        lazy var waitlistBetaThankYouPresenter = WaitlistThankYouPromptPresenter()
+
         lazy var listOfFeatures = isFirstSession ? firstRunFeatures : randomisedFeatures
 
         private var featuresMatrix: [[FeatureType]] = [[]] {
@@ -135,18 +143,18 @@ extension HomePage.Models {
              dataImportProvider: DataImportStatusProviding,
              tabCollectionViewModel: TabCollectionViewModel,
              emailManager: EmailManager = EmailManager(),
-             privacyPreferences: PrivacySecurityPreferences = PrivacySecurityPreferences.shared,
              duckPlayerPreferences: DuckPlayerPreferencesPersistor,
              homePageRemoteMessaging: HomePageRemoteMessaging,
-             privacyConfigurationManager: PrivacyConfigurationManaging = AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager) {
+             privacyConfigurationManager: PrivacyConfigurationManaging = AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager,
+             randomNumberGenerator: RandomNumberGenerating = RandomNumberGenerator()) {
             self.defaultBrowserProvider = defaultBrowserProvider
             self.dataImportProvider = dataImportProvider
             self.tabCollectionViewModel = tabCollectionViewModel
             self.emailManager = emailManager
-            self.privacyPreferences = privacyPreferences
             self.duckPlayerPreferences = duckPlayerPreferences
             self.homePageRemoteMessaging = homePageRemoteMessaging
             self.privacyConfigurationManager = privacyConfigurationManager
+            self.randomNumberGenerator = randomNumberGenerator
 
             refreshFeaturesMatrix()
 
@@ -159,6 +167,7 @@ extension HomePage.Models {
             switch featureType {
             case .defaultBrowser:
                 do {
+                    Pixel.fire(.defaultRequestedFromHomepageSetupView)
                     try defaultBrowserProvider.presentDefaultBrowserPrompt()
                 } catch {
                     defaultBrowserProvider.openSystemPreferences()
@@ -175,8 +184,8 @@ extension HomePage.Models {
                 tabCollectionViewModel.append(tab: tab)
             case .surveyDay0:
                 visitSurvey(day: .day0)
-            case .surveyDay7:
-                visitSurvey(day: .day7)
+            case .surveyDay14:
+                visitSurvey(day: .day14)
             case .networkProtectionRemoteMessage(let message):
                 handle(remoteMessage: message)
             case .dataBrokerProtectionRemoteMessage(let message):
@@ -185,9 +194,16 @@ extension HomePage.Models {
 #if DBP
                 DataBrokerProtectionAppEvents().handleWaitlistInvitedNotification(source: .cardUI)
 #endif
+            case .vpnThankYou:
+                guard let window = NSApp.keyWindow else { return }
+                waitlistBetaThankYouPresenter.presentVPNThankYouPrompt(in: window)
+            case .pirThankYou:
+                guard let window = NSApp.keyWindow else { return }
+                waitlistBetaThankYouPresenter.presentPIRThankYouPrompt(in: window)
             }
         }
 
+        // swiftlint:disable:next cyclomatic_complexity
         func removeItem(for featureType: FeatureType) {
             switch featureType {
             case .defaultBrowser:
@@ -200,8 +216,8 @@ extension HomePage.Models {
                 shouldShowEmailProtectionSetting = false
             case .surveyDay0:
                 shouldShowSurveyDay0 = false
-            case .surveyDay7:
-                shouldShowSurveyDay7 = false
+            case .surveyDay14:
+                shouldShowSurveyDay14 = false
             case .networkProtectionRemoteMessage(let message):
 #if NETWORK_PROTECTION
                 homePageRemoteMessaging.networkProtectionRemoteMessaging.dismiss(message: message)
@@ -214,6 +230,10 @@ extension HomePage.Models {
 #endif
             case .dataBrokerProtectionWaitlistInvited:
                 shouldShowDBPWaitlistInvitedCardUI = false
+            case .vpnThankYou:
+                waitlistBetaThankYouPresenter.didDismissVPNThankYouCard()
+            case .pirThankYou:
+                waitlistBetaThankYouPresenter.didDismissPIRThankYouCard()
             }
             refreshFeaturesMatrix()
         }
@@ -245,6 +265,14 @@ extension HomePage.Models {
             }
 #endif
 
+            if waitlistBetaThankYouPresenter.canShowVPNCard {
+                features.append(.vpnThankYou)
+            }
+
+            if waitlistBetaThankYouPresenter.canShowPIRCard {
+                features.append(.pirThankYou)
+            }
+
             for feature in listOfFeatures {
                 switch feature {
                 case .defaultBrowser:
@@ -266,12 +294,17 @@ extension HomePage.Models {
                 case .surveyDay0:
                     if shouldSurveyDay0BeVisible {
                         features.append(feature)
+                        userInteractedWithSurveyDay0 = true
                     }
-                case .surveyDay7:
-                    if shouldSurveyDay7BeVisible {
+                case .surveyDay14:
+                    if shouldSurveyDay14BeVisible {
                         features.append(feature)
                     }
-                case .networkProtectionRemoteMessage, .dataBrokerProtectionRemoteMessage, .dataBrokerProtectionWaitlistInvited:
+                case .networkProtectionRemoteMessage,
+                        .dataBrokerProtectionRemoteMessage,
+                        .dataBrokerProtectionWaitlistInvited,
+                        .vpnThankYou,
+                        .pirThankYou:
                     break // Do nothing, these messages get appended first
                 }
             }
@@ -353,22 +386,39 @@ extension HomePage.Models {
             let oneDayAgo = Calendar.current.date(byAdding: .weekday, value: -1, to: Date())!
             return isDay0SurveyEnabled &&
             shouldShowSurveyDay0 &&
-            !userInteractedWithSurveyDay0 &&
-            firstLaunchDate > oneDayAgo
+            firstLaunchDate >= oneDayAgo &&
+            Bundle.main.preferredLocalizations.first == "en" &&
+            isPartOfSurveyDay0On10Percent ?? calculateIfIn10percent(day: .day0)
         }
 
-        private var shouldSurveyDay7BeVisible: Bool {
-            let oneWeekAgo = Calendar.current.date(byAdding: .weekOfYear, value: -1, to: Date())!
-            return isDay7SurveyEnabled &&
+        private var shouldSurveyDay14BeVisible: Bool {
+            let fourteenDaysAgo = Calendar.current.date(byAdding: .weekday, value: -14, to: Date())!
+            let fifteenDaysAgo = Calendar.current.date(byAdding: .weekday, value: -15, to: Date())!
+            return isDay14SurveyEnabled &&
             shouldShowSurveyDay0 &&
-            shouldShowSurveyDay7 &&
+            shouldShowSurveyDay14 &&
             !userInteractedWithSurveyDay0 &&
-            firstLaunchDate <= oneWeekAgo
+            firstLaunchDate >= fifteenDaysAgo &&
+            firstLaunchDate <= fourteenDaysAgo &&
+            Bundle.main.preferredLocalizations.first == "en" &&
+            isPartOfSurveyDay14On10Percent ?? calculateIfIn10percent(day: .day14)
+        }
+
+        private func calculateIfIn10percent(day: SurveyDay) -> Bool {
+            let randomNumber0To99 = randomNumberGenerator.random(in: 0..<100)
+            let isInSurvey10Percent = randomNumber0To99 < 10
+            switch day {
+            case .day0:
+                isPartOfSurveyDay0On10Percent = isInSurvey10Percent
+            case .day14:
+                isPartOfSurveyDay14On10Percent = isInSurvey10Percent
+            }
+            return isInSurvey10Percent
         }
 
         private enum SurveyDay {
             case day0
-            case day7
+            case day14
         }
 
         @MainActor private func visitSurvey(day: SurveyDay) {
@@ -376,11 +426,8 @@ extension HomePage.Models {
             switch day {
             case .day0:
                 surveyURLString = day0SurveyURL
-            case .day7:
-                surveyURLString = day7SurveyURL
-            }
-            if let atb = statisticsStore.atb {
-                surveyURLString += "&atb=\(atb)"
+            case .day14:
+                surveyURLString = day14SurveyURL
             }
 
             if let url = URL(string: surveyURLString) {
@@ -388,9 +435,9 @@ extension HomePage.Models {
                 tabCollectionViewModel.append(tab: tab)
                 switch day {
                 case .day0:
-                    userInteractedWithSurveyDay0 = true
-                case .day7:
-                    shouldShowSurveyDay7 = false
+                    shouldShowSurveyDay0 = false
+                case .day14:
+                    shouldShowSurveyDay14 = false
                 }
             }
         }
@@ -455,7 +502,7 @@ extension HomePage.Models {
         // We ignore the `networkProtectionRemoteMessage` case here to avoid it getting accidentally included - it has special handling and will get
         // included elsewhere.
         static var allCases: [HomePage.Models.FeatureType] {
-            [.duckplayer, .emailProtection, .defaultBrowser, .importBookmarksAndPasswords, .surveyDay0, .surveyDay7]
+            [.duckplayer, .emailProtection, .defaultBrowser, .importBookmarksAndPasswords, .surveyDay0, .surveyDay14]
         }
 
         case duckplayer
@@ -463,10 +510,12 @@ extension HomePage.Models {
         case defaultBrowser
         case importBookmarksAndPasswords
         case surveyDay0
-        case surveyDay7
+        case surveyDay14
         case networkProtectionRemoteMessage(NetworkProtectionRemoteMessage)
         case dataBrokerProtectionRemoteMessage(DataBrokerProtectionRemoteMessage)
         case dataBrokerProtectionWaitlistInvited
+        case vpnThankYou
+        case pirThankYou
 
         var title: String {
             switch self {
@@ -480,14 +529,18 @@ extension HomePage.Models {
                 return UserText.newTabSetUpEmailProtectionCardTitle
             case .surveyDay0:
                 return UserText.newTabSetUpSurveyDay0CardTitle
-            case .surveyDay7:
-                return UserText.newTabSetUpSurveyDay7CardTitle
+            case .surveyDay14:
+                return UserText.newTabSetUpSurveyDay14CardTitle
             case .networkProtectionRemoteMessage(let message):
                 return message.cardTitle
             case .dataBrokerProtectionRemoteMessage(let message):
                 return message.cardTitle
             case .dataBrokerProtectionWaitlistInvited:
                 return "Personal Information Removal"
+            case .vpnThankYou:
+                return "Thanks for testing DuckDuckGo VPN!"
+            case .pirThankYou:
+                return "Thanks for testing Personal Information Removal!"
             }
         }
 
@@ -503,14 +556,18 @@ extension HomePage.Models {
                 return UserText.newTabSetUpEmailProtectionSummary
             case .surveyDay0:
                 return UserText.newTabSetUpSurveyDay0Summary
-            case .surveyDay7:
-                return UserText.newTabSetUpSurveyDay7Summary
+            case .surveyDay14:
+                return UserText.newTabSetUpSurveyDay14Summary
             case .networkProtectionRemoteMessage(let message):
                 return message.cardDescription
             case .dataBrokerProtectionRemoteMessage(let message):
                 return message.cardDescription
             case .dataBrokerProtectionWaitlistInvited:
                 return "You're invited to try Personal Information Removal beta!"
+            case .vpnThankYou:
+                return "To keep using it, subscribe to DuckDuckGo Privacy Pro."
+            case .pirThankYou:
+                return "To keep using it, subscribe to DuckDuckGo Privacy Pro."
             }
         }
 
@@ -526,14 +583,18 @@ extension HomePage.Models {
                 return UserText.newTabSetUpEmailProtectionAction
             case .surveyDay0:
                 return UserText.newTabSetUpSurveyDay0Action
-            case .surveyDay7:
-                return UserText.newTabSetUpSurveyDay7Action
+            case .surveyDay14:
+                return UserText.newTabSetUpSurveyDay14Action
             case .networkProtectionRemoteMessage(let message):
                 return message.action.actionTitle
             case .dataBrokerProtectionRemoteMessage(let message):
                 return message.action.actionTitle
             case .dataBrokerProtectionWaitlistInvited:
                 return "Get Started"
+            case .vpnThankYou:
+                return "See Special Offer For Testers"
+            case .pirThankYou:
+                return "See Special Offer For Testers"
             }
         }
 
@@ -550,15 +611,19 @@ extension HomePage.Models {
             case .emailProtection:
                 return .inbox128.resized(to: iconSize)!
             case .surveyDay0:
-                return .survey128.resized(to: iconSize)!
-            case .surveyDay7:
-                return .survey128.resized(to: iconSize)!
+                return .qandA128.resized(to: iconSize)!
+            case .surveyDay14:
+                return .qandA128.resized(to: iconSize)!
             case .networkProtectionRemoteMessage:
                 return .vpnEnded.resized(to: iconSize)!
             case .dataBrokerProtectionRemoteMessage:
                 return .dbpInformationRemover.resized(to: iconSize)!
             case .dataBrokerProtectionWaitlistInvited:
                 return .dbpInformationRemover.resized(to: iconSize)!
+            case .vpnThankYou:
+                return .vpnEnded.resized(to: iconSize)!
+            case .pirThankYou:
+                return .dbpInformationRemover.resized(to: iconSize)!
             }
         }
     }
@@ -615,3 +680,13 @@ struct HomePageRemoteMessaging {
 #endif
 
 }
+
+public protocol RandomNumberGenerating {
+    func random(in range: Range<Int>) -> Int
+}
+
+struct RandomNumberGenerator: RandomNumberGenerating {
+    func random(in range: Range<Int>) -> Int {
+        return Int.random(in: range)
+    }
+}
diff --git a/DuckDuckGo/HomePage/Model/HomePageFavoritesModel.swift b/DuckDuckGo/HomePage/Model/HomePageFavoritesModel.swift
index 0860f02cfc..e88a48b1b0 100644
--- a/DuckDuckGo/HomePage/Model/HomePageFavoritesModel.swift
+++ b/DuckDuckGo/HomePage/Model/HomePageFavoritesModel.swift
@@ -86,14 +86,16 @@ extension HomePage.Models {
         let open: (Bookmark, OpenTarget) -> Void
         let removeFavorite: (Bookmark) -> Void
         let deleteBookmark: (Bookmark) -> Void
-        let addEdit: (Bookmark?) -> Void
+        let add: () -> Void
+        let edit: (Bookmark) -> Void
         let moveFavorite: (Bookmark, Int) -> Void
         let onFaviconMissing: () -> Void
 
         init(open: @escaping (Bookmark, OpenTarget) -> Void,
              removeFavorite: @escaping (Bookmark) -> Void,
              deleteBookmark: @escaping (Bookmark) -> Void,
-             addEdit: @escaping (Bookmark?) -> Void,
+             add: @escaping () -> Void,
+             edit: @escaping (Bookmark) -> Void,
              moveFavorite: @escaping (Bookmark, Int) -> Void,
              onFaviconMissing: @escaping () -> Void
         ) {
@@ -102,7 +104,8 @@ extension HomePage.Models {
             self.open = open
             self.removeFavorite = removeFavorite
             self.deleteBookmark = deleteBookmark
-            self.addEdit = addEdit
+            self.add = add
+            self.edit = edit
             self.moveFavorite = moveFavorite
             self.onFaviconMissing = onFaviconMissing
         }
@@ -119,12 +122,12 @@ extension HomePage.Models {
             open(bookmark, .current)
         }
 
-        func edit(_ bookmark: Bookmark) {
-            addEdit(bookmark)
+        func editBookmark(_ bookmark: Bookmark) {
+            edit(bookmark)
         }
 
         func addNew() {
-            addEdit(nil)
+            add()
         }
 
         private func updateVisibleModels() {
diff --git a/DuckDuckGo/HomePage/View/FavoritesView.swift b/DuckDuckGo/HomePage/View/FavoritesView.swift
index 90956a4a66..52e7f585d1 100644
--- a/DuckDuckGo/HomePage/View/FavoritesView.swift
+++ b/DuckDuckGo/HomePage/View/FavoritesView.swift
@@ -305,14 +305,17 @@ struct Favorite: View {
     let bookmark: Bookmark
 
     // Maintain separate copies of bookmark metadata required by the view, in order to ensure that SwiftUI re-renders correctly.
+    // Do not remove these properties even if some are not used in the `FavoriteTemplate` view as the view will not re-render correctly.
     private let bookmarkTitle: String
     private let bookmarkURL: URL
+    private let bookmarkParentFolder: String?
 
     init?(bookmark: Bookmark) {
         guard let urlObject = bookmark.urlObject else { return nil }
         self.bookmark = bookmark
         self.bookmarkTitle = bookmark.title
         self.bookmarkURL = urlObject
+        self.bookmarkParentFolder = bookmark.parentFolderUUID
     }
 
     var body: some View {
diff --git a/DuckDuckGo/HomePage/View/HomePageViewController.swift b/DuckDuckGo/HomePage/View/HomePageViewController.swift
index ae40aff5df..96fb2aca47 100644
--- a/DuckDuckGo/HomePage/View/HomePageViewController.swift
+++ b/DuckDuckGo/HomePage/View/HomePageViewController.swift
@@ -42,7 +42,9 @@ final class HomePageViewController: NSViewController {
     var defaultBrowserModel: HomePage.Models.DefaultBrowserModel!
     var recentlyVisitedModel: HomePage.Models.RecentlyVisitedModel!
     var featuresModel: HomePage.Models.ContinueSetUpModel!
-    var appearancePreferences: AppearancePreferences!
+    let accessibilityPreferences: AccessibilityPreferences
+    let appearancePreferences: AppearancePreferences
+    let defaultBrowserPreferences: DefaultBrowserPreferences
     var cancellables = Set<AnyCancellable>()
 
     @UserDefaultsWrapper(key: .defaultBrowserDismissed, defaultValue: false)
@@ -56,13 +58,19 @@ final class HomePageViewController: NSViewController {
          bookmarkManager: BookmarkManager,
          historyCoordinating: HistoryCoordinating = HistoryCoordinator.shared,
          fireViewModel: FireViewModel? = nil,
-         onboardingViewModel: OnboardingViewModel = OnboardingViewModel()) {
+         onboardingViewModel: OnboardingViewModel = OnboardingViewModel(),
+         accessibilityPreferences: AccessibilityPreferences = AccessibilityPreferences.shared,
+         appearancePreferences: AppearancePreferences = AppearancePreferences.shared,
+         defaultBrowserPreferences: DefaultBrowserPreferences = DefaultBrowserPreferences.shared) {
 
         self.tabCollectionViewModel = tabCollectionViewModel
         self.bookmarkManager = bookmarkManager
         self.historyCoordinating = historyCoordinating
         self.fireViewModel = fireViewModel ?? FireCoordinator.fireViewModel
         self.onboardingViewModel = onboardingViewModel
+        self.accessibilityPreferences = accessibilityPreferences
+        self.appearancePreferences = appearancePreferences
+        self.defaultBrowserPreferences = defaultBrowserPreferences
 
         super.init(nibName: nil, bundle: nil)
     }
@@ -72,7 +80,6 @@ final class HomePageViewController: NSViewController {
         defaultBrowserModel = createDefaultBrowserModel()
         recentlyVisitedModel = createRecentlyVisitedModel()
         featuresModel = createFeatureModel()
-        appearancePreferences = AppearancePreferences.shared
 
         refreshModels()
 
@@ -81,6 +88,7 @@ final class HomePageViewController: NSViewController {
             .environmentObject(defaultBrowserModel)
             .environmentObject(recentlyVisitedModel)
             .environmentObject(featuresModel)
+            .environmentObject(accessibilityPreferences)
             .environmentObject(appearancePreferences)
             .onTapGesture { [weak self] in
                 // Remove focus from the address bar if interacting with this view.
@@ -149,8 +157,9 @@ final class HomePageViewController: NSViewController {
     }
 
     func createDefaultBrowserModel() -> HomePage.Models.DefaultBrowserModel {
-        return .init(isDefault: DefaultBrowserPreferences().isDefault, wasClosed: defaultBrowserDismissed, requestSetDefault: { [weak self] in
-            let defaultBrowserPreferencesModel = DefaultBrowserPreferences()
+        return .init(isDefault: DefaultBrowserPreferences.shared.isDefault, wasClosed: defaultBrowserDismissed, requestSetDefault: { [weak self] in
+            Pixel.fire(.defaultRequestedFromHomepage)
+            let defaultBrowserPreferencesModel = DefaultBrowserPreferences.shared
             defaultBrowserPreferencesModel.becomeDefault { [weak self] isDefault in
                 _ = defaultBrowserPreferencesModel
                 self?.defaultBrowserModel.isDefault = isDefault
@@ -172,8 +181,10 @@ final class HomePageViewController: NSViewController {
             self?.bookmarkManager.update(bookmark: bookmark)
         }, deleteBookmark: { [weak self] bookmark in
             self?.bookmarkManager.remove(bookmark: bookmark)
-        }, addEdit: { [weak self] bookmark in
-            self?.showAddEditController(for: bookmark)
+        }, add: { [weak self] in
+            self?.showAddController()
+        }, edit: { [weak self] bookmark in
+            self?.showEditController(for: bookmark)
         }, moveFavorite: { [weak self] (bookmark, index) in
             self?.bookmarkManager.moveFavorites(with: [bookmark.id], toIndex: index) { _ in }
         }, onFaviconMissing: { [weak self] in
@@ -194,7 +205,7 @@ final class HomePageViewController: NSViewController {
     }
 
     func refreshDefaultBrowserModel() {
-        let prefs = DefaultBrowserPreferences()
+        let prefs = DefaultBrowserPreferences.shared
         if prefs.isDefault {
             defaultBrowserDismissed = false
         }
@@ -204,7 +215,7 @@ final class HomePageViewController: NSViewController {
     }
 
     func subscribeToBookmarks() {
-        bookmarkManager.listPublisher.receive(on: RunLoop.main).sink { [weak self] _ in
+        bookmarkManager.listPublisher.receive(on: DispatchQueue.main).sink { [weak self] _ in
             withAnimation {
                 self?.refreshFavoritesModel()
             }
@@ -230,9 +241,14 @@ final class HomePageViewController: NSViewController {
         tabCollectionViewModel.selectedTabViewModel?.tab.setContent(.contentFromURL(url, source: .bookmark))
     }
 
-    private func showAddEditController(for bookmark: Bookmark? = nil) {
-        AddBookmarkModalView(model: AddBookmarkModalViewModel(originalBookmark: bookmark, isFavorite: true))
-            .show(in: self.view.window)
+    private func showAddController() {
+        BookmarksDialogViewFactory.makeAddFavoriteView()
+            .show(in: view.window)
+    }
+
+    private func showEditController(for bookmark: Bookmark) {
+        BookmarksDialogViewFactory.makeEditBookmarkView(bookmark: bookmark)
+            .show(in: view.window)
     }
 
     private var burningDataCancellable: AnyCancellable?
diff --git a/DuckDuckGo/Info.plist b/DuckDuckGo/Info.plist
index 8c7dca0e52..bdb809d70e 100644
--- a/DuckDuckGo/Info.plist
+++ b/DuckDuckGo/Info.plist
@@ -60,7 +60,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>CFBundleURLName</key>
-			<string>Network Protection URLs</string>
+			<string>VPN URLs</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>networkprotection</string>
diff --git a/DuckDuckGo/InfoPlist.xcstrings b/DuckDuckGo/InfoPlist.xcstrings
index ee95494024..e4f7972ce7 100644
--- a/DuckDuckGo/InfoPlist.xcstrings
+++ b/DuckDuckGo/InfoPlist.xcstrings
@@ -7,7 +7,7 @@
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "DuckDuckGo"
           }
         },
@@ -19,43 +19,43 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "DuckDuckGo"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "DuckDuckGo"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "DuckDuckGo"
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "DuckDuckGo"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "DuckDuckGo"
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "DuckDuckGo"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "DuckDuckGo"
           }
         }
@@ -363,4 +363,4 @@
     }
   },
   "version" : "1.0"
-}
\ No newline at end of file
+}
diff --git a/DuckDuckGo/Localizable.xcstrings b/DuckDuckGo/Localizable.xcstrings
index 9347c6977d..ce218cd1b2 100644
--- a/DuckDuckGo/Localizable.xcstrings
+++ b/DuckDuckGo/Localizable.xcstrings
@@ -53,8 +53,57 @@
         }
       }
     },
-    "-1 -> 0 ... 1" : {
-
+    " %@" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : " %@"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : " %@"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : " %@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : " %@"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : " %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : " %@"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : " %@"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : " %@"
+          }
+        }
+      }
     },
     "**%lld** tracking attempts blocked" : {
       "comment" : "The number of tracking attempts blocked in the last 7 days, shown on a new tab, translate as: Tracking attempts blocked: %@",
@@ -430,24 +479,6 @@
           }
         }
       }
-    },
-    "0->1->nil" : {
-
-    },
-    "10%" : {
-
-    },
-    "20%" : {
-
-    },
-    "50%" : {
-
-    },
-    "80%" : {
-
-    },
-    "100%" : {
-
     },
     "about.app_name" : {
       "comment" : "Application name to be displayed in the About dialog",
@@ -908,66 +939,6 @@
         }
       }
     },
-    "add.folder.name" : {
-      "comment" : "Add Folder popover: folder name text field title",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Name:"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Name:"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nombre:"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nom :"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nome:"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Naam:"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nazwa:"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nome:"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Имя:"
-          }
-        }
-      }
-    },
     "add.link.to.bookmarks" : {
       "comment" : "Context menu item",
       "extractionState" : "extracted_with_value",
@@ -2026,9 +1997,6 @@
           }
         }
       }
-    },
-    "Animate" : {
-
     },
     "auth.alert.login.button" : {
       "comment" : "Authentication Alert Sign In Button",
@@ -2932,7 +2900,7 @@
     },
     "autoconsent.title" : {
       "comment" : "Autoconsent settings section title",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -8959,7 +8927,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Add bookmark"
+            "value" : "Add Bookmark"
           }
         },
         "es" : {
@@ -9079,7 +9047,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Edit bookmark"
+            "value" : "Edit Bookmark"
           }
         },
         "es" : {
@@ -15626,66 +15594,6 @@
         }
       }
     },
-    "edit.folder" : {
-      "comment" : "Header of the view that edits a bookmark folder",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ordner bearbeiten"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Edit Folder"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Editar carpeta"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modifier le dossier"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modifica cartella"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Map bewerken"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Edytuj folder"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Editar pasta"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Изменить папку"
-          }
-        }
-      }
-    },
     "email.copied" : {
       "comment" : "Notification that the Private email address was copied to clipboard after the user generated a new address",
       "extractionState" : "extracted_with_value",
@@ -16046,6 +15954,66 @@
         }
       }
     },
+    "email.protection.explanation" : {
+      "comment" : "Email protection feature explanation in settings. The feature blocks email trackers and hides original email address.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "E-Mail-Tracker blockieren und deine Adresse verbergen, ohne den E-Mail-Anbieter zu wechseln."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Block email trackers and hide your address without switching your email provider."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bloquea los rastreadores de correo electrónico y oculta tu dirección sin cambiar de proveedor de correo electrónico."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bloquez les traqueurs d'e-mails et masquez votre adresse sans changer de fournisseur de messagerie."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Blocca i sistemi di tracciamento delle e-mail e nascondi il tuo indirizzo, senza cambiare il provider di posta elettronica."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Blokkeer e-mailtrackers en verberg je adres zonder van e-mailprovider te wisselen."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Zablokuj mechanizmy śledzące pocztę e-mail i ukryj swój adres bez zmiany dostawcy poczty e-mail."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bloqueia os rastreadores de e-mail e oculta o teu endereço sem alterares o teu fornecedor de e-mail."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Чтобы блокировать трекеры и скрывать свой адрес, вовсе не нужно менять почтовый сервис."
+          }
+        }
+      }
+    },
     "Enter Full Screen" : {
       "comment" : "Main Menu View item",
       "localizations" : {
@@ -19687,7 +19655,7 @@
     },
     "gpc.title" : {
       "comment" : "GPC settings title",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -24294,9 +24262,6 @@
           }
         }
       }
-    },
-    "Indeterminate (-1)" : {
-
     },
     "invite.dialog.get.started.button" : {
       "comment" : "Get Started button on an invite dialog",
@@ -24584,59 +24549,6 @@
         }
       }
     },
-    "Location:" : {
-      "comment" : "Add Folder popover: parent folder picker title",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Standort:"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ubicación:"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Emplacement :"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Posizione:"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Locatie:"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Lokalizacja:"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Localização:"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Папка:"
-          }
-        }
-      }
-    },
     "looking.for.bitwarden" : {
       "comment" : "Setup of the integration with Bitwarden app",
       "extractionState" : "extracted_with_value",
@@ -29509,120 +29421,120 @@
       }
     },
     "newTab.setup.survey.day.0.action" : {
-      "comment" : "Action title of the Day 0 durvey of the Set Up section in the home page",
+      "comment" : "Action title of the Day 0 survey of the Set Up section in the home page",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Teile deine Gedanken"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Share Your Thoughts"
+            "value" : "Sign Up To Participate"
           }
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Comparte tus ideas"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Partagez votre avis"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Comunicaci la tua opinione"
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Deel je gedachten"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Podziel się przemyśleniami"
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Partilha as tuas opiniões"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Поделиться соображениями"
           }
         }
       }
     },
     "newTab.setup.survey.day.0.summary" : {
-      "comment" : "Summary of the Day 0 durvey of the Set Up section in the home page",
+      "comment" : "Summary of the card on the new tab page that invites users to partecipate to a survey",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Nimm an unserer kurzen Umfrage teil und hilf uns, den besten Browser zu entwickeln."
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Take our short survey and help us build the best browser."
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Responde a nuestra breve encuesta y ayúdanos a crear el mejor navegador."
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Répondez à notre courte enquête et aidez-nous à créer le meilleur navigateur."
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Rispondi al nostro breve sondaggio e aiutaci a creare il browser migliore."
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Vul onze korte enquête in en help ons de beste browser te bouwen."
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Weź udział w krótkiej ankiecie i pomóż nam opracować najlepszą przeglądarkę."
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Responde ao nosso curto inquérito e ajuda-nos a criar o melhor navegador."
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Пройдите короткий опрос и помогите DuckDuckGo стать лучшим из браузеров."
           }
         }
@@ -29634,55 +29546,55 @@
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Sag uns, was dich hierher gebracht hat"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Tell Us What Brought You Here"
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Cuéntanos qué te ha traído hasta aquí"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Dites-nous ce qui vous amène ici"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Raccontaci cosa ti ha portato qui"
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Vertel ons wat je hier heeft gebracht"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Powiedz nam, co Cię tu sprowadziło"
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Diz-nos o que te trouxe aqui"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Что привело вас к нам"
           }
         }
@@ -29690,7 +29602,7 @@
     },
     "newTab.setup.survey.day.7.action" : {
       "comment" : "Action title of the Day 7 durvey of the Set Up section in the home page",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -29750,7 +29662,7 @@
     },
     "newTab.setup.survey.day.7.summary" : {
       "comment" : "Summary of the Day 7 durvey of the Set Up section in the home page",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -29810,7 +29722,7 @@
     },
     "newTab.setup.survey.day.7.title" : {
       "comment" : "Title of the Day 7 durvey of the Set Up section in the home page",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -29868,6 +29780,42 @@
         }
       }
     },
+    "newTab.setup.survey.day.14.action" : {
+      "comment" : "Action title of the Day 14 survey of the Set Up section in the home page",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Sign Up To Participate"
+          }
+        }
+      }
+    },
+    "newTab.setup.survey.day.14.summary" : {
+      "comment" : "Summary of the card on the new tab page that invites users to partecipate to a survey",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
+          }
+        }
+      }
+    },
+    "newTab.setup.survey.day.14.title" : {
+      "comment" : "Title of the Day 14 durvey of the Set Up section in the home page",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Share Your Thoughts With Us"
+          }
+        }
+      }
+    },
     "next" : {
       "comment" : "Next button",
       "extractionState" : "extracted_with_value",
@@ -29927,9 +29875,6 @@
           }
         }
       }
-    },
-    "nil->0->nil" : {
-
     },
     "no.access.to.downloads.folder.header" : {
       "comment" : "Header of the alert dialog warning the user they need to give the browser permission to access the Downloads folder",
@@ -31815,7 +31760,7 @@
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Apri collegamento in una nuova scheda"
+            "value" : "Apri link in una nuova scheda"
           }
         },
         "nl" : {
@@ -41830,7 +41775,7 @@
       }
     },
     "preferences.about" : {
-      "comment" : "Show about screen",
+      "comment" : "Title of the option to show the About screen",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
@@ -42309,8 +42254,128 @@
         }
       }
     },
+    "preferences.accessibility" : {
+      "comment" : "Title of the option to show the Accessibility browser preferences",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Barrierefreiheit"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Accessibility"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Accesibilidad"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Accessibilité"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Accessibilità"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Toegankelijkheid"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Dostępność"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Acessibilidade"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Универсальный доступ"
+          }
+        }
+      }
+    },
+    "preferences.always-on" : {
+      "comment" : "Status indicator of a browser privacy protection feature.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Immer aktiviert"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Always On"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Siempre activado"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Toujours activé"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sempre attiva"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Altijd aan"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Zawsze włączone"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sempre ligada"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Всегда включено"
+          }
+        }
+      }
+    },
     "preferences.appearance" : {
-      "comment" : "Show appearance preferences",
+      "comment" : "Title of the option to show the Appearance preferences",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
@@ -42791,7 +42856,7 @@
     },
     "preferences.appearance.zoom" : {
       "comment" : "Zoom settings section title",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -42916,61 +42981,241 @@
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Autovervollständigen"
+            "value" : "Passwörter"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Autofill"
+            "value" : "Passwords"
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Autocompletar"
+            "value" : "Contraseñas"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Saisie automatique"
+            "value" : "Mots de passe"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Compilazione automatica"
+            "value" : "Password"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Automatisch invullen"
+            "value" : "Wachtwoorden"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Autouzupełnianie"
+            "value" : "Hasła"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Preenchimento automático"
+            "value" : "Palavras-passe"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Автозаполнение"
+            "value" : "Пароли"
+          }
+        }
+      }
+    },
+    "preferences.autofill-enabled-for" : {
+      "comment" : "Label presented before the email account in email protection preferences",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Autovervollständigen in diesem Browser aktiviert für:"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Autofill enabled in this browser for:"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Autocompletar habilitado en este navegador para:"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "La saisie automatique est activée dans ce navigateur pour :"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Compilazione automatica abilitata in questo browser per:"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "'Automatisch aanvullen' is ingeschakeld in deze browser voor:"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Autouzupełnianie włączone w tej przeglądarce dla:"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Preenchimento automático ativado neste navegador para:"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "В этом браузере включено автозаполнение для:"
+          }
+        }
+      }
+    },
+    "preferences.cookie-pop-up-protection" : {
+      "comment" : "Title of the option to show the Cookie Pop-Up Protection preferences",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cookie-Pop-up-Schutz"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Cookie Pop-Up Protection"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protección contra ventanas emergentes de cookies"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protection contre les fenêtres contextuelles des cookies"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protezione pop-up dei cookie"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bescherming tegen cookiepop-ups"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ochrona przed wyskakującymi okienkami dotyczącymi plików cookie"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Proteção contra pop-ups de cookies"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Защита от всплывающих окон куки"
+          }
+        }
+      }
+    },
+    "preferences.data-clearing" : {
+      "comment" : "Title of the option to show the Data Clearing preferences",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Datenlöschung"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Data Clearing"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Eliminación de datos"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Effacement des données"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cancellazione dati"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Gegevens wissen"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Czyszczenie danych"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Limpeza de Dados"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Очистка данных"
           }
         }
       }
     },
     "preferences.default-browser" : {
-      "comment" : "Show default browser preferences",
+      "comment" : "Title of the option to show the Default Browser Preferences",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
@@ -43210,7 +43455,7 @@
       }
     },
     "preferences.downloads" : {
-      "comment" : "Show downloads browser preferences",
+      "comment" : "Title of the downloads browser preferences",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
@@ -43270,7 +43515,7 @@
       }
     },
     "preferences.duck-player" : {
-      "comment" : "Show Duck Player browser preferences",
+      "comment" : "Title of the option to show the Duck Player browser preferences",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
@@ -43329,8 +43574,128 @@
         }
       }
     },
+    "preferences.duckduckgo-on-other-platforms" : {
+      "comment" : "Button presented to users to navigate them to our product page which presents all other products for other platforms",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo auf anderen Plattformen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "DuckDuckGo on Other Platforms"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo en otras plataformas"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo sur d'autres plateformes"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo su altre piattaforme"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo op andere platforms"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo na innych platformach"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo Noutras Plataformas"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo для других платформ"
+          }
+        }
+      }
+    },
+    "preferences.email-protection" : {
+      "comment" : "Title of the option to show the Email Protection preferences",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "E-Mail-Schutz"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Email Protection"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protección del correo electrónico"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protection des e-mails"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protezione email"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "E-mailbescherming"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ochrona poczty e-mail"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Proteção de e-mail"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Защита электронной почты"
+          }
+        }
+      }
+    },
     "preferences.general" : {
-      "comment" : "Show general preferences",
+      "comment" : "Title of the option to show the General preferences",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
@@ -43389,6 +43754,186 @@
         }
       }
     },
+    "preferences.main-settings" : {
+      "comment" : "Section header in Preferences for main settings",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Haupteinstellungen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Main Settings"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ajustes principales"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Réglages principaux"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Impostazioni principali"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Hoofdinstellingen"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ustawienia główne"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Definições Principais"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Основные настройки"
+          }
+        }
+      }
+    },
+    "preferences.off" : {
+      "comment" : "Status indicator of a browser privacy protection feature.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aus"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Off"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Desactivado"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Désactivé"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Disattivato"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Uit"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wył."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Desligado"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Выкл."
+          }
+        }
+      }
+    },
+    "preferences.on" : {
+      "comment" : "Status indicator of a browser privacy protection feature.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "An"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "On"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Activado"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Activé"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "On"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aan"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wł."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ligado"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Вкл."
+          }
+        }
+      }
+    },
     "preferences.on-startup" : {
       "comment" : "Name of the preferences section related to app startup",
       "extractionState" : "extracted_with_value",
@@ -43451,7 +43996,7 @@
     },
     "preferences.privacy" : {
       "comment" : "Show privacy browser preferences",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -43509,6 +44054,126 @@
         }
       }
     },
+    "preferences.privacy-protections" : {
+      "comment" : "The section header in Preferences representing browser features related to privacy protection",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Datenschutz"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Privacy Protections"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protecciones de privacidad"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protections de la confidentialité"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protezioni della Privacy"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privacybescherming"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mechanizmy Ochrony Prywatności"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Proteções de Privacidade"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Защита конфиденциальности"
+          }
+        }
+      }
+    },
+    "preferences.private-search" : {
+      "comment" : "Title of the option to show the Private Search preferences",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Private Suche"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Private Search"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Búsqueda privada"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Recherche privée"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ricerca Privata"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privézoekopdracht"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Prywatne wyszukiwanie"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pesquisa Privada"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Частный поиск"
+          }
+        }
+      }
+    },
     "preferences.reopen-windows" : {
       "comment" : "Option to control session restoration",
       "extractionState" : "extracted_with_value",
@@ -43629,8 +44294,68 @@
         }
       }
     },
+    "preferences.support" : {
+      "comment" : "Open support page",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Unterstützung"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Support"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ayuda"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aide"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Supporto"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Support"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wsparcie"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Assistência"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Поддержка"
+          }
+        }
+      }
+    },
     "preferences.sync" : {
-      "comment" : "Show sync preferences",
+      "comment" : "Title of the option to show the Sync preferences",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
@@ -43750,7 +44475,7 @@
       }
     },
     "preferences.vpn" : {
-      "comment" : "Show VPN preferences",
+      "comment" : "Title of the option to show the VPN preferences",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
@@ -43809,6 +44534,66 @@
         }
       }
     },
+    "preferences.web-tracking-protection" : {
+      "comment" : "Title of the option to show the Web Tracking Protection preferences",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Web Tracking Protection"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Web Tracking Protection"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protección de rastreo en la web"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protection contre le pistage sur le Web"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Protezione dal tracciamento web"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bescherming tegen webtracking"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ochrona przed śledzeniem w sieci"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Proteção contra rastreamento na internet"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Защита от отслеживания онлайн"
+          }
+        }
+      }
+    },
     "print.menu.item" : {
       "comment" : "Menu item title",
       "extractionState" : "extracted_with_value",
@@ -43869,6 +44654,66 @@
         }
       }
     },
+    "private.search.explenation" : {
+      "comment" : "feature explanation in settings",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo Private Search ist deine Standardsuchmaschine – du kannst also das Web durchsuchen, ohne getrackt zu werden."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "DuckDuckGo Private Search is your default search engine, so you can search the web without being tracked."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "La búsqueda privada de DuckDuckGo es tu motor de búsqueda predeterminado para que puedas buscar en la web sin que te rastreen."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo Private Search est votre moteur de recherche par défaut, qui vous permet d'effectuer des recherches sur le Web sans être suivi(e)."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo Private Search è il tuo motore di ricerca predefinito, quindi puoi effettuare ricerche sul Web senza essere tracciato."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo Private Search is je standaardzoekmachine, zodat je op het web kunt zoeken zonder gevolgd te worden."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo Private Search to domyślna wyszukiwarka, dzięki której możesz wyszukiwać treści w sieci, unikając śledzenia."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "O DuckDuckGo Private Search é o teu motor de pesquisa predefinido, para que possas pesquisar a web sem seres rastreado."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo Private Search — ваша поисковая система по умолчанию. Вы можете пользоваться поиском в интернете, не опасаясь слежки."
+          }
+        }
+      }
+    },
     "quit" : {
       "comment" : "Quit button",
       "extractionState" : "extracted_with_value",
@@ -44500,9 +45345,6 @@
           }
         }
       }
-    },
-    "Reset (nil)" : {
-
     },
     "restart.bitwarden" : {
       "comment" : "Button to restart Bitwarden application",
@@ -46610,9 +47452,6 @@
           }
         }
       }
-    },
-    "Slow animations" : {
-
     },
     "Smart Copy/Paste" : {
       "comment" : "Main Menu Edit-Substitutions item",
@@ -47670,59 +48509,6 @@
         }
       }
     },
-    "Title:" : {
-      "comment" : "Add Bookmark dialog bookmark title field heading",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Titel:"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Título:"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Titre :"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Titolo:"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Titel:"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tytuł:"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Título:"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Название:"
-          }
-        }
-      }
-    },
     "tooltip.addToFavorites" : {
       "comment" : "Tooltip for add to favorites button",
       "extractionState" : "extracted_with_value",
@@ -50127,7 +50913,7 @@
         }
       }
     },
-    "web.tracking.protection.explenation" : {
+    "web.tracking.protection.explanation" : {
       "comment" : "feature explanation in settings",
       "extractionState" : "extracted_with_value",
       "localizations" : {
@@ -50187,6 +50973,66 @@
         }
       }
     },
+    "web.tracking.protection.explenation" : {
+      "comment" : "Privacy feature explanation in the browser settings",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo blockiert beim Durchsuchen des Internets automatisch ausgeblendete Tracker."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "DuckDuckGo automatically blocks hidden trackers as you browse the web."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo bloquea automáticamente los rastreadores ocultos mientras navegas por la web."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo bloque automatiquement les traqueurs cachés lorsque vous naviguez sur le Web."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo blocca automaticamente i sistemi di tracciamento nascosti mentre navighi sul web."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo blokkeert automatisch verborgen trackers terwijl je op het web surft."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Podczas przeglądania stron internetowych DuckDuckGo automatycznie blokuje ukryte mechanizmy śledzące."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "O DuckDuckGo bloqueia automaticamente os rastreadores ocultos enquanto navegas na Internet."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo автоматически блокирует скрытые трекеры, пока вы посещаете сайты."
+          }
+        }
+      }
+    },
     "web.tracking.protection.title" : {
       "comment" : "Web tracking protection settings section title",
       "extractionState" : "extracted_with_value",
@@ -50352,9 +51198,6 @@
           }
         }
       }
-    },
-    "Zero" : {
-
     },
     "zoom" : {
       "comment" : "Menu with Zooming commands",
@@ -50524,4 +51367,4 @@
     }
   },
   "version" : "1.0"
-}
+}
\ No newline at end of file
diff --git a/DuckDuckGo/LoginItems/LoginItemsManager.swift b/DuckDuckGo/LoginItems/LoginItemsManager.swift
index d8ab2356db..e0a44a4fb4 100644
--- a/DuckDuckGo/LoginItems/LoginItemsManager.swift
+++ b/DuckDuckGo/LoginItems/LoginItemsManager.swift
@@ -20,8 +20,8 @@ import Common
 import Foundation
 import LoginItems
 
-/// Class to manage the login items for Network Protection and DBP
-/// 
+/// Class to manage the login items for the VPN and DBP
+///
 final class LoginItemsManager {
     private enum Action: String {
         case enable
@@ -59,6 +59,12 @@ final class LoginItemsManager {
         }
     }
 
+    func isAnyEnabled(_ items: Set<LoginItem>) -> Bool {
+        return items.contains(where: { item in
+            item.status == .enabled
+        })
+    }
+
     private func handleError(for item: LoginItem, action: Action, error: NSError) {
         let event = Pixel.Event.Debug.loginItemUpdateError(
             loginItemBundleID: item.agentBundleID,
diff --git a/DuckDuckGo/MainWindow/MainViewController.swift b/DuckDuckGo/MainWindow/MainViewController.swift
index 5741f2f55e..17c166e932 100644
--- a/DuckDuckGo/MainWindow/MainViewController.swift
+++ b/DuckDuckGo/MainWindow/MainViewController.swift
@@ -23,6 +23,7 @@ import Common
 
 #if NETWORK_PROTECTION
 import NetworkProtection
+import NetworkProtectionIPC
 #endif
 
 final class MainViewController: NSViewController {
@@ -56,14 +57,53 @@ final class MainViewController: NSViewController {
         fatalError("MainViewController: Bad initializer")
     }
 
-    init(tabCollectionViewModel: TabCollectionViewModel? = nil,
-         bookmarkManager: BookmarkManager = LocalBookmarkManager.shared) {
+    init(tabCollectionViewModel: TabCollectionViewModel? = nil, bookmarkManager: BookmarkManager = LocalBookmarkManager.shared, autofillPopoverPresenter: AutofillPopoverPresenter) {
         let tabCollectionViewModel = tabCollectionViewModel ?? TabCollectionViewModel()
         self.tabCollectionViewModel = tabCollectionViewModel
         self.isBurner = tabCollectionViewModel.isBurner
 
         tabBarViewController = TabBarViewController.create(tabCollectionViewModel: tabCollectionViewModel)
-        navigationBarViewController = NavigationBarViewController.create(tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner)
+
+#if NETWORK_PROTECTION
+        let networkProtectionPopoverManager: NetPPopoverManager = {
+#if DEBUG
+            guard case .normal = NSApp.runType else {
+                return NetPPopoverManagerMock()
+            }
+#endif
+
+            let ipcClient = TunnelControllerIPCClient()
+            ipcClient.register()
+
+            return NetworkProtectionNavBarPopoverManager(ipcClient: ipcClient, networkProtectionFeatureDisabler: NetworkProtectionFeatureDisabler())
+        }()
+        let networkProtectionStatusReporter: NetworkProtectionStatusReporter = {
+            var connectivityIssuesObserver: ConnectivityIssueObserver!
+            var controllerErrorMessageObserver: ControllerErrorMesssageObserver!
+#if DEBUG
+            if ![.normal, .integrationTests].contains(NSApp.runType) {
+                connectivityIssuesObserver = ConnectivityIssueObserverMock()
+                controllerErrorMessageObserver = ControllerErrorMesssageObserverMock()
+            }
+#endif
+            connectivityIssuesObserver = connectivityIssuesObserver ?? DisabledConnectivityIssueObserver()
+            controllerErrorMessageObserver = controllerErrorMessageObserver ?? ControllerErrorMesssageObserverThroughDistributedNotifications()
+
+            let ipcClient = networkProtectionPopoverManager.ipcClient
+            return DefaultNetworkProtectionStatusReporter(
+                statusObserver: ipcClient.ipcStatusObserver,
+                serverInfoObserver: ipcClient.ipcServerInfoObserver,
+                connectionErrorObserver: ipcClient.ipcConnectionErrorObserver,
+                connectivityIssuesObserver: connectivityIssuesObserver,
+                controllerErrorMessageObserver: controllerErrorMessageObserver
+            )
+        }()
+
+        navigationBarViewController = NavigationBarViewController.create(tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, networkProtectionPopoverManager: networkProtectionPopoverManager, networkProtectionStatusReporter: networkProtectionStatusReporter, autofillPopoverPresenter: autofillPopoverPresenter)
+#else
+        navigationBarViewController = NavigationBarViewController.create(tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, autofillPopoverPresenter: AutofillPopoverPresenter)
+#endif
+
         browserTabViewController = BrowserTabViewController(tabCollectionViewModel: tabCollectionViewModel, bookmarkManager: bookmarkManager)
         findInPageViewController = FindInPageViewController.create()
         fireViewController = FireViewController.create(tabCollectionViewModel: tabCollectionViewModel)
@@ -156,6 +196,7 @@ final class MainViewController: NSViewController {
         updateReloadMenuItem()
         updateStopMenuItem()
         browserTabViewController.windowDidBecomeKey()
+        presentWaitlistThankYouPromptIfNecessary()
 
 #if NETWORK_PROTECTION
         sendActiveNetworkProtectionWaitlistUserPixel()
@@ -417,6 +458,16 @@ final class MainViewController: NSViewController {
     }
 #endif
 
+    func presentWaitlistThankYouPromptIfNecessary() {
+        guard let window = self.view.window else {
+            assertionFailure("Couldn't get main view controller's window")
+            return
+        }
+
+        let presenter = WaitlistThankYouPromptPresenter()
+        presenter.presentThankYouPromptIfNecessary(in: window)
+    }
+
     // MARK: - First responder
 
     func adjustFirstResponder(selectedTabViewModel: TabViewModel? = nil, tabContent: Tab.TabContent? = nil, force: Bool = false) {
@@ -560,7 +611,7 @@ extension MainViewController {
     ]))
     bkman.loadBookmarks()
 
-    let vc = MainViewController(bookmarkManager: bkman)
+    let vc = MainViewController(bookmarkManager: bkman, autofillPopoverPresenter: DefaultAutofillPopoverPresenter())
     var c: AnyCancellable!
     c = vc.publisher(for: \.view.window).sink { window in
         window?.titlebarAppearsTransparent = true
diff --git a/DuckDuckGo/Menus/HistoryMenu.swift b/DuckDuckGo/Menus/HistoryMenu.swift
index aca38c3e10..b99c7a867f 100644
--- a/DuckDuckGo/Menus/HistoryMenu.swift
+++ b/DuckDuckGo/Menus/HistoryMenu.swift
@@ -34,6 +34,7 @@ final class HistoryMenu: NSMenu {
     private let clearAllHistoryMenuItem = NSMenuItem(title: UserText.mainMenuHistoryClearAllHistory,
                                                      action: #selector(MainViewController.clearAllHistory),
                                                      keyEquivalent: [.command, .shift, .backspace])
+        .withAccessibilityIdentifier("HistoryMenu.clearAllHistory")
     private let clearAllHistorySeparator = NSMenuItem.separator()
 
     private let historyCoordinator: HistoryCoordinating
@@ -56,6 +57,7 @@ final class HistoryMenu: NSMenu {
         }
 
         reopenMenuItemKeyEquivalentManager.reopenLastClosedMenuItem = reopenLastClosedMenuItem
+        reopenAllWindowsFromLastSessionMenuItem.setAccessibilityIdentifier("HistoryMenu.reopenAllWindowsFromLastSessionMenuItem")
         reopenMenuItemKeyEquivalentManager.lastSessionMenuItem = reopenAllWindowsFromLastSessionMenuItem
     }
 
@@ -89,8 +91,10 @@ final class HistoryMenu: NSMenu {
         switch RecentlyClosedCoordinator.shared.cache.last {
         case is RecentlyClosedWindow:
             reopenLastClosedMenuItem.title = UserText.reopenLastClosedWindow
+            reopenLastClosedMenuItem.setAccessibilityIdentifier("HistoryMenu.reopenLastClosedWindow")
         default:
             reopenLastClosedMenuItem.title = UserText.reopenLastClosedTab
+            reopenLastClosedMenuItem.setAccessibilityIdentifier("HistoryMenu.reopenLastClosedTab")
         }
 
     }
@@ -106,6 +110,7 @@ final class HistoryMenu: NSMenu {
     var recentlyVisitedHeaderMenuItem: NSMenuItem {
         let item = NSMenuItem(title: UserText.recentlyVisitedMenuSection)
         item.isEnabled = false
+        item.setAccessibilityIdentifier("HistoryMenu.recentlyVisitedHeaderMenuItem")
         return item
     }
 
@@ -113,13 +118,16 @@ final class HistoryMenu: NSMenu {
 
     private func addRecentlyVisited() {
         recentlyVisitedMenuItems = [recentlyVisitedHeaderMenuItem]
-        recentlyVisitedMenuItems.append(contentsOf: historyCoordinator.getRecentVisits(maxCount: 14)
-            .map {
-                VisitMenuItem(visitViewModel: VisitViewModel(visit: $0))
-            }
-        )
-        recentlyVisitedMenuItems.forEach {
-            addItem($0)
+        let recentVisits = historyCoordinator.getRecentVisits(maxCount: 14)
+        for (index, visit) in zip(
+            recentVisits.indices, recentVisits
+        ) {
+            let visitMenuItem = VisitMenuItem(visitViewModel: VisitViewModel(visit: visit))
+            visitMenuItem.setAccessibilityIdentifier("HistoryMenu.recentlyVisitedMenuItem.\(index)")
+            recentlyVisitedMenuItems.append(visitMenuItem)
+        }
+        for recentlyVisitedMenuItem in recentlyVisitedMenuItems {
+            addItem(recentlyVisitedMenuItem)
         }
     }
 
@@ -189,9 +197,18 @@ final class HistoryMenu: NSMenu {
     }
 
     private func makeMenuItems(from grouping: HistoryGrouping) -> [NSMenuItem] {
-        return grouping.visits.map { visit in
-            VisitMenuItem(visitViewModel: VisitViewModel(visit: visit))
+        let date = grouping.date
+        let isToday = NSCalendar.current.isDateInToday(date)
+        let visits = grouping.visits
+        var menuItems = [NSMenuItem]()
+        for (index, visit) in zip(
+            visits.indices, visits
+        ) {
+            let menuItem = VisitMenuItem(visitViewModel: VisitViewModel(visit: visit))
+            menuItem.setAccessibilityIdentifier("HistoryMenu.historyMenuItem.\(isToday ? "Today" : "\(date)").\(index)")
+            menuItems.append(menuItem)
         }
+        return menuItems
     }
 
     private func makeTitle(for grouping: HistoryGrouping) -> (String, String) {
diff --git a/DuckDuckGo/Menus/MainMenu.swift b/DuckDuckGo/Menus/MainMenu.swift
index da7c0d9984..15e6e5b723 100644
--- a/DuckDuckGo/Menus/MainMenu.swift
+++ b/DuckDuckGo/Menus/MainMenu.swift
@@ -43,7 +43,7 @@ import SubscriptionUI
 
     // MARK: DuckDuckGo
     let servicesMenu = NSMenu(title: UserText.mainMenuAppServices)
-    let preferencesMenuItem = NSMenuItem(title: UserText.mainMenuAppPreferences, action: #selector(AppDelegate.openPreferences), keyEquivalent: ",")
+    let preferencesMenuItem = NSMenuItem(title: UserText.mainMenuAppPreferences, action: #selector(AppDelegate.openPreferences), keyEquivalent: ",").withAccessibilityIdentifier("MainMenu.preferencesMenuItem")
 
     // MARK: File
     let newWindowMenuItem = NSMenuItem(title: UserText.newWindowMenuItem, action: #selector(AppDelegate.newWindow), keyEquivalent: "n")
@@ -207,12 +207,12 @@ import SubscriptionUI
             NSMenuItem.separator()
 
             NSMenuItem(title: UserText.mainMenuEditFind) {
-                NSMenuItem(title: UserText.findInPageMenuItem, action: #selector(MainViewController.findInPage), keyEquivalent: "f")
-                NSMenuItem(title: UserText.mainMenuEditFindFindNext, action: #selector(MainViewController.findInPageNext), keyEquivalent: "g")
-                NSMenuItem(title: UserText.mainMenuEditFindFindPrevious, action: #selector(MainViewController.findInPagePrevious), keyEquivalent: "G")
+                NSMenuItem(title: UserText.findInPageMenuItem, action: #selector(MainViewController.findInPage), keyEquivalent: "f").withAccessibilityIdentifier("MainMenu.findInPage")
+                NSMenuItem(title: UserText.mainMenuEditFindFindNext, action: #selector(MainViewController.findInPageNext), keyEquivalent: "g").withAccessibilityIdentifier("MainMenu.findNext")
+                NSMenuItem(title: UserText.mainMenuEditFindFindPrevious, action: #selector(MainViewController.findInPagePrevious), keyEquivalent: "G").withAccessibilityIdentifier("MainMenu.findPrevious")
                 NSMenuItem.separator()
 
-                NSMenuItem(title: UserText.mainMenuEditFindHideFind, action: #selector(MainViewController.findInPageDone), keyEquivalent: "F")
+                NSMenuItem(title: UserText.mainMenuEditFindHideFind, action: #selector(MainViewController.findInPageDone), keyEquivalent: "F").withAccessibilityIdentifier("MainMenu.findInPageDone")
             }
 
             NSMenuItem(title: UserText.mainMenuEditSpellingandGrammar) {
@@ -544,18 +544,20 @@ import SubscriptionUI
     }
 
     private func updateShortcutMenuItems() {
-        toggleAutofillShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .autofill)
-        toggleBookmarksShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .bookmarks)
-        toggleDownloadsShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .downloads)
+        Task { @MainActor in
+            toggleAutofillShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .autofill)
+            toggleBookmarksShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .bookmarks)
+            toggleDownloadsShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .downloads)
 
 #if NETWORK_PROTECTION
-        if NetworkProtectionKeychainTokenStore().isFeatureActivated {
-            toggleNetworkProtectionShortcutMenuItem.isHidden = false
-            toggleNetworkProtectionShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .networkProtection)
-        } else {
-            toggleNetworkProtectionShortcutMenuItem.isHidden = true
-        }
+            if await DefaultNetworkProtectionVisibility().isVPNVisible() {
+                toggleNetworkProtectionShortcutMenuItem.isHidden = false
+                toggleNetworkProtectionShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .networkProtection)
+            } else {
+                toggleNetworkProtectionShortcutMenuItem.isHidden = true
+            }
 #endif
+        }
     }
 
     // MARK: - Debug
@@ -570,24 +572,30 @@ import SubscriptionUI
             NSMenuItem(title: "Reset Data") {
                 NSMenuItem(title: "Reset Default Browser Prompt", action: #selector(MainViewController.resetDefaultBrowserPrompt))
                 NSMenuItem(title: "Reset Default Grammar Checks", action: #selector(MainViewController.resetDefaultGrammarChecks))
-                NSMenuItem(title: "Reset Autofill Data", action: #selector(MainViewController.resetSecureVaultData))
-                NSMenuItem(title: "Reset Bookmarks", action: #selector(MainViewController.resetBookmarks))
+                NSMenuItem(title: "Reset Autofill Data", action: #selector(MainViewController.resetSecureVaultData)).withAccessibilityIdentifier("MainMenu.resetSecureVaultData")
+                NSMenuItem(title: "Reset Bookmarks", action: #selector(MainViewController.resetBookmarks)).withAccessibilityIdentifier("MainMenu.resetBookmarks")
                 NSMenuItem(title: "Reset Pinned Tabs", action: #selector(MainViewController.resetPinnedTabs))
                 NSMenuItem(title: "Reset YouTube Overlay Interactions", action: #selector(MainViewController.resetDuckPlayerOverlayInteractions))
                 NSMenuItem(title: "Reset MakeDuckDuckYours user settings", action: #selector(MainViewController.resetMakeDuckDuckGoYoursUserSettings))
+                NSMenuItem(title: "Survey 10% on", action: #selector(MainViewController.in10PercentSurveyOn))
+                NSMenuItem(title: "Survey 10% off", action: #selector(MainViewController.in10PercentSurveyOff))
                 NSMenuItem(title: "Change Activation Date") {
                     NSMenuItem(title: "Today", action: #selector(MainViewController.changeInstallDateToToday), keyEquivalent: "N")
-                    NSMenuItem(title: "Less Than a 21 days Ago", action: #selector(MainViewController.changeInstallDateToLessThan21DaysAgo))
-                    NSMenuItem(title: "More Than 21 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan21DaysAgoButLessThan27))
-                    NSMenuItem(title: "More Than 27 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan27DaysAgo))
+                    NSMenuItem(title: "Less Than a 1 days Ago", action: #selector(MainViewController.changeInstallDateToLessThan1DayAgo(_:)))
+                    NSMenuItem(title: "More Than 1 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan1DayAgoButLessThan14(_:)))
+                    NSMenuItem(title: "More Than 14 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan14DaysAgoButLessThan15(_:)))
+                    NSMenuItem(title: "More Than 15 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan15DaysAgo(_:)))
                 }
                 NSMenuItem(title: "Reset Email Protection InContext Signup Prompt", action: #selector(MainViewController.resetEmailProtectionInContextPrompt))
                 NSMenuItem(title: "Reset Daily Pixels", action: #selector(MainViewController.resetDailyPixels))
-            }
+            }.withAccessibilityIdentifier("MainMenu.resetData")
             NSMenuItem(title: "UI Triggers") {
                 NSMenuItem(title: "Show Save Credentials Popover", action: #selector(MainViewController.showSaveCredentialsPopover))
                 NSMenuItem(title: "Show Credentials Saved Popover", action: #selector(MainViewController.showCredentialsSavedPopover))
                 NSMenuItem(title: "Show Pop Up Window", action: #selector(MainViewController.showPopUpWindow))
+                NSMenuItem(title: "Show VPN Thank You Modal", action: #selector(MainViewController.showVPNThankYouModal))
+                NSMenuItem(title: "Show PIR Thank You Modal", action: #selector(MainViewController.showPIRThankYouModal))
+                NSMenuItem(title: "Reset Thank You Modal Checks", action: #selector(MainViewController.resetThankYouModalChecks))
             }
             NSMenuItem(title: "Remote Configuration") {
                 customConfigurationUrlMenuItem
@@ -609,8 +617,10 @@ import SubscriptionUI
 #endif
 
 #if NETWORK_PROTECTION
-            NSMenuItem(title: "Network Protection")
-                .submenu(NetworkProtectionDebugMenu())
+            if case .normal = NSApp.runType {
+                NSMenuItem(title: "VPN")
+                    .submenu(NetworkProtectionDebugMenu())
+            }
 #endif
 
             NSMenuItem(title: "Trigger Fatal Error", action: #selector(MainViewController.triggerFatalError))
@@ -619,16 +629,21 @@ import SubscriptionUI
             let currentEnvironmentWrapper = UserDefaultsWrapper(key: .subscriptionEnvironment, defaultValue: SubscriptionPurchaseEnvironment.ServiceEnvironment.default)
             let isInternalTestingWrapper = UserDefaultsWrapper(key: .subscriptionInternalTesting, defaultValue: false)
 
-            SubscriptionDebugMenu(currentEnvironment: { currentEnvironmentWrapper.wrappedValue.rawValue },
-                                  updateEnvironment: {
-                guard let newEnvironment = SubscriptionPurchaseEnvironment.ServiceEnvironment(rawValue: $0) else { return }
-                currentEnvironmentWrapper.wrappedValue = newEnvironment
-                SubscriptionPurchaseEnvironment.currentServiceEnvironment = newEnvironment },
-                                  isInternalTestingEnabled: { isInternalTestingWrapper.wrappedValue },
-                                  updateInternalTestingFlag: { isInternalTestingWrapper.wrappedValue = $0 },
-                                  currentViewController: {
-                WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController
-            }, subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+            SubscriptionDebugMenu(
+                currentEnvironment: { currentEnvironmentWrapper.wrappedValue.rawValue },
+                updateEnvironment: {
+                    guard let newEnvironment = SubscriptionPurchaseEnvironment.ServiceEnvironment(rawValue: $0) else { return }
+                    currentEnvironmentWrapper.wrappedValue = newEnvironment
+                    SubscriptionPurchaseEnvironment.currentServiceEnvironment = newEnvironment
+                    VPNSettings(defaults: .netP).selectedEnvironment = newEnvironment == .staging ? .staging : .production
+                },
+                isInternalTestingEnabled: { isInternalTestingWrapper.wrappedValue },
+                updateInternalTestingFlag: { isInternalTestingWrapper.wrappedValue = $0 },
+                currentViewController: {
+                    WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController
+            },
+                subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)
+            )
 #endif
 
             NSMenuItem(title: "Logging").submenu(setupLoggingMenu())
diff --git a/DuckDuckGo/Menus/MainMenuActions.swift b/DuckDuckGo/Menus/MainMenuActions.swift
index 2f4c286472..fc0b5c9dc2 100644
--- a/DuckDuckGo/Menus/MainMenuActions.swift
+++ b/DuckDuckGo/Menus/MainMenuActions.swift
@@ -22,6 +22,8 @@ import Common
 import WebKit
 import Configuration
 import History
+import PixelKit
+import Subscription
 
 // Actions are sent to objects of responder chain
 
@@ -708,7 +710,7 @@ extension MainViewController {
         UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowDuckPlayer.rawValue)
         UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowEmailProtection.rawValue)
         UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowSurveyDay0.rawValue)
-        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowSurveyDay7.rawValue)
+        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowSurveyDay14.rawValue)
         UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
     }
 
@@ -716,28 +718,64 @@ extension MainViewController {
         guard let internalUserDecider = NSApp.delegateTyped.internalUserDecider as? DefaultInternalUserDecider else { return }
         let state = internalUserDecider.isInternalUser
         internalUserDecider.debugSetInternalUserState(!state)
+
+        if !DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
+            // We only clear PPro state when it's not available, as otherwise
+            // there should be no state to clear.  Clearing PPro state can
+            // trigger notifications which we want to avoid unless
+            // necessary.
+            clearPrivacyProState()
+        }
+    }
+
+    /// Clears the PrivacyPro state to make testing easier.
+    ///
+    private func clearPrivacyProState() {
+        AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).signOut()
+        resetThankYouModalChecks(nil)
+        UserDefaults.netP.networkProtectionEntitlementsExpired = false
+
+        // Clear pixel data
+        DailyPixel.clearLastFireDate(pixel: .privacyProFeatureEnabled)
+        Pixel.shared?.clearRepetitions(for: .privacyProBetaUserThankYouDBP)
+        Pixel.shared?.clearRepetitions(for: .privacyProBetaUserThankYouVPN)
     }
 
     @objc func resetDailyPixels(_ sender: Any?) {
         UserDefaults.standard.removePersistentDomain(forName: DailyPixel.Constant.dailyPixelStorageIdentifier)
     }
 
+    @objc func in10PercentSurveyOn(_ sender: Any?) {
+        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay14in10Percent.rawValue)
+        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay0in10Percent.rawValue)
+    }
+
+    @objc func in10PercentSurveyOff(_ sender: Any?) {
+        UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay14in10Percent.rawValue)
+        UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay0in10Percent.rawValue)
+    }
+
     @objc func changeInstallDateToToday(_ sender: Any?) {
         UserDefaults.standard.set(Date(), forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
-    @objc func changeInstallDateToLessThan21DaysAgo(_ sender: Any?) {
-        let lessThanTwentyOneDaysAgo = Calendar.current.date(byAdding: .day, value: -20, to: Date())
-        UserDefaults.standard.set(lessThanTwentyOneDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+    @objc func changeInstallDateToLessThan1DayAgo(_ sender: Any?) {
+        let lessThanOneDaysAgo = Calendar.current.date(byAdding: .hour, value: -23, to: Date())
+        UserDefaults.standard.set(lessThanOneDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+    }
+
+    @objc func changeInstallDateToMoreThan1DayAgoButLessThan14(_ sender: Any?) {
+        let between1And4DaysAgo = Calendar.current.date(byAdding: .day, value: -13, to: Date())
+        UserDefaults.standard.set(between1And4DaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
-    @objc func changeInstallDateToMoreThan21DaysAgoButLessThan27(_ sender: Any?) {
-        let twentyOneDaysAgo = Calendar.current.date(byAdding: .day, value: -21, to: Date())
-        UserDefaults.standard.set(twentyOneDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+    @objc func changeInstallDateToMoreThan14DaysAgoButLessThan15(_ sender: Any?) {
+        let twentyEightDaysAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())
+        UserDefaults.standard.set(twentyEightDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
-    @objc func changeInstallDateToMoreThan27DaysAgo(_ sender: Any?) {
-        let twentyEightDaysAgo = Calendar.current.date(byAdding: .day, value: -28, to: Date())
+    @objc func changeInstallDateToMoreThan15DaysAgo(_ sender: Any?) {
+        let twentyEightDaysAgo = Calendar.current.date(byAdding: .day, value: -16, to: Date())
         UserDefaults.standard.set(twentyEightDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
@@ -764,6 +802,28 @@ extension MainViewController {
         WindowsManager.openPopUpWindow(with: tab, origin: nil, contentSize: nil)
     }
 
+    @objc func resetThankYouModalChecks(_ sender: Any?) {
+        let presenter = WaitlistThankYouPromptPresenter()
+        presenter.resetPromptCheck()
+        UserDefaults.netP.removeObject(forKey: UserDefaults.vpnLegacyUserAccessDisabledOnceKey)
+    }
+
+    @objc func showVPNThankYouModal(_ sender: Any?) {
+        let thankYouModalView = WaitlistBetaThankYouDialogViewController(copy: .vpn)
+        let thankYouWindowController = thankYouModalView.wrappedInWindowController()
+        if let thankYouWindow = thankYouWindowController.window {
+            WindowsManager.windows.first?.beginSheet(thankYouWindow)
+        }
+    }
+
+    @objc func showPIRThankYouModal(_ sender: Any?) {
+        let thankYouModalView = WaitlistBetaThankYouDialogViewController(copy: .dbp)
+        let thankYouWindowController = thankYouModalView.wrappedInWindowController()
+        if let thankYouWindow = thankYouWindowController.window {
+            WindowsManager.windows.first?.beginSheet(thankYouWindow)
+        }
+    }
+
     @objc func resetEmailProtectionInContextPrompt(_ sender: Any?) {
         EmailManager().resetEmailProtectionInContextPrompt()
     }
@@ -844,6 +904,9 @@ extension MainViewController: NSMenuItemValidation {
     // swiftlint:disable cyclomatic_complexity
     // swiftlint:disable function_body_length
     func validateMenuItem(_ menuItem: NSMenuItem) -> Bool {
+        guard fireViewController.fireViewModel.fire.burningData == nil else {
+            return true
+        }
         switch menuItem.action {
         // Back/Forward
         case #selector(MainViewController.back(_:)):
diff --git a/DuckDuckGo/NavigationBar/PinningManager.swift b/DuckDuckGo/NavigationBar/PinningManager.swift
index 64d29c104e..d2cc6ef6bb 100644
--- a/DuckDuckGo/NavigationBar/PinningManager.swift
+++ b/DuckDuckGo/NavigationBar/PinningManager.swift
@@ -104,6 +104,7 @@ final class LocalPinningManager: PinningManager {
             return
         }
 
+        manuallyToggledPinnedViewsStrings.removeAll(where: { $0 == view.rawValue })
         pinnedViewStrings.removeAll(where: { $0 == view.rawValue })
 
         NotificationCenter.default.post(name: .PinnedViewsChanged, object: nil, userInfo: [
@@ -133,7 +134,7 @@ final class LocalPinningManager: PinningManager {
     /// This method is useful for knowing if the view was manually toggled.
     /// It's particularly useful for initializing a pin to a certain value at a certain point during the execution of code,
     /// only if the user hasn't explicitly specified a desired state.
-    /// As an example: this is used in Network Protection for pinning the icon to the navigation bar the first time the
+    /// As an example: this is used in the VPN for pinning the icon to the navigation bar the first time the
     /// feature is enabled.
     ///
     func wasManuallyToggled(_ view: PinnableView) -> Bool {
diff --git a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
index c834cdd58e..84fbb30576 100644
--- a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
+++ b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
@@ -20,7 +20,8 @@ import AppKit
 import Carbon.HIToolbox
 import Combine
 import Common
-import BrowserServicesKit
+import Suggestions
+import Subscription
 
 final class AddressBarTextField: NSTextField {
 
@@ -57,6 +58,8 @@ final class AddressBarTextField: NSTextField {
     private var addressBarStringCancellable: AnyCancellable?
     private var contentTypeCancellable: AnyCancellable?
 
+    private let searchPreferences: SearchPreferences = SearchPreferences.shared
+
     private enum TextDidChangeEventType {
         case none
         case userAppendingTextToTheEnd
@@ -345,7 +348,7 @@ final class AddressBarTextField: NSTextField {
 #endif
 
 #if SUBSCRIPTION
-        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable() {
+        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
             if providedUrl.isChild(of: URL.subscriptionBaseURL) || providedUrl.isChild(of: URL.identityTheftRestoration) {
                 self.updateValue(selectedTabViewModel: nil, addressBarString: nil) // reset
                 self.window?.makeFirstResponder(nil)
@@ -624,9 +627,9 @@ final class AddressBarTextField: NSTextField {
     }
 
     @objc func toggleAutocomplete(_ menuItem: NSMenuItem) {
-        AppearancePreferences.shared.showAutocompleteSuggestions.toggle()
+        searchPreferences.showAutocompleteSuggestions.toggle()
 
-        let shouldShowAutocomplete = AppearancePreferences.shared.showAutocompleteSuggestions
+        let shouldShowAutocomplete = searchPreferences.showAutocompleteSuggestions
 
         menuItem.state = shouldShowAutocomplete ? .on : .off
 
@@ -1084,7 +1087,7 @@ private extension NSMenuItem {
             action: #selector(AddressBarTextField.toggleAutocomplete(_:)),
             keyEquivalent: ""
         )
-        menuItem.state = AppearancePreferences.shared.showAutocompleteSuggestions ? .on : .off
+        menuItem.state = SearchPreferences.shared.showAutocompleteSuggestions ? .on : .off
 
         return menuItem
     }
diff --git a/DuckDuckGo/NavigationBar/View/AddressBarViewController.swift b/DuckDuckGo/NavigationBar/View/AddressBarViewController.swift
index 4caad386b5..256138f56e 100644
--- a/DuckDuckGo/NavigationBar/View/AddressBarViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/AddressBarViewController.swift
@@ -99,6 +99,7 @@ final class AddressBarViewController: NSViewController {
         view.layer?.masksToBounds = false
 
         addressBarTextField.placeholderString = UserText.addressBarPlaceholder
+        addressBarTextField.setAccessibilityIdentifier("AddressBarViewController.addressBarTextField")
 
         updateView()
         // only activate active text field leading constraint on its appearance to avoid constraint conflicts
diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
index 28c9122766..4598e190e4 100644
--- a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
+++ b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -62,6 +62,7 @@ final class MoreOptionsMenu: NSMenu {
     private let passwordManagerCoordinator: PasswordManagerCoordinating
     private let internalUserDecider: InternalUserDecider
     private lazy var sharingMenu: NSMenu = SharingMenu(title: UserText.shareMenuItem)
+    private lazy var accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
 
 #if NETWORK_PROTECTION
     private let networkProtectionFeatureVisibility: NetworkProtectionFeatureVisibility
@@ -164,15 +165,11 @@ final class MoreOptionsMenu: NSMenu {
 
 #if DBP
     @objc func openDataBrokerProtection(_ sender: NSMenuItem) {
-        #if SUBSCRIPTION
-        actionDelegate?.optionsButtonMenuRequestedDataBrokerProtection(self)
-        #else
         if !DefaultDataBrokerProtectionFeatureVisibility.bypassWaitlist && DataBrokerProtectionWaitlistViewControllerPresenter.shouldPresentWaitlist() {
             DataBrokerProtectionWaitlistViewControllerPresenter.show()
         } else {
             actionDelegate?.optionsButtonMenuRequestedDataBrokerProtection(self)
         }
-        #endif
     }
 #endif // DBP
 
@@ -255,7 +252,6 @@ final class MoreOptionsMenu: NSMenu {
 
 #if SUBSCRIPTION
     @objc func openSubscriptionPurchasePage(_ sender: NSMenuItem) {
-        Pixel.fire(.privacyProOfferScreenImpression)
         actionDelegate?.optionsButtonMenuRequestedSubscriptionPurchasePage(self)
     }
 
@@ -322,7 +318,7 @@ final class MoreOptionsMenu: NSMenu {
         var items: [NSMenuItem] = []
 
 #if SUBSCRIPTION
-        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable() && !AccountManager().isUserAuthenticated {
+        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable && !accountManager.isUserAuthenticated {
             items.append(contentsOf: makeInactiveSubscriptionItems())
         } else {
             items.append(contentsOf: makeActiveSubscriptionItems()) // this adds NETP and DBP only if conditionally enabled
@@ -341,29 +337,23 @@ final class MoreOptionsMenu: NSMenu {
     private func makeActiveSubscriptionItems() -> [NSMenuItem] {
         var items: [NSMenuItem] = []
 
-#if NETWORK_PROTECTION
-        if networkProtectionFeatureVisibility.isNetworkProtectionVisible() {
-            let isWaitlistUser = NetworkProtectionWaitlist().waitlistStorage.isWaitlistUser
-            let hasAuthToken = NetworkProtectionKeychainTokenStore().isFeatureActivated
+#if SUBSCRIPTION
+        let subscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability()
+#endif
 
+#if NETWORK_PROTECTION
+        if networkProtectionFeatureVisibility.isNetworkProtectionBetaVisible() {
             let networkProtectionItem: NSMenuItem
 
-            // If the user can see the Network Protection option but they haven't joined the waitlist or don't have an auth token, show the "New"
-            // badge to bring it to their attention.
-            if !isWaitlistUser && !hasAuthToken {
-                networkProtectionItem = makeNetworkProtectionItem(showNewLabel: true)
-            } else {
-                networkProtectionItem = makeNetworkProtectionItem(showNewLabel: false)
-            }
+            networkProtectionItem = makeNetworkProtectionItem()
 
             items.append(networkProtectionItem)
-
 #if SUBSCRIPTION
-            if DefaultSubscriptionFeatureAvailability().isFeatureAvailable() && AccountManager().isUserAuthenticated {
+            if subscriptionFeatureAvailability.isFeatureAvailable && accountManager.isUserAuthenticated {
                 Task {
                     let isMenuItemEnabled: Bool
 
-                    switch await AccountManager().hasEntitlement(for: .networkProtection) {
+                    switch await accountManager.hasEntitlement(for: .networkProtection) {
                     case let .success(result):
                         isMenuItemEnabled = result
                     case .failure:
@@ -382,7 +372,8 @@ final class MoreOptionsMenu: NSMenu {
 #endif // NETWORK_PROTECTION
 
 #if DBP
-        if DefaultDataBrokerProtectionFeatureVisibility().isFeatureVisible() {
+        let dbpVisibility = DefaultDataBrokerProtectionFeatureVisibility()
+        if dbpVisibility.isFeatureVisible() || dbpVisibility.isPrivacyProEnabled() {
             let dataBrokerProtectionItem = NSMenuItem(title: UserText.dataBrokerProtectionOptionsMenuItem,
                                                       action: #selector(openDataBrokerProtection),
                                                       keyEquivalent: "")
@@ -391,11 +382,11 @@ final class MoreOptionsMenu: NSMenu {
             items.append(dataBrokerProtectionItem)
 
 #if SUBSCRIPTION
-            if DefaultSubscriptionFeatureAvailability().isFeatureAvailable() && AccountManager().isUserAuthenticated  {
+            if subscriptionFeatureAvailability.isFeatureAvailable && accountManager.isUserAuthenticated  {
                 Task {
                     let isMenuItemEnabled: Bool
 
-                    switch await AccountManager().hasEntitlement(for: .dataBrokerProtection) {
+                    switch await accountManager.hasEntitlement(for: .dataBrokerProtection) {
                     case let .success(result):
                         isMenuItemEnabled = result
                     case .failure:
@@ -415,7 +406,7 @@ final class MoreOptionsMenu: NSMenu {
 #endif // DBP
 
 #if SUBSCRIPTION
-        if AccountManager().isUserAuthenticated {
+        if accountManager.isUserAuthenticated {
             let identityTheftRestorationItem = NSMenuItem(title: UserText.identityTheftRestorationOptionsMenuItem,
                                                           action: #selector(openIdentityTheftRestoration),
                                                           keyEquivalent: "")
@@ -423,11 +414,11 @@ final class MoreOptionsMenu: NSMenu {
                 .withImage(.itrIcon)
             items.append(identityTheftRestorationItem)
 
-            if DefaultSubscriptionFeatureAvailability().isFeatureAvailable() && AccountManager().isUserAuthenticated  {
+            if subscriptionFeatureAvailability.isFeatureAvailable && accountManager.isUserAuthenticated  {
                 Task {
                     let isMenuItemEnabled: Bool
 
-                    switch await AccountManager().hasEntitlement(for: .identityTheftRestoration) {
+                    switch await accountManager.hasEntitlement(for: .identityTheftRestoration) {
                     case let .success(result):
                         isMenuItemEnabled = result
                     case .failure:
@@ -445,11 +436,10 @@ final class MoreOptionsMenu: NSMenu {
 
 #if SUBSCRIPTION
     private func makeInactiveSubscriptionItems() -> [NSMenuItem] {
-        let dataBrokerProtectionItem = NSMenuItem(title: UserText.dataBrokerProtectionScanOptionsMenuItem,
-                                                  action: #selector(openSubscriptionPurchasePage(_:)),
-                                                  keyEquivalent: "")
-            .targetting(self)
-            .withImage(.dbpIcon)
+        let shouldHidePrivacyProDueToNoProducts = SubscriptionPurchaseEnvironment.current == .appStore && SubscriptionPurchaseEnvironment.canPurchase == false
+        if shouldHidePrivacyProDueToNoProducts {
+            return []
+        }
 
         let privacyProItem = NSMenuItem(title: UserText.subscriptionOptionsMenuItem,
                                         action: #selector(openSubscriptionPurchasePage(_:)),
@@ -457,7 +447,7 @@ final class MoreOptionsMenu: NSMenu {
             .targetting(self)
             .withImage(.subscriptionIcon)
 
-        return [dataBrokerProtectionItem, privacyProItem]
+        return [privacyProItem]
     }
 #endif
 
@@ -479,6 +469,7 @@ final class MoreOptionsMenu: NSMenu {
         addItem(withTitle: UserText.findInPageMenuItem, action: #selector(findInPage(_:)), keyEquivalent: "f")
             .targetting(self)
             .withImage(.findSearch)
+            .withAccessibilityIdentifier("MoreOptionsMenu.findInPage")
 
         addItem(withTitle: UserText.shareMenuItem, action: nil, keyEquivalent: "")
             .targetting(self)
@@ -494,25 +485,12 @@ final class MoreOptionsMenu: NSMenu {
     }
 
 #if NETWORK_PROTECTION
-    private func makeNetworkProtectionItem(showNewLabel: Bool) -> NSMenuItem {
+    private func makeNetworkProtectionItem() -> NSMenuItem {
         let networkProtectionItem = NSMenuItem(title: "", action: #selector(showNetworkProtectionStatus(_:)), keyEquivalent: "")
             .targetting(self)
             .withImage(.image(for: .vpnIcon))
 
-        if showNewLabel {
-            let attributedText = NSMutableAttributedString(string: UserText.networkProtection)
-            attributedText.append(NSAttributedString(string: "  "))
-
-            let imageAttachment = NSTextAttachment()
-            imageAttachment.image = .newLabel
-            imageAttachment.setImageHeight(height: 16, offset: .init(x: 0, y: -4))
-
-            attributedText.append(NSAttributedString(attachment: imageAttachment))
-
-            networkProtectionItem.attributedTitle = attributedText
-        } else {
-            networkProtectionItem.title = UserText.networkProtection
-        }
+        networkProtectionItem.title = UserText.networkProtection
 
         return networkProtectionItem
     }
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
index fe6b3f27ca..357dbe0d25 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
+++ b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
@@ -252,7 +252,7 @@
                                             <action selector="bookmarksButtonAction:" target="o2v-eH-jTI" id="feR-3s-kbn"/>
                                         </connections>
                                     </button>
-                                    <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iKf-yR-au9" userLabel="Network Protection Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
+                                    <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iKf-yR-au9" userLabel="VPN Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="28" height="28"/>
                                         <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="sRc-lQ-ndi">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
index 0d0f567b5c..b8607c8f85 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
@@ -27,7 +27,30 @@ import NetworkProtectionUI
 import NetworkProtectionIPC
 #endif
 
-final class NavigationBarPopovers {
+protocol PopoverPresenter {
+    func show(_ popover: NSPopover, positionedBelow view: NSView)
+}
+
+#if NETWORK_PROTECTION
+protocol NetPPopoverManager: AnyObject {
+    var ipcClient: NetworkProtectionIPCClient { get }
+    var isShown: Bool { get }
+
+    func show(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate)
+    func close()
+
+    func toggle(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate)
+}
+#endif
+
+extension PopoverPresenter {
+    func show(_ popover: NSPopover, positionedBelow view: NSView) {
+        view.isHidden = false
+        popover.show(positionedBelow: view.bounds.insetFromLineOfDeath(flipped: view.isFlipped), in: view)
+    }
+}
+
+final class NavigationBarPopovers: PopoverPresenter {
 
     enum Constants {
         static let downloadsPopoverAutoHidingInterval: TimeInterval = 10
@@ -37,20 +60,26 @@ final class NavigationBarPopovers {
     private(set) var saveCredentialsPopover: SaveCredentialsPopover?
     private(set) var saveIdentityPopover: SaveIdentityPopover?
     private(set) var savePaymentMethodPopover: SavePaymentMethodPopover?
-    private(set) var passwordManagementPopover: PasswordManagementPopover?
+    private(set) var autofillPopoverPresenter: AutofillPopoverPresenter
     private(set) var downloadsPopover: DownloadsPopover?
 
 #if NETWORK_PROTECTION
-    private let networkProtectionPopoverManager: NetworkProtectionNavBarPopoverManager
+    private let networkProtectionPopoverManager: NetPPopoverManager
 
-    init(networkProtectionPopoverManager: NetworkProtectionNavBarPopoverManager) {
+    init(networkProtectionPopoverManager: NetPPopoverManager, autofillPopoverPresenter: AutofillPopoverPresenter) {
         self.networkProtectionPopoverManager = networkProtectionPopoverManager
+        self.autofillPopoverPresenter = autofillPopoverPresenter
+    }
+
+#else
+    init(passwordPopoverPresenter: PasswordPopoverPresenter) {
+        self.passwordPopoverPresenter = passwordPopoverPresenter
     }
 #endif
 
     var passwordManagementDomain: String? {
         didSet {
-            passwordManagementPopover?.viewController.domain = passwordManagementDomain
+            autofillPopoverPresenter.passwordDomain = passwordManagementDomain
         }
     }
 
@@ -63,11 +92,11 @@ final class NavigationBarPopovers {
     }
 
     var isPasswordManagementDirty: Bool {
-        passwordManagementPopover?.viewController.isDirty ?? false
+        autofillPopoverPresenter.popoverIsDirty
     }
 
     var isPasswordManagementPopoverShown: Bool {
-        passwordManagementPopover?.isShown ?? false
+        autofillPopoverPresenter.popoverIsShown
     }
 
     @MainActor
@@ -92,8 +121,8 @@ final class NavigationBarPopovers {
     }
 
     func passwordManagementButtonPressed(usingView view: NSView, withDelegate delegate: NSPopoverDelegate) {
-        if passwordManagementPopover?.isShown == true {
-            passwordManagementPopover?.close()
+        if autofillPopoverPresenter.popoverIsShown == true && view.window == autofillPopoverPresenter.popoverPresentingWindow  {
+            autofillPopoverPresenter.dismiss()
         } else {
             showPasswordManagementPopover(selectedCategory: nil, usingView: view, withDelegate: delegate)
         }
@@ -152,8 +181,8 @@ final class NavigationBarPopovers {
             bookmarkListPopover?.close()
         }
 
-        if passwordManagementPopover?.isShown ?? false {
-            passwordManagementPopover?.close()
+        if autofillPopoverPresenter.popoverIsShown {
+            autofillPopoverPresenter.dismiss()
         }
 
         if downloadsPopover?.isShown ?? false {
@@ -187,20 +216,11 @@ final class NavigationBarPopovers {
     func showPasswordManagementPopover(selectedCategory: SecureVaultSorting.Category?, usingView view: NSView, withDelegate delegate: NSPopoverDelegate) {
         guard closeTransientPopovers() else { return }
 
-        let popover = passwordManagementPopover ?? PasswordManagementPopover()
-        passwordManagementPopover = popover
-        popover.viewController.domain = passwordManagementDomain
-        popover.delegate = delegate
-        show(popover, positionedBelow: view)
-        popover.select(category: selectedCategory)
+        autofillPopoverPresenter.show(positionedBelow: view, withDomain: passwordManagementDomain, selectedCategory: selectedCategory)
     }
 
     func showPasswordManagerPopover(selectedWebsiteAccount: SecureVaultModels.WebsiteAccount, usingView view: NSView, withDelegate delegate: NSPopoverDelegate) {
-        let popover = passwordManagementPopover ?? PasswordManagementPopover()
-        passwordManagementPopover = popover
-        popover.delegate = delegate
-        show(popover, positionedBelow: view)
-        popover.select(websiteAccount: selectedWebsiteAccount)
+        autofillPopoverPresenter.show(positionedBelow: view, withSelectedAccount: selectedWebsiteAccount)
     }
 
     func hasAnySavePopoversVisible() -> Bool {
@@ -236,10 +256,6 @@ final class NavigationBarPopovers {
         bookmarkListPopover = nil
     }
 
-    func passwordManagementPopoverClosed() {
-        passwordManagementPopover = nil
-    }
-
     func saveIdentityPopoverClosed() {
         saveIdentityPopover = nil
     }
@@ -273,13 +289,13 @@ final class NavigationBarPopovers {
         show(popover, positionedBelow: view)
     }
 
-    private func show(_ popover: NSPopover, positionedBelow view: NSView) {
+    func show(_ popover: NSPopover, positionedBelow view: NSView) {
         view.isHidden = false
 
         popover.show(positionedBelow: view.bounds.insetFromLineOfDeath(flipped: view.isFlipped), in: view)
     }
 
-    // MARK: - Network Protection
+    // MARK: - VPN
 
 #if NETWORK_PROTECTION
     func showNetworkProtectionPopover(
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
index 5af04c4065..2148a66473 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -113,23 +113,22 @@ final class NavigationBarViewController: NSViewController {
 #endif
 
 #if NETWORK_PROTECTION
-    static func create(tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, networkProtectionFeatureActivation: NetworkProtectionFeatureActivation = NetworkProtectionKeychainTokenStore(), downloadListCoordinator: DownloadListCoordinator = .shared) -> NavigationBarViewController {
+    static func create(tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool,
+                       networkProtectionFeatureActivation: NetworkProtectionFeatureActivation = NetworkProtectionKeychainTokenStore(),
+                       downloadListCoordinator: DownloadListCoordinator = .shared,
+                       networkProtectionPopoverManager: NetPPopoverManager,
+                       networkProtectionStatusReporter: NetworkProtectionStatusReporter,
+                       autofillPopoverPresenter: AutofillPopoverPresenter) -> NavigationBarViewController {
         NSStoryboard(name: "NavigationBar", bundle: nil).instantiateInitialController { coder in
-            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, networkProtectionFeatureActivation: networkProtectionFeatureActivation, downloadListCoordinator: downloadListCoordinator)
+            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, networkProtectionFeatureActivation: networkProtectionFeatureActivation, downloadListCoordinator: downloadListCoordinator, networkProtectionPopoverManager: networkProtectionPopoverManager, networkProtectionStatusReporter: networkProtectionStatusReporter, autofillPopoverPresenter: autofillPopoverPresenter)
         }!
     }
 
-    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, networkProtectionFeatureActivation: NetworkProtectionFeatureActivation, downloadListCoordinator: DownloadListCoordinator) {
+    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, networkProtectionFeatureActivation: NetworkProtectionFeatureActivation, downloadListCoordinator: DownloadListCoordinator, networkProtectionPopoverManager: NetPPopoverManager, networkProtectionStatusReporter: NetworkProtectionStatusReporter, autofillPopoverPresenter: AutofillPopoverPresenter) {
 
-        let vpnBundleID = Bundle.main.vpnMenuAgentBundleId
-        let ipcClient = TunnelControllerIPCClient(machServiceName: vpnBundleID)
-        ipcClient.register()
-
-        let networkProtectionPopoverManager = NetworkProtectionNavBarPopoverManager(ipcClient: ipcClient)
-
-        self.popovers = NavigationBarPopovers(networkProtectionPopoverManager: networkProtectionPopoverManager)
+        self.popovers = NavigationBarPopovers(networkProtectionPopoverManager: networkProtectionPopoverManager, autofillPopoverPresenter: autofillPopoverPresenter)
         self.tabCollectionViewModel = tabCollectionViewModel
-        self.networkProtectionButtonModel = NetworkProtectionNavBarButtonModel(popoverManager: networkProtectionPopoverManager)
+        self.networkProtectionButtonModel = NetworkProtectionNavBarButtonModel(popoverManager: networkProtectionPopoverManager, statusReporter: networkProtectionStatusReporter)
         self.isBurner = isBurner
         self.networkProtectionFeatureActivation = networkProtectionFeatureActivation
         self.downloadListCoordinator = downloadListCoordinator
@@ -138,14 +137,15 @@ final class NavigationBarViewController: NSViewController {
         super.init(coder: coder)
     }
 #else
-    static func create(tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, downloadListCoordinator: DownloadListCoordinator = .shared) -> NavigationBarViewController {
+    static func create(tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, downloadListCoordinator: DownloadListCoordinator = .shared, autofillPopoverPresenter: AutofillPopoverPresenter) -> NavigationBarViewController {
         NSStoryboard(name: "NavigationBar", bundle: nil).instantiateInitialController { coder in
-            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, downloadListCoordinator: downloadListCoordinator)
+            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, downloadListCoordinator: downloadListCoordinator, passwordPopoverPresenter: passwordPopoverPresenter)
         }!
     }
 
-    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, downloadListCoordinator: DownloadListCoordinator) {
-        self.popovers = NavigationBarPopovers()
+    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, downloadListCoordinator: DownloadListCoordinator,
+          autofillPopoverPresenter: AutofillPopoverPresenter) {
+        self.popovers = NavigationBarPopovers(autofillPopoverPresenter: autofillPopoverPresenter)
         self.tabCollectionViewModel = tabCollectionViewModel
         self.isBurner = isBurner
         self.downloadListCoordinator = downloadListCoordinator
@@ -185,7 +185,7 @@ final class NavigationBarViewController: NSViewController {
         passwordManagementButton.sendAction(on: .leftMouseDown)
 
         optionsButton.toolTip = UserText.applicationMenuTooltip
-        optionsButton.setAccessibilityIdentifier("Options Button")
+        optionsButton.setAccessibilityIdentifier("NavigationBarViewController.optionsButton")
 
         networkProtectionButton.toolTip = UserText.networkProtectionButtonTooltip
 
@@ -320,15 +320,15 @@ final class NavigationBarViewController: NSViewController {
 
     private func toggleNetworkProtectionPopover() {
         let featureVisibility = DefaultNetworkProtectionVisibility()
-        guard featureVisibility.isNetworkProtectionVisible() else {
+        guard featureVisibility.isNetworkProtectionBetaVisible() else {
             featureVisibility.disableForWaitlistUsers()
             LocalPinningManager.shared.unpin(.networkProtection)
             return
         }
 
         #if SUBSCRIPTION
-        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable() {
-            let accountManager = AccountManager()
+        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
+            let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
             let networkProtectionTokenStorage = NetworkProtectionKeychainTokenStore()
 
             if accountManager.accessToken != nil && (try? networkProtectionTokenStorage.fetchToken()) == nil {
@@ -405,7 +405,7 @@ final class NavigationBarViewController: NSViewController {
                     self.updateHomeButton()
 #if NETWORK_PROTECTION
                 case .networkProtection:
-                    networkProtectionButtonModel.updateVisibility()
+                    self.networkProtectionButtonModel.updateVisibility()
 #endif
                 }
             } else {
@@ -438,18 +438,24 @@ final class NavigationBarViewController: NSViewController {
                                                object: nil)
 
 #if NETWORK_PROTECTION
-        NotificationCenter.default.addObserver(self,
-                                               selector: #selector(showVPNUninstalledFeedback(_:)),
-                                               name: NetworkProtectionFeatureDisabler.vpnUninstalledNotificationName,
-                                               object: nil)
+        UserDefaults.netP
+            .publisher(for: \.networkProtectionShouldShowVPNUninstalledMessage)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] shouldShowUninstalledMessage in
+                if shouldShowUninstalledMessage {
+                    self?.showVPNUninstalledFeedback()
+                    UserDefaults.netP.networkProtectionShouldShowVPNUninstalledMessage = false
+                }
+            }
+            .store(in: &cancellables)
 #endif
     }
 
-    @objc private func showVPNUninstalledFeedback(_ sender: Notification) {
+    @objc private func showVPNUninstalledFeedback() {
         guard view.window?.isKeyWindow == true else { return }
 
         DispatchQueue.main.async {
-            let viewController = PopoverMessageViewController(message: "Network Protection was uninstalled")
+            let viewController = PopoverMessageViewController(message: "DuckDuckGo VPN was uninstalled")
             viewController.show(onParent: self, relativeTo: self.optionsButton)
         }
     }
@@ -939,7 +945,7 @@ extension NavigationBarViewController: NSMenuDelegate {
 #if NETWORK_PROTECTION
         let isPopUpWindow = view.window?.isPopUpWindow ?? false
 
-        if !isPopUpWindow && networkProtectionFeatureActivation.isFeatureActivated {
+        if !isPopUpWindow && DefaultNetworkProtectionVisibility().isVPNVisible() {
             let networkProtectionTitle = LocalPinningManager.shared.shortcutTitle(for: .networkProtection)
             menu.addItem(withTitle: networkProtectionTitle, action: #selector(toggleNetworkProtectionPanelPinning), keyEquivalent: "N")
         }
@@ -968,13 +974,13 @@ extension NavigationBarViewController: NSMenuDelegate {
 #endif
     }
 
-    // MARK: - Network Protection
+    // MARK: - VPN
 
 #if NETWORK_PROTECTION
     func showNetworkProtectionStatus() {
         let featureVisibility = DefaultNetworkProtectionVisibility()
 
-        if featureVisibility.isNetworkProtectionVisible() {
+        if featureVisibility.isNetworkProtectionBetaVisible() {
             popovers.showNetworkProtectionPopover(positionedBelow: networkProtectionButton,
                                                   withDelegate: networkProtectionButtonModel)
         } else {
@@ -982,7 +988,7 @@ extension NavigationBarViewController: NSMenuDelegate {
         }
     }
 
-    /// Sets up the Network Protection button.
+    /// Sets up the VPN button.
     ///
     /// This method should be run just once during the lifecycle of this view.
     /// .
@@ -1065,7 +1071,7 @@ extension NavigationBarViewController: OptionsButtonMenuDelegate {
 #if NETWORK_PROTECTION
         toggleNetworkProtectionPopover()
 #else
-        fatalError("Tried to open Network Protection when it was disabled")
+        fatalError("Tried to open the VPN when it was disabled")
 #endif
     }
 
@@ -1088,6 +1094,7 @@ extension NavigationBarViewController: OptionsButtonMenuDelegate {
 #if SUBSCRIPTION
     func optionsButtonMenuRequestedSubscriptionPurchasePage(_ menu: NSMenu) {
         WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
+        Pixel.fire(.privacyProOfferScreenImpression)
     }
 
     func optionsButtonMenuRequestedIdentityTheftRestoration(_ menu: NSMenu) {
@@ -1109,8 +1116,6 @@ extension NavigationBarViewController: NSPopoverDelegate {
         } else if let popover = popovers.bookmarkListPopover, notification.object as AnyObject? === popover {
             popovers.bookmarkListPopoverClosed()
             updateBookmarksButton()
-        } else if let popover = popovers.passwordManagementPopover, notification.object as AnyObject? === popover {
-            popovers.passwordManagementPopoverClosed()
         } else if let popover = popovers.saveIdentityPopover, notification.object as AnyObject? === popover {
             popovers.saveIdentityPopoverClosed()
             updatePasswordManagementButton()
diff --git a/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift b/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
new file mode 100644
index 0000000000..ef82b84da6
--- /dev/null
+++ b/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
@@ -0,0 +1,82 @@
+//
+//  NetPPopoverManagerMock.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if DEBUG && NETWORK_PROTECTION
+
+import Combine
+import Foundation
+import NetworkProtection
+
+final class NetPPopoverManagerMock: NetPPopoverManager {
+    var isShown: Bool { false }
+    var ipcClient: NetworkProtectionIPCClient = IPCClientMock()
+
+    func toggle(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate) {}
+    func show(positionedBelow view: NSView, withDelegate delegate: any NSPopoverDelegate) {}
+    func close() {}
+}
+
+final class IPCClientMock: NetworkProtectionIPCClient {
+
+    final class ConnectionStatusObserverMock: NetworkProtection.ConnectionStatusObserver {
+        var publisher: AnyPublisher<NetworkProtection.ConnectionStatus, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: NetworkProtection.ConnectionStatus = .notConfigured
+    }
+    var ipcStatusObserver: any NetworkProtection.ConnectionStatusObserver = ConnectionStatusObserverMock()
+
+    final class ConnectionServerInfoObserverMock: NetworkProtection.ConnectionServerInfoObserver {
+        var publisher: AnyPublisher<NetworkProtection.NetworkProtectionStatusServerInfo, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: NetworkProtection.NetworkProtectionStatusServerInfo = .unknown
+    }
+    var ipcServerInfoObserver: any NetworkProtection.ConnectionServerInfoObserver = ConnectionServerInfoObserverMock()
+
+    final class ConnectionErrorObserverMock: NetworkProtection.ConnectionErrorObserver {
+        var publisher: AnyPublisher<String?, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: String?
+    }
+    var ipcConnectionErrorObserver: any NetworkProtection.ConnectionErrorObserver = ConnectionErrorObserverMock()
+
+    final class ConnectivityIssueObserverMock: NetworkProtection.ConnectivityIssueObserver {
+        var publisher: AnyPublisher<Bool, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: Bool = false
+    }
+    var ipcConnectivityIssuesObserver: any NetworkProtection.ConnectivityIssueObserver = ConnectivityIssueObserverMock()
+
+    final class ControllerErrorMesssageObserverMock: NetworkProtection.ControllerErrorMesssageObserver {
+        var publisher: AnyPublisher<String?, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: String?
+    }
+    var ipcControllerErrorMessageObserver: any NetworkProtection.ControllerErrorMesssageObserver = ControllerErrorMesssageObserverMock()
+
+    func start() {}
+
+    func stop() {}
+
+}
+
+final class ConnectivityIssueObserverMock: ConnectivityIssueObserver {
+    var publisher: AnyPublisher<Bool, Never> = PassthroughSubject().eraseToAnyPublisher()
+    var recentValue = false
+}
+
+final class ControllerErrorMesssageObserverMock: ControllerErrorMesssageObserver {
+    var publisher: AnyPublisher<String?, Never> = PassthroughSubject().eraseToAnyPublisher()
+    var recentValue: String?
+}
+
+#endif
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift
index 370813fb40..b85ed68d8b 100644
--- a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift
@@ -21,7 +21,7 @@
 import AppKit
 import Foundation
 import Common
-import NetworkProtection
+import NetworkProtectionUI
 
 extension AppLaunchCommand {
     var rawValue: String {
@@ -30,11 +30,13 @@ extension AppLaunchCommand {
         case .stopVPN: return "stopVPN"
         case .justOpen: return "justOpen"
         case .shareFeedback: return "shareFeedback"
+        case .showFAQ: return "showFAQ"
         case .showStatus: return "showStatus"
         case .showSettings: return "showSettings"
         case .showVPNLocations: return "showVPNLocations"
         case .enableOnDemand: return "enableOnDemand"
         case .moveAppToApplications: return "moveAppToApplications"
+        case .showPrivacyPro: return "showPrivacyPro"
         }
     }
 }
@@ -86,6 +88,8 @@ extension AppLaunchCommand {
             return "networkprotection://just-open"
         case .shareFeedback:
             return "networkprotection://share-feedback"
+        case .showFAQ:
+            return "https://duckduckgo.com/duckduckgo-help-pages/privacy-pro/vpn/"
         case .showStatus:
             return "networkprotection://show-status"
         case .showSettings:
@@ -94,6 +98,8 @@ extension AppLaunchCommand {
             return "networkprotection://show-settings/locations"
         case .moveAppToApplications:
             return "networkprotection://move-app-to-applications"
+        case .showPrivacyPro:
+            return "networkprotection://show-privacy-pro"
         default:
             return nil
         }
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
index f7e491577b..efa517356a 100644
--- a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
@@ -22,22 +22,23 @@ import Foundation
 import PixelKit
 import NetworkProtection
 
-enum NetworkProtectionPixelEvent: PixelKitEvent {
+enum NetworkProtectionPixelEvent: PixelKitEventV2 {
+    static let vpnErrorDomain = "com.duckduckgo.vpn.errorDomain"
 
     case networkProtectionActiveUser
     case networkProtectionNewUser
 
     case networkProtectionControllerStartAttempt
     case networkProtectionControllerStartSuccess
-    case networkProtectionControllerStartFailure
+    case networkProtectionControllerStartFailure(_ error: Error)
 
     case networkProtectionTunnelStartAttempt
     case networkProtectionTunnelStartSuccess
-    case networkProtectionTunnelStartFailure
+    case networkProtectionTunnelStartFailure(_ error: Error)
 
     case networkProtectionTunnelUpdateAttempt
     case networkProtectionTunnelUpdateSuccess
-    case networkProtectionTunnelUpdateFailure
+    case networkProtectionTunnelUpdateFailure(_ error: Error)
 
     case networkProtectionEnableAttemptConnecting
     case networkProtectionEnableAttemptSuccess
@@ -55,24 +56,19 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
     case networkProtectionTunnelConfigurationCouldNotGetPeerHostName
     case networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange
 
-    case networkProtectionClientFailedToFetchServerList(error: Error?)
+    case networkProtectionClientFailedToFetchServerList(_ error: Error?)
     case networkProtectionClientFailedToParseServerListResponse
     case networkProtectionClientFailedToEncodeRegisterKeyRequest
-    case networkProtectionClientFailedToFetchRegisteredServers(error: Error?)
+    case networkProtectionClientFailedToFetchRegisteredServers(_ error: Error?)
     case networkProtectionClientFailedToParseRegisteredServersResponse
     case networkProtectionClientFailedToEncodeRedeemRequest
     case networkProtectionClientInvalidInviteCode
-    case networkProtectionClientFailedToRedeemInviteCode(error: Error?)
-    case networkProtectionClientFailedToParseRedeemResponse(error: Error)
-    case networkProtectionClientFailedToFetchLocations(error: Error?)
-    case networkProtectionClientFailedToParseLocationsResponse(error: Error?)
+    case networkProtectionClientFailedToRedeemInviteCode(_ error: Error?)
+    case networkProtectionClientFailedToParseRedeemResponse(_ error: Error)
+    case networkProtectionClientFailedToFetchLocations(_ error: Error?)
+    case networkProtectionClientFailedToParseLocationsResponse(_ error: Error?)
     case networkProtectionClientInvalidAuthToken
 
-    case networkProtectionServerListStoreFailedToEncodeServerList
-    case networkProtectionServerListStoreFailedToDecodeServerList
-    case networkProtectionServerListStoreFailedToWriteServerList(error: Error)
-    case networkProtectionServerListStoreFailedToReadServerList(error: Error)
-
     case networkProtectionKeychainErrorFailedToCastKeychainValueToData(field: String)
     case networkProtectionKeychainReadError(field: String, status: Int32)
     case networkProtectionKeychainWriteError(field: String, status: Int32)
@@ -82,14 +78,14 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
     case networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor
     case networkProtectionWireguardErrorInvalidState(reason: String)
     case networkProtectionWireguardErrorFailedDNSResolution
-    case networkProtectionWireguardErrorCannotSetNetworkSettings(error: Error)
+    case networkProtectionWireguardErrorCannotSetNetworkSettings(_ error: Error)
     case networkProtectionWireguardErrorCannotStartWireguardBackend(code: Int32)
 
     case networkProtectionNoAuthTokenFoundError
 
     case networkProtectionRekeyAttempt
     case networkProtectionRekeyCompleted
-    case networkProtectionRekeyFailure
+    case networkProtectionRekeyFailure(_ error: Error)
 
     case networkProtectionSystemExtensionActivationFailure
 
@@ -102,169 +98,157 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
         switch self {
 
         case .networkProtectionActiveUser:
-            return "m_mac_netp_daily_active"
+            return "netp_daily_active"
 
         case .networkProtectionNewUser:
-            return "m_mac_netp_daily_active_u"
+            return "netp_daily_active_u"
 
         case .networkProtectionControllerStartAttempt:
-            return "m_mac_netp_controller_start_attempt"
+            return "netp_controller_start_attempt"
 
         case .networkProtectionControllerStartSuccess:
-            return "m_mac_netp_controller_start_success"
+            return "netp_controller_start_success"
 
         case .networkProtectionControllerStartFailure:
-            return "m_mac_netp_controller_start_failure"
+            return "netp_controller_start_failure"
 
         case .networkProtectionTunnelStartAttempt:
-            return "m_mac_netp_tunnel_start_attempt"
+            return "netp_tunnel_start_attempt"
 
         case .networkProtectionTunnelStartSuccess:
-            return "m_mac_netp_tunnel_start_success"
+            return "netp_tunnel_start_success"
 
         case .networkProtectionTunnelStartFailure:
-            return "m_mac_netp_tunnel_start_failure"
+            return "netp_tunnel_start_failure"
 
         case .networkProtectionTunnelUpdateAttempt:
-            return "m_mac_netp_tunnel_update_attempt"
+            return "netp_tunnel_update_attempt"
 
         case .networkProtectionTunnelUpdateSuccess:
-            return "m_mac_netp_tunnel_update_success"
+            return "netp_tunnel_update_success"
 
         case .networkProtectionTunnelUpdateFailure:
-            return "m_mac_netp_tunnel_update_failure"
+            return "netp_tunnel_update_failure"
 
         case .networkProtectionEnableAttemptConnecting:
-            return "m_mac_netp_ev_enable_attempt"
+            return "netp_ev_enable_attempt"
 
         case .networkProtectionEnableAttemptSuccess:
-            return "m_mac_netp_ev_enable_attempt_success"
+            return "netp_ev_enable_attempt_success"
 
         case .networkProtectionEnableAttemptFailure:
-            return "m_mac_netp_ev_enable_attempt_failure"
+            return "netp_ev_enable_attempt_failure"
 
         case .networkProtectionTunnelFailureDetected:
-            return "m_mac_netp_ev_tunnel_failure"
+            return "netp_ev_tunnel_failure"
 
         case .networkProtectionTunnelFailureRecovered:
-            return "m_mac_netp_ev_tunnel_failure_recovered"
+            return "netp_ev_tunnel_failure_recovered"
 
         case .networkProtectionLatency(let quality):
-            return "m_mac_netp_ev_\(quality.rawValue)_latency"
+            return "netp_ev_\(quality.rawValue)_latency"
 
         case .networkProtectionLatencyError:
-            return "m_mac_netp_ev_latency_error"
+            return "netp_ev_latency_error"
 
         case .networkProtectionTunnelConfigurationNoServerRegistrationInfo:
-            return "m_mac_netp_tunnel_config_error_no_server_registration_info"
+            return "netp_tunnel_config_error_no_server_registration_info"
 
         case .networkProtectionTunnelConfigurationCouldNotSelectClosestServer:
-            return "m_mac_netp_tunnel_config_error_could_not_select_closest_server"
+            return "netp_tunnel_config_error_could_not_select_closest_server"
 
         case .networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey:
-            return "m_mac_netp_tunnel_config_error_could_not_get_peer_public_key"
+            return "netp_tunnel_config_error_could_not_get_peer_public_key"
 
         case .networkProtectionTunnelConfigurationCouldNotGetPeerHostName:
-            return "m_mac_netp_tunnel_config_error_could_not_get_peer_host_name"
+            return "netp_tunnel_config_error_could_not_get_peer_host_name"
 
         case .networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange:
-            return "m_mac_netp_tunnel_config_error_could_not_get_interface_address_range"
+            return "netp_tunnel_config_error_could_not_get_interface_address_range"
 
         case .networkProtectionClientFailedToFetchServerList:
-            return "m_mac_netp_backend_api_error_failed_to_fetch_server_list"
+            return "netp_backend_api_error_failed_to_fetch_server_list"
 
         case .networkProtectionClientFailedToParseServerListResponse:
-            return "m_mac_netp_backend_api_error_parsing_server_list_response_failed"
+            return "netp_backend_api_error_parsing_server_list_response_failed"
 
         case .networkProtectionClientFailedToEncodeRegisterKeyRequest:
-            return "m_mac_netp_backend_api_error_encoding_register_request_body_failed"
+            return "netp_backend_api_error_encoding_register_request_body_failed"
 
         case .networkProtectionClientFailedToFetchRegisteredServers:
-            return "m_mac_netp_backend_api_error_failed_to_fetch_registered_servers"
+            return "netp_backend_api_error_failed_to_fetch_registered_servers"
 
         case .networkProtectionClientFailedToParseRegisteredServersResponse:
-            return "m_mac_netp_backend_api_error_parsing_device_registration_response_failed"
+            return "netp_backend_api_error_parsing_device_registration_response_failed"
 
         case .networkProtectionClientFailedToEncodeRedeemRequest:
-            return "m_mac_netp_backend_api_error_encoding_redeem_request_body_failed"
+            return "netp_backend_api_error_encoding_redeem_request_body_failed"
 
         case .networkProtectionClientInvalidInviteCode:
-            return "m_mac_netp_backend_api_error_invalid_invite_code"
+            return "netp_backend_api_error_invalid_invite_code"
 
         case .networkProtectionClientFailedToRedeemInviteCode:
-            return "m_mac_netp_backend_api_error_failed_to_redeem_invite_code"
+            return "netp_backend_api_error_failed_to_redeem_invite_code"
 
         case .networkProtectionClientFailedToParseRedeemResponse:
-            return "m_mac_netp_backend_api_error_parsing_redeem_response_failed"
+            return "netp_backend_api_error_parsing_redeem_response_failed"
 
         case .networkProtectionClientFailedToFetchLocations:
-            return "m_mac_netp_backend_api_error_failed_to_fetch_location_list"
+            return "netp_backend_api_error_failed_to_fetch_location_list"
 
         case .networkProtectionClientFailedToParseLocationsResponse:
-            return "m_mac_netp_backend_api_error_parsing_location_list_response_failed"
+            return "netp_backend_api_error_parsing_location_list_response_failed"
 
         case .networkProtectionClientInvalidAuthToken:
-            return "m_mac_netp_backend_api_error_invalid_auth_token"
-
-        case .networkProtectionServerListStoreFailedToEncodeServerList:
-            return "m_mac_netp_storage_error_failed_to_encode_server_list"
-
-        case .networkProtectionServerListStoreFailedToDecodeServerList:
-            return "m_mac_netp_storage_error_failed_to_decode_server_list"
-
-        case .networkProtectionServerListStoreFailedToWriteServerList:
-            return "m_mac_netp_storage_error_server_list_file_system_write_failed"
-
-        case .networkProtectionServerListStoreFailedToReadServerList:
-            return "m_mac_netp_storage_error_server_list_file_system_read_failed"
+            return "netp_backend_api_error_invalid_auth_token"
 
         case .networkProtectionKeychainErrorFailedToCastKeychainValueToData:
-            return "m_mac_netp_keychain_error_failed_to_cast_keychain_value_to_data"
+            return "netp_keychain_error_failed_to_cast_keychain_value_to_data"
 
         case .networkProtectionKeychainReadError:
-            return "m_mac_netp_keychain_error_read_failed"
+            return "netp_keychain_error_read_failed"
 
         case .networkProtectionKeychainWriteError:
-            return "m_mac_netp_keychain_error_write_failed"
+            return "netp_keychain_error_write_failed"
 
         case .networkProtectionKeychainUpdateError:
-            return "m_mac_netp_keychain_error_update_failed"
+            return "netp_keychain_error_update_failed"
 
         case .networkProtectionKeychainDeleteError:
-            return "m_mac_netp_keychain_error_delete_failed"
+            return "netp_keychain_error_delete_failed"
 
         case .networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor:
-            return "m_mac_netp_wireguard_error_cannot_locate_tunnel_file_descriptor"
+            return "netp_wireguard_error_cannot_locate_tunnel_file_descriptor"
 
         case .networkProtectionWireguardErrorInvalidState:
-            return "m_mac_netp_wireguard_error_invalid_state"
+            return "netp_wireguard_error_invalid_state"
 
         case .networkProtectionWireguardErrorFailedDNSResolution:
-            return "m_mac_netp_wireguard_error_failed_dns_resolution"
+            return "netp_wireguard_error_failed_dns_resolution"
 
         case .networkProtectionWireguardErrorCannotSetNetworkSettings:
-            return "m_mac_netp_wireguard_error_cannot_set_network_settings"
+            return "netp_wireguard_error_cannot_set_network_settings"
 
         case .networkProtectionWireguardErrorCannotStartWireguardBackend:
-            return "m_mac_netp_wireguard_error_cannot_start_wireguard_backend"
+            return "netp_wireguard_error_cannot_start_wireguard_backend"
 
         case .networkProtectionNoAuthTokenFoundError:
-            return "m_mac_netp_no_auth_token_found_error"
+            return "netp_no_auth_token_found_error"
 
         case .networkProtectionRekeyAttempt:
-            return "m_mac_netp_rekey_attempt"
+            return "netp_rekey_attempt"
 
         case .networkProtectionRekeyCompleted:
-            return "m_mac_netp_rekey_completed"
+            return "netp_rekey_completed"
 
         case .networkProtectionRekeyFailure:
-            return "m_mac_netp_rekey_failure"
+            return "netp_rekey_failure"
 
         case .networkProtectionSystemExtensionActivationFailure:
-            return "m_mac_netp_system_extension_activation_failure"
+            return "netp_system_extension_activation_failure"
 
         case .networkProtectionUnhandledError:
-            return "m_mac_netp_unhandled_error"
+            return "netp_unhandled_error"
         }
     }
 
@@ -296,25 +280,19 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
                 PixelKit.Parameters.errorCode: String(status)
             ]
 
-        case .networkProtectionServerListStoreFailedToWriteServerList(let error):
-            return error.pixelParameters
-
-        case .networkProtectionServerListStoreFailedToReadServerList(let error):
-            return error.pixelParameters
-
         case .networkProtectionClientFailedToFetchServerList(let error):
             return error?.pixelParameters
 
         case .networkProtectionClientFailedToFetchRegisteredServers(let error):
             return error?.pixelParameters
 
-        case .networkProtectionClientFailedToRedeemInviteCode(error: let error):
+        case .networkProtectionClientFailedToRedeemInviteCode(let error):
             return error?.pixelParameters
 
-        case .networkProtectionClientFailedToFetchLocations(error: let error):
+        case .networkProtectionClientFailedToFetchLocations(let error):
             return error?.pixelParameters
 
-        case .networkProtectionClientFailedToParseLocationsResponse(error: let error):
+        case .networkProtectionClientFailedToParseLocationsResponse(let error):
             return error?.pixelParameters
 
         case .networkProtectionUnhandledError(let function, let line, let error):
@@ -323,7 +301,7 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
             parameters[PixelKit.Parameters.line] = String(line)
             return parameters
 
-        case .networkProtectionWireguardErrorCannotSetNetworkSettings(error: let error):
+        case .networkProtectionWireguardErrorCannotSetNetworkSettings(let error):
             return error.pixelParameters
 
         case .networkProtectionWireguardErrorCannotStartWireguardBackend(code: let code):
@@ -348,8 +326,6 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
              .networkProtectionClientInvalidInviteCode,
              .networkProtectionClientFailedToEncodeRedeemRequest,
              .networkProtectionClientInvalidAuthToken,
-             .networkProtectionServerListStoreFailedToEncodeServerList,
-             .networkProtectionServerListStoreFailedToDecodeServerList,
              .networkProtectionNoAuthTokenFoundError,
              .networkProtectionRekeyAttempt,
              .networkProtectionRekeyCompleted,
@@ -379,6 +355,65 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
             return nil
         }
     }
+
+    var error: (any Error)? {
+        switch self {
+        case .networkProtectionActiveUser,
+                .networkProtectionNewUser,
+                .networkProtectionControllerStartAttempt,
+                .networkProtectionControllerStartSuccess,
+                .networkProtectionTunnelStartAttempt,
+                .networkProtectionTunnelStartSuccess,
+                .networkProtectionTunnelUpdateAttempt,
+                .networkProtectionTunnelUpdateSuccess,
+                .networkProtectionEnableAttemptConnecting,
+                .networkProtectionEnableAttemptSuccess,
+                .networkProtectionEnableAttemptFailure,
+                .networkProtectionTunnelFailureDetected,
+                .networkProtectionTunnelFailureRecovered,
+                .networkProtectionLatencyError,
+                .networkProtectionLatency,
+                .networkProtectionTunnelConfigurationNoServerRegistrationInfo,
+                .networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey,
+                .networkProtectionTunnelConfigurationCouldNotGetPeerHostName,
+                .networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange,
+                .networkProtectionClientFailedToParseServerListResponse,
+                .networkProtectionClientFailedToEncodeRegisterKeyRequest,
+                .networkProtectionClientFailedToParseRegisteredServersResponse,
+                .networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
+                .networkProtectionClientFailedToEncodeRedeemRequest,
+                .networkProtectionClientInvalidInviteCode,
+                .networkProtectionClientInvalidAuthToken,
+                .networkProtectionKeychainErrorFailedToCastKeychainValueToData,
+                .networkProtectionKeychainReadError,
+                .networkProtectionKeychainWriteError,
+                .networkProtectionKeychainUpdateError,
+                .networkProtectionKeychainDeleteError,
+                .networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor,
+                .networkProtectionWireguardErrorInvalidState,
+                .networkProtectionWireguardErrorFailedDNSResolution,
+                .networkProtectionWireguardErrorCannotStartWireguardBackend,
+                .networkProtectionNoAuthTokenFoundError,
+                .networkProtectionRekeyAttempt,
+                .networkProtectionRekeyCompleted,
+                .networkProtectionSystemExtensionActivationFailure:
+            return nil
+        case .networkProtectionClientFailedToRedeemInviteCode(let error),
+                .networkProtectionClientFailedToFetchLocations(let error),
+                .networkProtectionClientFailedToParseLocationsResponse(let error),
+                .networkProtectionClientFailedToFetchServerList(let error),
+                .networkProtectionClientFailedToFetchRegisteredServers(let error):
+            return error
+        case .networkProtectionControllerStartFailure(let error),
+                .networkProtectionTunnelStartFailure(let error),
+                .networkProtectionTunnelUpdateFailure(let error),
+                .networkProtectionClientFailedToParseRedeemResponse(let error),
+                .networkProtectionWireguardErrorCannotSetNetworkSettings(let error),
+                .networkProtectionRekeyFailure(let error),
+                .networkProtectionUnhandledError(_, _, let error):
+            return error
+        }
+    }
 }
 
 #endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
index b363c3d843..641c69c7f5 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
@@ -36,10 +36,10 @@ extension EventMapping where Event == NetworkProtectionError {
             domainEvent = .networkProtectionClientInvalidInviteCode
             frequency = .standard
         case .failedToRedeemInviteCode(let error):
-            domainEvent = .networkProtectionClientFailedToRedeemInviteCode(error: error)
+            domainEvent = .networkProtectionClientFailedToRedeemInviteCode(error)
             frequency = .standard
         case .failedToParseRedeemResponse(let error):
-            domainEvent = .networkProtectionClientFailedToParseRedeemResponse(error: error)
+            domainEvent = .networkProtectionClientFailedToParseRedeemResponse(error)
             frequency = .standard
         case .invalidAuthToken:
             domainEvent = .networkProtectionClientInvalidAuthToken
@@ -63,10 +63,10 @@ extension EventMapping where Event == NetworkProtectionError {
             domainEvent = .networkProtectionNoAuthTokenFoundError
             frequency = .standard
         case .failedToFetchLocationList(let error):
-            domainEvent = .networkProtectionClientFailedToFetchLocations(error: error)
+            domainEvent = .networkProtectionClientFailedToFetchLocations(error)
             frequency = .dailyAndContinuous
         case .failedToParseLocationListResponse(let error):
-            domainEvent = .networkProtectionClientFailedToParseLocationsResponse(error: error)
+            domainEvent = .networkProtectionClientFailedToParseLocationsResponse(error)
             frequency = .dailyAndContinuous
         case .noServerRegistrationInfo,
                 .couldNotSelectClosestServer,
@@ -74,17 +74,11 @@ extension EventMapping where Event == NetworkProtectionError {
                 .couldNotGetPeerHostName,
                 .couldNotGetInterfaceAddressRange,
                 .failedToEncodeRegisterKeyRequest,
-                .noServerListFound,
                 .serverListInconsistency,
                 .failedToFetchRegisteredServers,
                 .failedToFetchServerList,
                 .failedToParseServerListResponse,
                 .failedToParseRegisteredServersResponse,
-                .failedToEncodeServerList,
-                .failedToDecodeServerList,
-                .failedToWriteServerList,
-                .couldNotCreateServerListDirectory,
-                .failedToReadServerList,
                 .wireGuardCannotLocateTunnelFileDescriptor,
                 .wireGuardInvalidState,
                 .wireGuardDnsResolution,
@@ -99,7 +93,6 @@ extension EventMapping where Event == NetworkProtectionError {
             frequency = .standard
             return
         case .vpnAccessRevoked:
-            // todo
             return
         }
 
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
index a32ca7ee85..0beb6527cd 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
@@ -20,10 +20,16 @@
 
 import Foundation
 import NetworkProtection
+import NetworkProtectionIPC
 import Common
 
+#if SUBSCRIPTION
+import Subscription
+#endif
+
 extension NetworkProtectionDeviceManager {
 
+    @MainActor
     static func create() -> NetworkProtectionDeviceManager {
         let settings = VPNSettings(defaults: .netP)
         let keyStore = NetworkProtectionKeychainKeyStore()
@@ -32,7 +38,7 @@ extension NetworkProtectionDeviceManager {
                                               tokenStore: tokenStore,
                                               keyStore: keyStore,
                                               errorEvents: .networkProtectionAppDebugEvents,
-                                              isSubscriptionEnabled: false)
+                                              isSubscriptionEnabled: DefaultSubscriptionFeatureAvailability().isFeatureAvailable)
     }
 }
 
@@ -42,15 +48,25 @@ extension NetworkProtectionCodeRedemptionCoordinator {
         self.init(environment: settings.selectedEnvironment,
                   tokenStore: NetworkProtectionKeychainTokenStore(),
                   errorEvents: .networkProtectionAppDebugEvents,
-                  isSubscriptionEnabled: false)
+                  isSubscriptionEnabled: DefaultSubscriptionFeatureAvailability().isFeatureAvailable)
     }
 }
 
 extension NetworkProtectionKeychainTokenStore {
     convenience init() {
+        self.init(isSubscriptionEnabled: DefaultSubscriptionFeatureAvailability().isFeatureAvailable)
+    }
+
+    convenience init(isSubscriptionEnabled: Bool) {
+#if SUBSCRIPTION
+        let accessTokenProvider: () -> String? = { AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).accessToken }
+#else
+        let accessTokenProvider: () -> String? = { return nil }
+#endif
         self.init(keychainType: .default,
                   errorEvents: .networkProtectionAppDebugEvents,
-                  isSubscriptionEnabled: false)
+                  isSubscriptionEnabled: isSubscriptionEnabled,
+                  accessTokenProvider: accessTokenProvider)
     }
 }
 
@@ -61,4 +77,23 @@ extension NetworkProtectionKeychainKeyStore {
     }
 }
 
+extension NetworkProtectionLocationListCompositeRepository {
+    convenience init() {
+        let settings = VPNSettings(defaults: .netP)
+        self.init(
+            environment: settings.selectedEnvironment,
+            tokenStore: NetworkProtectionKeychainTokenStore(),
+            errorEvents: .networkProtectionAppDebugEvents,
+            isSubscriptionEnabled: DefaultSubscriptionFeatureAvailability().isFeatureAvailable
+        )
+    }
+}
+
+extension TunnelControllerIPCClient {
+
+    convenience init() {
+        self.init(machServiceName: Bundle.main.vpnMenuAgentBundleId)
+    }
+}
+
 #endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
index 3e02fb49ed..8830942459 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
@@ -24,8 +24,9 @@ import NetworkProtection
 import NetworkProtectionUI
 import NetworkProtectionIPC
 import NetworkExtension
+import Subscription
 
-/// Implements the sequence of steps that Network Protection needs to execute when the App starts up.
+/// Implements the sequence of steps that the VPN needs to execute when the App starts up.
 ///
 final class NetworkProtectionAppEvents {
 
@@ -47,8 +48,15 @@ final class NetworkProtectionAppEvents {
     // MARK: - Feature Visibility
 
     private let featureVisibility: NetworkProtectionFeatureVisibility
+    private let featureDisabler: NetworkProtectionFeatureDisabling
+    private let defaults: UserDefaults
 
-    init(featureVisibility: NetworkProtectionFeatureVisibility = DefaultNetworkProtectionVisibility()) {
+    init(featureVisibility: NetworkProtectionFeatureVisibility = DefaultNetworkProtectionVisibility(),
+         featureDisabler: NetworkProtectionFeatureDisabling = NetworkProtectionFeatureDisabler(),
+         defaults: UserDefaults = .netP) {
+
+        self.defaults = defaults
+        self.featureDisabler = featureDisabler
         self.featureVisibility = featureVisibility
     }
 
@@ -58,8 +66,9 @@ final class NetworkProtectionAppEvents {
         let loginItemsManager = LoginItemsManager()
 
         Task { @MainActor in
-            if featureVisibility.shouldUninstallAutomatically() {
-                featureVisibility.disableForAllUsers()
+            let disabled = await featureVisibility.disableIfUserHasNoAccess()
+
+            guard !disabled else {
                 return
             }
 
@@ -71,30 +80,29 @@ final class NetworkProtectionAppEvents {
     /// Call this method when the app becomes active to run the associated NetP logic.
     ///
     func applicationDidBecomeActive() {
-        guard featureVisibility.isNetworkProtectionVisible() else {
-            featureVisibility.disableForAllUsers()
-            return
+        Task { @MainActor in
+            await featureVisibility.disableIfUserHasNoAccess()
+
+#if SUBSCRIPTION
+            await AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).refreshSubscriptionAndEntitlements()
+#endif
         }
     }
 
     private func restartNetworkProtectionIfVersionChanged(using loginItemsManager: LoginItemsManager) {
-        let versionStore = NetworkProtectionLastVersionRunStore()
-
-        // should‘ve been run at least once with NetP enabled
-        guard versionStore.lastVersionRun != nil else {
-            os_log(.info, log: .networkProtection, "No last version found for the NetP login items, skipping update")
-            return
-        }
-
         // We want to restart the VPN menu app to make sure it's always on the latest.
         restartNetworkProtectionMenu(using: loginItemsManager)
     }
 
     private func restartNetworkProtectionMenu(using loginItemsManager: LoginItemsManager) {
+        guard loginItemsManager.isAnyEnabled(LoginItemsManager.networkProtectionLoginItems) else {
+            return
+        }
+
         loginItemsManager.restartLoginItems(LoginItemsManager.networkProtectionLoginItems, log: .networkProtection)
     }
 
-    /// Fetches a new list of Network Protection servers, and updates the existing set.
+    /// Fetches a new list of VPN servers, and updates the existing set.
     ///
     private func refreshNetworkProtectionServers() {
         Task {
@@ -102,11 +110,11 @@ final class NetworkProtectionAppEvents {
             do {
                 serverCount = try await NetworkProtectionDeviceManager.create().refreshServerList().count
             } catch {
-                os_log("Failed to update Network Protection servers", log: .networkProtection, type: .error)
+                os_log("Failed to update DuckDuckGo VPN servers", log: .networkProtection, type: .error)
                 return
             }
 
-            os_log("Successfully updated Network Protection servers; total server count = %{public}d", log: .networkProtection, serverCount)
+            os_log("Successfully updated DuckDuckGo VPN servers; total server count = %{public}d", log: .networkProtection, serverCount)
         }
     }
 }
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
index f54236f387..9495954da1 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
@@ -25,7 +25,7 @@ import NetworkProtection
 import NetworkProtectionProxy
 import SwiftUI
 
-/// Controller for the Network Protection debug menu.
+/// Controller for the VPN debug menu.
 ///
 @MainActor
 final class NetworkProtectionDebugMenu: NSMenu {
@@ -70,7 +70,7 @@ final class NetworkProtectionDebugMenu: NSMenu {
         registrationKeyValidityMenu = NSMenu { [registrationKeyValidityAutomaticItem] in
             registrationKeyValidityAutomaticItem
         }
-        super.init(title: "Network Protection")
+        super.init(title: "VPN")
 
         buildItems {
             NSMenuItem(title: "Reset") {
@@ -183,7 +183,9 @@ final class NetworkProtectionDebugMenu: NSMenu {
 
         preferredServerMenu.autoenablesItems = false
         populateNetworkProtectionEnvironmentListMenuItems()
-        populateNetworkProtectionServerListMenuItems()
+        Task {
+            try? await populateNetworkProtectionServerListMenuItems()
+        }
         populateNetworkProtectionRegistrationKeyValidityMenuItems()
 
         excludedRoutesMenu.delegate = self
@@ -227,7 +229,7 @@ final class NetworkProtectionDebugMenu: NSMenu {
         settings.resetToDefaults()
     }
 
-    /// Removes the system extension and agents for Network Protection.
+    /// Removes the system extension and agents for DuckDuckGo VPN.
     ///
     @objc func removeSystemExtensionAndAgents(_ sender: Any?) {
         Task { @MainActor in
@@ -344,9 +346,9 @@ final class NetworkProtectionDebugMenu: NSMenu {
         ]
     }
 
-    private func populateNetworkProtectionServerListMenuItems() {
-        let networkProtectionServerStore = NetworkProtectionServerListFileSystemStore(errorEvents: nil)
-        let servers = (try? networkProtectionServerStore.storedNetworkProtectionServerList()) ?? []
+    @MainActor
+    private func populateNetworkProtectionServerListMenuItems() async throws {
+        let servers = try await NetworkProtectionDeviceManager.create().refreshServerList()
 
         preferredServerAutomaticItem.target = self
         if servers.isEmpty {
@@ -588,7 +590,7 @@ final class NetworkProtectionDebugMenu: NSMenu {
         alert.addButton(withTitle: "Use Invite Code")
         alert.addButton(withTitle: "Cancel")
         alert.messageText = "Enter Invite Code"
-        alert.informativeText = "Please grab a Network Protection invite code from Asana and enter it here."
+        alert.informativeText = "Please grab a VPN invite code from Asana and enter it here."
 
         let textField = NSTextField(frame: NSRect(x: 0, y: 0, width: 200, height: 24))
         alert.accessoryView = textField
@@ -618,9 +620,8 @@ final class NetworkProtectionDebugMenu: NSMenu {
 
         Task {
             _ = try await NetworkProtectionDeviceManager.create().refreshServerList()
-            await MainActor.run {
-                populateNetworkProtectionServerListMenuItems()
-            }
+            try? await populateNetworkProtectionServerListMenuItems()
+
             settings.selectedServer = .automatic
         }
     }
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
index 6a07a4d330..fe66a59959 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
@@ -27,7 +27,7 @@ import SystemExtensions
 import LoginItems
 import NetworkProtectionIPC
 
-/// Utility code to help implement our debug menu options for Network Protection.
+/// Utility code to help implement our debug menu options for the VPN.
 ///
 final class NetworkProtectionDebugUtilities {
 
@@ -48,7 +48,7 @@ final class NetworkProtectionDebugUtilities {
         self.loginItemsManager = loginItemsManager
         self.settings = settings
 
-        let ipcClient = TunnelControllerIPCClient(machServiceName: Bundle.main.vpnMenuAgentBundleId)
+        let ipcClient = TunnelControllerIPCClient()
 
         self.ipcClient = ipcClient
         self.networkProtectionFeatureDisabler = NetworkProtectionFeatureDisabler(ipcClient: ipcClient)
@@ -71,6 +71,7 @@ final class NetworkProtectionDebugUtilities {
 
         UserDefaults().removeObject(forKey: UserDefaultsWrapper<Bool>.Key.networkProtectionTermsAndConditionsAccepted.rawValue)
         NotificationCenter.default.post(name: .networkProtectionWaitlistAccessChanged, object: nil)
+        UserDefaults.netP.networkProtectionEntitlementsExpired = false
     }
 
     func removeSystemExtensionAndAgents() async throws {
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
index 8812470f5e..5ee8f863a0 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
@@ -31,15 +31,9 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
 
     private let networkProtectionStatusReporter: NetworkProtectionStatusReporter
     private var status: NetworkProtection.ConnectionStatus = .default
-    private let popoverManager: NetworkProtectionNavBarPopoverManager
+    private let popoverManager: NetPPopoverManager
     private let waitlistActivationDateStore: DefaultWaitlistActivationDateStore
 
-    // MARK: - IPC
-
-    public var ipcClient: TunnelControllerIPCClient {
-        popoverManager.ipcClient
-    }
-
     // MARK: - Subscriptions
 
     private var cancellables = Set<AnyCancellable>()
@@ -76,23 +70,13 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
 
     // MARK: - Initialization
 
-    init(popoverManager: NetworkProtectionNavBarPopoverManager,
+    init(popoverManager: NetPPopoverManager,
          pinningManager: PinningManager = LocalPinningManager.shared,
-         statusReporter: NetworkProtectionStatusReporter? = nil,
+         statusReporter: NetworkProtectionStatusReporter,
          iconProvider: IconProvider = NavigationBarIconProvider()) {
 
         self.popoverManager = popoverManager
-
-        let ipcClient = popoverManager.ipcClient
-
         self.networkProtectionStatusReporter = statusReporter
-            ?? DefaultNetworkProtectionStatusReporter(
-                statusObserver: ipcClient.connectionStatusObserver,
-                serverInfoObserver: ipcClient.serverInfoObserver,
-                connectionErrorObserver: ipcClient.connectionErrorObserver,
-                connectivityIssuesObserver: DisabledConnectivityIssueObserver(),
-                controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications()
-        )
         self.iconPublisher = NetworkProtectionIconPublisher(statusReporter: networkProtectionStatusReporter, iconProvider: iconProvider)
         self.pinningManager = pinningManager
         self.shortcutTitle = pinningManager.shortcutTitle(for: .networkProtection)
@@ -116,22 +100,20 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
     }
 
     private func setupIconSubscription() {
-        iconPublisherCancellable = iconPublisher.$icon.sink { [weak self] icon in
-            self?.buttonImage = self?.buttonImageFromWaitlistState(icon: icon)
-        }
+        iconPublisherCancellable = iconPublisher.$icon
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] icon in
+                self?.buttonImage = self?.buttonImageFromWaitlistState(icon: icon)
+            }
     }
 
     /// Temporary override used for the NetP waitlist beta, as a different asset is used for users who are invited to join the beta but haven't yet accepted.
     /// This will be removed once the waitlist beta has ended.
     private func buttonImageFromWaitlistState(icon: NetworkProtectionAsset?) -> NSImage {
         let icon = icon ?? iconPublisher.icon
-
-        let isWaitlistUser = NetworkProtectionWaitlist().waitlistStorage.isWaitlistUser
-        let hasAuthToken = NetworkProtectionKeychainTokenStore().isFeatureActivated
-
-        if !isWaitlistUser && !hasAuthToken {
-            return .networkProtectionAvailableButton
-        }
+#if DEBUG
+        guard [.normal, .integrationTests].contains(NSApp.runType) else { return NSImage() }
+#endif
 
         if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {
             return .networkProtectionAvailableButton
@@ -196,7 +178,7 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
     func updateVisibility() {
         // The button is visible in the case where NetP has not been activated, but the user has been invited and they haven't accepted T&Cs.
         let networkProtectionVisibility = DefaultNetworkProtectionVisibility()
-        if networkProtectionVisibility.isNetworkProtectionVisible() {
+        if networkProtectionVisibility.isNetworkProtectionBetaVisible() {
             if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {
                 DailyPixel.fire(pixel: .networkProtectionWaitlistEntryPointToolbarButtonDisplayed,
                                 frequency: .dailyOnly,
@@ -204,20 +186,6 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
                 showButton = true
                 return
             }
-
-            let waitlist = NetworkProtectionWaitlist()
-            let isWaitlistUser = waitlist.waitlistStorage.isWaitlistUser
-            let hasAuthToken = NetworkProtectionKeychainTokenStore().isFeatureActivated
-
-#if !APPSTORE
-            // If the user hasn't signed up to the waitlist or doesn't have an auth token through some other method, then show them the badged icon
-            // to get their attention and encourage them to sign up. Also avoid showing the button is the user has opened the waitlist UI but
-            // dismissed it.
-            if !isWaitlistUser && !hasAuthToken && !waitlist.waitlistSignUpPromptDismissed {
-                showButton = true
-                return
-            }
-#endif
         }
 
         guard !isPinned,
@@ -239,7 +207,7 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
         pinningManager.togglePinning(for: .networkProtection)
     }
 
-    /// We want to pin Network Protection to the navigation bar the first time it's enabled, and only
+    /// We want to pin the VPN to the navigation bar the first time it's enabled, and only
     /// if the user hasn't toggled it manually before.
     /// 
     private func pinNetworkProtectionToNavBarIfNeverPinnedBefore() {
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
index 37d8daa09e..089a82f3f1 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
@@ -24,13 +24,36 @@ import NetworkProtection
 import NetworkProtectionIPC
 import NetworkProtectionUI
 
+#if SUBSCRIPTION
+import Subscription
+#endif
+
 #if NETWORK_PROTECTION
-final class NetworkProtectionNavBarPopoverManager {
+
+protocol NetworkProtectionIPCClient {
+    var ipcStatusObserver: ConnectionStatusObserver { get }
+    var ipcServerInfoObserver: ConnectionServerInfoObserver { get }
+    var ipcConnectionErrorObserver: ConnectionErrorObserver { get }
+
+    func start()
+    func stop()
+}
+
+extension TunnelControllerIPCClient: NetworkProtectionIPCClient {
+    public var ipcStatusObserver: any NetworkProtection.ConnectionStatusObserver { connectionStatusObserver }
+    public var ipcServerInfoObserver: any NetworkProtection.ConnectionServerInfoObserver { serverInfoObserver }
+    public var ipcConnectionErrorObserver: any NetworkProtection.ConnectionErrorObserver { connectionErrorObserver }
+}
+
+final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
     private var networkProtectionPopover: NetworkProtectionPopover?
-    let ipcClient: TunnelControllerIPCClient
+    let ipcClient: NetworkProtectionIPCClient
+    let networkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
 
-    init(ipcClient: TunnelControllerIPCClient) {
+    init(ipcClient: TunnelControllerIPCClient,
+         networkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling) {
         self.ipcClient = ipcClient
+        self.networkProtectionFeatureDisabler = networkProtectionFeatureDisabler
     }
 
     var isShown: Bool {
@@ -41,22 +64,16 @@ final class NetworkProtectionNavBarPopoverManager {
 #endif
     }
 
-    private func show(_ popover: NSPopover, positionedBelow view: NSView) {
-        view.isHidden = false
-
-        popover.show(positionedBelow: view.bounds.insetFromLineOfDeath(flipped: view.isFlipped), in: view)
-    }
-
+    // swiftlint:disable:next function_body_length
     func show(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate) {
-
         let popover = networkProtectionPopover ?? {
 
             let controller = NetworkProtectionIPCTunnelController(ipcClient: ipcClient)
 
             let statusReporter = DefaultNetworkProtectionStatusReporter(
-                statusObserver: ipcClient.connectionStatusObserver,
-                serverInfoObserver: ipcClient.serverInfoObserver,
-                connectionErrorObserver: ipcClient.connectionErrorObserver,
+                statusObserver: ipcClient.ipcStatusObserver,
+                serverInfoObserver: ipcClient.ipcServerInfoObserver,
+                connectionErrorObserver: ipcClient.ipcConnectionErrorObserver,
                 connectivityIssuesObserver: ConnectivityIssueObserverThroughDistributedNotifications(),
                 controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications()
             )
@@ -76,6 +93,10 @@ final class NetworkProtectionNavBarPopoverManager {
                             name: UserText.networkProtectionNavBarStatusMenuVPNSettings, action: {
                                 await appLauncher.launchApp(withCommand: .showSettings)
                             }),
+                        NetworkProtectionStatusView.Model.MenuItem(
+                            name: UserText.networkProtectionNavBarStatusMenuFAQ, action: {
+                                await appLauncher.launchApp(withCommand: .showFAQ)
+                            }),
                         NetworkProtectionStatusView.Model.MenuItem(
                             name: UserText.networkProtectionNavBarStatusViewShareFeedback,
                             action: {
@@ -84,6 +105,10 @@ final class NetworkProtectionNavBarPopoverManager {
                     ]
                 } else {
                     return [
+                        NetworkProtectionStatusView.Model.MenuItem(
+                            name: UserText.networkProtectionNavBarStatusMenuFAQ, action: {
+                                await appLauncher.launchApp(withCommand: .showFAQ)
+                            }),
                         NetworkProtectionStatusView.Model.MenuItem(
                             name: UserText.networkProtectionNavBarStatusViewShareFeedback,
                             action: {
@@ -93,8 +118,11 @@ final class NetworkProtectionNavBarPopoverManager {
                 }
             },
                                                    agentLoginItem: LoginItem.vpnMenu,
-                                                   isMenuBarStatusView: false
-            )
+                                                   isMenuBarStatusView: false,
+                                                   userDefaults: .netP,
+                                                   uninstallHandler: { [weak self] in
+                _ = await self?.networkProtectionFeatureDisabler.disable(keepAuthToken: false, uninstallSystemExtension: true)
+            })
             popover.delegate = delegate
 
             networkProtectionPopover = popover
@@ -104,13 +132,19 @@ final class NetworkProtectionNavBarPopoverManager {
         show(popover, positionedBelow: view)
     }
 
+    private func show(_ popover: NSPopover, positionedBelow view: NSView) {
+        view.isHidden = false
+
+        popover.show(positionedBelow: view.bounds.insetFromLineOfDeath(flipped: view.isFlipped), in: view)
+    }
+
     func toggle(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate) {
         if let networkProtectionPopover, networkProtectionPopover.isShown {
             networkProtectionPopover.close()
         } else {
             let featureVisibility = DefaultNetworkProtectionVisibility()
 
-            if featureVisibility.isNetworkProtectionVisible() {
+            if featureVisibility.isNetworkProtectionBetaVisible() {
                 show(positionedBelow: view, withDelegate: delegate)
             } else {
                 featureVisibility.disableForWaitlistUsers()
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift
index d3668a838e..d9ca618427 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift
@@ -24,7 +24,7 @@ import NetworkProtection
 import NetworkProtectionUI
 import SwiftUI
 
-/// Implements the logic for Network Protection's onboarding menu.
+/// Implements the logic for the VPN's onboarding menu.
 ///
 @MainActor
 final class NetworkProtectionOnboardingMenu: NSMenu {
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift
index 4d31485c67..fa62d0ae6a 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift
@@ -23,7 +23,7 @@ import Foundation
 import NetworkProtection
 import SwiftUI
 
-/// Implements the logic for Network Protection's simulate failures menu.
+/// Implements the logic for the VPN's simulate failures menu.
 ///
 @MainActor
 final class NetworkProtectionSimulateFailureMenu: NSMenu {
@@ -56,20 +56,20 @@ final class NetworkProtectionSimulateFailureMenu: NSMenu {
         NetworkProtectionSimulationOptions()
     }
 
-    /// Simulates a controller failure the next time Network Protection is started.
+    /// Simulates a controller failure the next time the VPN is started.
     ///
     @objc func simulateControllerFailure(_ menuItem: NSMenuItem) {
         simulationOptions.setEnabled(menuItem.state == .off, option: .controllerFailure)
     }
 
-    /// Simulates a tunnel failure the next time Network Protection is started.
+    /// Simulates a tunnel failure the next time the VPN is started.
     ///
     @objc func simulateTunnelFailure(_ menuItem: NSMenuItem) {
         // Temporarily disabled: https://app.asana.com/0/0/1205766100762904/f
         // simulateFailure(NetworkProtectionTunnelController().toggleShouldSimulateTunnelFailure)
     }
 
-    /// Simulates a fatal error on the tunnel the next time Network Protection is started.
+    /// Simulates a fatal error on the tunnel the next time the VPN is started.
     ///
     @objc func simulateTunnelCrash(_ menuItem: NSMenuItem) {
         // Temporarily disabled: https://app.asana.com/0/0/1205766100762904/f
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
index 6915d6cfba..27833760c2 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
@@ -34,6 +34,10 @@ import SystemExtensionManager
 import SystemExtensions
 #endif
 
+#if SUBSCRIPTION
+import Subscription
+#endif
+
 typealias NetworkProtectionStatusChangeHandler = (NetworkProtection.ConnectionStatus) -> Void
 typealias NetworkProtectionConfigChangeHandler = () -> Void
 
@@ -72,6 +76,12 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
     /// Auth token store
     private let tokenStore: NetworkProtectionTokenStore
 
+#if SUBSCRIPTION
+    // MARK: - Subscriptions
+
+    private let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+#endif
+
     // MARK: - Debug Options Support
 
     private let networkExtensionBundleID: String
@@ -379,7 +389,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
 
     // MARK: - Connection Status Querying
 
-    /// Queries Network Protection to know if its VPN is connected.
+    /// Queries the VPN to know if it's connected.
     ///
     /// - Returns: `true` if the VPN is connected, connecting or reasserting, and `false` otherwise.
     ///
@@ -445,12 +455,15 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
     // MARK: - Starting & Stopping the VPN
 
     enum StartError: LocalizedError {
+        case noAuthToken
         case connectionStatusInvalid
         case connectionAlreadyStarted
         case simulateControllerFailureError
 
         var errorDescription: String? {
             switch self {
+            case .noAuthToken:
+                return "You need a subscription to start the VPN"
             case .connectionAlreadyStarted:
 #if DEBUG
                 return "[Debug] Connection already started"
@@ -470,7 +483,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
         }
     }
 
-    /// Starts the VPN connection used for Network Protection
+    /// Starts the VPN connection
     ///
     func start() async {
         PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionControllerStartAttempt,
@@ -519,7 +532,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
             }
         } catch {
             PixelKit.fire(
-                NetworkProtectionPixelEvent.networkProtectionControllerStartFailure, frequency: .dailyAndContinuous, withError: error, includeAppVersionParameter: true
+                NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(error), frequency: .dailyAndContinuous, includeAppVersionParameter: true
             )
 
             await stop()
@@ -535,7 +548,10 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
         var options = [String: NSObject]()
 
         options[NetworkProtectionOptionKey.activationAttemptId] = UUID().uuidString as NSString
-        options[NetworkProtectionOptionKey.authToken] = try tokenStore.fetchToken() as NSString?
+        guard let authToken = try fetchAuthToken() else {
+            throw StartError.noAuthToken
+        }
+        options[NetworkProtectionOptionKey.authToken] = authToken
         options[NetworkProtectionOptionKey.selectedEnvironment] = settings.selectedEnvironment.rawValue as NSString
         options[NetworkProtectionOptionKey.selectedServer] = settings.selectedServer.stringValue as? NSString
 
@@ -575,7 +591,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
             }
     }
 
-    /// Stops the VPN connection used for Network Protection
+    /// Stops the VPN connection
     ///
     @MainActor
     func stop() async {
@@ -732,6 +748,21 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
             throw TunnelFailureError(errorDescription: errorMessage.value)
         }
     }
+
+    private func fetchAuthToken() throws -> NSString? {
+#if SUBSCRIPTION
+        if let accessToken = accountManager.accessToken  {
+            os_log(.error, log: .networkProtection, "🟢 TunnelController found token: %{public}d", accessToken)
+            return Self.adaptAccessTokenForVPN(accessToken) as NSString?
+        }
+#endif
+        os_log(.error, log: .networkProtection, "🔴 TunnelController found no token :(")
+        return try tokenStore.fetchToken() as NSString?
+    }
+
+    private static func adaptAccessTokenForVPN(_ token: String) -> String {
+        "ddg:\(token)"
+    }
 }
 
 #endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift
index 4893d694fb..dd0783b9c9 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift
@@ -24,7 +24,7 @@ import NetworkProtection
 import NetworkProtectionUI
 import SwiftUI
 
-/// Implements the logic for Network Protection's simulate failures menu.
+/// Implements the logic for the VPN's simulate failures menu.
 ///
 @MainActor
 final class NetworkProtectionWaitlistFeatureFlagOverridesMenu: NSMenu {
@@ -148,9 +148,9 @@ final class NetworkProtectionWaitlistFeatureFlagOverridesMenu: NSMenu {
         let alert = NSAlert()
         alert.messageText = "Override to OFF value?"
         alert.informativeText = """
-        This will potentially disable Network Protection and erase your invitation.
+        This will potentially disable DuckDuckGo VPN and erase your invitation.
 
-        You can re-enable Network Protection after reverting this change.
+        You can re-enable DuckDuckGo VPN after reverting this change.
 
         Please click 'Cancel' if you're unsure.
         """
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift
index 01b7b3f4ec..15e6bcdc66 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift
@@ -286,19 +286,4 @@ private struct VPNLocationViewButtons: View {
 
 }
 
-extension View {
-    /// Applies the given transform if the given condition evaluates to `true`.
-    /// - Parameters:
-    ///   - condition: The condition to evaluate.
-    ///   - transform: The transform to apply to the source `View`.
-    /// - Returns: Either the original `View` or the modified `View` if the condition is `true`.
-    @ViewBuilder func `if`<Content: View>(_ condition: Bool, transform: (Self) -> Content) -> some View {
-        if condition {
-            transform(self)
-        } else {
-            self
-        }
-    }
-}
-
 #endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
index fb1b74c2ff..24dfd9c4ab 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
@@ -185,18 +185,6 @@ extension VPNCityItemModel {
     }
 }
 
-extension NetworkProtectionLocationListCompositeRepository {
-    convenience init() {
-        let settings = VPNSettings(defaults: .netP)
-        self.init(
-            environment: settings.selectedEnvironment,
-            tokenStore: NetworkProtectionKeychainTokenStore(),
-            errorEvents: .networkProtectionAppDebugEvents,
-            isSubscriptionEnabled: false
-        )
-    }
-}
-
 extension VPNLocationViewModel {
     convenience init() {
         let locationListRepository = NetworkProtectionLocationListCompositeRepository()
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
index a7ac07106b..1b03bfb3f8 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
@@ -18,43 +18,61 @@
 
 #if NETWORK_PROTECTION
 
+import Common
 import Foundation
 import NetworkProtection
 import NetworkProtectionIPC
 
 final class NetworkProtectionIPCTunnelController: TunnelController {
 
+    private let featureVisibility: NetworkProtectionFeatureVisibility
     private let loginItemsManager: LoginItemsManager
-    private let ipcClient: TunnelControllerIPCClient
+    private let ipcClient: NetworkProtectionIPCClient
 
-    init(loginItemsManager: LoginItemsManager = LoginItemsManager(),
-         ipcClient: TunnelControllerIPCClient) {
+    init(featureVisibility: NetworkProtectionFeatureVisibility = DefaultNetworkProtectionVisibility(),
+         loginItemsManager: LoginItemsManager = LoginItemsManager(),
+         ipcClient: NetworkProtectionIPCClient) {
 
+        self.featureVisibility = featureVisibility
         self.loginItemsManager = loginItemsManager
         self.ipcClient = ipcClient
     }
 
     @MainActor
     func start() async {
-        enableLoginItems()
+        do {
+            guard try await enableLoginItems() else {
+                os_log("🔴 IPC Controller refusing to start the VPN menu app.  Not authorized.", log: .networkProtection)
+                return
+            }
 
-        ipcClient.start()
+            ipcClient.start()
+        } catch {
+            os_log("🔴 IPC Controller found en error when starting the VPN: \(error)", log: .networkProtection)
+        }
     }
 
     @MainActor
     func stop() async {
-        enableLoginItems()
+        do {
+            guard try await enableLoginItems() else {
+                os_log("🔴 IPC Controller refusing to start the VPN.  Not authorized.", log: .networkProtection)
+                return
+            }
 
-        ipcClient.stop()
+            ipcClient.stop()
+        } catch {
+            os_log("🔴 IPC Controller found en error when starting the VPN: \(error)", log: .networkProtection)
+        }
     }
 
-    /// Queries Network Protection to know if its VPN is connected.
+    /// Queries VPN to know if it's connected.
     ///
     /// - Returns: `true` if the VPN is connected, connecting or reasserting, and `false` otherwise.
     ///
     var isConnected: Bool {
         get {
-            if case .connected = ipcClient.connectionStatusObserver.recentValue {
+            if case .connected = ipcClient.ipcStatusObserver.recentValue {
                 return true
             }
 
@@ -64,8 +82,14 @@ final class NetworkProtectionIPCTunnelController: TunnelController {
 
     // MARK: - Login Items Manager
 
-    private func enableLoginItems() {
+    private func enableLoginItems() async throws -> Bool {
+        guard try await featureVisibility.canStartVPN() else {
+            // We shouldn't enable the menu app is the VPN feature is disabled.
+            return false
+        }
+
         loginItemsManager.enableLoginItems(LoginItemsManager.networkProtectionLoginItems, log: .networkProtection)
+        return true
     }
 }
 
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift
index 781a2ebebc..382a4f1bd8 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift
@@ -107,13 +107,13 @@ final class DefaultNetworkProtectionRemoteMessaging: NetworkProtectionRemoteMess
 
     }
 
-    /// Uses the "days since Network Protection activated" count combined with the set of dismissed messages to determine which messages should be displayed to the user.
+    /// Uses the "days since VPN activated" count combined with the set of dismissed messages to determine which messages should be displayed to the user.
     func presentableRemoteMessages() -> [NetworkProtectionRemoteMessage] {
         let dismissedMessageIDs = messageStorage.dismissedMessageIDs()
         let possibleMessages: [NetworkProtectionRemoteMessage] = messageStorage.storedMessages()
 
-        // Only show messages that haven't been dismissed, and check whether they have a requirement on how long the user
-        // has used Network Protection for.
+        // Only show messages that haven't been dismissed, and check whether they have a
+        // requirement on how long the user has used the VPN for.
         let filteredMessages = possibleMessages.filter { message in
 
             // Don't show messages that have already been dismissed. If you need to show the same message to a user again,
@@ -133,7 +133,7 @@ final class DefaultNetworkProtectionRemoteMessaging: NetworkProtectionRemoteMess
             }
 
             // Next, check if the message requires access to NetP but it's not visible:
-            if message.requiresNetworkProtectionAccess, !networkProtectionVisibility.isNetworkProtectionVisible() {
+            if message.requiresNetworkProtectionAccess, !networkProtectionVisibility.isNetworkProtectionBetaVisible() {
                 return false
             }
 
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift
index 7ad69d346b..6a9cc26537 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift
@@ -18,25 +18,79 @@
 
 #if NETWORK_PROTECTION && SUBSCRIPTION
 
+import Combine
 import Foundation
 import Subscription
 import NetworkProtection
+import NetworkProtectionUI
 
 final class NetworkProtectionSubscriptionEventHandler {
 
-    private let accountManager: AccountManaging
+    private let accountManager: AccountManager
     private let networkProtectionRedemptionCoordinator: NetworkProtectionCodeRedeeming
     private let networkProtectionTokenStorage: NetworkProtectionTokenStore
     private let networkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
+    private let userDefaults: UserDefaults
+    private var cancellables = Set<AnyCancellable>()
 
-    init(accountManager: AccountManaging = AccountManager(),
+    init(accountManager: AccountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)),
          networkProtectionRedemptionCoordinator: NetworkProtectionCodeRedeeming = NetworkProtectionCodeRedemptionCoordinator(),
          networkProtectionTokenStorage: NetworkProtectionTokenStore = NetworkProtectionKeychainTokenStore(),
-         networkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling = NetworkProtectionFeatureDisabler()) {
+         networkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling = NetworkProtectionFeatureDisabler(),
+         userDefaults: UserDefaults = .netP) {
         self.accountManager = accountManager
         self.networkProtectionRedemptionCoordinator = networkProtectionRedemptionCoordinator
         self.networkProtectionTokenStorage = networkProtectionTokenStorage
         self.networkProtectionFeatureDisabler = networkProtectionFeatureDisabler
+        self.userDefaults = userDefaults
+
+        subscribeToEntitlementChanges()
+    }
+
+    private func subscribeToEntitlementChanges() {
+        Task {
+            switch await accountManager.hasEntitlement(for: .networkProtection) {
+            case .success(let hasEntitlements):
+                Task {
+                    await handleEntitlementsChange(hasEntitlements: hasEntitlements)
+                }
+            case .failure:
+                break
+            }
+
+            NotificationCenter.default
+                .publisher(for: .entitlementsDidChange)
+                .receive(on: DispatchQueue.main)
+                .sink { [weak self] notification in
+                    guard let self else {
+                        return
+                    }
+
+                    guard let entitlements = notification.userInfo?[UserDefaultsCacheKey.subscriptionEntitlements] as? [Entitlement] else {
+
+                        assertionFailure("Missing entitlements are truly unexpected")
+                        return
+                    }
+
+                    let hasEntitlements = entitlements.contains { entitlement in
+                        entitlement.product == .networkProtection
+                    }
+
+                    Task {
+                        await self.handleEntitlementsChange(hasEntitlements: hasEntitlements)
+                    }
+                }
+                .store(in: &cancellables)
+        }
+    }
+
+    private func handleEntitlementsChange(hasEntitlements: Bool) async {
+        if hasEntitlements {
+            UserDefaults.netP.networkProtectionEntitlementsExpired = false
+        } else {
+            networkProtectionFeatureDisabler.stop()
+            UserDefaults.netP.networkProtectionEntitlementsExpired = true
+        }
     }
 
     func registerForSubscriptionAccountManagerEvents() {
@@ -45,19 +99,11 @@ final class NetworkProtectionSubscriptionEventHandler {
     }
 
     @objc private func handleAccountDidSignIn() {
-        guard let token = accountManager.accessToken else {
+        guard accountManager.accessToken != nil else {
             assertionFailure("[NetP Subscription] AccountManager signed in but token could not be retrieved")
             return
         }
-
-        Task {
-            do {
-                try await networkProtectionRedemptionCoordinator.exchange(accessToken: token)
-                print("[NetP Subscription] Exchanged access token for auth token successfully")
-            } catch {
-                print("[NetP Subscription] Failed to exchange access token for auth token: \(error)")
-            }
-        }
+        userDefaults.networkProtectionEntitlementsExpired = false
     }
 
     @objc private func handleAccountDidSignOut() {
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift
index a08386e9c3..3977fccef5 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift
@@ -19,6 +19,7 @@
 import Foundation
 import UserNotifications
 import NetworkProtection
+import NetworkProtectionUI
 
 extension UNNotificationAction {
 
@@ -46,6 +47,7 @@ extension UNNotificationCategory {
 /// This class takes care of requesting the presentation of notifications using UNNotificationCenter
 ///
 final class NetworkProtectionUNNotificationsPresenter: NSObject, NetworkProtectionNotificationsPresenter {
+
     private static let threadIdentifier = "com.duckduckgo.NetworkProtectionNotificationsManager.threadIdentifier"
 
     private let appLauncher: AppLauncher
@@ -133,6 +135,12 @@ final class NetworkProtectionUNNotificationsPresenter: NSObject, NetworkProtecti
         showNotification(.superseded, content)
     }
 
+    func showEntitlementNotification() {
+        let content = notificationContent(title: UserText.networkProtectionEntitlementExpiredNotificationTitle,
+                                          subtitle: UserText.networkProtectionEntitlementExpiredNotificationBody)
+        showNotification(.expiredEntitlement, content)
+    }
+
     func showTestNotification() {
         // These strings are deliberately hardcoded as we don't want them localized, they're only for debugging:
         let content = notificationContent(title: "Test notification",
@@ -140,10 +148,6 @@ final class NetworkProtectionUNNotificationsPresenter: NSObject, NetworkProtecti
         showNotification(.test, content)
     }
 
-    func showEntitlementNotification() {
-        // todo
-    }
-
     private func showNotification(_ identifier: NetworkProtectionNotificationIdentifier, _ content: UNNotificationContent) {
         let request = UNNotificationRequest(identifier: identifier.rawValue, content: content, trigger: .none)
 
@@ -165,6 +169,7 @@ public enum NetworkProtectionNotificationIdentifier: String {
     case reconnecting = "network-protection.notification.reconnecting"
     case connected = "network-protection.notification.connected"
     case superseded = "network-protection.notification.superseded"
+    case expiredEntitlement = "network-protection.notification.expired-entitlement"
     case test = "network-protection.notification.test"
 }
 
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionAndNotificationTargets/UserText+NetworkProtectionExtensions.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionAndNotificationTargets/UserText+NetworkProtectionExtensions.swift
index 219b048584..ecc8f96073 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionAndNotificationTargets/UserText+NetworkProtectionExtensions.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionAndNotificationTargets/UserText+NetworkProtectionExtensions.swift
@@ -20,27 +20,29 @@ import Foundation
 
 final class UserText {
 
-    // MARK: - Network Protection Notifications
+    // MARK: - VPN Notifications
 
-    static let networkProtectionConnectionSuccessNotificationTitle = NSLocalizedString("network.protection.success.notification.title", value: "Network Protection is On", comment: "The title of the notification shown when Network Protection connects successfully")
-    static let networkProtectionConnectionSuccessNotificationSubtitle = NSLocalizedString("network.protection.success.notification.subtitle", value: "Your location and online activity are protected.", comment: "The subtitle of the notification shown when Network Protection reconnects successfully")
+    static let networkProtectionConnectionSuccessNotificationTitle = NSLocalizedString("network.protection.success.notification.title", value: "DuckDuckGo VPN is ON", comment: "The title of the notification shown when DuckDuckGo VPN connects successfully")
+    static let networkProtectionConnectionSuccessNotificationSubtitle = NSLocalizedString("network.protection.success.notification.subtitle", value: "Your location and online activity are protected.", comment: "The subtitle of the notification shown when the VPN reconnects successfully")
     static func networkProtectionConnectionSuccessNotificationSubtitle(serverLocation: String) -> String {
         let localized = NSLocalizedString(
             "network.protection.success.notification.subtitle.including.serverLocation",
             value: "Routing device traffic through %@.",
-            comment: "The body of the notification shown when Network Protection connects successfully with the city + state/country as formatted parameter"
+            comment: "The body of the notification shown when DuckDuckGo VPN connects successfully with the city + state/country as formatted parameter"
         )
         return String(format: localized, serverLocation)
     }
 
-    static let networkProtectionConnectionInterruptedNotificationTitle = NSLocalizedString("network.protection.interrupted.notification.title", value: "Network Protection was interrupted", comment: "The title of the notification shown when Network Protection's connection is interrupted")
-    static let networkProtectionConnectionInterruptedNotificationSubtitle = NSLocalizedString("network.protection.interrupted.notification.subtitle", value: "Attempting to reconnect now...", comment: "The subtitle of the notification shown when Network Protection's connection is interrupted")
+    static let networkProtectionConnectionInterruptedNotificationTitle = NSLocalizedString("network.protection.interrupted.notification.title", value: "DuckDuckGo VPN was interrupted", comment: "The title of the notification shown when DuckDuckGo VPN's connection is interrupted")
+    static let networkProtectionConnectionInterruptedNotificationSubtitle = NSLocalizedString("network.protection.interrupted.notification.subtitle", value: "Attempting to reconnect now...", comment: "The subtitle of the notification shown when DuckDuckGo VPN's connection is interrupted")
 
-    static let networkProtectionConnectionFailureNotificationTitle = NSLocalizedString("network.protection.failure.notification.title", value: "Network Protection failed to connect", comment: "The title of the notification shown when Network Protection fails to reconnect")
-    static let networkProtectionConnectionFailureNotificationSubtitle = NSLocalizedString("network.protection.failure.notification.subtitle", value: "Unable to connect at this time. Please try again later.", comment: "The subtitle of the notification shown when Network Protection fails to reconnect")
+    static let networkProtectionConnectionFailureNotificationTitle = NSLocalizedString("network.protection.failure.notification.title", value: "DuckDuckGo VPN failed to connect", comment: "The title of the notification shown when DuckDuckGo VPN fails to reconnect")
+    static let networkProtectionConnectionFailureNotificationSubtitle = NSLocalizedString("network.protection.failure.notification.subtitle", value: "Unable to connect at this time. Please try again later.", comment: "The subtitle of the notification shown when DuckDuckGo VPN fails to reconnect")
 
-    static let networkProtectionSupersededNotificationTitle = NSLocalizedString("network.protection.superceded.notification.title", value: "Network Protection is disabled", comment: "The title of the notification shown when VPN connection is replaced by another app VPN connection taking over")
-    static let networkProtectionSupersededNotificationSubtitle = NSLocalizedString("network.protection.superceded.notification.subtitle", value: "A VPN app on your device may have disabled it. Click to re-enable.", comment: "The subtitle of the notification shown when VPN connection is replaced by another app VPN connection taking over")
-    static let networkProtectionSupersededReconnectActionTitle = NSLocalizedString("network.protection.superceded.action.reconnect.title", value: "Re-enable", comment: "The title of the `Reconnect` notification action button shown when VPN connection is replaced by another app VPN connection taking over")
+    static let networkProtectionSupersededNotificationTitle = NSLocalizedString("network.protection.superceded.notification.title", value: "DuckDuckGo VPN disconnected", comment: "The title of the notification shown when VPN connection is replaced by another app VPN connection taking over")
+    static let networkProtectionSupersededNotificationSubtitle = NSLocalizedString("network.protection.superceded.notification.subtitle", value: "Another VPN app on your Mac may have disabled it.", comment: "The subtitle of the notification shown when VPN connection is replaced by another app VPN connection taking over")
+    static let networkProtectionSupersededReconnectActionTitle = NSLocalizedString("network.protection.superceded.action.reconnect.title", value: "Reconnect", comment: "The title of the `Reconnect` notification action button shown when VPN connection is replaced by another app VPN connection taking over")
 
+    static let networkProtectionEntitlementExpiredNotificationTitle = NSLocalizedString("network.protection.entitlement.expired.notification.title", value: "VPN disconnected", comment: "The title of the notification when Privacy Pro subscription expired")
+    static let networkProtectionEntitlementExpiredNotificationBody = NSLocalizedString("network.protection.entitlement.expired.notification.body", value: "Subscribe to Privacy Pro to reconnect DuckDuckGo VPN.", comment: "The body of the notification when Privacy Pro subscription expired")
 }
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
index 8b35cbd540..c9a8819faa 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
@@ -24,8 +24,24 @@ import NetworkExtension
 import Networking
 import PixelKit
 
+#if SUBSCRIPTION
+import Subscription
+#endif
+
 final class MacPacketTunnelProvider: PacketTunnelProvider {
 
+    static var isAppex: Bool {
+#if NETP_SYSTEM_EXTENSION
+        false
+#else
+        true
+#endif
+    }
+
+    static var subscriptionsAppGroup: String? {
+        isAppex ? Bundle.main.appGroup(bundle: .subs) : nil
+    }
+
     // MARK: - Additional Status Info
 
     /// Holds the date when the status was last changed so we can send it out as additional information
@@ -37,8 +53,6 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 
     private var cancellables = Set<AnyCancellable>()
 
-    private let appLauncher: AppLaunching?
-
     // MARK: - Error Reporting
 
     // swiftlint:disable:next cyclomatic_complexity function_body_length
@@ -61,13 +75,13 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .couldNotGetInterfaceAddressRange:
                 domainEvent = .networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange
             case .failedToFetchServerList(let eventError):
-                domainEvent = .networkProtectionClientFailedToFetchServerList(error: eventError)
+                domainEvent = .networkProtectionClientFailedToFetchServerList(eventError)
             case .failedToParseServerListResponse:
                 domainEvent = .networkProtectionClientFailedToParseServerListResponse
             case .failedToEncodeRegisterKeyRequest:
                 domainEvent = .networkProtectionClientFailedToEncodeRegisterKeyRequest
             case .failedToFetchRegisteredServers(let eventError):
-                domainEvent = .networkProtectionClientFailedToFetchRegisteredServers(error: eventError)
+                domainEvent = .networkProtectionClientFailedToFetchRegisteredServers(eventError)
             case .failedToParseRegisteredServersResponse:
                 domainEvent = .networkProtectionClientFailedToParseRegisteredServersResponse
             case .failedToEncodeRedeemRequest:
@@ -75,25 +89,13 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .invalidInviteCode:
                 domainEvent = .networkProtectionClientInvalidInviteCode
             case .failedToRedeemInviteCode(let error):
-                domainEvent = .networkProtectionClientFailedToRedeemInviteCode(error: error)
+                domainEvent = .networkProtectionClientFailedToRedeemInviteCode(error)
             case .failedToParseRedeemResponse(let error):
-                domainEvent = .networkProtectionClientFailedToParseRedeemResponse(error: error)
+                domainEvent = .networkProtectionClientFailedToParseRedeemResponse(error)
             case .invalidAuthToken:
                 domainEvent = .networkProtectionClientInvalidAuthToken
             case .serverListInconsistency:
                 return
-            case .failedToEncodeServerList:
-                domainEvent = .networkProtectionServerListStoreFailedToEncodeServerList
-            case .failedToDecodeServerList:
-                domainEvent = .networkProtectionServerListStoreFailedToDecodeServerList
-            case .failedToWriteServerList(let eventError):
-                domainEvent = .networkProtectionServerListStoreFailedToWriteServerList(error: eventError)
-            case .noServerListFound:
-                return
-            case .couldNotCreateServerListDirectory:
-                return
-            case .failedToReadServerList(let eventError):
-                domainEvent = .networkProtectionServerListStoreFailedToReadServerList(error: eventError)
             case .failedToCastKeychainValueToData(let field):
                 domainEvent = .networkProtectionKeychainErrorFailedToCastKeychainValueToData(field: field)
             case .keychainReadError(let field, let status):
@@ -111,7 +113,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .wireGuardDnsResolution:
                 domainEvent = .networkProtectionWireguardErrorFailedDNSResolution
             case .wireGuardSetNetworkSettings(let error):
-                domainEvent = .networkProtectionWireguardErrorCannotSetNetworkSettings(error: error)
+                domainEvent = .networkProtectionWireguardErrorCannotSetNetworkSettings(error)
             case .startWireGuardBackend(let code):
                 domainEvent = .networkProtectionWireguardErrorCannotStartWireguardBackend(code: code)
             case .noAuthTokenFound:
@@ -124,7 +126,6 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                 // Needs Privacy triage for macOS Geoswitching pixels
                 return
             case .vpnAccessRevoked:
-                // todo
                 return
             }
 
@@ -208,9 +209,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionRekeyFailure,
+                    NetworkProtectionPixelEvent.networkProtectionRekeyFailure(error),
                     frequency: .dailyAndContinuous,
-                    withError: error,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
@@ -227,9 +227,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure,
+                    NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure(error),
                     frequency: .dailyAndContinuous,
-                    withError: error,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
@@ -246,9 +245,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure,
+                    NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure(error),
                     frequency: .dailyAndContinuous,
-                    withError: error,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
@@ -270,7 +268,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
     // MARK: - Initialization
 
     @objc public init() {
-        self.appLauncher = AppLauncher(appBundleURL: .mainAppBundleURL)
+        let isSubscriptionEnabled = false
 
 #if NETP_SYSTEM_EXTENSION
         let defaults = UserDefaults.standard
@@ -281,11 +279,24 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
         let tunnelHealthStore = NetworkProtectionTunnelHealthStore(notificationCenter: notificationCenter)
         let controllerErrorStore = NetworkProtectionTunnelErrorStore(notificationCenter: notificationCenter)
         let debugEvents = Self.networkProtectionDebugEvents(controllerErrorStore: controllerErrorStore)
-        let tokenStore = NetworkProtectionKeychainTokenStore(keychainType: Bundle.keychainType,
-                                                             serviceName: Self.tokenServiceName,
-                                                             errorEvents: debugEvents,
-                                                             isSubscriptionEnabled: false)
         let notificationsPresenter = NetworkProtectionNotificationsPresenterFactory().make(settings: settings, defaults: defaults)
+        let tokenStore = NetworkProtectionKeychainTokenStore(keychainType: Bundle.keychainType,
+                                                                           serviceName: Self.tokenServiceName,
+                                                                           errorEvents: debugEvents,
+                                                                           isSubscriptionEnabled: isSubscriptionEnabled,
+                                                                           accessTokenProvider: { nil }
+        )
+#if SUBSCRIPTION
+
+        let accountManager = AccountManager(subscriptionAppGroup: Self.subscriptionsAppGroup, accessTokenStorage: tokenStore)
+
+        SubscriptionPurchaseEnvironment.currentServiceEnvironment = settings.selectedEnvironment == .production ? .production : .staging
+        let entitlementsCheck = {
+            await accountManager.hasEntitlement(for: .networkProtection, cachePolicy: .reloadIgnoringLocalCacheData)
+        }
+#else
+        let entitlementsCheck: (() async -> Result<Bool, Error>)? = nil
+#endif
 
         super.init(notificationsPresenter: notificationsPresenter,
                    tunnelHealthStore: tunnelHealthStore,
@@ -296,8 +307,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                    providerEvents: Self.packetTunnelProviderEvents,
                    settings: settings,
                    defaults: defaults,
-                   isSubscriptionEnabled: false,
-                   entitlementCheck: nil)
+                   isSubscriptionEnabled: isSubscriptionEnabled,
+                   entitlementCheck: entitlementsCheck)
 
         setupPixels()
         observeServerChanges()
@@ -373,7 +384,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
         }
 
         let serverStatusInfo = NetworkProtectionStatusServerInfo(
-            serverLocation: serverInfo.serverLocation,
+            serverLocation: serverInfo.attributes,
             serverAddress: serverInfo.endpoint?.host.hostWithoutPort
         )
         let payload = ServerSelectedNotificationObjectEncoder().encode(serverStatusInfo)
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift
new file mode 100644
index 0000000000..2987ab2ff9
--- /dev/null
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift
@@ -0,0 +1,45 @@
+//
+//  NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if SUBSCRIPTION
+
+import Foundation
+import Subscription
+import NetworkProtection
+import Common
+
+extension NetworkProtectionKeychainTokenStore: SubscriptionTokenStorage {
+    public func store(accessToken: String) throws {
+        try store(accessToken)
+    }
+
+    public func getAccessToken() throws -> String? {
+        guard var token = try fetchToken() else { return nil }
+        if token.hasPrefix("ddg:") {
+            token = token.replacingOccurrences(of: "ddg:", with: "")
+        }
+        os_log("🔵 Wrapper successfully fetched token %{token}@", log: .networkProtection, type: .info, token)
+        return token
+    }
+
+    public func removeAccessToken() throws {
+        try deleteToken()
+    }
+}
+
+#endif
diff --git a/DuckDuckGo/NetworkProtectionAppExtension.entitlements b/DuckDuckGo/NetworkProtectionAppExtension.entitlements
index e2ec46d330..6295c6a6ef 100644
--- a/DuckDuckGo/NetworkProtectionAppExtension.entitlements
+++ b/DuckDuckGo/NetworkProtectionAppExtension.entitlements
@@ -11,7 +11,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(TeamIdentifierPrefix)com.duckduckgo.macos.browser.network-protection</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 		<string>$(NETP_APP_GROUP)</string>
 	</array>
 	<key>com.apple.security.network.client</key>
diff --git a/DuckDuckGo/Preferences/Model/AboutModel.swift b/DuckDuckGo/Preferences/Model/AboutModel.swift
index 7c44d07efd..52508bd9cb 100644
--- a/DuckDuckGo/Preferences/Model/AboutModel.swift
+++ b/DuckDuckGo/Preferences/Model/AboutModel.swift
@@ -19,7 +19,7 @@
 import SwiftUI
 import Common
 
-final class AboutModel: ObservableObject {
+final class AboutModel: ObservableObject, PreferencesTabOpening {
     let appVersion = AppVersion()
 
 #if NETWORK_PROTECTION
@@ -37,11 +37,6 @@ final class AboutModel: ObservableObject {
     let displayableAboutURL: String = URL.aboutDuckDuckGo
         .toString(decodePunycode: false, dropScheme: true, dropTrailingSlash: false)
 
-    @MainActor
-    func openURL(_ url: URL) {
-        WindowControllersManager.shared.show(url: url, source: .ui, newTab: true)
-    }
-
     @MainActor
     func openFeedbackForm() {
         FeedbackPresenter.presentFeedbackForm()
diff --git a/DuckDuckGo/Preferences/Model/AccessibilityPreferences.swift b/DuckDuckGo/Preferences/Model/AccessibilityPreferences.swift
new file mode 100644
index 0000000000..c096191757
--- /dev/null
+++ b/DuckDuckGo/Preferences/Model/AccessibilityPreferences.swift
@@ -0,0 +1,69 @@
+//
+//  AccessibilityPreferences.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import AppKit
+import Bookmarks
+import Common
+
+protocol AccessibilityPreferencesPersistor {
+    var defaultPageZoom: CGFloat { get set }
+}
+
+struct AccessibilityPreferencesUserDefaultsPersistor: AccessibilityPreferencesPersistor {
+    @UserDefaultsWrapper(key: .defaultPageZoom, defaultValue: DefaultZoomValue.percent100.rawValue)
+    var defaultPageZoom: CGFloat
+}
+
+enum DefaultZoomValue: CGFloat, CaseIterable {
+    case percent50 = 0.5
+    case percent75 = 0.75
+    case percent85 = 0.85
+    case percent100 = 1.0
+    case percent115 = 1.15
+    case percent125 = 1.25
+    case percent150 = 1.50
+    case percent175 = 1.75
+    case percent200 = 2.0
+    case percent250 = 2.5
+    case percent300 = 3.0
+
+    var displayString: String {
+        let percentage = (self.rawValue * 100).rounded()
+        return String(format: "%.0f%%", percentage)
+    }
+
+    var index: Int {DefaultZoomValue.allCases.firstIndex(of: self) ?? 3}
+}
+
+final class AccessibilityPreferences: ObservableObject {
+    static let shared = AccessibilityPreferences()
+
+    @Published var defaultPageZoom: DefaultZoomValue {
+        didSet {
+            persistor.defaultPageZoom = defaultPageZoom.rawValue
+        }
+    }
+
+    init(persistor: AccessibilityPreferencesPersistor = AccessibilityPreferencesUserDefaultsPersistor()) {
+        self.persistor = persistor
+        defaultPageZoom =  .init(rawValue: persistor.defaultPageZoom) ?? .percent100
+    }
+
+    private var persistor: AccessibilityPreferencesPersistor
+}
diff --git a/DuckDuckGo/Preferences/Model/AppearancePreferences.swift b/DuckDuckGo/Preferences/Model/AppearancePreferences.swift
index 28b4c55576..833bab73f0 100644
--- a/DuckDuckGo/Preferences/Model/AppearancePreferences.swift
+++ b/DuckDuckGo/Preferences/Model/AppearancePreferences.swift
@@ -23,9 +23,7 @@ import Common
 
 protocol AppearancePreferencesPersistor {
     var showFullURL: Bool { get set }
-    var showAutocompleteSuggestions: Bool { get set }
     var currentThemeName: String { get set }
-    var defaultPageZoom: CGFloat { get set }
     var favoritesDisplayMode: String? { get set }
     var isFavoriteVisible: Bool { get set }
     var isContinueSetUpVisible: Bool { get set }
@@ -39,15 +37,9 @@ struct AppearancePreferencesUserDefaultsPersistor: AppearancePreferencesPersisto
     @UserDefaultsWrapper(key: .showFullURL, defaultValue: false)
     var showFullURL: Bool
 
-    @UserDefaultsWrapper(key: .showAutocompleteSuggestions, defaultValue: true)
-    var showAutocompleteSuggestions: Bool
-
     @UserDefaultsWrapper(key: .currentThemeName, defaultValue: ThemeName.systemDefault.rawValue)
     var currentThemeName: String
 
-    @UserDefaultsWrapper(key: .defaultPageZoom, defaultValue: DefaultZoomValue.percent100.rawValue)
-    var defaultPageZoom: CGFloat
-
     @UserDefaultsWrapper(key: .favoritesDisplayMode, defaultValue: FavoritesDisplayMode.displayNative(.desktop).description)
     var favoritesDisplayMode: String?
 
@@ -85,27 +77,6 @@ enum HomeButtonPosition: String, CaseIterable {
     case right
 }
 
-enum DefaultZoomValue: CGFloat, CaseIterable {
-    case percent50 = 0.5
-    case percent75 = 0.75
-    case percent85 = 0.85
-    case percent100 = 1.0
-    case percent115 = 1.15
-    case percent125 = 1.25
-    case percent150 = 1.50
-    case percent175 = 1.75
-    case percent200 = 2.0
-    case percent250 = 2.5
-    case percent300 = 3.0
-
-    var displayString: String {
-        let percentage = (self.rawValue * 100).rounded()
-        return String(format: "%.0f%%", percentage)
-    }
-
-    var index: Int {DefaultZoomValue.allCases.firstIndex(of: self) ?? 3}
-}
-
 enum ThemeName: String, Equatable, CaseIterable {
     case light
     case dark
@@ -181,24 +152,12 @@ final class AppearancePreferences: ObservableObject {
         }
     }
 
-    @Published var showAutocompleteSuggestions: Bool {
-        didSet {
-            persistor.showAutocompleteSuggestions = showAutocompleteSuggestions
-        }
-    }
-
     @Published var favoritesDisplayMode: FavoritesDisplayMode {
         didSet {
             persistor.favoritesDisplayMode = favoritesDisplayMode.description
         }
     }
 
-    @Published var defaultPageZoom: DefaultZoomValue {
-        didSet {
-            persistor.defaultPageZoom = defaultPageZoom.rawValue
-        }
-    }
-
     @Published var isFavoriteVisible: Bool {
         didSet {
             persistor.isFavoriteVisible = isFavoriteVisible
@@ -248,8 +207,10 @@ final class AppearancePreferences: ObservableObject {
     }
 
     var isContinueSetUpAvailable: Bool {
+        let osVersion = ProcessInfo.processInfo.operatingSystemVersion
+
         let privacyConfig = AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager.privacyConfig
-        return privacyConfig.isEnabled(featureKey: .newTabContinueSetUp)
+        return privacyConfig.isEnabled(featureKey: .newTabContinueSetUp) && osVersion.majorVersion >= 12
     }
 
     func updateUserInterfaceStyle() {
@@ -260,12 +221,10 @@ final class AppearancePreferences: ObservableObject {
         self.persistor = persistor
         currentThemeName = .init(rawValue: persistor.currentThemeName) ?? .systemDefault
         showFullURL = persistor.showFullURL
-        showAutocompleteSuggestions = persistor.showAutocompleteSuggestions
         favoritesDisplayMode = persistor.favoritesDisplayMode.flatMap(FavoritesDisplayMode.init) ?? .default
         isFavoriteVisible = persistor.isFavoriteVisible
         isRecentActivityVisible = persistor.isRecentActivityVisible
         isContinueSetUpVisible = persistor.isContinueSetUpVisible
-        defaultPageZoom =  .init(rawValue: persistor.defaultPageZoom) ?? .percent100
         showBookmarksBar = persistor.showBookmarksBar
         bookmarksBarAppearance = persistor.bookmarksBarAppearance
         homeButtonPosition = persistor.homeButtonPosition
diff --git a/DuckDuckGo/Preferences/Model/CookiePopupProtectionPreferences.swift b/DuckDuckGo/Preferences/Model/CookiePopupProtectionPreferences.swift
new file mode 100644
index 0000000000..3082f23a0a
--- /dev/null
+++ b/DuckDuckGo/Preferences/Model/CookiePopupProtectionPreferences.swift
@@ -0,0 +1,52 @@
+//
+//  CookiePopupProtectionPreferences.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import AppKit
+import Bookmarks
+import Common
+
+protocol CookiePopupProtectionPreferencesPersistor {
+    var autoconsentEnabled: Bool { get set }
+}
+
+struct CookiePopupProtectionPreferencesUserDefaultsPersistor: CookiePopupProtectionPreferencesPersistor {
+
+    @UserDefaultsWrapper(key: .autoconsentEnabled, defaultValue: true)
+    var autoconsentEnabled: Bool
+
+}
+
+final class CookiePopupProtectionPreferences: ObservableObject, PreferencesTabOpening {
+
+    static let shared = CookiePopupProtectionPreferences()
+
+    @Published
+    var isAutoconsentEnabled: Bool {
+        didSet {
+            persistor.autoconsentEnabled = isAutoconsentEnabled
+        }
+    }
+
+    init(persistor: CookiePopupProtectionPreferencesPersistor = CookiePopupProtectionPreferencesUserDefaultsPersistor()) {
+        self.persistor = persistor
+        isAutoconsentEnabled = persistor.autoconsentEnabled
+    }
+
+    private var persistor: CookiePopupProtectionPreferencesPersistor
+}
diff --git a/DuckDuckGo/Preferences/Model/PrivacyPreferencesModel.swift b/DuckDuckGo/Preferences/Model/DataClearingPreferences.swift
similarity index 51%
rename from DuckDuckGo/Preferences/Model/PrivacyPreferencesModel.swift
rename to DuckDuckGo/Preferences/Model/DataClearingPreferences.swift
index 212336b3a8..e336ab7cbd 100644
--- a/DuckDuckGo/Preferences/Model/PrivacyPreferencesModel.swift
+++ b/DuckDuckGo/Preferences/Model/DataClearingPreferences.swift
@@ -1,5 +1,5 @@
 //
-//  PrivacyPreferencesModel.swift
+//  DataClearingPreferences.swift
 //
 //  Copyright © 2022 DuckDuckGo. All rights reserved.
 //
@@ -18,25 +18,14 @@
 
 import Foundation
 
-final class PrivacyPreferencesModel: ObservableObject {
+final class DataClearingPreferences: ObservableObject, PreferencesTabOpening {
 
-    @Published
-    var isLoginDetectionEnabled: Bool {
-        didSet {
-            privacySecurityPreferences.loginDetectionEnabled = isLoginDetectionEnabled
-        }
-    }
+    static let shared = DataClearingPreferences()
 
     @Published
-    var isGPCEnabled: Bool {
-        didSet {
-            privacySecurityPreferences.gpcEnabled = isGPCEnabled
-        }
-    }
-
-    @Published var isAutoconsentEnabled: Bool {
+    var isLoginDetectionEnabled: Bool {
         didSet {
-            privacySecurityPreferences.autoconsentEnabled = isAutoconsentEnabled
+            persistor.loginDetectionEnabled = isLoginDetectionEnabled
         }
     }
 
@@ -47,24 +36,28 @@ final class PrivacyPreferencesModel: ObservableObject {
         guard let fireproofDomainsWindow = fireproofDomainsWindowController.window,
               let parentWindowController = WindowControllersManager.shared.lastKeyMainWindowController
         else {
-            assertionFailure("Privacy Preferences: Failed to present FireproofDomainsViewController")
+            assertionFailure("DataClearingPreferences: Failed to present FireproofDomainsViewController")
             return
         }
 
         parentWindowController.window?.beginSheet(fireproofDomainsWindow)
     }
 
-    @MainActor
-    func openURL(_ url: URL) {
-        WindowControllersManager.shared.show(url: url, source: .ui, newTab: true)
+    init(persistor: FireButtonPreferencesPersistor = FireButtonPreferencesUserDefaultsPersistor()) {
+        self.persistor = persistor
+        isLoginDetectionEnabled = persistor.loginDetectionEnabled
     }
 
-    init(privacySecurityPreferences: PrivacySecurityPreferences = .shared) {
-        self.privacySecurityPreferences = privacySecurityPreferences
-        isLoginDetectionEnabled = privacySecurityPreferences.loginDetectionEnabled
-        isGPCEnabled = privacySecurityPreferences.gpcEnabled
-        isAutoconsentEnabled = privacySecurityPreferences.autoconsentEnabled
-    }
+    private var persistor: FireButtonPreferencesPersistor
+}
+
+protocol FireButtonPreferencesPersistor {
+    var loginDetectionEnabled: Bool { get set }
+}
+
+struct FireButtonPreferencesUserDefaultsPersistor: FireButtonPreferencesPersistor {
+
+    @UserDefaultsWrapper(key: .loginDetectionEnabled, defaultValue: false)
+    var loginDetectionEnabled: Bool
 
-    private let privacySecurityPreferences: PrivacySecurityPreferences
 }
diff --git a/DuckDuckGo/Preferences/Model/DefaultBrowserPreferences.swift b/DuckDuckGo/Preferences/Model/DefaultBrowserPreferences.swift
index ecaf76e24e..a40e390510 100644
--- a/DuckDuckGo/Preferences/Model/DefaultBrowserPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/DefaultBrowserPreferences.swift
@@ -71,6 +71,8 @@ struct SystemDefaultBrowserProvider: DefaultBrowserProvider {
 
 final class DefaultBrowserPreferences: ObservableObject {
 
+    static let shared = DefaultBrowserPreferences()
+
     @Published private(set) var isDefault: Bool = false {
         didSet {
             // Temporary pixel for first time user import data
@@ -113,11 +115,37 @@ final class DefaultBrowserPreferences: ObservableObject {
 
         do {
             try defaultBrowserProvider.presentDefaultBrowserPrompt()
+            repeatCheckIfDefault()
         } catch {
             defaultBrowserProvider.openSystemPreferences()
         }
     }
 
+    var executionCount = 0
+    let maxNumberOfExecutions = 60
+    var timer: Timer?
+
+    // Monitors for changes in default browser setting over the next minute.
+    // The reason is there is no API to get a notification for this change.
+    private func repeatCheckIfDefault() {
+        timer?.invalidate()
+        executionCount = 0
+        timer = Timer.scheduledTimer(timeInterval: 1.0,
+                                     target: self,
+                                     selector: #selector(timerFired),
+                                     userInfo: nil,
+                                     repeats: true)
+    }
+
+    @objc private func timerFired() {
+        checkIfDefault()
+
+        executionCount += 1
+        if executionCount >= maxNumberOfExecutions {
+            timer?.invalidate()
+        }
+    }
+
     private var appDidBecomeActiveCancellable: AnyCancellable?
     private let defaultBrowserProvider: DefaultBrowserProvider
 }
diff --git a/DuckDuckGo/Preferences/Model/PreferencesSection.swift b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
index a928eb6202..d1d1a8ebfd 100644
--- a/DuckDuckGo/Preferences/Model/PreferencesSection.swift
+++ b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
@@ -29,52 +29,88 @@ struct PreferencesSection: Hashable, Identifiable {
 
     @MainActor
     static func defaultSections(includingDuckPlayer: Bool, includingSync: Bool, includingVPN: Bool) -> [PreferencesSection] {
-        let regularPanes: [PreferencePaneIdentifier] = {
-
-            var panes: [PreferencePaneIdentifier] = [.general, .appearance, .privacy, .autofill, .downloads]
+        var privacyPanes: [PreferencePaneIdentifier] = [.defaultBrowser, .privateSearch, .webTrackingProtection, .cookiePopupProtection, .emailProtection]
 
-            if DefaultSubscriptionFeatureAvailability().isFeatureAvailable() {
-#if SUBSCRIPTION
-                panes = [.privacy, .subscription, .general, .appearance, .autofill, .downloads]
+#if NETWORK_PROTECTION
+        if includingVPN {
+            privacyPanes.append(.vpn)
+        }
 #endif
-            }
+
+        let regularPanes: [PreferencePaneIdentifier] = {
+            var panes: [PreferencePaneIdentifier] = [.general, .appearance, .autofill, .accessibility, .dataClearing]
 
             if includingSync {
-                if let generalIndex = panes.firstIndex(of: .general) {
-                    panes.insert(.sync, at: generalIndex + 1)
-                }
+                panes.insert(.sync, at: 1)
             }
 
             if includingDuckPlayer {
                 panes.append(.duckPlayer)
             }
 
-#if NETWORK_PROTECTION
-            if includingVPN {
-                panes.append(.vpn)
-            }
-#endif
-
             return panes
         }()
 
-        return [
+        let otherPanes: [PreferencePaneIdentifier] = [.about, .otherPlatforms]
+
+        var sections: [PreferencesSection] = [
+            .init(id: .privacyProtections, panes: privacyPanes),
             .init(id: .regularPreferencePanes, panes: regularPanes),
-            .init(id: .about, panes: [.about])
+            .init(id: .about, panes: otherPanes)
         ]
+
+#if SUBSCRIPTION
+        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
+
+            var shouldHidePrivacyProDueToNoProducts = SubscriptionPurchaseEnvironment.current == .appStore && SubscriptionPurchaseEnvironment.canPurchase == false
+
+            if AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).isUserAuthenticated {
+                shouldHidePrivacyProDueToNoProducts = false
+            }
+
+            if !shouldHidePrivacyProDueToNoProducts {
+                let subscriptionPanes: [PreferencePaneIdentifier] = [.subscription]
+                sections.insert(.init(id: .privacyPro, panes: subscriptionPanes), at: 1)
+            }
+        }
+#endif
+
+        return sections
     }
 }
 
 enum PreferencesSectionIdentifier: Hashable, CaseIterable {
+    case privacyProtections
+    case privacyPro
     case regularPreferencePanes
     case about
+
+    var displayName: String? {
+        switch self {
+        case .privacyProtections:
+            return UserText.privacyProtections
+        case .privacyPro:
+            return nil
+        case .regularPreferencePanes:
+            return UserText.mainSettings
+        case .about:
+            return nil
+        }
+    }
+
 }
 
 enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
+    case defaultBrowser
+    case privateSearch
+    case webTrackingProtection
+    case cookiePopupProtection
+    case emailProtection
+
     case general
     case sync
     case appearance
-    case privacy
+    case dataClearing
 #if NETWORK_PROTECTION
     case vpn
 #endif
@@ -82,8 +118,9 @@ enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
     case subscription
 #endif
     case autofill
-    case downloads
+    case accessibility
     case duckPlayer = "duckplayer"
+    case otherPlatforms = "https://duckduckgo.com/app"
     case about
 
     var id: Self {
@@ -106,6 +143,16 @@ enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
     @MainActor
     var displayName: String {
         switch self {
+        case .defaultBrowser:
+            return UserText.defaultBrowser
+        case .privateSearch:
+            return UserText.privateSearch
+        case .webTrackingProtection:
+            return UserText.webTrackingProtection
+        case .cookiePopupProtection:
+            return UserText.cookiePopUpProtection
+        case .emailProtection:
+            return UserText.emailProtectionPreferences
         case .general:
             return UserText.general
         case .sync:
@@ -119,8 +166,8 @@ enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
             return UserText.sync
         case .appearance:
             return UserText.appearance
-        case .privacy:
-            return UserText.privacy
+        case .dataClearing:
+            return UserText.dataClearing
 #if NETWORK_PROTECTION
         case .vpn:
             return UserText.vpn
@@ -131,25 +178,37 @@ enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
 #endif
         case .autofill:
             return UserText.autofill
-        case .downloads:
-            return UserText.downloads
+        case .accessibility:
+            return UserText.accessibility
         case .duckPlayer:
             return UserText.duckPlayer
         case .about:
             return UserText.about
+        case .otherPlatforms:
+            return UserText.duckduckgoOnOtherPlatforms
         }
     }
 
     var preferenceIconName: String {
         switch self {
+        case .defaultBrowser:
+            return "DefaultBrowser"
+        case .privateSearch:
+            return "PrivateSearchIcon"
+        case .webTrackingProtection:
+            return "WebTrackingProtectionIcon"
+        case .cookiePopupProtection:
+            return "CookieProtectionIcon"
+        case .emailProtection:
+            return "EmailProtectionIcon"
         case .general:
-            return "Rocket"
+            return "GeneralIcon"
         case .sync:
             return "Sync"
         case .appearance:
             return "Appearance"
-        case .privacy:
-            return "Privacy"
+        case .dataClearing:
+            return "FireSettings"
 #if NETWORK_PROTECTION
         case .vpn:
             return "VPN"
@@ -160,12 +219,14 @@ enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
 #endif
         case .autofill:
             return "Autofill"
-        case .downloads:
-            return "DownloadsPreferences"
+        case .accessibility:
+            return "Accessibility"
         case .duckPlayer:
             return "DuckPlayerSettings"
         case .about:
             return "About"
+        case .otherPlatforms:
+            return "OtherPlatformsPreferences"
         }
     }
 }
diff --git a/DuckDuckGo/Preferences/Model/PreferencesSidebarModel.swift b/DuckDuckGo/Preferences/Model/PreferencesSidebarModel.swift
index de53764fec..b5ba825f14 100644
--- a/DuckDuckGo/Preferences/Model/PreferencesSidebarModel.swift
+++ b/DuckDuckGo/Preferences/Model/PreferencesSidebarModel.swift
@@ -21,13 +21,17 @@ import Combine
 import DDGSync
 import SwiftUI
 
+#if SUBSCRIPTION
+import Subscription
+#endif
+
 final class PreferencesSidebarModel: ObservableObject {
 
     let tabSwitcherTabs: [Tab.TabContent]
 
     @Published private(set) var sections: [PreferencesSection] = []
     @Published var selectedTabIndex: Int = 0
-    @Published private(set) var selectedPane: PreferencePaneIdentifier = .general
+    @Published private(set) var selectedPane: PreferencePaneIdentifier = .defaultBrowser
 
     var selectedTabContent: AnyPublisher<Tab.TabContent, Never> {
         $selectedTabIndex.map { [tabSwitcherTabs] in tabSwitcherTabs[$0] }.eraseToAnyPublisher()
@@ -75,11 +79,12 @@ final class PreferencesSidebarModel: ObservableObject {
         tabSwitcherTabs: [Tab.TabContent] = Tab.TabContent.displayableTabTypes,
         privacyConfigurationManager: PrivacyConfigurationManaging = ContentBlocking.shared.privacyConfigurationManager,
         syncService: DDGSyncing,
-        includeDuckPlayer: Bool
+        includeDuckPlayer: Bool,
+        userDefaults: UserDefaults = .netP
     ) {
         let loadSections = {
 #if NETWORK_PROTECTION
-            let includingVPN = DefaultNetworkProtectionVisibility().isOnboarded
+            let includingVPN = DefaultNetworkProtectionVisibility().isInstalled
 #else
             let includingVPN = false
 #endif
@@ -103,13 +108,9 @@ final class PreferencesSidebarModel: ObservableObject {
     private func setupVPNPaneVisibility() {
         DefaultNetworkProtectionVisibility().onboardStatusPublisher
             .receive(on: DispatchQueue.main)
-            .sink { [weak self] onboardingStatus in
+            .sink { [weak self] _ in
                 guard let self else { return }
 
-                if onboardingStatus != .completed && self.selectedPane == .vpn {
-                    self.selectedPane = .general
-                }
-
                 self.refreshSections()
             }
             .store(in: &cancellables)
@@ -125,7 +126,16 @@ final class PreferencesSidebarModel: ObservableObject {
         }
     }
 
+    @MainActor
     func selectPane(_ identifier: PreferencePaneIdentifier) {
+        // Open a new tab in case of special panes
+        if identifier.rawValue.hasPrefix(URL.NavigationalScheme.https.rawValue),
+            let url = URL(string: identifier.rawValue) {
+            WindowControllersManager.shared.show(url: url,
+                                                 source: .ui,
+                                                 newTab: true)
+        }
+
         if sections.flatMap(\.panes).contains(identifier), identifier != selectedPane {
             selectedPane = identifier
         }
diff --git a/DuckDuckGo/Preferences/Model/PrivacyProtectionStatus.swift b/DuckDuckGo/Preferences/Model/PrivacyProtectionStatus.swift
new file mode 100644
index 0000000000..67474fabe6
--- /dev/null
+++ b/DuckDuckGo/Preferences/Model/PrivacyProtectionStatus.swift
@@ -0,0 +1,77 @@
+//
+//  PrivacyProtectionStatus.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import Combine
+import BrowserServicesKit
+
+final class PrivacyProtectionStatus: ObservableObject {
+
+    static func status(for preferencePane: PreferencePaneIdentifier) -> PrivacyProtectionStatus {
+        switch preferencePane {
+        case .defaultBrowser:
+            return PrivacyProtectionStatus(statusPublisher: DefaultBrowserPreferences.shared.$isDefault) { isDefault in
+                isDefault ? .on : .off
+            }
+        case .privateSearch:
+            return PrivacyProtectionStatus(statusIndicator: .on)
+        case .webTrackingProtection:
+            return PrivacyProtectionStatus(statusIndicator: .on)
+        case .cookiePopupProtection:
+            return PrivacyProtectionStatus(statusPublisher: CookiePopupProtectionPreferences.shared.$isAutoconsentEnabled) { isAutoconsentEnabled in
+                isAutoconsentEnabled ? .on : .off
+            }
+        case .emailProtection:
+            let publisher = Publishers.Merge(
+                NotificationCenter.default.publisher(for: .emailDidSignIn),
+                NotificationCenter.default.publisher(for: .emailDidSignOut)
+            )
+            return PrivacyProtectionStatus(statusPublisher: publisher, initialValue: EmailManager().isSignedIn ? .on : .off) { _ in
+                EmailManager().isSignedIn ? .on : .off
+            }
+        default:
+            return PrivacyProtectionStatus()
+        }
+    }
+
+    var statusSubscription: AnyCancellable?
+    @Published var status: Preferences.StatusIndicator?
+
+    // Initializer for observable properties
+    init<T: Publisher>(statusPublisher: T,
+                       initialValue: Preferences.StatusIndicator? = nil,
+                       transform: @escaping (T.Output) -> Preferences.StatusIndicator?) where T.Failure == Never {
+        self.status = initialValue
+
+        statusSubscription = statusPublisher
+            .map(transform)
+            .sink { [weak self] newStatus in
+                self?.status = newStatus
+            }
+    }
+
+    // Initializer for items without a status
+    init() {
+        self.status = nil
+    }
+
+    // Initializer for items with static status
+    init(statusIndicator: Preferences.StatusIndicator) {
+        self.status = statusIndicator
+    }
+}
diff --git a/DuckDuckGo/Preferences/Model/PrivacySecurityPreferences.swift b/DuckDuckGo/Preferences/Model/PrivacySecurityPreferences.swift
deleted file mode 100644
index 96b8b2b4a0..0000000000
--- a/DuckDuckGo/Preferences/Model/PrivacySecurityPreferences.swift
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  PrivacySecurityPreferences.swift
-//
-//  Copyright © 2021 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import Foundation
-import Combine
-
-final class PrivacySecurityPreferences {
-    static let shared = PrivacySecurityPreferences()
-
-    private init() {}
-
-    @UserDefaultsWrapper(key: .loginDetectionEnabled, defaultValue: false)
-    var loginDetectionEnabled: Bool
-
-    @Published
-    var gpcEnabled: Bool = UserDefaultsWrapper(key: .gpcEnabled, defaultValue: true).wrappedValue {
-        didSet {
-            let udWrapper = UserDefaultsWrapper(key: .gpcEnabled, defaultValue: true)
-            udWrapper.wrappedValue = gpcEnabled
-        }
-    }
-
-    @UserDefaultsWrapper(key: .autoconsentEnabled, defaultValue: true)
-    var autoconsentEnabled: Bool
-
-}
diff --git a/DuckDuckGo/Preferences/Model/SearchPreferences.swift b/DuckDuckGo/Preferences/Model/SearchPreferences.swift
new file mode 100644
index 0000000000..bbe5cfb70c
--- /dev/null
+++ b/DuckDuckGo/Preferences/Model/SearchPreferences.swift
@@ -0,0 +1,64 @@
+//
+//  SearchPreferences.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import AppKit
+import Bookmarks
+import Common
+
+protocol SearchPreferencesPersistor {
+    var showAutocompleteSuggestions: Bool { get set }
+}
+
+struct SearchPreferencesUserDefaultsPersistor: SearchPreferencesPersistor {
+    @UserDefaultsWrapper(key: .showAutocompleteSuggestions, defaultValue: true)
+    var showAutocompleteSuggestions: Bool
+}
+
+final class SearchPreferences: ObservableObject, PreferencesTabOpening {
+
+    static let shared = SearchPreferences()
+
+    @Published var showAutocompleteSuggestions: Bool {
+        didSet {
+            persistor.showAutocompleteSuggestions = showAutocompleteSuggestions
+        }
+    }
+
+    init(persistor: SearchPreferencesPersistor = SearchPreferencesUserDefaultsPersistor()) {
+        self.persistor = persistor
+        showAutocompleteSuggestions = persistor.showAutocompleteSuggestions
+    }
+
+    private var persistor: SearchPreferencesPersistor
+}
+
+protocol PreferencesTabOpening {
+
+    func openNewTab(with url: URL)
+
+}
+
+extension PreferencesTabOpening {
+
+    @MainActor
+    func openNewTab(with url: URL) {
+        WindowControllersManager.shared.show(url: url, source: .ui, newTab: true)
+    }
+
+}
diff --git a/DuckDuckGo/Preferences/Model/SyncPreferences.swift b/DuckDuckGo/Preferences/Model/SyncPreferences.swift
index 6c2df2e7ac..28be6ba74d 100644
--- a/DuckDuckGo/Preferences/Model/SyncPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/SyncPreferences.swift
@@ -86,6 +86,9 @@ final class SyncPreferences: ObservableObject, SyncUI.ManagementViewModel {
 
     @Published var isSyncCredentialsPaused: Bool
 
+    @Published var invalidBookmarksTitles: [String] = []
+    @Published var invalidCredentialsTitles: [String] = []
+
     private var shouldRequestSyncOnFavoritesOptionChange: Bool = true
     private var isScreenLocked: Bool = false
     private var recoveryKey: SyncCode.RecoveryKey?
@@ -117,12 +120,14 @@ final class SyncPreferences: ObservableObject, SyncUI.ManagementViewModel {
     init(
         syncService: DDGSyncing,
         syncBookmarksAdapter: SyncBookmarksAdapter,
+        syncCredentialsAdapter: SyncCredentialsAdapter,
         appearancePreferences: AppearancePreferences = .shared,
         managementDialogModel: ManagementDialogModel = ManagementDialogModel(),
         userAuthenticator: UserAuthenticating = DeviceAuthenticator.shared
     ) {
         self.syncService = syncService
         self.syncBookmarksAdapter = syncBookmarksAdapter
+        self.syncCredentialsAdapter = syncCredentialsAdapter
         self.appearancePreferences = appearancePreferences
         self.syncFeatureFlags = syncService.featureFlags
         self.userAuthenticator = userAuthenticator
@@ -140,6 +145,16 @@ final class SyncPreferences: ObservableObject, SyncUI.ManagementViewModel {
         setUpSyncOptionsObservables(apperancePreferences: appearancePreferences)
     }
 
+    private func updateInvalidObjects() {
+        invalidBookmarksTitles = syncBookmarksAdapter.provider?
+            .fetchDescriptionsForObjectsThatFailedValidation()
+            .map { $0.truncated(length: 15) } ?? []
+
+        let invalidCredentialsObjects: [String] = (try? syncCredentialsAdapter.provider?.fetchDescriptionsForObjectsThatFailedValidation()) ?? []
+        invalidCredentialsTitles = invalidCredentialsObjects.map({ $0.truncated(length: 15) })
+    }
+
+    // swiftlint:disable:next function_body_length
     private func setUpObservables() {
         syncService.featureFlagsPublisher
             .dropFirst()
@@ -157,6 +172,18 @@ final class SyncPreferences: ObservableObject, SyncUI.ManagementViewModel {
             }
             .store(in: &cancellables)
 
+        if DDGSync.isFieldValidationEnabled {
+            syncService.isSyncInProgressPublisher
+                .removeDuplicates()
+                .filter { !$0 }
+                .asVoid()
+                .receive(on: DispatchQueue.main)
+                .sink { [weak self] in
+                    self?.updateInvalidObjects()
+                }
+                .store(in: &cancellables)
+        }
+
         $syncErrorMessage
             .map { $0 != nil }
             .receive(on: DispatchQueue.main)
@@ -351,6 +378,7 @@ final class SyncPreferences: ObservableObject, SyncUI.ManagementViewModel {
 
     private let syncService: DDGSyncing
     private let syncBookmarksAdapter: SyncBookmarksAdapter
+    private let syncCredentialsAdapter: SyncCredentialsAdapter
     private let appearancePreferences: AppearancePreferences
     private var cancellables = Set<AnyCancellable>()
     private var connector: RemoteConnecting?
diff --git a/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift b/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift
index 8e062d7e27..54ead02220 100644
--- a/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift
+++ b/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift
@@ -61,7 +61,7 @@ final class VPNPreferencesModel: ObservableObject {
 
     private var onboardingStatus: OnboardingStatus {
         didSet {
-            showUninstallVPN = onboardingStatus != .default
+            showUninstallVPN = DefaultNetworkProtectionVisibility().isInstalled
         }
     }
 
diff --git a/DuckDuckGo/Preferences/Model/WebTrackingProtectionPreferences.swift b/DuckDuckGo/Preferences/Model/WebTrackingProtectionPreferences.swift
new file mode 100644
index 0000000000..5ef1539af1
--- /dev/null
+++ b/DuckDuckGo/Preferences/Model/WebTrackingProtectionPreferences.swift
@@ -0,0 +1,52 @@
+//
+//  WebTrackingProtectionPreferences.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import AppKit
+import Bookmarks
+import Common
+
+protocol WebTrackingProtectionPreferencesPersistor {
+    var gpcEnabled: Bool { get set }
+}
+
+struct WebTrackingProtectionPreferencesUserDefaultsPersistor: WebTrackingProtectionPreferencesPersistor {
+
+    @UserDefaultsWrapper(key: .gpcEnabled, defaultValue: true)
+    var gpcEnabled: Bool
+
+}
+
+final class WebTrackingProtectionPreferences: ObservableObject, PreferencesTabOpening {
+
+    static let shared = WebTrackingProtectionPreferences()
+
+    @Published
+    var isGPCEnabled: Bool {
+        didSet {
+            persistor.gpcEnabled = isGPCEnabled
+        }
+    }
+
+    init(persistor: WebTrackingProtectionPreferencesPersistor = WebTrackingProtectionPreferencesUserDefaultsPersistor()) {
+        self.persistor = persistor
+        isGPCEnabled = persistor.gpcEnabled
+    }
+
+    private var persistor: WebTrackingProtectionPreferencesPersistor
+}
diff --git a/DuckDuckGo/Preferences/View/PreferencesAboutView.swift b/DuckDuckGo/Preferences/View/PreferencesAboutView.swift
index d039da2091..d298ef89fd 100644
--- a/DuckDuckGo/Preferences/View/PreferencesAboutView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesAboutView.swift
@@ -70,11 +70,11 @@ extension Preferences {
                     .padding(.bottom, 8)
 
                     TextButton(UserText.moreAt(url: model.displayableAboutURL)) {
-                        model.openURL(.aboutDuckDuckGo)
+                        model.openNewTab(with: .aboutDuckDuckGo)
                     }
 
                     TextButton(UserText.privacyPolicy) {
-                        model.openURL(.privacyPolicy)
+                        model.openNewTab(with: .privacyPolicy)
                     }
 
                     #if FEEDBACK
diff --git a/DuckDuckGo/Preferences/View/PreferencesAccessibilityView.swift b/DuckDuckGo/Preferences/View/PreferencesAccessibilityView.swift
new file mode 100644
index 0000000000..fa38e9e2dd
--- /dev/null
+++ b/DuckDuckGo/Preferences/View/PreferencesAccessibilityView.swift
@@ -0,0 +1,54 @@
+//
+//  PreferencesAccessibilityView.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import Combine
+import PreferencesViews
+import SwiftUI
+import SwiftUIExtensions
+
+extension Preferences {
+
+    struct AccessibilityView: View {
+        @ObservedObject var model: AccessibilityPreferences
+
+        var body: some View {
+            PreferencePane(UserText.accessibility) {
+
+                // SECTION 1: Zoom Setting
+                PreferencePaneSection {
+
+                    HStack {
+                        Text(UserText.zoomPickerTitle)
+                        NSPopUpButtonView(selection: $model.defaultPageZoom) {
+                            let button = NSPopUpButton()
+                            button.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+
+                            for value in DefaultZoomValue.allCases {
+                                let item = button.menu?.addItem(withTitle: value.displayString, action: nil, keyEquivalent: "")
+                                item?.representedObject = value
+                            }
+                            return button
+                        }
+                    }
+                }
+
+            }
+        }
+    }
+}
diff --git a/DuckDuckGo/Preferences/View/PreferencesAppearanceView.swift b/DuckDuckGo/Preferences/View/PreferencesAppearanceView.swift
index 8e9e46fdfd..be30d68da2 100644
--- a/DuckDuckGo/Preferences/View/PreferencesAppearanceView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesAppearanceView.swift
@@ -98,7 +98,6 @@ extension Preferences {
                 // SECTION 2: Address Bar
                 PreferencePaneSection(UserText.addressBar) {
                     ToggleMenuItem(UserText.showFullWebsiteAddress, isOn: $model.showFullURL)
-                    ToggleMenuItem(UserText.showAutocompleteSuggestions, isOn: $model.showAutocompleteSuggestions)
                 }
 
                 // SECTION 3: New Tab Page
@@ -131,24 +130,6 @@ extension Preferences {
                         .disabled(!model.showBookmarksBar)
                     }
                 }
-
-                // SECTION 5: Zoom Setting
-                PreferencePaneSection(UserText.zoomSettingTitle) {
-
-                    HStack {
-                        Text(UserText.zoomPickerTitle)
-                        NSPopUpButtonView(selection: $model.defaultPageZoom) {
-                            let button = NSPopUpButton()
-                            button.setContentHuggingPriority(.defaultHigh, for: .horizontal)
-
-                            for value in DefaultZoomValue.allCases {
-                                let item = button.menu?.addItem(withTitle: value.displayString, action: nil, keyEquivalent: "")
-                                item?.representedObject = value
-                            }
-                            return button
-                        }
-                    }
-                }
             }
         }
     }
diff --git a/DuckDuckGo/Preferences/View/PreferencesCookiePopupProtectionView.swift b/DuckDuckGo/Preferences/View/PreferencesCookiePopupProtectionView.swift
new file mode 100644
index 0000000000..b1b22cd69c
--- /dev/null
+++ b/DuckDuckGo/Preferences/View/PreferencesCookiePopupProtectionView.swift
@@ -0,0 +1,55 @@
+//
+//  PreferencesCookiePopupProtectionView.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import Combine
+import PreferencesViews
+import SwiftUI
+import SwiftUIExtensions
+
+extension Preferences {
+
+    struct CookiePopupProtectionView: View {
+        @ObservedObject var model: CookiePopupProtectionPreferences
+
+        var body: some View {
+            PreferencePane(UserText.cookiePopUpProtection, spacing: 4) {
+
+                // SECTION 1: Status Indicator
+                PreferencePaneSection {
+                    StatusIndicatorView(status: model.isAutoconsentEnabled ? .on : .off, isLarge: true)
+                }
+
+                // SECTION 2: Description
+                PreferencePaneSection {
+                    VStack(alignment: .leading, spacing: 1) {
+                        TextMenuItemCaption(UserText.autoconsentExplanation)
+                        TextButton(UserText.learnMore) {
+                            model.openNewTab(with: .cookieConsentPopUpManagement)
+                        }
+                    }
+                }
+
+                // SECTION 3: Search Settings
+                PreferencePaneSection {
+                    ToggleMenuItem(UserText.autoconsentCheckboxTitle, isOn: $model.isAutoconsentEnabled)
+                }
+            }
+        }
+    }
+}
diff --git a/DuckDuckGo/Preferences/View/PreferencesDataClearingView.swift b/DuckDuckGo/Preferences/View/PreferencesDataClearingView.swift
new file mode 100644
index 0000000000..dc3f28607c
--- /dev/null
+++ b/DuckDuckGo/Preferences/View/PreferencesDataClearingView.swift
@@ -0,0 +1,54 @@
+//
+//  PreferencesDataClearingView.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import PreferencesViews
+import SwiftUI
+import SwiftUIExtensions
+
+extension Preferences {
+
+    struct DataClearingView: View {
+        @ObservedObject var model: DataClearingPreferences
+
+        var body: some View {
+            PreferencePane(UserText.dataClearing) {
+
+                // SECTION 1: Fireproof Site
+                PreferencePaneSection(UserText.fireproofSites) {
+
+                    PreferencePaneSubSection {
+                        ToggleMenuItem(UserText.fireproofCheckboxTitle, isOn: $model.isLoginDetectionEnabled)
+                        VStack(alignment: .leading, spacing: 1) {
+                            TextMenuItemCaption(UserText.fireproofExplanation)
+                            TextButton(UserText.learnMore) {
+                                model.openNewTab(with: .theFireButton)
+                            }
+                        }
+                    }
+
+                    PreferencePaneSubSection {
+                        Button(UserText.manageFireproofSites) {
+                            model.presentManageFireproofSitesDialog()
+                        }
+                    }
+                }
+
+            }
+        }
+    }
+}
diff --git a/DuckDuckGo/Preferences/View/PreferencesDefaultBrowserView.swift b/DuckDuckGo/Preferences/View/PreferencesDefaultBrowserView.swift
new file mode 100644
index 0000000000..cc7692b366
--- /dev/null
+++ b/DuckDuckGo/Preferences/View/PreferencesDefaultBrowserView.swift
@@ -0,0 +1,69 @@
+//
+//  PreferencesDefaultBrowserView.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import Combine
+import PreferencesViews
+import SwiftUI
+import SwiftUIExtensions
+
+extension Preferences {
+
+    struct DefaultBrowserView: View {
+        @ObservedObject var defaultBrowserModel: DefaultBrowserPreferences
+        let status: PrivacyProtectionStatus
+
+        var body: some View {
+            PreferencePane(UserText.defaultBrowser, spacing: 4) {
+
+                // SECTION 1: Status Indicator
+                if let status = status.status {
+                    PreferencePaneSection {
+                        StatusIndicatorView(status: status, isLarge: true)
+                    }
+                }
+
+                // SECTION 2: Default Browser
+                PreferencePaneSection {
+
+                    PreferencePaneSubSection {
+                        HStack {
+                            if defaultBrowserModel.isDefault {
+                                Text(UserText.isDefaultBrowser)
+                            } else {
+                                HStack {
+                                    Image(.warning).foregroundColor(Color(.linkBlue))
+                                    Text(UserText.isNotDefaultBrowser)
+                                }
+                                .padding(.trailing, 8)
+                                Button(action: {
+                                    Pixel.fire(.defaultRequestedFromSettings)
+                                    defaultBrowserModel.becomeDefault()
+                                }) {
+                                    Text(UserText.makeDefaultBrowser)
+                                        .fixedSize(horizontal: true, vertical: false)
+                                        .multilineTextAlignment(.center)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/DuckDuckGo/Preferences/View/PreferencesDownloadsView.swift b/DuckDuckGo/Preferences/View/PreferencesDownloadsView.swift
deleted file mode 100644
index 9ffd8ee3a4..0000000000
--- a/DuckDuckGo/Preferences/View/PreferencesDownloadsView.swift
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-//  PreferencesDownloadsView.swift
-//
-//  Copyright © 2022 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import PreferencesViews
-import SwiftUI
-import SwiftUIExtensions
-
-extension Preferences {
-
-    struct DownloadsView: View {
-        @ObservedObject var model: DownloadsPreferences
-
-        var body: some View {
-            PreferencePane(UserText.downloads) {
-
-                PreferencePaneSubSection {
-                    ToggleMenuItem(UserText.downloadsOpenPopupOnCompletion,
-                                   isOn: $model.shouldOpenPopupOnCompletion)
-                }
-
-                // MARK: Location
-                PreferencePaneSection(UserText.downloadsLocation) {
-
-                    HStack {
-                        NSPathControlView(url: model.selectedDownloadLocation)
-#if !APPSTORE
-                        Button(UserText.downloadsChangeDirectory) {
-                            model.presentDownloadDirectoryPanel()
-                        }
-#endif
-                    }
-                    .disabled(model.alwaysRequestDownloadLocation)
-                    ToggleMenuItem(UserText.downloadsAlwaysAsk,
-                                   isOn: $model.alwaysRequestDownloadLocation)
-                }
-            }
-        }
-    }
-}
-
-#Preview {
-    VStack {
-        HStack {
-            Preferences.DownloadsView(model: DownloadsPreferences(persistor: DownloadsPreferencesUserDefaultsPersistor()))
-                .padding()
-            Spacer()
-        }.frame(width: 500)
-
-    }.background(Color.preferencesBackground)
-}
diff --git a/DuckDuckGo/Preferences/View/PreferencesEmailProtectionView.swift b/DuckDuckGo/Preferences/View/PreferencesEmailProtectionView.swift
new file mode 100644
index 0000000000..cf864f651e
--- /dev/null
+++ b/DuckDuckGo/Preferences/View/PreferencesEmailProtectionView.swift
@@ -0,0 +1,81 @@
+//
+//  PreferencesEmailProtectionView.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import Combine
+import PreferencesViews
+import SwiftUI
+import SwiftUIExtensions
+import BrowserServicesKit
+
+extension Preferences {
+    struct EmailProtectionView: View, PreferencesTabOpening {
+        var emailManager: EmailManager
+        @ObservedObject var protectionStatus: PrivacyProtectionStatus = PrivacyProtectionStatus.status(for: .emailProtection)
+
+        var body: some View {
+            PreferencePane(UserText.emailProtectionPreferences, spacing: 4) {
+
+                // SECTION 1: Status Indicator
+                PreferencePaneSection {
+                    StatusIndicatorView(status: protectionStatus.status ?? .off, isLarge: true)
+                }
+
+                // SECTION 2: Description
+                PreferencePaneSection {
+                    VStack(alignment: .leading, spacing: 1) {
+                        TextMenuItemCaption(UserText.emailProtectionExplanation)
+                        TextButton(UserText.learnMore) {
+                            openNewTab(with: .duckDuckGoEmailInfo)
+                        }
+                    }
+                }
+
+                // SECTION 3: Current Account Info
+                PreferencePaneSection {
+                    if emailManager.isSignedIn {
+                        if let userEmail = emailManager.userEmail {
+                            Text(UserText.autofillEnabledFor) + Text(" \(userEmail)").bold()
+                        }
+                        Button(UserText.emailOptionsMenuManageAccountSubItem + "…") {
+                            openNewTab(with: EmailUrls().emailProtectionAccountLink)
+                        }
+                        Button(UserText.emailOptionsMenuTurnOffSubItem) {
+                            let alert = NSAlert.disableEmailProtection()
+                            let response = alert.runModal()
+                            if response == .alertFirstButtonReturn {
+                                try? emailManager.signOut()
+                            }
+                        }
+
+                        // Support
+                        PreferencePaneSubSection {
+                            TextButton(UserText.support) {
+                                openNewTab(with: EmailUrls().emailProtectionSupportLink)
+                            }
+                        }
+                    } else {
+                        Button(UserText.emailOptionsMenuTurnOnSubItem + "…") {
+                            openNewTab(with: EmailUrls().emailProtectionLink)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift b/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift
index 6ad97d6463..591961ee75 100644
--- a/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift
@@ -25,38 +25,15 @@ import SwiftUIExtensions
 extension Preferences {
 
     struct GeneralView: View {
-        @ObservedObject var defaultBrowserModel: DefaultBrowserPreferences
         @ObservedObject var startupModel: StartupPreferences
+        @ObservedObject var downloadsModel: DownloadsPreferences
+        @ObservedObject var searchModel: SearchPreferences
         @State private var showingCustomHomePageSheet = false
 
         var body: some View {
             PreferencePane(UserText.general) {
 
-                // SECTION 1: Default Browser
-                PreferencePaneSection(UserText.defaultBrowser) {
-
-                    PreferencePaneSubSection {
-                        HStack {
-                            if defaultBrowserModel.isDefault {
-                                Image(.solidCheckmark)
-                                Text(UserText.isDefaultBrowser)
-                            } else {
-                                Image(.warning).foregroundColor(Color(.linkBlue))
-                                Text(UserText.isNotDefaultBrowser)
-                                Button(action: {
-                                    defaultBrowserModel.becomeDefault()
-                                }) {
-                                    Text(UserText.makeDefaultBrowser)
-                                        .fixedSize(horizontal: false, vertical: true)
-                                        .multilineTextAlignment(.center)
-                                        .lineLimit(2)
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // SECTION 2: On Startup
+                // SECTION 1: On Startup
                 PreferencePaneSection(UserText.onStartup) {
 
                     PreferencePaneSubSection {
@@ -70,7 +47,7 @@ extension Preferences {
                     }
                 }
 
-                // SECTION 3: Home Page
+                // SECTION 2: Home Page
                 PreferencePaneSection(UserText.homePage) {
 
                     PreferencePaneSubSection {
@@ -103,7 +80,7 @@ extension Preferences {
                                     Text(UserText.homeButtonMode(for: position)).tag(position)
                                 }
                             }
-                            .scaledToFit()
+                            .fixedSize()
                             .onChange(of: startupModel.homeButtonPosition) { _ in
                                 startupModel.updateHomeButton()
                             }
@@ -114,6 +91,34 @@ extension Preferences {
                     CustomHomePageSheet(startupModel: startupModel, isSheetPresented: $showingCustomHomePageSheet)
                 }
 
+                // SECTION 3: Search Settings
+                PreferencePaneSection(UserText.privateSearch) {
+                    ToggleMenuItem(UserText.showAutocompleteSuggestions, isOn: $searchModel.showAutocompleteSuggestions)
+                }
+
+                // SECTION 4: Downloads
+                PreferencePaneSection(UserText.downloads) {
+                    PreferencePaneSubSection {
+                        ToggleMenuItem(UserText.downloadsOpenPopupOnCompletion,
+                                       isOn: $downloadsModel.shouldOpenPopupOnCompletion)
+                    }.padding(.bottom, 5)
+
+                    // MARK: Location
+                    PreferencePaneSubSection {
+                        Text(UserText.downloadsLocation).bold()
+                        HStack {
+                            NSPathControlView(url: downloadsModel.selectedDownloadLocation)
+#if !APPSTORE
+                            Button(UserText.downloadsChangeDirectory) {
+                                downloadsModel.presentDownloadDirectoryPanel()
+                            }
+#endif
+                        }
+                        .disabled(downloadsModel.alwaysRequestDownloadLocation)
+                        ToggleMenuItem(UserText.downloadsAlwaysAsk,
+                                       isOn: $downloadsModel.alwaysRequestDownloadLocation)
+                    }
+                }
             }
         }
     }
diff --git a/DuckDuckGo/Preferences/View/PreferencesPrivacyView.swift b/DuckDuckGo/Preferences/View/PreferencesPrivacyView.swift
deleted file mode 100644
index 22755196e7..0000000000
--- a/DuckDuckGo/Preferences/View/PreferencesPrivacyView.swift
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//  PreferencesPrivacyView.swift
-//
-//  Copyright © 2022 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import PreferencesViews
-import SwiftUI
-import SwiftUIExtensions
-
-extension Preferences {
-
-    struct PrivacyView: View {
-        @ObservedObject var model: PrivacyPreferencesModel
-
-        var body: some View {
-            PreferencePane(UserText.privacy) {
-
-                // SECTION 1: Web Tracking Protection Section
-                PreferencePaneSection(UserText.webTrackingProtectionSettingsTitle) {
-
-                    VStack(alignment: .leading, spacing: 0) {
-                        TextMenuItemCaption(UserText.webTrackingProtectionExplenation)
-                        TextButton(UserText.learnMore) {
-                            model.openURL(.webTrackingProtection)
-                        }
-                    }
-                }
-
-                // SECTION 2: Cookie Consent Pop-ups
-                PreferencePaneSection(UserText.autoconsentSettingsTitle) {
-
-                    ToggleMenuItem(UserText.autoconsentCheckboxTitle, isOn: $model.isAutoconsentEnabled)
-                    VStack(alignment: .leading, spacing: 0) {
-                        TextMenuItemCaption(UserText.autoconsentExplanation)
-                        TextButton(UserText.learnMore) {
-                            model.openURL(.cookieConsentPopUpManagement)
-                        }
-                    }
-                }
-
-                // SECTION 3: Fireproof Site
-                PreferencePaneSection(UserText.fireproofSites) {
-
-                    PreferencePaneSubSection {
-                        ToggleMenuItem(UserText.fireproofCheckboxTitle, isOn: $model.isLoginDetectionEnabled)
-                        VStack(alignment: .leading, spacing: 0) {
-                            TextMenuItemCaption(UserText.fireproofExplanation)
-                            TextButton(UserText.learnMore) {
-                                model.openURL(.theFireButton)
-                            }
-                        }
-                    }
-
-                    PreferencePaneSubSection {
-                        Button(UserText.manageFireproofSites) {
-                            model.presentManageFireproofSitesDialog()
-                        }
-                    }
-                }
-
-                // SECTION 4: Global privacy control
-                PreferencePaneSection(UserText.gpcSettingsTitle) {
-
-                    ToggleMenuItem(UserText.gpcCheckboxTitle, isOn: $model.isGPCEnabled)
-                    VStack(alignment: .leading, spacing: 0) {
-                        TextMenuItemCaption(UserText.gpcExplanation)
-                        TextButton(UserText.learnMore) {
-                            model.openURL(.gpcLearnMore)
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/DuckDuckGo/Preferences/View/PreferencesPrivateSearchView.swift b/DuckDuckGo/Preferences/View/PreferencesPrivateSearchView.swift
new file mode 100644
index 0000000000..b43f5db8fd
--- /dev/null
+++ b/DuckDuckGo/Preferences/View/PreferencesPrivateSearchView.swift
@@ -0,0 +1,55 @@
+//
+//  PreferencesPrivateSearchView.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import Combine
+import PreferencesViews
+import SwiftUI
+import SwiftUIExtensions
+
+extension Preferences {
+
+    struct PrivateSearchView: View {
+        @ObservedObject var model: SearchPreferences
+
+        var body: some View {
+            PreferencePane(UserText.privateSearch, spacing: 4) {
+
+                // SECTION 1: Status Indicator
+                PreferencePaneSection {
+                    StatusIndicatorView(status: .alwaysOn, isLarge: true)
+                }
+
+                // SECTION 2: Description
+                PreferencePaneSection {
+                    VStack(alignment: .leading, spacing: 1) {
+                        TextMenuItemCaption(UserText.privateSearchExplanation)
+                        TextButton(UserText.learnMore) {
+                            model.openNewTab(with: .privateSearchLearnMore)
+                        }
+                    }
+                }
+
+                // SECTION 3: Search Settings
+                PreferencePaneSection {
+                    ToggleMenuItem(UserText.showAutocompleteSuggestions, isOn: $model.showAutocompleteSuggestions)
+                }
+            }
+        }
+    }
+}
diff --git a/DuckDuckGo/Preferences/View/PreferencesRootView.swift b/DuckDuckGo/Preferences/View/PreferencesRootView.swift
index 76c6d00af1..922b2fe501 100644
--- a/DuckDuckGo/Preferences/View/PreferencesRootView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesRootView.swift
@@ -21,6 +21,7 @@ import PreferencesViews
 import SwiftUI
 import SwiftUIExtensions
 import SyncUI
+import BrowserServicesKit
 
 #if SUBSCRIPTION
 import Subscription
@@ -30,9 +31,16 @@ import SubscriptionUI
 enum Preferences {
 
     enum Const {
-        static let sidebarWidth: CGFloat = 256
+        static var sidebarWidth: CGFloat {
+            switch Locale.current.languageCode {
+            case "en":
+                return 310
+            default:
+                return 355
+            }
+        }
         static let paneContentWidth: CGFloat = 524
-        static let panePaddingHorizontal: CGFloat = 48
+        static let panePaddingHorizontal: CGFloat = 40
         static let panePaddingVertical: CGFloat = 40
     }
 
@@ -55,62 +63,79 @@ enum Preferences {
         var body: some View {
             HStack(spacing: 0) {
                 Sidebar().environmentObject(model).frame(width: Const.sidebarWidth)
-
                 Color(NSColor.separatorColor).frame(width: 1)
-
                 ScrollView(.vertical) {
                     HStack(spacing: 0) {
-                        VStack(alignment: .leading) {
-
-                            switch model.selectedPane {
-                            case .general:
-                                GeneralView(defaultBrowserModel: DefaultBrowserPreferences(), startupModel: StartupPreferences.shared)
-                            case .sync:
-                                SyncView()
-                            case .appearance:
-                                AppearanceView(model: .shared)
-                            case .privacy:
-                                PrivacyView(model: PrivacyPreferencesModel())
+                        contentView
+                        Spacer()
+                    }
+                }
+                .frame(maxWidth: .infinity)
+            }
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
+            .background(Color.preferencesBackground)
+        }
+
+        @ViewBuilder
+        var contentView: some View {
+            VStack(alignment: .leading) {
+                switch model.selectedPane {
+                case .defaultBrowser:
+                    DefaultBrowserView(defaultBrowserModel: DefaultBrowserPreferences.shared,
+                                       status: PrivacyProtectionStatus.status(for: .defaultBrowser))
+                case .privateSearch:
+                    PrivateSearchView(model: SearchPreferences.shared)
+                case .webTrackingProtection:
+                    WebTrackingProtectionView(model: WebTrackingProtectionPreferences.shared)
+                case .cookiePopupProtection:
+                    CookiePopupProtectionView(model: CookiePopupProtectionPreferences.shared)
+                case .emailProtection:
+                    EmailProtectionView(emailManager: EmailManager())
+                case .general:
+                    GeneralView(startupModel: StartupPreferences.shared,
+                                downloadsModel: DownloadsPreferences.shared,
+                                searchModel: SearchPreferences.shared)
+                case .sync:
+                    SyncView()
+                case .appearance:
+                    AppearanceView(model: .shared)
+                case .dataClearing:
+                    DataClearingView(model: DataClearingPreferences.shared)
 
 #if NETWORK_PROTECTION
-                            case .vpn:
-                                VPNView(model: VPNPreferencesModel())
+                case .vpn:
+                    VPNView(model: VPNPreferencesModel())
 #endif
 
 #if SUBSCRIPTION
-                            case .subscription:
-                                SubscriptionUI.PreferencesSubscriptionView(model: subscriptionModel!)
+                case .subscription:
+                    SubscriptionUI.PreferencesSubscriptionView(model: subscriptionModel!)
 #endif
-                            case .autofill:
-                                AutofillView(model: AutofillPreferencesModel())
-                            case .downloads:
-                                DownloadsView(model: .shared)
-                            case .duckPlayer:
-                                DuckPlayerView(model: .shared)
-                            case .about:
+                case .autofill:
+                    AutofillView(model: AutofillPreferencesModel())
+                case .accessibility:
+                    AccessibilityView(model: AccessibilityPreferences.shared)
+                case .duckPlayer:
+                    DuckPlayerView(model: .shared)
+                case .otherPlatforms:
+                    // Opens a new tab
+                    Spacer()
+                case .about:
 #if NETWORK_PROTECTION
-                                let netPInvitePresenter = NetworkProtectionInvitePresenter()
-                                AboutView(model: AboutModel(netPInvitePresenter: netPInvitePresenter))
+                    let netPInvitePresenter = NetworkProtectionInvitePresenter()
+                    AboutView(model: AboutModel(netPInvitePresenter: netPInvitePresenter))
 #else
-                                AboutView(model: AboutModel())
+                    AboutView(model: AboutModel())
 #endif
-                            }
-                        }
-                        .frame(maxWidth: Const.paneContentWidth, maxHeight: .infinity, alignment: .topLeading)
-                        .padding(.vertical, Const.panePaddingVertical)
-                        .padding(.horizontal, Const.panePaddingHorizontal)
-
-                        Spacer()
-                    }
                 }
-                .frame(maxWidth: .infinity)
             }
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .background(Color.preferencesBackground)
+            .frame(maxWidth: Const.paneContentWidth, maxHeight: .infinity, alignment: .topLeading)
+            .padding(.vertical, Const.panePaddingVertical)
+            .padding(.horizontal, Const.panePaddingHorizontal)
         }
 
 #if SUBSCRIPTION
-        // swiftlint:disable:next cyclomatic_complexity
+        // swiftlint:disable:next cyclomatic_complexity function_body_length
         private func makeSubscriptionViewModel() -> PreferencesSubscriptionModel {
             let openURL: (URL) -> Void = { url in
                 DispatchQueue.main.async {
@@ -154,7 +179,14 @@ enum Preferences {
 
             let sheetActionHandler = SubscriptionAccessActionHandlers(restorePurchases: {
                 if #available(macOS 12.0, *) {
-                    SubscriptionPagesUseSubscriptionFeature.startAppStoreRestoreFlow { _ in }
+                    Task {
+                        guard let mainViewController = WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController,
+                              let windowControllerManager = WindowControllersManager.shared.lastKeyMainWindowController else {
+                            return
+                        }
+
+                        await SubscriptionAppStoreRestorer.restoreAppStoreSubscription(mainViewController: mainViewController, windowController: windowControllerManager)
+                    }
                 }
             },
                                                                       openURLHandler: openURL,
@@ -168,27 +200,3 @@ enum Preferences {
 #endif
     }
 }
-
-struct SyncView: View {
-
-    var body: some View {
-        if let syncService = NSApp.delegateTyped.syncService, let syncDataProviders = NSApp.delegateTyped.syncDataProviders {
-            SyncUI.ManagementView(model: SyncPreferences(syncService: syncService, syncBookmarksAdapter: syncDataProviders.bookmarksAdapter))
-                .onAppear {
-                    requestSync()
-                }
-        } else {
-            FailedAssertionView("Failed to initialize Sync Management View")
-        }
-    }
-
-    private func requestSync() {
-        Task { @MainActor in
-            guard let syncService = (NSApp.delegate as? AppDelegate)?.syncService else {
-                return
-            }
-            os_log(.debug, log: OSLog.sync, "Requesting sync if enabled")
-            syncService.scheduler.notifyDataChanged()
-        }
-    }
-}
diff --git a/DuckDuckGo/Preferences/View/PreferencesSidebar.swift b/DuckDuckGo/Preferences/View/PreferencesSidebar.swift
index 1a0c1babc6..b6f65c0a44 100644
--- a/DuckDuckGo/Preferences/View/PreferencesSidebar.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesSidebar.swift
@@ -22,22 +22,109 @@ import SwiftUIExtensions
 
 extension Preferences {
 
-    struct SidebarItem: View {
+    struct SidebarSectionHeader: View {
+        let section: PreferencesSectionIdentifier
+
+        var body: some View {
+            Group {
+                if let name = section.displayName {
+                    Text(name)
+                        .padding(.horizontal, 16)
+                        .padding(.bottom, 3)
+                        .font(PreferencesViews.Const.Fonts.sideBarHeader)
+                        .foregroundColor(.secondary)
+                        .frame(maxWidth: .infinity, minHeight: 31, alignment: .leading)
+                }
+            }
+        }
+    }
+
+    struct PaneSidebarItem: View {
         let pane: PreferencePaneIdentifier
         let isSelected: Bool
         let action: () -> Void
+        @ObservedObject var protectionStatus: PrivacyProtectionStatus
+
+        init(pane: PreferencePaneIdentifier, isSelected: Bool, action: @escaping () -> Void) {
+            self.pane = pane
+            self.isSelected = isSelected
+            self.action = action
+            self.protectionStatus = PrivacyProtectionStatus.status(for: pane)
+        }
 
         var body: some View {
             Button(action: action) {
                 HStack(spacing: 6) {
                     Image(pane.preferenceIconName).frame(width: 16, height: 16)
                     Text(pane.displayName).font(PreferencesViews.Const.Fonts.sideBarItem)
+
+                    Spacer()
+
+                    if let status = protectionStatus.status {
+                        StatusIndicatorView(status: status)
+                    }
                 }
             }
             .buttonStyle(SidebarItemButtonStyle(isSelected: isSelected))
         }
     }
 
+    enum StatusIndicator: Equatable {
+        case alwaysOn
+        case on
+        case off
+        case custom(String)
+
+        var text: String {
+            switch self {
+            case .alwaysOn:
+                return UserText.preferencesAlwaysOn
+            case .on:
+                return UserText.preferencesOn
+            case .off:
+                return UserText.preferencesOff
+            case .custom(let customText):
+                return customText
+            }
+        }
+    }
+
+    struct StatusIndicatorView: View {
+        var status: StatusIndicator
+        var isLarge: Bool = false
+
+        private var fontSize: CGFloat {
+            isLarge ? 13 : 10
+        }
+
+        private var circleSize: CGFloat {
+            isLarge ? 7 : 5
+        }
+
+        var body: some View {
+            HStack(spacing: isLarge ? 6 : 4) {
+                Circle()
+                    .frame(width: circleSize, height: circleSize)
+                    .foregroundColor(colorForStatus(status))
+
+                Text(status.text)
+                    .font(.system(size: fontSize))
+                    .foregroundColor(.secondary)
+            }
+        }
+
+        private func colorForStatus(_ status: StatusIndicator) -> Color {
+            switch status {
+            case .on, .alwaysOn:
+                return .alertGreen
+            case .off:
+                return Color.secondary.opacity(0.33)
+            case .custom:
+                return .orange
+            }
+        }
+    }
+
     struct TabSwitcher: View {
         @EnvironmentObject var model: PreferencesSidebarModel
 
@@ -61,7 +148,7 @@ extension Preferences {
                 return button
             })
             .padding(.horizontal, 3)
-            .frame(height: 60)
+            .frame(height: 51)
             .onAppear(perform: model.resetTabSelectionIfNeeded)
         }
     }
@@ -77,20 +164,22 @@ extension Preferences {
                 ScrollView {
                     VStack(spacing: 0) {
                         ForEach(model.sections) { section in
+                            SidebarSectionHeader(section: section.id)
                             sidebarSection(section)
                         }
-                    }
+                    }.padding(.bottom, 16)
                 }
 
             }
             .padding(.top, 18)
-            .padding(.horizontal, 20)
+            .padding(.horizontal, 10)
         }
 
         @ViewBuilder
         private func sidebarSection(_ section: PreferencesSection) -> some View {
             ForEach(section.panes) { pane in
-                SidebarItem(pane: pane, isSelected: model.selectedPane == pane) {
+                PaneSidebarItem(pane: pane,
+                                isSelected: model.selectedPane == pane) {
                     model.selectPane(pane)
                 }
             }
diff --git a/DuckDuckGo/Preferences/View/PreferencesSyncView.swift b/DuckDuckGo/Preferences/View/PreferencesSyncView.swift
new file mode 100644
index 0000000000..c4de382680
--- /dev/null
+++ b/DuckDuckGo/Preferences/View/PreferencesSyncView.swift
@@ -0,0 +1,52 @@
+//
+//  PreferencesSyncView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import Common
+import SyncUI
+import SwiftUIExtensions
+import BrowserServicesKit
+
+struct SyncView: View {
+
+    var body: some View {
+        if let syncService = NSApp.delegateTyped.syncService, let syncDataProviders = NSApp.delegateTyped.syncDataProviders {
+            let syncPreferences = SyncPreferences(
+                syncService: syncService,
+                syncBookmarksAdapter: syncDataProviders.bookmarksAdapter,
+                syncCredentialsAdapter: syncDataProviders.credentialsAdapter
+            )
+            SyncUI.ManagementView(model: syncPreferences)
+                .onAppear {
+                    requestSync()
+                }
+        } else {
+            FailedAssertionView("Failed to initialize Sync Management View")
+        }
+    }
+
+    private func requestSync() {
+        Task { @MainActor in
+            guard let syncService = (NSApp.delegate as? AppDelegate)?.syncService else {
+                return
+            }
+            os_log(.debug, log: OSLog.sync, "Requesting sync if enabled")
+            syncService.scheduler.notifyDataChanged()
+        }
+    }
+}
diff --git a/DuckDuckGo/Preferences/View/PreferencesWebTrackingProtectionView.swift b/DuckDuckGo/Preferences/View/PreferencesWebTrackingProtectionView.swift
new file mode 100644
index 0000000000..90b5fa821a
--- /dev/null
+++ b/DuckDuckGo/Preferences/View/PreferencesWebTrackingProtectionView.swift
@@ -0,0 +1,61 @@
+//
+//  PreferencesWebTrackingProtectionView.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import Combine
+import PreferencesViews
+import SwiftUI
+import SwiftUIExtensions
+
+extension Preferences {
+
+    struct WebTrackingProtectionView: View {
+        @ObservedObject var model: WebTrackingProtectionPreferences
+
+        var body: some View {
+            PreferencePane(UserText.webTrackingProtection, spacing: 4) {
+
+                // SECTION 1: Status Indicator
+                PreferencePaneSection {
+                    StatusIndicatorView(status: .alwaysOn, isLarge: true)
+                }
+
+                // SECTION 2: Description
+                PreferencePaneSection {
+                    VStack(alignment: .leading, spacing: 1) {
+                        TextMenuItemCaption(UserText.webTrackingProtectionExplanation)
+                        TextButton(UserText.learnMore) {
+                            model.openNewTab(with: .webTrackingProtection)
+                        }
+                    }
+                }
+
+                // SECTION 3: Global privacy control
+                PreferencePaneSection {
+                    ToggleMenuItem(UserText.gpcCheckboxTitle, isOn: $model.isGPCEnabled)
+                    VStack(alignment: .leading, spacing: 1) {
+                        TextMenuItemCaption(UserText.gpcExplanation)
+                        TextButton(UserText.learnMore) {
+                            model.openNewTab(with: .gpcLearnMore)
+                        }
+                    }.padding(.leading, 19)
+                }
+            }
+        }
+    }
+}
diff --git a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift
index d30d1700d7..4a5d5113f3 100644
--- a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift
+++ b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift
@@ -221,7 +221,7 @@ extension PrivacyDashboardViewController: PrivacyDashboardControllerDelegate {
 
         switch target {
         case .cookiePopupManagement:
-            tabCollection.appendNewTab(with: .settings(pane: .privacy), selected: true)
+            tabCollection.appendNewTab(with: .settings(pane: .dataClearing), selected: true)
         default:
             tabCollection.appendNewTab(with: .anySettingsPane, selected: true)
         }
@@ -258,11 +258,13 @@ extension PrivacyDashboardViewController: PrivacyDashboardReportBrokenSiteDelega
                                     didRequestSubmitBrokenSiteReportWithCategory category: String,
                                     description: String) {
         let source: BrokenSiteReport.Source = privacyDashboardController.initDashboardMode == .report ? .appMenu : .dashboard
-        do {
-            let report = try makeBrokenSiteReport(category: category, description: description, source: source)
-            try brokenSiteReporter.report(report, reportMode: .regular)
-        } catch {
-            os_log("Failed to generate or send the broken site report: \(error.localizedDescription)", type: .error)
+        Task { @MainActor in
+            do {
+                let report = try await makeBrokenSiteReport(category: category, description: description, source: source)
+                try brokenSiteReporter.report(report, reportMode: .regular)
+            } catch {
+                os_log("Failed to generate or send the broken site report: \(error.localizedDescription)", type: .error)
+            }
         }
     }
 
@@ -281,13 +283,15 @@ extension PrivacyDashboardViewController: PrivacyDashboardToggleReportDelegate {
                                    didRequestSubmitToggleReportWithSource source: BrokenSiteReport.Source,
                                    didOpenReportInfo: Bool,
                                    toggleReportCounter: Int?) {
-       do {
-           let report = try makeBrokenSiteReport(source: source,
-                                                 didOpenReportInfo: didOpenReportInfo,
-                                                 toggleReportCounter: toggleReportCounter)
-           try toggleProtectionsOffReporter.report(report, reportMode: .toggle)
-       } catch {
-           os_log("Failed to generate or send the broken site report: %@", type: .error, error.localizedDescription)
+       Task { @MainActor in
+           do {
+               let report = try await makeBrokenSiteReport(source: source,
+                                                           didOpenReportInfo: didOpenReportInfo,
+                                                           toggleReportCounter: toggleReportCounter)
+               try toggleProtectionsOffReporter.report(report, reportMode: .toggle)
+           } catch {
+               os_log("Failed to generate or send the broken site report: %@", type: .error, error.localizedDescription)
+           }
        }
    }
 
@@ -301,11 +305,25 @@ extension PrivacyDashboardViewController {
         case failedToFetchTheCurrentURL
     }
 
+    private func calculateWebVitals(performanceMetrics: PerformanceMetricsSubfeature?, privacyConfig: PrivacyConfiguration) async -> [Double]? {
+        var webVitalsResult: [Double]?
+        if privacyConfig.isEnabled(featureKey: .performanceMetrics) {
+            webVitalsResult = await withCheckedContinuation({ continuation in
+                guard let performanceMetrics else { continuation.resume(returning: nil); return }
+                performanceMetrics.notifyHandler { result in
+                    continuation.resume(returning: result)
+                }
+            })
+        }
+
+        return webVitalsResult
+    }
+
     private func makeBrokenSiteReport(category: String = "",
                                       description: String = "",
                                       source: BrokenSiteReport.Source,
                                       didOpenReportInfo: Bool = false,
-                                      toggleReportCounter: Int? = nil) throws -> BrokenSiteReport {
+                                      toggleReportCounter: Int? = nil) async throws -> BrokenSiteReport {
 
         // ⚠️ To limit privacy risk, site URL is trimmed to not include query and fragment
         guard let currentTab = tabViewModel?.tab,
@@ -321,12 +339,14 @@ extension PrivacyDashboardViewController {
         let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
         let protectionsState = configuration.isFeature(.contentBlocking, enabledForDomain: currentTab.content.url?.host)
 
+        let webVitals = await calculateWebVitals(performanceMetrics: currentTab.performanceMetrics, privacyConfig: configuration)
+
         var errors: [Error]?
         var statusCodes: [Int]?
-        if let error = tabViewModel?.tab.lastWebError {
+        if let error = currentTab.lastWebError {
             errors = [error]
         }
-        if let httpStatusCode = tabViewModel?.tab.lastHttpStatusCode {
+        if let httpStatusCode = currentTab.lastHttpStatusCode {
             statusCodes = [httpStatusCode]
         }
 
@@ -339,13 +359,17 @@ extension PrivacyDashboardViewController {
                                                tdsETag: ContentBlocking.shared.contentBlockingManager.currentRules.first?.etag,
                                                blockedTrackerDomains: blockedTrackerDomains,
                                                installedSurrogates: installedSurrogates,
-                                               isGPCEnabled: PrivacySecurityPreferences.shared.gpcEnabled,
+                                               isGPCEnabled: WebTrackingProtectionPreferences.shared.isGPCEnabled,
                                                ampURL: ampURL,
                                                urlParametersRemoved: urlParametersRemoved,
                                                protectionsState: protectionsState,
                                                reportFlow: source,
                                                errors: errors,
                                                httpStatusCodes: statusCodes,
+                                               openerContext: currentTab.inferredOpenerContext,
+                                               vpnOn: currentTab.tunnelController?.isConnected ?? false,
+                                               jsPerformance: webVitals,
+                                               userRefreshCount: currentTab.refreshCountSinceLoad,
                                                didOpenReportInfo: didOpenReportInfo,
                                                toggleReportCounter: toggleReportCounter)
         return websiteBreakage
diff --git a/DuckDuckGo/SecureVault/View/AutofillPopoverPresenter.swift b/DuckDuckGo/SecureVault/View/AutofillPopoverPresenter.swift
new file mode 100644
index 0000000000..871641ebb0
--- /dev/null
+++ b/DuckDuckGo/SecureVault/View/AutofillPopoverPresenter.swift
@@ -0,0 +1,84 @@
+//
+//  AutofillPopoverPresenter.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import BrowserServicesKit
+import Foundation
+
+protocol AutofillPopoverPresenter {
+    var passwordDomain: String? { get set }
+    var popoverIsDirty: Bool { get }
+    var popoverIsShown: Bool { get }
+    var popoverPresentingWindow: NSWindow? { get }
+    func show(positionedBelow view: NSView, withDomain domain: String?, selectedCategory category: SecureVaultSorting.Category?)
+    func show(positionedBelow view: NSView, withSelectedAccount: SecureVaultModels.WebsiteAccount)
+    func dismiss()
+}
+
+final class DefaultAutofillPopoverPresenter: AutofillPopoverPresenter, PopoverPresenter {
+
+    private var popover: PasswordManagementPopover?
+
+    var passwordDomain: String? {
+        get {
+            popover?.viewController.domain
+        } set {
+            popover?.viewController.domain = newValue
+        }
+    }
+
+    /// Property indicating whether the popover view controller is "dirty", i.e it's state has been edited but is unsaved
+    var popoverIsDirty: Bool {
+        popover?.viewController.isDirty ?? false
+    }
+
+    var popoverIsShown: Bool {
+        popover?.isShown ?? false
+    }
+
+    var popoverPresentingWindow: NSWindow? {
+        popover?.mainWindow
+    }
+
+    /// Note: Dismisses any previously displayed popover before showing a new one
+    func show(positionedBelow view: NSView, withDomain domain: String?, selectedCategory category: SecureVaultSorting.Category?) {
+        show(under: view, withDomain: domain).select(category: category)
+    }
+
+    func show(positionedBelow view: NSView, withSelectedAccount account: SecureVaultModels.WebsiteAccount) {
+        show(under: view, withDomain: nil).select(websiteAccount: account)
+    }
+
+    func dismiss() {
+        guard popoverIsShown, let popover else { return }
+        popover.close()
+        self.popover = nil
+    }
+}
+
+private extension DefaultAutofillPopoverPresenter {
+
+    func show(under view: NSView, withDomain domain: String?) -> PasswordManagementPopover {
+        dismiss()
+
+        let popover = PasswordManagementPopover()
+        self.popover = popover
+        popover.viewController.domain = domain
+        show(popover, positionedBelow: view)
+        return popover
+    }
+}
diff --git a/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift b/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift
index f25f41632e..7e439c1e25 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift
+++ b/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift
@@ -23,8 +23,6 @@ import SwiftUI
 
 final class PasswordManagementPopover: NSPopover {
 
-    private var cancellables = Set<AnyCancellable>()
-
     override init() {
         super.init()
 
@@ -61,23 +59,6 @@ final class PasswordManagementPopover: NSPopover {
 
 extension PasswordManagementPopover: NSPopoverDelegate {
 
-    func popoverDidShow(_ notification: Notification) {
-        NotificationCenter.default.publisher(for: NSWindow.didResignMainNotification)
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] _ in
-                guard let self = self, self.isShown else { return }
-
-                if !DeviceAuthenticator.shared.isAuthenticating {
-                    self.close()
-                }
-            }
-            .store(in: &cancellables)
-    }
-
-    func popoverShouldClose(_ popover: NSPopover) -> Bool {
-        return !DeviceAuthenticator.shared.isAuthenticating
-    }
-
     func popoverDidClose(_ notification: Notification) {
         if let window = viewController.view.window {
             for sheet in window.sheets {
diff --git a/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift b/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift
index cc1ae4fcba..4647fd79a8 100644
--- a/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift
+++ b/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift
@@ -279,7 +279,7 @@ final class SaveCredentialsViewController: NSViewController {
             delegate?.shouldCloseSaveCredentialsViewController(self)
         }
 
-        guard PrivacySecurityPreferences.shared.loginDetectionEnabled else {
+        guard DataClearingPreferences.shared.isLoginDetectionEnabled else {
             notifyDelegate()
             return
         }
diff --git a/DuckDuckGo/Statistics/DailyPixel.swift b/DuckDuckGo/Statistics/DailyPixel.swift
index 9aade6d337..e436d453ba 100644
--- a/DuckDuckGo/Statistics/DailyPixel.swift
+++ b/DuckDuckGo/Statistics/DailyPixel.swift
@@ -66,6 +66,10 @@ final class DailyPixel {
         storage.set(Date(), forKey: pixel.name)
     }
 
+    static func clearLastFireDate(pixel: Pixel.Event) {
+        storage.removeObject(forKey: pixel.name)
+    }
+
 }
 
 private extension Pixel.Event {
diff --git a/DuckDuckGo/Statistics/Pixel.swift b/DuckDuckGo/Statistics/Pixel.swift
index 4dddf4d740..30fde214bd 100644
--- a/DuckDuckGo/Statistics/Pixel.swift
+++ b/DuckDuckGo/Statistics/Pixel.swift
@@ -154,6 +154,9 @@ final class Pixel {
                           onComplete: onComplete)
     }
 
+    func clearRepetitions(for event: Pixel.Event) {
+        store().removeValue(forKey: event.name)
+    }
 }
 
 public func pixelAssertionFailure(_ message: @autoclosure () -> String = String(), file: StaticString = #fileID, line: UInt = #line) {
diff --git a/DuckDuckGo/Statistics/PixelEvent.swift b/DuckDuckGo/Statistics/PixelEvent.swift
index 8756dae668..695cc12e88 100644
--- a/DuckDuckGo/Statistics/PixelEvent.swift
+++ b/DuckDuckGo/Statistics/PixelEvent.swift
@@ -164,7 +164,7 @@ extension Pixel {
         // VPN
         case vpnBreakageReport(category: String, description: String, metadata: String)
 
-        // Network Protection
+        // VPN
         case networkProtectionWaitlistUserActive
         case networkProtectionWaitlistEntryPointMenuItemDisplayed
         case networkProtectionWaitlistEntryPointToolbarButtonDisplayed
@@ -218,6 +218,9 @@ extension Pixel {
         case dataBrokerProtectionErrorWhenFetchingSubscriptionAuthTokenAfterSignIn
 
         // Subscription
+        case privacyProFeatureEnabled
+        case privacyProBetaUserThankYouVPN
+        case privacyProBetaUserThankYouDBP
         case privacyProSubscriptionActive
         case privacyProOfferScreenImpression
         case privacyProPurchaseAttempt
@@ -250,14 +253,30 @@ extension Pixel {
         case privacyProSubscriptionManagementEmail
         case privacyProSubscriptionManagementPlanBilling
         case privacyProSubscriptionManagementRemoval
+        case privacyProPurchaseStripeSuccess
+        // Web pixels
+        case privacyProOfferMonthlyPriceClick
+        case privacyProOfferYearlyPriceClick
+        case privacyProAddEmailSuccess
+        case privacyProWelcomeFAQClick
 
         case dailyPixel(Event, isFirst: Bool)
 
+        // Default Browser
+        case defaultRequestedFromHomepage
+        case defaultRequestedFromHomepageSetupView
+        case defaultRequestedFromSettings
+        case defaultRequestedFromOnboarding
+
         case protectionToggledOffBreakageReport
         case toggleProtectionsDailyCount
         case toggleReportDoNotSend
         case toggleReportDismiss
 
+        // Password Import Keychain Prompt
+        case passwordImportKeychainPrompt
+        case passwordImportKeychainPromptDenied
+
         enum Debug {
             /// This is a convenience pixel that allows us to fire `PixelKitEvents` using our
             /// regular `Pixel.fire()` calls.  This is a convenience intermediate step to help ensure
@@ -634,7 +653,16 @@ extension Pixel.Event {
         case .networkProtectionGeoswitchingNoLocations:
             return "m_mac_netp_ev_geoswitching_no_locations"
 
+        case .defaultRequestedFromHomepage: return "m_mac_default_requested_from_homepage"
+        case .defaultRequestedFromHomepageSetupView: return "m_mac_default_requested_from_homepage_setup_view"
+        case .defaultRequestedFromSettings: return "m_mac_default_requested_from_settings"
+        case .defaultRequestedFromOnboarding: return "m_mac_default_requested_from_onboarding"
+
             // MARK: - Subscription
+        case .privacyProFeatureEnabled: return
+            "m_mac_\(appDistribution)_privacy-pro_feature_enabled"
+        case .privacyProBetaUserThankYouVPN: return "m_mac_\(appDistribution)_privacy-pro_promotion-dialog_shown_vpn"
+        case .privacyProBetaUserThankYouDBP: return "m_mac_\(appDistribution)_privacy-pro_promotion-dialog_shown_dbp"
         case .privacyProSubscriptionActive: return "m_mac_\(appDistribution)_privacy-pro_app_subscription_active"
         case .privacyProOfferScreenImpression: return "m_mac_\(appDistribution)_privacy-pro_offer_screen_impression"
         case .privacyProPurchaseAttempt: return "m_mac_\(appDistribution)_privacy-pro_terms-conditions_subscribe_click"
@@ -667,11 +695,21 @@ extension Pixel.Event {
         case .privacyProSubscriptionManagementEmail: return "m_mac_\(appDistribution)_privacy-pro_manage-email_edit_click"
         case .privacyProSubscriptionManagementPlanBilling: return "m_mac_\(appDistribution)_privacy-pro_settings_change-plan-or-billing_click"
         case .privacyProSubscriptionManagementRemoval: return "m_mac_\(appDistribution)_privacy-pro_settings_remove-from-device_click"
+        case .privacyProPurchaseStripeSuccess: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_stripe_success"
+            // Web
+        case .privacyProOfferMonthlyPriceClick: return "m_mac_\(appDistribution)_privacy-pro_offer_monthly-price_click"
+        case .privacyProOfferYearlyPriceClick: return "m_mac_\(appDistribution)_privacy-pro_offer_yearly-price_click"
+        case .privacyProAddEmailSuccess: return "m_mac_\(appDistribution)_privacy-pro_app_add-email_success_u"
+        case .privacyProWelcomeFAQClick: return "m_mac_\(appDistribution)_privacy-pro_welcome_faq_click_u"
 
         case .protectionToggledOffBreakageReport: return "m_mac_protection-toggled-off-breakage-report"
         case .toggleProtectionsDailyCount: return "m_mac_toggle-protections-daily-count"
         case .toggleReportDoNotSend: return "m_mac_toggle-report-do-not-send"
         case .toggleReportDismiss: return "m_mac_toggle-report-dismiss"
+
+        // Password Import Keychain Prompt
+        case .passwordImportKeychainPrompt: return "m_mac_password_import_keychain_prompt"
+        case .passwordImportKeychainPromptDenied: return "m_mac_password_import_keychain_prompt_denied"
         }
     }
 }
diff --git a/DuckDuckGo/Statistics/PixelParameters.swift b/DuckDuckGo/Statistics/PixelParameters.swift
index 12312f60bb..afbd32473f 100644
--- a/DuckDuckGo/Statistics/PixelParameters.swift
+++ b/DuckDuckGo/Statistics/PixelParameters.swift
@@ -166,6 +166,13 @@ extension Pixel.Event {
              .dataBrokerEnableLoginItemDaily,
              .dataBrokerDisableLoginItemDaily,
              .dataBrokerResetLoginItemDaily,
+             .defaultRequestedFromHomepage,
+             .defaultRequestedFromHomepageSetupView,
+             .defaultRequestedFromSettings,
+             .defaultRequestedFromOnboarding,
+             .privacyProFeatureEnabled,
+             .privacyProBetaUserThankYouVPN,
+             .privacyProBetaUserThankYouDBP,
              .privacyProSubscriptionActive,
              .privacyProOfferScreenImpression,
              .privacyProPurchaseAttempt,
@@ -201,7 +208,14 @@ extension Pixel.Event {
              .protectionToggledOffBreakageReport,
              .toggleProtectionsDailyCount,
              .toggleReportDoNotSend,
-             .toggleReportDismiss:
+             .toggleReportDismiss,
+             .privacyProOfferMonthlyPriceClick,
+             .privacyProOfferYearlyPriceClick,
+             .privacyProAddEmailSuccess,
+             .privacyProWelcomeFAQClick,
+             .privacyProPurchaseStripeSuccess,
+             .passwordImportKeychainPrompt,
+             .passwordImportKeychainPromptDenied:
             return nil
         }
     }
@@ -345,11 +359,11 @@ extension Error {
         let nsError = self as NSError
 
         params[PixelKit.Parameters.errorCode] = "\(nsError.code)"
-        params[PixelKit.Parameters.errorDesc] = nsError.domain
+        params[PixelKit.Parameters.errorDomain] = nsError.domain
 
         if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError {
             params[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
-            params[PixelKit.Parameters.underlyingErrorDesc] = underlyingError.domain
+            params[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
         }
 
         if let sqlErrorCode = nsError.userInfo["SQLiteResultCode"] as? NSNumber {
diff --git a/DuckDuckGo/Subscription/AccountManagerExtension.swift b/DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift
similarity index 67%
rename from DuckDuckGo/Subscription/AccountManagerExtension.swift
rename to DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift
index c1758fb2e5..3e24a33be7 100644
--- a/DuckDuckGo/Subscription/AccountManagerExtension.swift
+++ b/DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift
@@ -1,5 +1,5 @@
 //
-//  AccountManagerExtension.swift
+//  DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift
 //
 //  Copyright © 2024 DuckDuckGo. All rights reserved.
 //
@@ -16,12 +16,15 @@
 //  limitations under the License.
 //
 
+import Foundation
+
 #if SUBSCRIPTION
 import Subscription
+#endif
 
-public extension AccountManager {
+extension DefaultSubscriptionFeatureAvailability {
     convenience init() {
-        self.init(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+        self.init(privacyConfigurationManager: AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager,
+                  purchasePlatform: SubscriptionPurchaseEnvironment.current)
     }
 }
-#endif
diff --git a/DuckDuckGo/Suggestions/Model/SuggestionContainer.swift b/DuckDuckGo/Suggestions/Model/SuggestionContainer.swift
index d1be46c375..9ca0f3aaa9 100644
--- a/DuckDuckGo/Suggestions/Model/SuggestionContainer.swift
+++ b/DuckDuckGo/Suggestions/Model/SuggestionContainer.swift
@@ -17,7 +17,7 @@
 //
 
 import Foundation
-import BrowserServicesKit
+import Suggestions
 import Common
 import History
 
@@ -86,11 +86,11 @@ final class SuggestionContainer {
 
 extension SuggestionContainer: SuggestionLoadingDataSource {
 
-    func history(for suggestionLoading: SuggestionLoading) -> [BrowserServicesKit.HistorySuggestion] {
+    func history(for suggestionLoading: SuggestionLoading) -> [HistorySuggestion] {
         return historyCoordinating.history ?? []
     }
 
-    func bookmarks(for suggestionLoading: SuggestionLoading) -> [BrowserServicesKit.Bookmark] {
+    func bookmarks(for suggestionLoading: SuggestionLoading) -> [Suggestions.Bookmark] {
         bookmarkManager.list?.bookmarks() ?? []
     }
 
diff --git a/DuckDuckGo/Suggestions/View/SuggestionViewController.swift b/DuckDuckGo/Suggestions/View/SuggestionViewController.swift
index 44442c1f86..b53239a6ac 100644
--- a/DuckDuckGo/Suggestions/View/SuggestionViewController.swift
+++ b/DuckDuckGo/Suggestions/View/SuggestionViewController.swift
@@ -87,6 +87,7 @@ final class SuggestionViewController: NSViewController {
 
     private func setupTableView() {
         tableView.style = .plain
+        tableView.setAccessibilityIdentifier("SuggestionViewController.tableView")
     }
 
     private func addTrackingArea() {
diff --git a/DuckDuckGo/Suggestions/ViewModel/SuggestionContainerViewModel.swift b/DuckDuckGo/Suggestions/ViewModel/SuggestionContainerViewModel.swift
index 8d205d7fcc..8ad5149a9b 100644
--- a/DuckDuckGo/Suggestions/ViewModel/SuggestionContainerViewModel.swift
+++ b/DuckDuckGo/Suggestions/ViewModel/SuggestionContainerViewModel.swift
@@ -75,7 +75,7 @@ final class SuggestionContainerViewModel {
     }
 
     func setUserStringValue(_ userStringValue: String, userAppendedStringToTheEnd: Bool) {
-        guard AppearancePreferences.shared.showAutocompleteSuggestions else {
+        guard SearchPreferences.shared.showAutocompleteSuggestions else {
             return
         }
 
diff --git a/DuckDuckGo/Suggestions/ViewModel/SuggestionViewModel.swift b/DuckDuckGo/Suggestions/ViewModel/SuggestionViewModel.swift
index e3aac3ea0c..d7b8c5910c 100644
--- a/DuckDuckGo/Suggestions/ViewModel/SuggestionViewModel.swift
+++ b/DuckDuckGo/Suggestions/ViewModel/SuggestionViewModel.swift
@@ -17,7 +17,7 @@
 //
 
 import Cocoa
-import BrowserServicesKit
+import Suggestions
 
 struct SuggestionViewModel: Equatable {
 
diff --git a/DuckDuckGo/Sync/SyncBookmarksAdapter.swift b/DuckDuckGo/Sync/SyncBookmarksAdapter.swift
index 8d90de82f8..d7a9651d14 100644
--- a/DuckDuckGo/Sync/SyncBookmarksAdapter.swift
+++ b/DuckDuckGo/Sync/SyncBookmarksAdapter.swift
@@ -112,6 +112,7 @@ final class SyncBookmarksAdapter {
             database: database,
             metadataStore: metadataStore,
             metricsEvents: metricsEventsHandler,
+            log: OSLog.sync,
             syncDidUpdateData: { [weak self] in
                 LocalBookmarkManager.shared.loadBookmarks()
                 self?.isSyncBookmarksPaused = false
@@ -132,7 +133,7 @@ final class SyncBookmarksAdapter {
 
         if !didMigrateToImprovedListsHandling {
             didMigrateToImprovedListsHandling = true
-            provider.lastSyncTimestamp = nil
+            provider.updateSyncTimestamps(server: nil, local: nil)
         }
 
         bindSyncErrorPublisher(provider)
diff --git a/DuckDuckGo/Sync/SyncCredentialsAdapter.swift b/DuckDuckGo/Sync/SyncCredentialsAdapter.swift
index 4eec486d2b..444e7a1872 100644
--- a/DuckDuckGo/Sync/SyncCredentialsAdapter.swift
+++ b/DuckDuckGo/Sync/SyncCredentialsAdapter.swift
@@ -73,6 +73,7 @@ final class SyncCredentialsAdapter {
                 secureVaultErrorReporter: SecureVaultErrorReporter.shared,
                 metadataStore: metadataStore,
                 metricsEvents: metricsEventsHandler,
+                log: OSLog.sync,
                 syncDidUpdateData: { [weak self] in
                     self?.syncDidCompleteSubject.send()
                     self?.isSyncCredentialsPaused = false
diff --git a/DuckDuckGo/Sync/SyncDebugMenu.swift b/DuckDuckGo/Sync/SyncDebugMenu.swift
index 6d60705595..da1fe3e0be 100644
--- a/DuckDuckGo/Sync/SyncDebugMenu.swift
+++ b/DuckDuckGo/Sync/SyncDebugMenu.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import DDGSync
+import Bookmarks
 
 @MainActor
 final class SyncDebugMenu: NSMenu {
@@ -32,6 +33,8 @@ final class SyncDebugMenu: NSMenu {
                 .submenu(environmentMenu)
             NSMenuItem(title: "Reset Favicons Fetcher Onboarding Dialog", action: #selector(resetFaviconsFetcherOnboardingDialog))
                 .targetting(self)
+            NSMenuItem(title: "Populate Stub objects", action: #selector(createStubsForDebug))
+                .targetting(self)
         }
     }
 
@@ -78,6 +81,28 @@ final class SyncDebugMenu: NSMenu {
 #endif
     }
 
+    @objc func createStubsForDebug() {
+#if DEBUG || REVIEW
+        let db = BookmarkDatabase.shared
+
+        let context = db.db.makeContext(concurrencyType: .privateQueueConcurrencyType)
+
+        context.performAndWait {
+            let root = BookmarkUtils.fetchRootFolder(context)!
+
+            _ = BookmarkEntity.makeBookmark(title: "Non stub", url: "url", parent: root, context: context)
+            let stub = BookmarkEntity.makeBookmark(title: "Stub", url: "", parent: root, context: context)
+            stub.isStub = true
+            let emptyStub = BookmarkEntity.makeBookmark(title: "", url: "", parent: root, context: context)
+            emptyStub.isStub = true
+            emptyStub.title = nil
+            emptyStub.url = nil
+
+            try? context.save()
+        }
+#endif
+    }
+
     @objc func resetFaviconsFetcherOnboardingDialog(_ sender: NSMenuItem) {
         UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<String>.Key.syncDidPresentFaviconsFetcherOnboarding.rawValue)
     }
diff --git a/DuckDuckGo/Sync/SyncSettingsAdapter.swift b/DuckDuckGo/Sync/SyncSettingsAdapter.swift
index d5939b7ac9..96fc030a0d 100644
--- a/DuckDuckGo/Sync/SyncSettingsAdapter.swift
+++ b/DuckDuckGo/Sync/SyncSettingsAdapter.swift
@@ -53,6 +53,7 @@ final class SyncSettingsAdapter {
             metadataStore: metadataStore,
             settingsHandlers: [FavoritesDisplayModeSyncHandler(), EmailProtectionSyncHandler(emailManager: emailManager)],
             metricsEvents: metricsEventsHandler,
+            log: OSLog.sync,
             syncDidUpdateData: { [weak self] in
                 self?.syncDidCompleteSubject.send()
             }
diff --git a/DuckDuckGo/Tab/Model/Tab.swift b/DuckDuckGo/Tab/Model/Tab.swift
index accb86d699..6fd7bffd3a 100644
--- a/DuckDuckGo/Tab/Model/Tab.swift
+++ b/DuckDuckGo/Tab/Model/Tab.swift
@@ -25,6 +25,7 @@ import Navigation
 import UserScript
 import WebKit
 import History
+import PrivacyDashboard
 
 #if SUBSCRIPTION
 import Subscription
@@ -344,7 +345,7 @@ protocol NewWindowPolicyDecisionMaker {
     let pinnedTabsManager: PinnedTabsManager
 
 #if NETWORK_PROTECTION
-    private var tunnelController: NetworkProtectionIPCTunnelController?
+    private(set) var tunnelController: NetworkProtectionIPCTunnelController?
 #endif
 
     private let webViewConfiguration: WKWebViewConfiguration
@@ -539,8 +540,7 @@ protocol NewWindowPolicyDecisionMaker {
             .sink { [weak self] onboardingStatus in
                 guard onboardingStatus == .completed else { return }
 
-                let machServiceName = Bundle.main.vpnMenuAgentBundleId
-                let ipcClient = TunnelControllerIPCClient(machServiceName: machServiceName)
+                let ipcClient = TunnelControllerIPCClient()
                 ipcClient.register()
 
                 self?.tunnelController = NetworkProtectionIPCTunnelController(ipcClient: ipcClient)
@@ -779,6 +779,10 @@ protocol NewWindowPolicyDecisionMaker {
     @Published private(set) var lastWebError: Error?
     @Published private(set) var lastHttpStatusCode: Int?
 
+    @Published private(set) var inferredOpenerContext: BrokenSiteReport.OpenerContext?
+    @Published private(set) var refreshCountSinceLoad: Int = 0
+    private (set) var performanceMetrics: PerformanceMetricsSubfeature?
+
     @Published private(set) var isLoading: Bool = false
     @Published private(set) var loadingProgress: Double = 0.0
 
@@ -1028,6 +1032,8 @@ protocol NewWindowPolicyDecisionMaker {
             return nil
         }
 
+        refreshCountSinceLoad += 1
+
         self.content = content.forceReload()
         if webView.url == nil, content.isUrl {
             // load from cache or interactionStateData when called by lazy loader
@@ -1287,6 +1293,9 @@ extension Tab: UserContentControllerDelegate {
         userScripts.faviconScript.delegate = self
         userScripts.pageObserverScript.delegate = self
         userScripts.printingUserScript.delegate = self
+
+        performanceMetrics = PerformanceMetricsSubfeature(targetWebview: webView)
+        userScripts.contentScopeUserScriptIsolated.registerSubfeature(delegate: performanceMetrics!)
     }
 
 }
@@ -1357,11 +1366,32 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
         committedURL = navigation.url
     }
 
+    func resetRefreshCountIfNeeded(action: NavigationAction) {
+        switch action.navigationType {
+        case .reload, .other:
+            break
+        default:
+            refreshCountSinceLoad = 0
+        }
+    }
+
+    func setOpenerContextIfNeeded(action: NavigationAction) {
+        switch action.navigationType {
+        case .linkActivated, .formSubmitted:
+            inferredOpenerContext = .navigation
+        default:
+            break
+        }
+    }
+
     @MainActor
     func decidePolicy(for navigationAction: NavigationAction, preferences: inout NavigationPreferences) async -> NavigationActionPolicy? {
         // allow local file navigations
         if navigationAction.url.isFileURL { return .allow }
 
+        resetRefreshCountIfNeeded(action: navigationAction)
+        setOpenerContextIfNeeded(action: navigationAction)
+
         // when navigating to a URL with basic auth username/password, cache it and redirect to a trimmed URL
         if let mainFrame = navigationAction.mainFrameTarget,
            let credential = navigationAction.url.basicAuthCredential {
@@ -1416,6 +1446,10 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
             error = nil
         }
 
+        if inferredOpenerContext != .external {
+            inferredOpenerContext = nil
+        }
+
         invalidateInteractionStateData()
     }
 
@@ -1425,6 +1459,12 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
         webViewDidFinishNavigationPublisher.send()
         statisticsLoader?.refreshRetentionAtb(isSearch: navigation.url.isDuckDuckGoSearch)
 
+        Task { @MainActor in
+            if await webView.isCurrentSiteReferredFromDuckDuckGo {
+                inferredOpenerContext = .serp
+            }
+        }
+
 #if NETWORK_PROTECTION
         if navigation.url.isDuckDuckGoSearch, tunnelController?.isConnected == true {
             DailyPixel.fire(pixel: .networkProtectionEnabledOnSearch, frequency: .dailyAndCount)
diff --git a/DuckDuckGo/Tab/Model/UserContentUpdating.swift b/DuckDuckGo/Tab/Model/UserContentUpdating.swift
index ba9f8ba7b6..721608ad24 100644
--- a/DuckDuckGo/Tab/Model/UserContentUpdating.swift
+++ b/DuckDuckGo/Tab/Model/UserContentUpdating.swift
@@ -50,13 +50,13 @@ final class UserContentUpdating {
          privacyConfigurationManager: PrivacyConfigurationManaging,
          trackerDataManager: TrackerDataManager,
          configStorage: ConfigurationStoring,
-         privacySecurityPreferences: PrivacySecurityPreferences,
+         webTrackingProtectionPreferences: WebTrackingProtectionPreferences,
          tld: TLD) {
 
         let makeValue: (Update) -> NewContent = { rulesUpdate in
             let sourceProvider = ScriptSourceProvider(configStorage: configStorage,
                                                       privacyConfigurationManager: privacyConfigurationManager,
-                                                      privacySettings: privacySecurityPreferences,
+                                                      webTrackingProtectionPreferences: webTrackingProtectionPreferences,
                                                       contentBlockingManager: contentBlockerRulesManager,
                                                       trackerDataManager: trackerDataManager,
                                                       tld: tld)
@@ -78,7 +78,7 @@ final class UserContentUpdating {
         // 1. Collect updates from ContentBlockerRulesManager and generate UserScripts based on its output
         cancellable = contentBlockerRulesManager.updatesPublisher
             // regenerate UserScripts on gpcEnabled preference updated
-            .combineLatest(privacySecurityPreferences.$gpcEnabled)
+            .combineLatest(webTrackingProtectionPreferences.$isGPCEnabled)
             .map { $0.0 } // drop gpcEnabled value: $0.1
             .combineLatest(onNotificationWithInitial(.autofillUserSettingsDidChange), combine)
             .combineLatest(onNotificationWithInitial(.autofillScriptDebugSettingsDidChange), combine)
diff --git a/DuckDuckGo/Tab/TabExtensions/AutofillTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/AutofillTabExtension.swift
index e4b1c54fa2..5a973d76cc 100644
--- a/DuckDuckGo/Tab/TabExtensions/AutofillTabExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/AutofillTabExtension.swift
@@ -109,6 +109,7 @@ extension AutofillTabExtension: SecureVaultManagerDelegate {
                             promptUserToAutofillCredentialsForDomain domain: String,
                             withAccounts accounts: [SecureVaultModels.WebsiteAccount],
                             withTrigger trigger: AutofillUserScript.GetTriggerType,
+                            onAccountSelected account: @escaping (SecureVaultModels.WebsiteAccount?) -> Void,
                             completionHandler: @escaping (SecureVaultModels.WebsiteAccount?) -> Void) {
         // no-op on macOS
     }
@@ -198,7 +199,7 @@ extension AutofillTabExtension: SecureVaultManagerDelegate {
             supportedFeatures.passwordGeneration = false
         }
 
-        return ContentScopeProperties(gpcEnabled: PrivacySecurityPreferences.shared.gpcEnabled,
+        return ContentScopeProperties(gpcEnabled: WebTrackingProtectionPreferences.shared.isGPCEnabled,
                                       sessionKey: autofillScript?.sessionKey ?? "",
                                       featureToggles: supportedFeatures)
     }
diff --git a/DuckDuckGo/Tab/TabExtensions/NavigationProtectionTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/NavigationProtectionTabExtension.swift
index 539f7a29e3..aa8fa230fc 100644
--- a/DuckDuckGo/Tab/TabExtensions/NavigationProtectionTabExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/NavigationProtectionTabExtension.swift
@@ -101,9 +101,10 @@ extension NavigationProtectionTabExtension: NavigationResponder {
             request = newRequest
         }
 
+        let isGPCEnabled = WebTrackingProtectionPreferences.shared.isGPCEnabled
         if let newRequest = GPCRequestFactory().requestForGPC(basedOn: request,
                                                               config: contentBlocking.privacyConfigurationManager.privacyConfig,
-                                                              gpcEnabled: PrivacySecurityPreferences.shared.gpcEnabled) {
+                                                              gpcEnabled: isGPCEnabled) {
             request = newRequest
         }
 
diff --git a/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift b/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift
index 280c5ef956..ca8efc779e 100644
--- a/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift
+++ b/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift
@@ -94,7 +94,7 @@ final class IdentityTheftRestorationPagesFeature: Subfeature {
     }
 
     func getAccessToken(params: Any, original: WKScriptMessage) async throws -> Encodable? {
-        if let accessToken = AccountManager().accessToken {
+        if let accessToken = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).accessToken {
             return ["token": accessToken]
         } else {
             return [String: String]()
diff --git a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift
new file mode 100644
index 0000000000..61375ff8c0
--- /dev/null
+++ b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift
@@ -0,0 +1,69 @@
+//
+//  SubscriptionAppStoreRestorer.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import Subscription
+import SubscriptionUI
+
+@available(macOS 12.0, *)
+struct SubscriptionAppStoreRestorer {
+
+    static func restoreAppStoreSubscription(mainViewController: MainViewController, windowController: MainWindowController) async {
+
+        let progressViewController = await ProgressViewController(title: UserText.restoringSubscriptionTitle)
+        defer {
+            DispatchQueue.main.async {
+                mainViewController.dismiss(progressViewController)
+            }
+        }
+
+        DispatchQueue.main.async {
+            mainViewController.presentAsSheet(progressViewController)
+        }
+
+        guard case .success = await PurchaseManager.shared.syncAppleIDAccount() else {
+            return
+        }
+
+        let result = await AppStoreRestoreFlow.restoreAccountFromPastPurchase(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+
+        switch result {
+        case .success:
+            DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreSuccess, frequency: .dailyAndCount)
+
+        case .failure(let error):
+            switch error {
+            case .missingAccountOrTransactions: break
+            default:
+                DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreFailureOther, frequency: .dailyAndCount)
+            }
+
+            switch error {
+            case .missingAccountOrTransactions:
+                SubscriptionErrorReporter.report(subscriptionActivationError: .subscriptionNotFound)
+                await windowController.showSubscriptionNotFoundAlert()
+            case .subscriptionExpired:
+                SubscriptionErrorReporter.report(subscriptionActivationError: .subscriptionExpired)
+                await windowController.showSubscriptionInactiveAlert()
+            case .pastTransactionAuthenticationError, .failedToObtainAccessToken, .failedToFetchAccountDetails, .failedToFetchSubscriptionDetails:
+                SubscriptionErrorReporter.report(subscriptionActivationError: .generalError)
+                await windowController.showSomethingWentWrongAlert()
+            }
+        }
+    }
+}
diff --git a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift
new file mode 100644
index 0000000000..bdce936804
--- /dev/null
+++ b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift
@@ -0,0 +1,85 @@
+//
+//  SubscriptionErrorReporter.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import Common
+
+enum SubscriptionError: Error {
+    case purchaseFailed,
+         missingEntitlements,
+         failedToGetSubscriptionOptions,
+         failedToSetSubscription,
+         failedToRestoreFromEmail,
+         failedToRestoreFromEmailSubscriptionInactive,
+         failedToRestorePastPurchase,
+         subscriptionNotFound,
+         subscriptionExpired,
+         hasActiveSubscription,
+         cancelledByUser,
+         accountCreationFailed,
+         activeSubscriptionAlreadyPresent,
+         generalError
+}
+
+struct SubscriptionErrorReporter {
+
+    // swiftlint:disable:next cyclomatic_complexity
+    static func report(subscriptionActivationError: SubscriptionError) {
+
+        os_log(.error, log: .subscription, "Subscription purchase error: %{public}s", subscriptionActivationError.localizedDescription)
+
+        var isStoreError = false
+        var isBackendError = false
+
+        switch subscriptionActivationError {
+        case .purchaseFailed:
+            isStoreError = true
+        case .missingEntitlements:
+            isBackendError = true
+        case .failedToGetSubscriptionOptions:
+            isStoreError = true
+        case .failedToSetSubscription:
+            isBackendError = true
+        case .failedToRestoreFromEmail, .failedToRestoreFromEmailSubscriptionInactive:
+            isBackendError = true
+        case .failedToRestorePastPurchase:
+            isStoreError = true
+        case .subscriptionNotFound:
+            DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreFailureNotFound, frequency: .dailyAndCount)
+            isStoreError = true
+        case .subscriptionExpired:
+            isStoreError = true
+        case .hasActiveSubscription:
+            isStoreError = true
+            isBackendError = true
+        case .cancelledByUser: break
+        case .accountCreationFailed:
+            DailyPixel.fire(pixel: .privacyProPurchaseFailureAccountNotCreated, frequency: .dailyAndCount)
+        case .activeSubscriptionAlreadyPresent: break
+        case .generalError: break
+        }
+
+        if isStoreError {
+            DailyPixel.fire(pixel: .privacyProPurchaseFailureStoreError, frequency: .dailyAndCount)
+        }
+
+        if isBackendError {
+            DailyPixel.fire(pixel: .privacyProPurchaseFailureBackendError, frequency: .dailyAndCount)
+        }
+    }
+}
diff --git a/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUserScript.swift
similarity index 64%
rename from DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift
rename to DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUserScript.swift
index b0c6391e44..76cdb94e7c 100644
--- a/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift
+++ b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUserScript.swift
@@ -79,28 +79,52 @@ extension SubscriptionPagesUserScript: WKScriptMessageHandler {
 ///
 final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     var broker: UserScriptMessageBroker?
-
     var featureName = "useSubscription"
-
     var messageOriginPolicy: MessageOriginPolicy = .only(rules: [
         .exact(hostname: "duckduckgo.com"),
         .exact(hostname: "abrown.duckduckgo.com")
     ])
 
+    let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+
     func with(broker: UserScriptMessageBroker) {
         self.broker = broker
     }
 
+    struct Handlers {
+        static let getSubscription = "getSubscription"
+        static let setSubscription = "setSubscription"
+        static let backToSettings = "backToSettings"
+        static let getSubscriptionOptions = "getSubscriptionOptions"
+        static let subscriptionSelected = "subscriptionSelected"
+        static let activateSubscription = "activateSubscription"
+        static let featureSelected = "featureSelected"
+        static let completeStripePayment = "completeStripePayment"
+        // Pixels related events
+        static let subscriptionsMonthlyPriceClicked = "subscriptionsMonthlyPriceClicked"
+        static let subscriptionsYearlyPriceClicked = "subscriptionsYearlyPriceClicked"
+        static let subscriptionsUnknownPriceClicked = "subscriptionsUnknownPriceClicked"
+        static let subscriptionsAddEmailSuccess = "subscriptionsAddEmailSuccess"
+        static let subscriptionsWelcomeFaqClicked = "subscriptionsWelcomeFaqClicked"
+    }
+
+    // swiftlint:disable:next cyclomatic_complexity
     func handler(forMethodNamed methodName: String) -> Subfeature.Handler? {
         switch methodName {
-        case "getSubscription": return getSubscription
-        case "setSubscription": return setSubscription
-        case "backToSettings": return backToSettings
-        case "getSubscriptionOptions": return getSubscriptionOptions
-        case "subscriptionSelected": return subscriptionSelected
-        case "activateSubscription": return activateSubscription
-        case "featureSelected": return featureSelected
-        case "completeStripePayment": return completeStripePayment
+        case Handlers.getSubscription: return getSubscription
+        case Handlers.setSubscription: return setSubscription
+        case Handlers.backToSettings: return backToSettings
+        case Handlers.getSubscriptionOptions: return getSubscriptionOptions
+        case Handlers.subscriptionSelected: return subscriptionSelected
+        case Handlers.activateSubscription: return activateSubscription
+        case Handlers.featureSelected: return featureSelected
+        case Handlers.completeStripePayment: return completeStripePayment
+            // Pixel related events
+        case Handlers.subscriptionsMonthlyPriceClicked: return subscriptionsMonthlyPriceClicked
+        case Handlers.subscriptionsYearlyPriceClicked: return subscriptionsYearlyPriceClicked
+        case Handlers.subscriptionsUnknownPriceClicked: return subscriptionsUnknownPriceClicked
+        case Handlers.subscriptionsAddEmailSuccess: return subscriptionsAddEmailSuccess
+        case Handlers.subscriptionsWelcomeFaqClicked: return subscriptionsWelcomeFaqClicked
         default:
             return nil
         }
@@ -119,7 +143,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     }
 
     func getSubscription(params: Any, original: WKScriptMessage) async throws -> Encodable? {
-        if let authToken = AccountManager().authToken, AccountManager().accessToken != nil {
+        if let authToken = accountManager.authToken, accountManager.accessToken != nil {
             return Subscription(token: authToken)
         } else {
             return Subscription(token: "")
@@ -136,7 +160,6 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         }
 
         let authToken = subscriptionValues.token
-        let accountManager = AccountManager()
         if case let .success(accessToken) = await accountManager.exchangeAuthTokenToAccessToken(authToken),
            case let .success(accountDetails) = await accountManager.fetchAccountDetails(with: accessToken) {
             accountManager.storeAuthToken(token: authToken)
@@ -147,7 +170,6 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     }
 
     func backToSettings(params: Any, original: WKScriptMessage) async throws -> Encodable? {
-        let accountManager = AccountManager()
         if let accessToken = accountManager.accessToken,
            case let .success(accountDetails) = await accountManager.fetchAccountDetails(with: accessToken) {
             accountManager.storeAccount(token: accessToken, email: accountDetails.email, externalID: accountDetails.externalID)
@@ -161,6 +183,8 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     }
 
     func getSubscriptionOptions(params: Any, original: WKScriptMessage) async throws -> Encodable? {
+        guard DefaultSubscriptionFeatureAvailability().isSubscriptionPurchaseAllowed else { return SubscriptionOptions.empty }
+
         if SubscriptionPurchaseEnvironment.current == .appStore {
             if #available(macOS 12.0, *) {
                 switch await AppStorePurchaseFlow.subscriptionOptions() {
@@ -179,9 +203,11 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
             }
         }
 
-        return nil
+        return SubscriptionOptions.empty
     }
 
+    let subscriptionAppGroup = Bundle.main.appGroup(bundle: .subs)
+
     // swiftlint:disable:next function_body_length cyclomatic_complexity
     func subscriptionSelected(params: Any, original: WKScriptMessage) async throws -> Encodable? {
 
@@ -206,7 +232,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
 
                 guard let subscriptionSelection: SubscriptionSelection = DecodableHelper.decode(from: params) else {
                     assertionFailure("SubscriptionPagesUserScript: expected JSON representation of SubscriptionSelection")
-                    report(subscriptionActivationError: .generalError)
+                    SubscriptionErrorReporter.report(subscriptionActivationError: .generalError)
                     return nil
                 }
 
@@ -220,7 +246,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
                     Pixel.fire(.privacyProRestoreAfterPurchaseAttempt)
 
                     os_log(.info, log: .subscription, "[Purchase] Found active subscription during purchase")
-                    report(subscriptionActivationError: .hasActiveSubscription)
+                    SubscriptionErrorReporter.report(subscriptionActivationError: .hasActiveSubscription)
                     await WindowControllersManager.shared.lastKeyMainWindowController?.showSubscriptionFoundAlert(originalMessage: message)
                     return nil
                 }
@@ -229,25 +255,25 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
                 let purchaseTransactionJWS: String
 
                 os_log(.info, log: .subscription, "[Purchase] Purchasing")
-                switch await AppStorePurchaseFlow.purchaseSubscription(with: subscriptionSelection.id, emailAccessToken: emailAccessToken, subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)) {
+                switch await AppStorePurchaseFlow.purchaseSubscription(with: subscriptionSelection.id, emailAccessToken: emailAccessToken, subscriptionAppGroup: subscriptionAppGroup) {
                 case .success(let transactionJWS):
                     purchaseTransactionJWS = transactionJWS
                 case .failure(let error):
                     switch error {
                     case .noProductsFound:
-                        report(subscriptionActivationError: .subscriptionNotFound)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .subscriptionNotFound)
                     case .activeSubscriptionAlreadyPresent:
-                        report(subscriptionActivationError: .activeSubscriptionAlreadyPresent)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .activeSubscriptionAlreadyPresent)
                     case .authenticatingWithTransactionFailed:
-                        report(subscriptionActivationError: .generalError)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .generalError)
                     case .accountCreationFailed:
-                        report(subscriptionActivationError: .accountCreationFailed)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .accountCreationFailed)
                     case .purchaseFailed:
-                        report(subscriptionActivationError: .purchaseFailed)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .purchaseFailed)
                     case .cancelledByUser:
-                        report(subscriptionActivationError: .cancelledByUser)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .cancelledByUser)
                     case .missingEntitlements:
-                        report(subscriptionActivationError: .missingEntitlements)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .missingEntitlements)
                     }
 
                     if error != .cancelledByUser {
@@ -261,7 +287,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
 
                 os_log(.info, log: .subscription, "[Purchase] Completing purchase")
 
-                switch await AppStorePurchaseFlow.completeSubscriptionPurchase(with: purchaseTransactionJWS, subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)) {
+                switch await AppStorePurchaseFlow.completeSubscriptionPurchase(with: purchaseTransactionJWS, subscriptionAppGroup: subscriptionAppGroup) {
                 case .success(let purchaseUpdate):
                     os_log(.info, log: .subscription, "[Purchase] Purchase complete")
                     DailyPixel.fire(pixel: .privacyProPurchaseSuccess, frequency: .dailyAndCount)
@@ -270,19 +296,23 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
                 case .failure(let error):
                     switch error {
                     case .noProductsFound:
-                        report(subscriptionActivationError: .subscriptionNotFound)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .subscriptionNotFound)
                     case .activeSubscriptionAlreadyPresent:
-                        report(subscriptionActivationError: .activeSubscriptionAlreadyPresent)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .activeSubscriptionAlreadyPresent)
                     case .authenticatingWithTransactionFailed:
-                        report(subscriptionActivationError: .generalError)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .generalError)
                     case .accountCreationFailed:
-                        report(subscriptionActivationError: .accountCreationFailed)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .accountCreationFailed)
                     case .purchaseFailed:
-                        report(subscriptionActivationError: .purchaseFailed)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .purchaseFailed)
                     case .cancelledByUser:
-                        report(subscriptionActivationError: .cancelledByUser)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .cancelledByUser)
                     case .missingEntitlements:
-                        report(subscriptionActivationError: .missingEntitlements)
+                        SubscriptionErrorReporter.report(subscriptionActivationError: .missingEntitlements)
+                        DispatchQueue.main.async {
+                            NotificationCenter.default.post(name: .subscriptionPageCloseAndOpenPreferences, object: self)
+                        }
+                        return nil
                     }
 
                     await pushPurchaseUpdate(originalMessage: message, purchaseUpdate: PurchaseUpdate(type: "completed"))
@@ -291,7 +321,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         } else if SubscriptionPurchaseEnvironment.current == .stripe {
             let emailAccessToken = try? EmailManager().getToken()
 
-            let result = await StripePurchaseFlow.prepareSubscriptionPurchase(emailAccessToken: emailAccessToken, subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+            let result = await StripePurchaseFlow.prepareSubscriptionPurchase(emailAccessToken: emailAccessToken, subscriptionAppGroup: subscriptionAppGroup)
 
             switch result {
             case .success(let success):
@@ -301,140 +331,48 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
 
                 switch error {
                 case .noProductsFound:
-                    report(subscriptionActivationError: .subscriptionNotFound)
+                    SubscriptionErrorReporter.report(subscriptionActivationError: .subscriptionNotFound)
                 case .accountCreationFailed:
-                    report(subscriptionActivationError: .accountCreationFailed)
+                    SubscriptionErrorReporter.report(subscriptionActivationError: .accountCreationFailed)
                 }
-
-                return nil
+                await pushPurchaseUpdate(originalMessage: message, purchaseUpdate: PurchaseUpdate(type: "canceled"))
             }
         }
 
         return nil
     }
 
-    fileprivate enum SubscriptionError: Error {
-        case purchaseFailed,
-             missingEntitlements,
-             failedToGetSubscriptionOptions,
-             failedToSetSubscription,
-             failedToRestoreFromEmail,
-             failedToRestoreFromEmailSubscriptionInactive,
-             failedToRestorePastPurchase,
-             subscriptionNotFound,
-             subscriptionExpired,
-             hasActiveSubscription,
-             cancelledByUser,
-             accountCreationFailed,
-             activeSubscriptionAlreadyPresent,
-             generalError
-    }
-
-    // swiftlint:disable:next cyclomatic_complexity
-    fileprivate func report(subscriptionActivationError: SubscriptionError) {
-
-        os_log(.error, log: .subscription, "Subscription purchase error: %{public}s", subscriptionActivationError.localizedDescription)
-
-        var isStoreError = false
-        var isBackendError = false
-
-        switch subscriptionActivationError {
-        case .purchaseFailed:
-            isStoreError = true
-        case .missingEntitlements:
-            isBackendError = true
-        case .failedToGetSubscriptionOptions:
-            isStoreError = true
-        case .failedToSetSubscription:
-            isBackendError = true
-        case .failedToRestoreFromEmail, .failedToRestoreFromEmailSubscriptionInactive:
-            isBackendError = true
-        case .failedToRestorePastPurchase:
-            isStoreError = true
-        case .subscriptionNotFound:
-            DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreFailureNotFound, frequency: .dailyAndCount)
-            isStoreError = true
-        case .subscriptionExpired:
-            isStoreError = true
-        case .hasActiveSubscription:
-            isStoreError = true
-            isBackendError = true
-        case .cancelledByUser: break
-        case .accountCreationFailed:
-            DailyPixel.fire(pixel: .privacyProPurchaseFailureAccountNotCreated, frequency: .dailyAndCount)
-        case .activeSubscriptionAlreadyPresent: break
-        case .generalError: break
-        }
-
-        if isStoreError {
-            DailyPixel.fire(pixel: .privacyProPurchaseFailureStoreError, frequency: .dailyAndCount)
-        }
-
-        if isBackendError {
-            DailyPixel.fire(pixel: .privacyProPurchaseFailureBackendError, frequency: .dailyAndCount)
-        }
-
-        if subscriptionActivationError != .hasActiveSubscription && subscriptionActivationError != .cancelledByUser {
-            DailyPixel.fire(pixel: .privacyProPurchaseFailure, frequency: .dailyAndCount)
-        }
-    }
-
     func activateSubscription(params: Any, original: WKScriptMessage) async throws -> Encodable? {
 
         Pixel.fire(.privacyProRestorePurchaseOfferPageEntry)
-
+        guard let mainViewController = await WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController,
+              let windowControllerManager = await WindowControllersManager.shared.lastKeyMainWindowController else {
+            return nil
+        }
         let message = original
 
-        Task { @MainActor in
-
-            let actionHandlers = SubscriptionAccessActionHandlers(
-                restorePurchases: {
-
-                    if #available(macOS 12.0, *) {
-                        Self.startAppStoreRestoreFlow { result in
-
-                            switch result {
-                            case .success:
-                                DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreSuccess, frequency: .dailyAndCount)
-
-                            case .failure(let error):
-
-                                switch error {
-                                case .missingAccountOrTransactions: break
-                                default:
-                                    DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreFailureOther, frequency: .dailyAndCount)
-                                }
-
-                                switch error {
-                                case .missingAccountOrTransactions:
-                                    self.report(subscriptionActivationError: .subscriptionNotFound)
-                                    WindowControllersManager.shared.lastKeyMainWindowController?.showSubscriptionNotFoundAlert()
-                                case .subscriptionExpired:
-                                    self.report(subscriptionActivationError: .subscriptionExpired)
-                                    WindowControllersManager.shared.lastKeyMainWindowController?.showSubscriptionInactiveAlert()
-                                case .pastTransactionAuthenticationError, .failedToObtainAccessToken, .failedToFetchAccountDetails, .failedToFetchSubscriptionDetails:
-                                    self.report(subscriptionActivationError: .generalError)
-                                    WindowControllersManager.shared.lastKeyMainWindowController?.showSomethingWentWrongAlert()
-                                }
-                            }
-                            message.webView?.reload()
-                        }
-                    }
-                },
-                openURLHandler: { url in
-                    WindowControllersManager.shared.showTab(with: .subscription(url))
-                }, uiActionHandler: { event in
-                    switch event {
-                    case .activateAddEmailClick:
-                        DailyPixel.fire(pixel: .privacyProRestorePurchaseEmailStart, frequency: .dailyAndCount)
-                    default:
-                        break
-                    }
-                })
+        let actionHandlers = SubscriptionAccessActionHandlers(restorePurchases: {
+            if #available(macOS 12.0, *) {
+                Task { @MainActor in
+                    await SubscriptionAppStoreRestorer.restoreAppStoreSubscription(mainViewController: mainViewController, windowController: windowControllerManager)
+                    message.webView?.reload()
+                }
+            }
+        }, openURLHandler: { url in
+            DispatchQueue.main.async {
+                WindowControllersManager.shared.showTab(with: .subscription(url))
+            }
+        }, uiActionHandler: { event in
+            switch event {
+            case .activateAddEmailClick:
+                DailyPixel.fire(pixel: .privacyProRestorePurchaseEmailStart, frequency: .dailyAndCount)
+            default:
+                break
+            }
+        })
 
-            let vc = SubscriptionAccessViewController(accountManager: AccountManager(), actionHandlers: actionHandlers, subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
-            WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController.presentAsSheet(vc)
-        }
+        let vc = await SubscriptionAccessViewController(accountManager: accountManager, actionHandlers: actionHandlers, subscriptionAppGroup: subscriptionAppGroup)
+        await WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController.presentAsSheet(vc)
 
         return nil
     }
@@ -483,10 +421,39 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         let progressViewController = await ProgressViewController(title: UserText.completingPurchaseTitle)
 
         await mainViewController?.presentAsSheet(progressViewController)
-        await StripePurchaseFlow.completeSubscriptionPurchase(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+        await StripePurchaseFlow.completeSubscriptionPurchase(subscriptionAppGroup: subscriptionAppGroup)
         await mainViewController?.dismiss(progressViewController)
 
-        return [String: String]() // cannot be nil
+        DailyPixel.fire(pixel: .privacyProPurchaseStripeSuccess, frequency: .dailyAndCount)
+
+        return [String: String]() // cannot be nil, the web app expect something back before redirecting the user to the final page
+    }
+
+    // MARK: Pixel related actions
+
+    func subscriptionsMonthlyPriceClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
+        Pixel.fire(.privacyProOfferMonthlyPriceClick)
+        return nil
+    }
+
+    func subscriptionsYearlyPriceClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
+        Pixel.fire(.privacyProOfferYearlyPriceClick)
+        return nil
+    }
+
+    func subscriptionsUnknownPriceClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
+        // Not used
+        return nil
+    }
+
+    func subscriptionsAddEmailSuccess(params: Any, original: WKScriptMessage) async -> Encodable? {
+        Pixel.fire(.privacyProAddEmailSuccess, limitTo: .initial)
+        return nil
+    }
+
+    func subscriptionsWelcomeFaqClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
+        Pixel.fire(.privacyProWelcomeFAQClick, limitTo: .initial)
+        return nil
     }
 
     // MARK: Push actions
@@ -506,33 +473,14 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     }
 }
 
-extension SubscriptionPagesUseSubscriptionFeature {
-
-    @available(macOS 12.0, *)
-    static func startAppStoreRestoreFlow(onResultHandler: @escaping (Result<Void, AppStoreRestoreFlow.Error>) -> Void = {_ in}) {
-        Task { @MainActor in
-            let mainViewController = WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController
-            let progressViewController = ProgressViewController(title: UserText.restoringSubscriptionTitle)
-            defer { mainViewController?.dismiss(progressViewController) }
-            mainViewController?.presentAsSheet(progressViewController)
-            guard case .success = await PurchaseManager.shared.syncAppleIDAccount() else { return }
-            onResultHandler(await AppStoreRestoreFlow.restoreAccountFromPastPurchase(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)))
-        }
-    }
-}
-
 extension MainWindowController {
 
     @MainActor
-    func showSomethingWentWrongAlert(environment: SubscriptionPurchaseEnvironment.Environment = SubscriptionPurchaseEnvironment.current) {
+    func showSomethingWentWrongAlert() {
+        DailyPixel.fire(pixel: .privacyProPurchaseFailure, frequency: .dailyAndCount)
         guard let window else { return }
 
-        switch environment {
-        case .appStore:
-            window.show(.somethingWentWrongAlert())
-        case .stripe:
-            window.show(.somethingWentWrongStripeAlert())
-        }
+        window.show(.somethingWentWrongAlert())
     }
 
     @MainActor
@@ -541,6 +489,7 @@ extension MainWindowController {
 
         window.show(.subscriptionNotFoundAlert(), firstButtonAction: {
             WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
+            Pixel.fire(.privacyProOfferScreenImpression)
         })
     }
 
@@ -550,6 +499,7 @@ extension MainWindowController {
 
         window.show(.subscriptionInactiveAlert(), firstButtonAction: {
             WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
+            Pixel.fire(.privacyProOfferScreenImpression)
         })
     }
 
diff --git a/DuckDuckGo/Tab/UserScripts/UserScripts.swift b/DuckDuckGo/Tab/UserScripts/UserScripts.swift
index 4cde694a07..017c0c6716 100644
--- a/DuckDuckGo/Tab/UserScripts/UserScripts.swift
+++ b/DuckDuckGo/Tab/UserScripts/UserScripts.swift
@@ -20,6 +20,7 @@ import Foundation
 import BrowserServicesKit
 import UserScript
 import WebKit
+import Subscription
 
 @MainActor
 final class UserScripts: UserScriptsProvider {
@@ -50,10 +51,10 @@ final class UserScripts: UserScriptsProvider {
         clickToLoadScript = ClickToLoadUserScript(scriptSourceProvider: sourceProvider)
         contentBlockerRulesScript = ContentBlockerRulesUserScript(configuration: sourceProvider.contentBlockerRulesConfig!)
         surrogatesScript = SurrogatesUserScript(configuration: sourceProvider.surrogatesConfig!)
-        let privacySettings = PrivacySecurityPreferences.shared
+        let isGPCEnabled = WebTrackingProtectionPreferences.shared.isGPCEnabled
         let privacyConfig = sourceProvider.privacyConfigurationManager.privacyConfig
         let sessionKey = sourceProvider.sessionKey ?? ""
-        let prefs = ContentScopeProperties(gpcEnabled: privacySettings.gpcEnabled,
+        let prefs = ContentScopeProperties(gpcEnabled: isGPCEnabled,
                                                 sessionKey: sessionKey,
                                                 featureToggles: ContentScopeFeatureToggles.supportedFeaturesOnMacOS(privacyConfig))
         contentScopeUserScript = ContentScopeUserScript(sourceProvider.privacyConfigurationManager, properties: prefs)
@@ -87,7 +88,7 @@ final class UserScripts: UserScriptsProvider {
         }
 
 #if SUBSCRIPTION
-        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable() {
+        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
             subscriptionPagesUserScript.registerSubfeature(delegate: SubscriptionPagesUseSubscriptionFeature())
             userScripts.append(subscriptionPagesUserScript)
 
diff --git a/DuckDuckGo/Tab/View/BrowserTabViewController.swift b/DuckDuckGo/Tab/View/BrowserTabViewController.swift
index 37b06c15d5..456886e3e9 100644
--- a/DuckDuckGo/Tab/View/BrowserTabViewController.swift
+++ b/DuckDuckGo/Tab/View/BrowserTabViewController.swift
@@ -22,6 +22,7 @@ import Combine
 import Common
 import SwiftUI
 import WebKit
+import Subscription
 
 // swiftlint:disable file_length
 // swiftlint:disable:next type_body_length
@@ -162,6 +163,10 @@ final class BrowserTabViewController: NSViewController {
                                                selector: #selector(onSubscriptionAccountDidSignOut),
                                                name: .accountDidSignOut,
                                                object: nil)
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(onSubscriptionDidChange),
+                                               name: .subscriptionDidChange,
+                                               object: nil)
 #endif
     }
 
@@ -199,7 +204,9 @@ final class BrowserTabViewController: NSViewController {
 #if DBP
     @objc
     private func onDBPFeatureDisabled(_ notification: Notification) {
-        tabCollectionViewModel.removeAll(with: .dataBrokerProtection)
+        Task { @MainActor in
+            tabCollectionViewModel.removeAll(with: .dataBrokerProtection)
+        }
     }
 
     @objc
@@ -251,6 +258,25 @@ final class BrowserTabViewController: NSViewController {
         }
     }
 
+    @objc
+    private func onSubscriptionDidChange(_ notification: Notification) {
+        guard let subscription = (notification.userInfo?[UserDefaultsCacheKey.subscription] as? DDGSubscription), !subscription.isActive else { return }
+
+        Task { @MainActor in
+            tabCollectionViewModel.removeAll { tabContent in
+                if case .subscription = tabContent {
+                    return true
+                } else if case .identityTheftRestoration = tabContent {
+                    return true
+                } else if case .dataBrokerProtection = tabContent {
+                    return true
+                } else {
+                    return false
+                }
+            }
+        }
+    }
+
 #endif
 
     private func subscribeToSelectedTabViewModel() {
@@ -1092,12 +1118,13 @@ extension BrowserTabViewController: OnboardingDelegate {
     }
 
     func onboardingDidRequestSetDefault(completion: @escaping () -> Void) {
-        let defaultBrowserPreferences = DefaultBrowserPreferences()
+        let defaultBrowserPreferences = DefaultBrowserPreferences.shared
         if defaultBrowserPreferences.isDefault {
             completion()
             return
         }
 
+        Pixel.fire(.defaultRequestedFromOnboarding)
         defaultBrowserPreferences.becomeDefault { _ in
             _ = defaultBrowserPreferences
             withAnimation {
diff --git a/DuckDuckGo/Tab/ViewModel/TabViewModel.swift b/DuckDuckGo/Tab/ViewModel/TabViewModel.swift
index 9d6fea5595..c6853be3fb 100644
--- a/DuckDuckGo/Tab/ViewModel/TabViewModel.swift
+++ b/DuckDuckGo/Tab/ViewModel/TabViewModel.swift
@@ -35,6 +35,7 @@ final class TabViewModel {
 
     private(set) var tab: Tab
     private let appearancePreferences: AppearancePreferences
+    private let accessibilityPreferences: AccessibilityPreferences
     private var cancellables = Set<AnyCancellable>()
 
     @Published private(set) var canGoForward: Bool = false
@@ -78,9 +79,12 @@ final class TabViewModel {
         !isShowingErrorPage && canReload && !tab.webView.isInFullScreenMode
     }
 
-    init(tab: Tab, appearancePreferences: AppearancePreferences = .shared) {
+    init(tab: Tab,
+         appearancePreferences: AppearancePreferences = .shared,
+         accessibilityPreferences: AccessibilityPreferences = .shared) {
         self.tab = tab
         self.appearancePreferences = appearancePreferences
+        self.accessibilityPreferences = accessibilityPreferences
 
         subscribeToUrl()
         subscribeToCanGoBackForwardAndReload()
@@ -88,7 +92,7 @@ final class TabViewModel {
         subscribeToFavicon()
         subscribeToTabError()
         subscribeToPermissions()
-        subscribeToAppearancePreferences()
+        subscribeToPreferences()
         subscribeToWebViewDidFinishNavigation()
         tab.$isLoading
             .assign(to: \.isLoading, onWeaklyHeld: self)
@@ -209,12 +213,12 @@ final class TabViewModel {
             .store(in: &cancellables)
     }
 
-    private func subscribeToAppearancePreferences() {
+    private func subscribeToPreferences() {
         appearancePreferences.$showFullURL.dropFirst().sink { [weak self] newValue in
             guard let self = self, let url = self.tabURL, let host = self.tabHostURL else { return }
             self.updatePassiveAddressBarString(showURL: newValue, url: url, hostURL: host)
         }.store(in: &cancellables)
-        appearancePreferences.$defaultPageZoom.sink { [weak self] newValue in
+        accessibilityPreferences.$defaultPageZoom.sink { [weak self] newValue in
             guard let self = self else { return }
             self.tab.webView.defaultZoomValue = newValue
             self.tab.webView.zoomLevel = newValue
diff --git a/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift b/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift
index 571eb7bd34..f724c14aae 100644
--- a/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift
+++ b/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift
@@ -31,7 +31,8 @@ struct VPNMetadata: Encodable {
 
     struct AppInfo: Encodable {
         let appVersion: String
-        let lastVersionRun: String
+        let lastAgentVersionRun: String
+        let lastExtensionVersionRun: String
         let isInternalUser: Bool
         let isInApplicationsDirectory: Bool
     }
@@ -114,8 +115,7 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
     private let statusReporter: NetworkProtectionStatusReporter
 
     init() {
-        let machServiceName = Bundle.main.vpnMenuAgentBundleId
-        let ipcClient = TunnelControllerIPCClient(machServiceName: machServiceName)
+        let ipcClient = TunnelControllerIPCClient()
         ipcClient.register()
 
         self.statusReporter = DefaultNetworkProtectionStatusReporter(
@@ -154,13 +154,14 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
 
     private func collectAppInfoMetadata() -> VPNMetadata.AppInfo {
         let appVersion = AppVersion.shared.versionAndBuildNumber
-        let versionStore = NetworkProtectionLastVersionRunStore()
+        let versionStore = NetworkProtectionLastVersionRunStore(userDefaults: .netP)
         let isInternalUser = NSApp.delegateTyped.internalUserDecider.isInternalUser
         let isInApplicationsDirectory = Bundle.main.isInApplicationsDirectory
 
         return .init(
             appVersion: appVersion,
-            lastVersionRun: versionStore.lastVersionRun ?? "Unknown",
+            lastAgentVersionRun: versionStore.lastAgentVersionRun ?? "none",
+            lastExtensionVersionRun: versionStore.lastExtensionVersionRun ?? "none",
             isInternalUser: isInternalUser,
             isInApplicationsDirectory: isInApplicationsDirectory
         )
@@ -236,7 +237,7 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
 
         let connectionState = String(describing: statusReporter.statusObserver.recentValue)
         let lastErrorMessage = statusReporter.connectionErrorObserver.recentValue ?? "none"
-        let connectedServer = statusReporter.serverInfoObserver.recentValue.serverLocation ?? "none"
+        let connectedServer = statusReporter.serverInfoObserver.recentValue.serverLocation?.serverLocation ?? "none"
         let connectedServerIP = statusReporter.serverInfoObserver.recentValue.serverAddress ?? "none"
         return .init(onboardingState: onboardingState,
                      connectionState: connectionState,
@@ -285,25 +286,4 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
 
 }
 
-extension Network.NWPath {
-    /// A description that's safe from a privacy standpoint.
-    ///
-    /// Ref: https://app.asana.com/0/0/1206712493935053/1206712516729780/f
-    ///
-    var anonymousDescription: String {
-        var description = "NWPath("
-
-        description += "status: \(status), "
-
-        if case .unsatisfied = status {
-            description += "unsatisfiedReason: \(unsatisfiedReason), "
-        }
-
-        description += "availableInterfaces: \(availableInterfaces)"
-        description += ")"
-
-        return description
-    }
-}
-
 #endif
diff --git a/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift b/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift
index 738d4fb053..ba12c9cdd2 100644
--- a/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift
+++ b/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift
@@ -24,17 +24,19 @@ import NetworkExtension
 import NetworkProtection
 import NetworkProtectionIPC
 import NetworkProtectionUI
+import LoginItems
 import SystemExtensions
 
 protocol NetworkProtectionFeatureDisabling {
     /// - Returns: `true` if the uninstallation was completed.  `false` if it was cancelled by the user or an error.
     ///
+    @discardableResult
     func disable(keepAuthToken: Bool, uninstallSystemExtension: Bool) async -> Bool
+
+    func stop()
 }
 
 final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling {
-    static let vpnUninstalledNotificationName = NSNotification.Name(rawValue: "com.duckduckgo.NetworkProtection.uninstalled")
-
     private let log: OSLog
     private let loginItemsManager: LoginItemsManager
     private let pinningManager: LocalPinningManager
@@ -42,11 +44,14 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
     private let userDefaults: UserDefaults
     private let ipcClient: TunnelControllerIPCClient
 
+    @MainActor
+    private var isDisabling = false
+
     init(loginItemsManager: LoginItemsManager = LoginItemsManager(),
          pinningManager: LocalPinningManager = .shared,
          userDefaults: UserDefaults = .netP,
          settings: VPNSettings = .init(defaults: .netP),
-         ipcClient: TunnelControllerIPCClient = TunnelControllerIPCClient(machServiceName: Bundle.main.vpnMenuAgentBundleId),
+         ipcClient: TunnelControllerIPCClient = TunnelControllerIPCClient(),
          log: OSLog = .networkProtection) {
 
         self.log = log
@@ -57,16 +62,33 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
         self.ipcClient = ipcClient
     }
 
-    /// This method disables Network Protection and clear all of its state.
+    @MainActor
+    private func canUninstall(includingSystemExtension: Bool) -> Bool {
+        !isDisabling && LoginItem.vpnMenu.status.isInstalled
+    }
+
+    /// This method disables the VPN and clear all of its state.
     ///
     /// - Parameters:
     ///     - keepAuthToken: If `true`, the auth token will not be removed.
     ///     - includeSystemExtension: Whether this method should uninstall the system extension.
     ///
+    @MainActor
     @discardableResult
     func disable(keepAuthToken: Bool, uninstallSystemExtension: Bool) async -> Bool {
         // To disable NetP we need the login item to be running
         // This should be fine though as we'll disable them further down below
+        guard canUninstall(includingSystemExtension: uninstallSystemExtension) else {
+            return true
+        }
+
+        isDisabling = true
+
+        defer {
+            unpinNetworkProtection()
+            resetUserDefaults(uninstallSystemExtension: uninstallSystemExtension)
+        }
+
         enableLoginItems()
 
         // Allow some time for the login items to fully launch
@@ -84,17 +106,20 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
         // We want to give some time for the login item to reset state before disabling it
         try? await Task.sleep(interval: 0.5)
         disableLoginItems()
-        resetUserDefaults()
 
         if !keepAuthToken {
             try? removeAppAuthToken()
         }
 
-        unpinNetworkProtection()
-        postVPNUninstalledNotification()
+        notifyVPNUninstalled()
+        isDisabling = false
         return true
     }
 
+    func stop() {
+        ipcClient.stop()
+    }
+
     private func enableLoginItems() {
         loginItemsManager.enableLoginItems(LoginItemsManager.networkProtectionLoginItems, log: log)
     }
@@ -122,18 +147,21 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
         try await ipcClient.debugCommand(.removeVPNConfiguration)
     }
 
-    private func resetUserDefaults() {
+    private func resetUserDefaults(uninstallSystemExtension: Bool) {
         settings.resetToDefaults()
+
+        if uninstallSystemExtension {
+            userDefaults.networkProtectionOnboardingStatus = .default
+        } else {
+            userDefaults.networkProtectionOnboardingStatus = .isOnboarding(step: .userNeedsToAllowVPNConfiguration)
+        }
     }
 
-    private func postVPNUninstalledNotification() {
-        Task { @MainActor in
+    private func notifyVPNUninstalled() {
             // Wait a bit since the NetP button is likely being hidden
+        Task {
             try? await Task.sleep(nanoseconds: 500 * NSEC_PER_MSEC)
-
-            NotificationCenter.default.post(
-                name: Self.vpnUninstalledNotificationName,
-                object: nil)
+            userDefaults.networkProtectionShouldShowVPNUninstalledMessage = true
         }
     }
 }
diff --git a/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift b/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift
index 35dd79662b..96341cc2db 100644
--- a/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift
+++ b/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift
@@ -24,21 +24,37 @@ import Common
 import NetworkExtension
 import NetworkProtection
 import NetworkProtectionUI
+import LoginItems
+import PixelKit
+
+#if SUBSCRIPTION
+import Subscription
+#endif
 
 protocol NetworkProtectionFeatureVisibility {
-    func isNetworkProtectionVisible() -> Bool
+    var isEligibleForThankYouMessage: Bool { get }
+    var isInstalled: Bool { get }
+
+    func canStartVPN() async throws -> Bool
+    func isVPNVisible() -> Bool
+    func isNetworkProtectionBetaVisible() -> Bool
     func shouldUninstallAutomatically() -> Bool
-    func disableForAllUsers()
+    func disableForAllUsers() async
     func disableForWaitlistUsers()
+    @discardableResult
+    func disableIfUserHasNoAccess() async -> Bool
 }
 
 struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
+    private static var subscriptionAuthTokenPrefix: String { "ddg:" }
     private let featureDisabler: NetworkProtectionFeatureDisabling
     private let featureOverrides: WaitlistBetaOverriding
     private let networkProtectionFeatureActivation: NetworkProtectionFeatureActivation
     private let networkProtectionWaitlist = NetworkProtectionWaitlist()
     private let privacyConfigurationManager: PrivacyConfigurationManaging
     private let defaults: UserDefaults
+    let subscriptionAppGroup = Bundle.main.appGroup(bundle: .subs)
+    let accountManager: AccountManager
 
     var waitlistIsOngoing: Bool {
         isWaitlistEnabled && isWaitlistBetaActive
@@ -56,27 +72,73 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
         self.featureDisabler = featureDisabler
         self.featureOverrides = featureOverrides
         self.defaults = defaults
+        self.accountManager = AccountManager(subscriptionAppGroup: subscriptionAppGroup)
     }
 
-    /// Calculates whether Network Protection is visible.
+    /// Calculates whether the VPN is visible.
     /// The following criteria are used:
     ///
     /// 1. If the user has a valid auth token, the feature is visible
     /// 2. If no auth token is found, the feature is visible if the waitlist feature flag is enabled
     ///
-    /// Once the waitlist beta has ended, we can trigger a remote change that removes the user's auth token and turn off the waitlist flag, hiding Network Protection from the user.
-    func isNetworkProtectionVisible() -> Bool {
+    /// Once the waitlist beta has ended, we can trigger a remote change that removes the user's auth token and turn off the waitlist flag, hiding the VPN from the user.
+    func isNetworkProtectionBetaVisible() -> Bool {
         return isEasterEggUser || waitlistIsOngoing
     }
 
-    /// Returns whether Network Protection should be uninstalled automatically.
+    var isInstalled: Bool {
+        LoginItem.vpnMenu.status.isInstalled
+    }
+
+    /// Whether the user can start the VPN.
+    ///
+    /// For beta users this means they have an auth token.
+    /// For subscription users this means they have entitlements.
+    ///
+    func canStartVPN() async throws -> Bool {
+        guard subscriptionFeatureAvailability.isFeatureAvailable else {
+            return isNetworkProtectionBetaVisible()
+        }
+
+        switch await accountManager.hasEntitlement(for: .networkProtection) {
+        case .success(let hasEntitlement):
+            return hasEntitlement
+        case .failure(let error):
+            throw error
+        }
+    }
+
+    /// Whether the user can see the VPN entry points in the UI.
+    ///
+    /// For beta users this means they have an auth token.
+    /// For subscription users this means they are authenticated.
+    ///
+    func isVPNVisible() -> Bool {
+        guard subscriptionFeatureAvailability.isFeatureAvailable else {
+            return isNetworkProtectionBetaVisible()
+        }
+
+        return accountManager.isUserAuthenticated
+    }
+
+    /// We've had to add this method because accessing the singleton in app delegate is crashing the integration tests.
+    ///
+    var subscriptionFeatureAvailability: DefaultSubscriptionFeatureAvailability {
+        DefaultSubscriptionFeatureAvailability()
+    }
+
+    /// Returns whether the VPN should be uninstalled automatically.
     /// This is only true when the user is not an Easter Egg user, the waitlist test has ended, and the user is onboarded.
     func shouldUninstallAutomatically() -> Bool {
+#if SUBSCRIPTION
+        return subscriptionFeatureAvailability.isFeatureAvailable && !accountManager.isUserAuthenticated && LoginItem.vpnMenu.status.isInstalled
+#else
         let waitlistAccessEnded = isWaitlistUser && !waitlistIsOngoing
         let isNotEasterEggUser = !isEasterEggUser
-        let isOnboarded = UserDefaults.netP.networkProtectionOnboardingStatus != .default
+        let isOnboarded = defaults.networkProtectionOnboardingStatus != .default
 
         return isNotEasterEggUser && waitlistAccessEnded && isOnboarded
+#endif
     }
 
     /// Whether the user is fully onboarded
@@ -140,10 +202,23 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
         }
     }
 
-    func disableForAllUsers() {
-        Task {
-            await featureDisabler.disable(keepAuthToken: false, uninstallSystemExtension: false)
+    func disableForAllUsers() async {
+        await featureDisabler.disable(keepAuthToken: true, uninstallSystemExtension: false)
+    }
+
+    /// Disables the VPN for legacy users, if necessary.
+    ///
+    /// This method does not seek to remove tokens or uninstall anything.
+    ///
+    private func disableVPNForLegacyUsersIfSubscriptionAvailable() async -> Bool {
+        guard isEligibleForThankYouMessage && !defaults.vpnLegacyUserAccessDisabledOnce else {
+            return false
         }
+
+        PixelKit.fire(VPNPrivacyProPixel.vpnBetaStoppedWhenPrivacyProEnabled, frequency: .dailyAndContinuous)
+        defaults.vpnLegacyUserAccessDisabledOnce = true
+        await featureDisabler.disable(keepAuthToken: true, uninstallSystemExtension: false)
+        return true
     }
 
     func disableForWaitlistUsers() {
@@ -155,6 +230,36 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
             await featureDisabler.disable(keepAuthToken: false, uninstallSystemExtension: false)
         }
     }
+
+    /// A method meant to be called safely from different places to disable the VPN if the user isn't meant to have access to it.
+    ///
+    @discardableResult
+    func disableIfUserHasNoAccess() async -> Bool {
+        if shouldUninstallAutomatically() {
+            await disableForAllUsers()
+            return true
+        }
+
+        return await disableVPNForLegacyUsersIfSubscriptionAvailable()
+    }
+
+    // MARK: - Subscription Start Support
+
+    /// To query whether we're a legacy (waitlist or easter egg) user.
+    ///
+    private func isPreSubscriptionUser() -> Bool {
+        guard let token = try? NetworkProtectionKeychainTokenStore(isSubscriptionEnabled: false).fetchToken() else {
+            return false
+        }
+
+        return !token.hasPrefix(Self.subscriptionAuthTokenPrefix)
+    }
+
+    /// Checks whether the VPN needs to be disabled.
+    ///
+    var isEligibleForThankYouMessage: Bool {
+        isPreSubscriptionUser() && subscriptionFeatureAvailability.isFeatureAvailable
+    }
 }
 
 #endif
diff --git a/DuckDuckGo/Waitlist/UserDefaults+vpnLegacyUser.swift b/DuckDuckGo/Waitlist/UserDefaults+vpnLegacyUser.swift
new file mode 100644
index 0000000000..68891bc44b
--- /dev/null
+++ b/DuckDuckGo/Waitlist/UserDefaults+vpnLegacyUser.swift
@@ -0,0 +1,40 @@
+//
+//  UserDefaults+vpnLegacyUser.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+extension UserDefaults {
+    static var vpnLegacyUserAccessDisabledOnceKey: String {
+        "vpnLegacyUserAccessDisabledOnce"
+    }
+
+    @objc
+    dynamic var vpnLegacyUserAccessDisabledOnce: Bool {
+        get {
+            bool(forKey: Self.vpnLegacyUserAccessDisabledOnceKey)
+        }
+
+        set {
+            set(newValue, forKey: Self.vpnLegacyUserAccessDisabledOnceKey)
+        }
+    }
+
+    func resetVPNLegacyUserAccessDisabledOnce() {
+        removeObject(forKey: Self.vpnLegacyUserAccessDisabledOnceKey)
+    }
+}
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift b/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift
index d6307fbf97..a10b10e34c 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift
@@ -153,7 +153,7 @@ struct NetworkProtectionTermsAndConditionsContentView: View {
 }
 
 struct NetworkProtectionWaitlistTermsAndConditionsViewData: WaitlistTermsAndConditionsViewData {
-    let title = "Network Protection Beta\nService Terms and Privacy Policy"
+    let title = "VPN Beta\nService Terms and Privacy Policy"
     let buttonCancelLabel = UserText.networkProtectionWaitlistButtonCancel
     let buttonAgreeAndContinueLabel = UserText.networkProtectionWaitlistButtonAgreeAndContinue
 }
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift b/DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift
new file mode 100644
index 0000000000..2237c32222
--- /dev/null
+++ b/DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift
@@ -0,0 +1,138 @@
+//
+//  WaitlistThankYouPromptPresenter.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import Foundation
+import Subscription
+
+final class WaitlistThankYouPromptPresenter {
+
+    private enum Constants {
+        static let didShowThankYouPromptKey = "duckduckgo.macos.browser.did-show-thank-you-prompt"
+        static let didDismissVPNCardKey = "duckduckgo.macos.browser.did-dismiss-vpn-card"
+        static let didDismissPIRCardKey = "duckduckgo.macos.browser.did-dismiss-pir-card"
+    }
+
+    private let isVPNBetaTester: () -> Bool
+    private let isPIRBetaTester: () -> Bool
+    private let userDefaults: UserDefaults
+
+    convenience init() {
+        self.init(isVPNBetaTester: {
+            return DefaultNetworkProtectionVisibility().isEligibleForThankYouMessage
+        }, isPIRBetaTester: {
+            return DefaultDataBrokerProtectionFeatureVisibility().isEligibleForThankYouMessage()
+        })
+    }
+
+    init(isVPNBetaTester: @escaping () -> Bool, isPIRBetaTester: @escaping () -> Bool, userDefaults: UserDefaults = .standard) {
+        self.isVPNBetaTester = isVPNBetaTester
+        self.isPIRBetaTester = isPIRBetaTester
+        self.userDefaults = userDefaults
+    }
+
+    // MARK: - Presentation
+
+    // Presents a Thank You prompt to testers of the VPN or PIR.
+    // If the user tested both, the PIR prompt will be displayed.
+    @MainActor
+    func presentThankYouPromptIfNecessary(in window: NSWindow) {
+        // Wiring this here since it's mostly useful for rolling out PrivacyPro, and should
+        // go away once PPro is fully rolled out.
+        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
+            DailyPixel.fire(pixel: .privacyProFeatureEnabled, frequency: .dailyOnly)
+        }
+
+        guard canShowPromptCheck() else {
+            return
+        }
+
+        if isPIRBetaTester() {
+            saveDidShowPromptCheck()
+            DailyPixel.fire(pixel: Pixel.Event.privacyProBetaUserThankYouDBP, frequency: .dailyAndCount)
+            presentPIRThankYouPrompt(in: window)
+        } else if isVPNBetaTester() {
+            saveDidShowPromptCheck()
+            DailyPixel.fire(pixel: Pixel.Event.privacyProBetaUserThankYouVPN, frequency: .dailyAndCount)
+            presentVPNThankYouPrompt(in: window)
+        }
+    }
+
+    @MainActor
+    func presentVPNThankYouPrompt(in window: NSWindow) {
+        let thankYouModalView = WaitlistBetaThankYouDialogViewController(copy: .vpn)
+        let thankYouWindowController = thankYouModalView.wrappedInWindowController()
+        if let thankYouWindow = thankYouWindowController.window {
+            window.beginSheet(thankYouWindow)
+        }
+    }
+
+    @MainActor
+    func presentPIRThankYouPrompt(in window: NSWindow) {
+        let thankYouModalView = WaitlistBetaThankYouDialogViewController(copy: .dbp)
+        let thankYouWindowController = thankYouModalView.wrappedInWindowController()
+        if let thankYouWindow = thankYouWindowController.window {
+            window.beginSheet(thankYouWindow)
+        }
+    }
+
+    // MARK: - Eligibility
+
+    var canShowVPNCard: Bool {
+        guard !self.userDefaults.bool(forKey: Constants.didDismissVPNCardKey) else {
+            return false
+        }
+
+        return isVPNBetaTester()
+    }
+
+    var canShowPIRCard: Bool {
+        guard !self.userDefaults.bool(forKey: Constants.didDismissPIRCardKey) else {
+            return false
+        }
+
+        return isPIRBetaTester()
+    }
+
+    func canShowPromptCheck() -> Bool {
+        return !self.userDefaults.bool(forKey: Constants.didShowThankYouPromptKey)
+    }
+
+    // MARK: - Dismissal
+
+    func didDismissVPNThankYouCard() {
+        self.userDefaults.setValue(true, forKey: Constants.didDismissVPNCardKey)
+    }
+
+    func didDismissPIRThankYouCard() {
+        self.userDefaults.setValue(true, forKey: Constants.didDismissPIRCardKey)
+    }
+
+    private func saveDidShowPromptCheck() {
+        self.userDefaults.setValue(true, forKey: Constants.didShowThankYouPromptKey)
+    }
+
+    // MARK: - Debug
+
+    func resetPromptCheck() {
+        self.userDefaults.removeObject(forKey: Constants.didShowThankYouPromptKey)
+        self.userDefaults.removeObject(forKey: Constants.didDismissVPNCardKey)
+        self.userDefaults.removeObject(forKey: Constants.didDismissPIRCardKey)
+    }
+
+}
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistThankYouView.swift b/DuckDuckGo/Waitlist/Views/WaitlistThankYouView.swift
new file mode 100644
index 0000000000..b94d1846d2
--- /dev/null
+++ b/DuckDuckGo/Waitlist/Views/WaitlistThankYouView.swift
@@ -0,0 +1,229 @@
+//
+//  WaitlistThankYouView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import Combine
+import SwiftUI
+
+// MARK: - Model
+
+struct WaitlistBetaThankYouCopy {
+    static let dbp = WaitlistBetaThankYouCopy(
+        title: UserText.dbpThankYouTitle,
+        subtitle: UserText.dbpThankYouSubtitle,
+        body1: UserText.dbpThankYouBody1,
+        body2: UserText.dbpThankYouBody2
+    )
+
+    static let vpn = WaitlistBetaThankYouCopy(
+        title: UserText.vpnThankYouTitle,
+        subtitle: UserText.vpnThankYouSubtitle,
+        body1: UserText.vpnThankYouBody1,
+        body2: UserText.vpnThankYouBody2
+    )
+
+    let title: String
+    let subtitle: String
+    let body1: String
+    let body2: String
+
+    @available(macOS 12.0, *)
+    func boldedBold1() -> AttributedString {
+        return bolded(text: body1, boldedStrings: ["THANKYOU"])
+    }
+
+    @available(macOS 12.0, *)
+    func boldedBold2() -> AttributedString {
+        return bolded(text: body2, boldedStrings: ["duckduckgo.com/app"])
+    }
+
+    @available(macOS 12.0, *)
+    private func bolded(text: String, boldedStrings: [String]) -> AttributedString {
+        var attributedString = AttributedString(text)
+
+        for boldedString in boldedStrings {
+            if let range = attributedString.range(of: boldedString) {
+                attributedString[range].font = .system(size: 14, weight: .semibold)
+            }
+        }
+
+        return attributedString
+    }
+}
+
+// MARK: - View Model
+
+protocol WaitlistBetaThankYouDialogViewModelDelegate: AnyObject {
+    func waitlistBetaThankYouViewModelDismissedView(_ viewModel: WaitlistBetaThankYouDialogViewModel)
+}
+
+final class WaitlistBetaThankYouDialogViewModel: ObservableObject {
+
+    enum ViewAction {
+        case close
+    }
+
+    weak var delegate: WaitlistBetaThankYouDialogViewModelDelegate?
+
+    init() {}
+
+    @MainActor
+    func process(action: ViewAction) async {
+        switch action {
+        case .close:
+            delegate?.waitlistBetaThankYouViewModelDismissedView(self)
+        }
+    }
+
+}
+
+// MARK: - View
+
+final class WaitlistBetaThankYouDialogViewController: NSViewController {
+
+    private let defaultSize = CGSize(width: 360, height: 498)
+    private let viewModel: WaitlistBetaThankYouDialogViewModel
+
+    private var heightConstraint: NSLayoutConstraint?
+    private var cancellables = Set<AnyCancellable>()
+
+    private let copy: WaitlistBetaThankYouCopy
+
+    init(copy: WaitlistBetaThankYouCopy) {
+        self.viewModel = WaitlistBetaThankYouDialogViewModel()
+        self.copy = copy
+        super.init(nibName: nil, bundle: nil)
+        self.viewModel.delegate = self
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func loadView() {
+        view = NSView(frame: NSRect(origin: CGPoint.zero, size: defaultSize))
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        let feedbackFormView = WaitlistBetaThankYouView(copy: self.copy)
+        let hostingView = NSHostingView(rootView: feedbackFormView.environmentObject(self.viewModel))
+        hostingView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(hostingView)
+
+        let heightConstraint = hostingView.heightAnchor.constraint(equalToConstant: defaultSize.height)
+        self.heightConstraint = heightConstraint
+
+        NSLayoutConstraint.activate([
+            heightConstraint,
+            hostingView.widthAnchor.constraint(equalToConstant: defaultSize.width),
+            hostingView.topAnchor.constraint(equalTo: view.topAnchor),
+            hostingView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+            hostingView.leftAnchor.constraint(equalTo: view.leftAnchor),
+            hostingView.rightAnchor.constraint(equalTo: view.rightAnchor)
+        ])
+    }
+
+}
+
+struct WaitlistBetaThankYouView: View {
+
+    @EnvironmentObject var viewModel: WaitlistBetaThankYouDialogViewModel
+
+    let copy: WaitlistBetaThankYouCopy
+
+    var body: some View {
+        VStack(spacing: 0) {
+            VStack {
+                Text(copy.title)
+                    .font(.system(size: 17, weight: .semibold))
+                    .padding([.leading, .trailing], 21.5)
+                    .padding([.top, .bottom], 24)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+            .frame(maxWidth: .infinity)
+            .background(Color.backgroundSecondary)
+
+            Divider()
+
+            Image("Gift-96")
+                .resizable()
+                .frame(width: 96, height: 96)
+                .padding([.top, .bottom], 24)
+
+            Text(copy.subtitle)
+                .font(.system(size: 17, weight: .semibold))
+                .padding([.leading, .trailing, .bottom], 14)
+
+            if #available(macOS 12.0, *) {
+                Text(copy.boldedBold1())
+                    .font(.system(size: 14))
+                    .padding([.leading, .trailing, .bottom], 14)
+                    .lineSpacing(2)
+            } else {
+                Text(copy.body1)
+                    .font(.system(size: 14))
+                    .padding([.leading, .trailing, .bottom], 14)
+                    .lineSpacing(2)
+            }
+
+            if #available(macOS 12.0, *) {
+                Text(copy.boldedBold2())
+                    .font(.system(size: 14))
+                    .padding([.leading, .trailing, .bottom], 14)
+                    .lineSpacing(2)
+            } else {
+                Text(copy.body2)
+                    .font(.system(size: 14))
+                    .padding([.leading, .trailing, .bottom], 14)
+                    .lineSpacing(2)
+            }
+
+            Spacer()
+
+            button(text: "Close", action: .close)
+                .padding(16)
+        }
+        .multilineTextAlignment(.center)
+    }
+
+    @ViewBuilder
+    func button(text: String, action: WaitlistBetaThankYouDialogViewModel.ViewAction) -> some View {
+        Button(action: {
+            Task {
+                await viewModel.process(action: action)
+            }
+        }, label: {
+            Text(text)
+                .frame(maxWidth: .infinity)
+        })
+        .controlSize(.large)
+        .keyboardShortcut(.defaultAction)
+        .frame(maxWidth: .infinity)
+    }
+
+}
+
+extension WaitlistBetaThankYouDialogViewController: WaitlistBetaThankYouDialogViewModelDelegate {
+
+    func waitlistBetaThankYouViewModelDismissedView(_ viewModel: WaitlistBetaThankYouDialogViewModel) {
+        dismiss()
+    }
+
+}
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift b/DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift
index fba944d198..22fcf9bbdb 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import UserNotifications
+import Subscription
 
 #if NETWORK_PROTECTION || DBP
 
@@ -81,6 +82,11 @@ struct NetworkProtectionWaitlistViewControllerPresenter: WaitlistViewControllerP
 struct DataBrokerProtectionWaitlistViewControllerPresenter: WaitlistViewControllerPresenter {
 
     static func shouldPresentWaitlist() -> Bool {
+#if SUBSCRIPTION
+        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
+            return false
+        }
+#endif
         let waitlist = DataBrokerProtectionWaitlist()
 
         let accepted = UserDefaults().bool(forKey: UserDefaultsWrapper<Bool>.Key.dataBrokerProtectionTermsAndConditionsAccepted.rawValue)
diff --git a/DuckDuckGo/Waitlist/Waitlist.swift b/DuckDuckGo/Waitlist/Waitlist.swift
index cacd783aff..8b91f0b8de 100644
--- a/DuckDuckGo/Waitlist/Waitlist.swift
+++ b/DuckDuckGo/Waitlist/Waitlist.swift
@@ -24,6 +24,7 @@ import UserNotifications
 import NetworkProtection
 import BrowserServicesKit
 import Common
+import Subscription
 
 protocol WaitlistConstants {
     static var identifier: String { get }
@@ -155,7 +156,7 @@ extension ProductWaitlistRequest {
     }
 }
 
-// MARK: - Network Protection Waitlist
+// MARK: - VPN Waitlist
 
 struct NetworkProtectionWaitlist: Waitlist {
 
@@ -206,28 +207,16 @@ struct NetworkProtectionWaitlist: Waitlist {
     }
 
     func fetchNetworkProtectionInviteCodeIfAvailable(completion: @escaping (WaitlistInviteCodeFetchError?) -> Void) {
+        // Never fetch the invite code if the Privacy Pro flag is enabled:
+        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
+            completion(nil)
+            return
+        }
+
         self.fetchInviteCodeIfAvailable { error in
             if let error {
-                // Check for users who have waitlist state but have no auth token, for example if the redeem call fails.
-                let networkProtectionKeyStore = NetworkProtectionKeychainTokenStore()
-                let configManager = ContentBlocking.shared.privacyConfigurationManager
-                let waitlistBetaActive = configManager.privacyConfig.isSubfeatureEnabled(NetworkProtectionSubfeature.waitlistBetaActive)
-
-                if let inviteCode = waitlistStorage.getWaitlistInviteCode(),
-                   !networkProtectionKeyStore.isFeatureActivated,
-                   waitlistBetaActive {
-                    Task { @MainActor in
-                        do {
-                            try await networkProtectionCodeRedemption.redeem(inviteCode)
-                            NotificationCenter.default.post(name: .networkProtectionWaitlistAccessChanged, object: nil)
-                            completion(nil)
-                        } catch {
-                            completion(.failure(error))
-                        }
-                    }
-                } else {
-                    completion(error)
-                }
+                // Do nothing if the app fails to fetch, as the waitlist is being phased out
+                completion(error)
             } else if let inviteCode = waitlistStorage.getWaitlistInviteCode() {
                 Task { @MainActor in
                     do {
@@ -299,7 +288,7 @@ struct DataBrokerProtectionWaitlist: Waitlist {
     }
 
     func redeemDataBrokerProtectionInviteCodeIfAvailable() async throws {
-        if DefaultDataBrokerProtectionFeatureVisibility.bypassWaitlist {
+        if DefaultDataBrokerProtectionFeatureVisibility.bypassWaitlist || DefaultDataBrokerProtectionFeatureVisibility().isPrivacyProEnabled() {
             return
         }
 
diff --git a/DuckDuckGo/Windows/View/WindowControllersManager.swift b/DuckDuckGo/Windows/View/WindowControllersManager.swift
index 0aeaeeadd2..92a871a208 100644
--- a/DuckDuckGo/Windows/View/WindowControllersManager.swift
+++ b/DuckDuckGo/Windows/View/WindowControllersManager.swift
@@ -198,7 +198,7 @@ extension WindowControllersManager {
         windowController.window?.orderFront(nil)
     }
 
-    // MARK: - Network Protection
+    // MARK: - VPN
 
 #if NETWORK_PROTECTION
     @MainActor
diff --git a/DuckDuckGo/Windows/View/WindowsManager.swift b/DuckDuckGo/Windows/View/WindowsManager.swift
index bfe93e0329..cb622baed4 100644
--- a/DuckDuckGo/Windows/View/WindowsManager.swift
+++ b/DuckDuckGo/Windows/View/WindowsManager.swift
@@ -30,6 +30,9 @@ final class WindowsManager {
         NSApplication.shared.windows.compactMap { $0 as? MainWindow }
     }
 
+    // Shared type to enable managing `PasswordManagementPopover`s in multiple windows
+    private static let autofillPopoverPresenter: AutofillPopoverPresenter = DefaultAutofillPopoverPresenter()
+
     class func closeWindows(except windows: [NSWindow] = []) {
         for controller in WindowControllersManager.shared.mainWindowControllers {
             guard let window = controller.window, !windows.contains(window) else { continue }
@@ -61,7 +64,8 @@ final class WindowsManager {
                              lazyLoadTabs: Bool = false) -> MainWindow? {
         let mainWindowController = makeNewWindow(tabCollectionViewModel: tabCollectionViewModel,
                                                  popUp: popUp,
-                                                 burnerMode: burnerMode)
+                                                 burnerMode: burnerMode,
+                                                 autofillPopoverPresenter: autofillPopoverPresenter)
 
         if let contentSize {
             mainWindowController.window?.setContentSize(contentSize)
@@ -161,8 +165,9 @@ final class WindowsManager {
     private class func makeNewWindow(tabCollectionViewModel: TabCollectionViewModel? = nil,
                                      contentSize: NSSize? = nil,
                                      popUp: Bool = false,
-                                     burnerMode: BurnerMode) -> MainWindowController {
-        let mainViewController = MainViewController(tabCollectionViewModel: tabCollectionViewModel ?? TabCollectionViewModel(burnerMode: burnerMode))
+                                     burnerMode: BurnerMode,
+                                     autofillPopoverPresenter: AutofillPopoverPresenter) -> MainWindowController {
+        let mainViewController = MainViewController(tabCollectionViewModel: tabCollectionViewModel ?? TabCollectionViewModel(burnerMode: burnerMode), autofillPopoverPresenter: autofillPopoverPresenter)
 
         var contentSize = contentSize ?? NSSize(width: 1024, height: 790)
         contentSize.width = min(NSScreen.main?.frame.size.width ?? 1024, max(contentSize.width, 300))
diff --git a/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift b/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift
index a10fb1fd97..2bdc06947a 100644
--- a/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift
+++ b/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift
@@ -36,7 +36,7 @@ public final class DataBrokerProtectionBackgroundManager {
     private lazy var ipcServiceManager = IPCServiceManager(scheduler: scheduler, pixelHandler: pixelHandler)
 
     lazy var dataManager: DataBrokerProtectionDataManager = {
-        DataBrokerProtectionDataManager(fakeBrokerFlag: fakeBrokerFlag)
+        DataBrokerProtectionDataManager(pixelHandler: pixelHandler, fakeBrokerFlag: fakeBrokerFlag)
     }()
 
     lazy var scheduler: DataBrokerProtectionScheduler = {
@@ -78,19 +78,36 @@ public final class DataBrokerProtectionBackgroundManager {
     public func runOperationsAndStartSchedulerIfPossible() {
         pixelHandler.fire(.backgroundAgentRunOperationsAndStartSchedulerIfPossible)
 
-        // If there's no saved profile we don't need to start the scheduler
-        if (try? dataManager.fetchProfile()) != nil {
-            scheduler.runQueuedOperations(showWebView: false) { [weak self] error in
-                guard error == nil else {
-                    // Ideally we'd fire a pixel here, however at the moment the scheduler never ever returns an error
-                    return
-                }
+        do {
+            // If there's no saved profile we don't need to start the scheduler
+            guard (try dataManager.fetchProfile()) != nil else {
+                pixelHandler.fire(.backgroundAgentRunOperationsAndStartSchedulerIfPossibleNoSavedProfile)
+                return
+            }
+        } catch {
+            pixelHandler.fire(.generalError(error: error,
+                                            functionOccurredIn: "DataBrokerProtectionBackgroundManager.runOperationsAndStartSchedulerIfPossible"))
+            return
+        }
 
-                self?.pixelHandler.fire(.backgroundAgentRunOperationsAndStartSchedulerIfPossibleRunQueuedOperationsCallbackStartScheduler)
-                self?.scheduler.startScheduler()
+        scheduler.runQueuedOperations(showWebView: false) { [weak self] errors in
+            if let errors = errors {
+                if let oneTimeError = errors.oneTimeError {
+                    os_log("Error during BackgroundManager runOperationsAndStartSchedulerIfPossible in scheduler.runQueuedOperations(), error: %{public}@",
+                           log: .dataBrokerProtection,
+                           oneTimeError.localizedDescription)
+                    self?.pixelHandler.fire(.generalError(error: oneTimeError,
+                                                          functionOccurredIn: "DataBrokerProtectionBackgroundManager.runOperationsAndStartSchedulerIfPossible"))
+                }
+                if let operationErrors = errors.operationErrors,
+                          operationErrors.count != 0 {
+                    os_log("Operation error(s) during  BackgroundManager runOperationsAndStartSchedulerIfPossible in scheduler.runQueuedOperations(), count: %{public}d", log: .dataBrokerProtection, operationErrors.count)
+                }
+                return
             }
-        } else {
-            pixelHandler.fire(.backgroundAgentRunOperationsAndStartSchedulerIfPossibleNoSavedProfile)
+
+            self?.pixelHandler.fire(.backgroundAgentRunOperationsAndStartSchedulerIfPossibleRunQueuedOperationsCallbackStartScheduler)
+            self?.scheduler.startScheduler()
         }
     }
 }
diff --git a/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgent.entitlements b/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgent.entitlements
index d479a64a3a..c1bf3bf0e0 100644
--- a/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgent.entitlements
+++ b/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgent.entitlements
@@ -2,14 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.application-groups</key>
-    <array>
-        <string>$(DBP_APP_GROUP)</string>
-        <string>$(NETP_APP_GROUP)</string>
-    </array>
-    <key>keychain-access-groups</key>
-    <array>
-        <string>$(DBP_APP_GROUP)</string>
-    </array>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>$(DBP_APP_GROUP)</string>
+		<string>$(NETP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
+	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(DBP_APP_GROUP)</string>
+	</array>
 </dict>
 </plist>
diff --git a/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppDelegate.swift b/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppDelegate.swift
index 9c8daa0d36..522bef3306 100644
--- a/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppDelegate.swift
+++ b/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppDelegate.swift
@@ -41,7 +41,7 @@ final class DuckDuckGoDBPBackgroundAgentApplication: NSApplication {
 
         PixelKit.setUp(dryRun: dryRun,
                        appVersion: AppVersion.shared.versionNumber,
-                       source: nil,
+                       source: "dbpBackgroundAgent",
                        defaultHeaders: [:],
                        log: .dbpBackgroundAgentPixel,
                        defaults: .standard) { (pixelName: String, headers: [String: String], parameters: [String: String], _, _, onComplete: @escaping (Bool, Error?) -> Void) in
diff --git a/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppStore.entitlements b/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppStore.entitlements
index 352df997f2..b90c211a88 100644
--- a/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppStore.entitlements
+++ b/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppStore.entitlements
@@ -2,18 +2,19 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>keychain-access-groups</key>
-    <array>
-        <string>$(DBP_APP_GROUP)</string>
-    </array>
-    <key>com.apple.security.application-groups</key>
-    <array>
-        <string>$(DBP_APP_GROUP)</string>
-        <string>$(NETP_APP_GROUP)</string>
-    </array>
-    <key>com.apple.security.network.client</key>
-    <true/>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>$(DBP_APP_GROUP)</string>
+		<string>$(NETP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
+	</array>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(DBP_APP_GROUP)</string>
+	</array>
 </dict>
 </plist>
diff --git a/DuckDuckGoDBPBackgroundAgent/IPCServiceManager.swift b/DuckDuckGoDBPBackgroundAgent/IPCServiceManager.swift
index c452200f7b..3f9361e6e5 100644
--- a/DuckDuckGoDBPBackgroundAgent/IPCServiceManager.swift
+++ b/DuckDuckGoDBPBackgroundAgent/IPCServiceManager.swift
@@ -77,27 +77,30 @@ extension IPCServiceManager: IPCServerInterface {
         scheduler.stopScheduler()
     }
 
-    func optOutAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    func optOutAllBrokers(showWebView: Bool,
+                          completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         pixelHandler.fire(.ipcServerOptOutAllBrokers)
-        scheduler.optOutAllBrokers(showWebView: showWebView) { error in
-            self.pixelHandler.fire(.ipcServerOptOutAllBrokersCompletion(error: error))
-            completion(error)
+        scheduler.optOutAllBrokers(showWebView: showWebView) { errors in
+            self.pixelHandler.fire(.ipcServerOptOutAllBrokersCompletion(error: errors?.oneTimeError))
+            completion(errors)
         }
     }
 
-    func scanAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    func scanAllBrokers(showWebView: Bool,
+                        completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         pixelHandler.fire(.ipcServerScanAllBrokers)
-        scheduler.scanAllBrokers(showWebView: showWebView) { error in
-            self.pixelHandler.fire(.ipcServerScanAllBrokersCompletion(error: error))
-            completion(error)
+        scheduler.scanAllBrokers(showWebView: showWebView) { errors in
+            self.pixelHandler.fire(.ipcServerScanAllBrokersCompletion(error: errors?.oneTimeError))
+            completion(errors)
         }
     }
 
-    func runQueuedOperations(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    func runQueuedOperations(showWebView: Bool,
+                             completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         pixelHandler.fire(.ipcServerRunQueuedOperations)
-        scheduler.runQueuedOperations(showWebView: showWebView) { error in
-            self.pixelHandler.fire(.ipcServerRunQueuedOperationsCompletion(error: error))
-            completion(error)
+        scheduler.runQueuedOperations(showWebView: showWebView) { errors in
+            self.pixelHandler.fire(.ipcServerRunQueuedOperationsCompletion(error: errors?.oneTimeError))
+            completion(errors)
         }
     }
 
diff --git a/DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements b/DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements
index 89b0fe101c..078b5b3f68 100644
--- a/DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements
+++ b/DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements
@@ -9,6 +9,7 @@
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>$(NETP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 	</array>
 </dict>
 </plist>
diff --git a/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift b/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift
index bd226a82c6..41677dc8f1 100644
--- a/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift
+++ b/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift
@@ -111,6 +111,12 @@ final class DuckDuckGoNotificationsAppDelegate: NSObject, NSApplicationDelegate
             os_log("Got notification: listener started")
             self?.notificationsPresenter.requestAuthorization()
         }.store(in: &cancellables)
+
+        distributedNotificationCenter.publisher(for: .showExpiredEntitlementNotification)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                self?.showEntitlementNotification()
+            }.store(in: &cancellables)
     }
 
     func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
@@ -139,6 +145,12 @@ final class DuckDuckGoNotificationsAppDelegate: NSObject, NSApplicationDelegate
         notificationsPresenter.showSupersededNotification()
     }
 
+    func showEntitlementNotification() {
+        os_log("Presenting Entitlements notification", log: .networkProtection, type: .info)
+
+        notificationsPresenter.showEntitlementNotification()
+    }
+
     func showTestNotification() {
         os_log("Presenting test notification", log: .networkProtection, type: .info)
         notificationsPresenter.showTestNotification()
diff --git a/DuckDuckGoNotifications/Logging.swift b/DuckDuckGoNotifications/Logging.swift
index 1d9b65a58c..1d8516705b 100644
--- a/DuckDuckGoNotifications/Logging.swift
+++ b/DuckDuckGoNotifications/Logging.swift
@@ -39,11 +39,11 @@ struct Logging {
     static let subsystem = Bundle.main.bundleIdentifier ?? "DuckDuckGo"
 
     fileprivate static let networkProtectionLoginItemLoggingEnabled = false
-    fileprivate static let networkProtectionLoginItemLog: OSLog = OSLog(subsystem: subsystem, category: "Network Protection: Login Item")
+    fileprivate static let networkProtectionLoginItemLog: OSLog = OSLog(subsystem: subsystem, category: "VPN: Login Item")
 
     fileprivate static let networkProtectionIPCLoginItemLoggingEnabled = false
-    fileprivate static let networkProtectionIPCLoginItemLog: OSLog = OSLog(subsystem: subsystem, category: "Network Protection: IPC (Login Item)")
+    fileprivate static let networkProtectionIPCLoginItemLog: OSLog = OSLog(subsystem: subsystem, category: "VPN: IPC (Login Item)")
 
     fileprivate static let networkProtectionMemoryLoggingEnabled = false
-    fileprivate static let networkProtectionMemoryLog: OSLog = OSLog(subsystem: subsystem, category: "Network Protection: Memory")
+    fileprivate static let networkProtectionMemoryLog: OSLog = OSLog(subsystem: subsystem, category: "VPN: Memory")
 }
diff --git a/DuckDuckGoVPN/DuckDuckGoVPN.entitlements b/DuckDuckGoVPN/DuckDuckGoVPN.entitlements
index e859396c56..3701cb8c93 100644
--- a/DuckDuckGoVPN/DuckDuckGoVPN.entitlements
+++ b/DuckDuckGoVPN/DuckDuckGoVPN.entitlements
@@ -12,6 +12,7 @@
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>$(NETP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
diff --git a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
index 56dfec2033..67d2baeb1d 100644
--- a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
+++ b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
@@ -47,6 +47,7 @@ final class DuckDuckGoVPNApplication: NSApplication {
 
         super.init()
         self.delegate = _delegate
+
 #if DEBUG && SUBSCRIPTION
         let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
 
@@ -144,7 +145,7 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
     }()
 
     private func handleControllerEvent(_ event: TransparentProxyController.Event) {
-        PixelKit.fire(event)
+
     }
 
     @MainActor
@@ -200,6 +201,10 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
         VPNAppEventsHandler(tunnelController: tunnelController)
     }()
 
+    private lazy var vpnUninstaller: VPNUninstaller = {
+        VPNUninstaller(networkExtensionController: networkExtensionController, vpnConfigurationManager: VPNConfigurationManager())
+    }()
+
     /// The status bar NetworkProtection menu
     ///
     /// For some reason the App will crash if this is initialized right away, which is why it was changed to be lazy.
@@ -237,6 +242,9 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
                     StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuVPNSettings, action: { [weak self] in
                         await self?.appLauncher.launchApp(withCommand: .showSettings)
                     }),
+                    StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuFAQ, action: { [weak self] in
+                        await self?.appLauncher.launchApp(withCommand: .showFAQ)
+                    }),
                     StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuOpenDuckDuckGo, action: { [weak self] in
                         await self?.appLauncher.launchApp(withCommand: .justOpen)
                     }),
@@ -246,68 +254,83 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
                 ]
             },
             agentLoginItem: nil,
-            isMenuBarStatusView: true)
+            isMenuBarStatusView: true,
+            userDefaults: .netP,
+            uninstallHandler: { [weak self] in
+                guard let self else { return }
+                await self.vpnUninstaller.uninstall(includingSystemExtension: true)
+            }
+        )
     }
 
     @MainActor
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         APIRequest.Headers.setUserAgent(UserAgent.duckDuckGoUserAgent())
+#if SUBSCRIPTION
+        SubscriptionPurchaseEnvironment.currentServiceEnvironment = tunnelSettings.selectedEnvironment == .production ? .production : .staging
+#endif
 
         os_log("DuckDuckGoVPN started", log: .networkProtectionLoginItemLog, type: .info)
 
         setupMenuVisibility()
 
-        bouncer.requireAuthTokenOrKillApp()
+        Task { @MainActor in
+            // The reason we want to await for this is that nothing else should be executed
+            // if the app should quit.
+            await bouncer.requireAuthTokenOrKillApp(controller: tunnelController)
 
-        // Initialize lazy properties
-        _ = tunnelControllerIPCService
-        _ = vpnProxyLauncher
+            // Initialize lazy properties
+            _ = tunnelControllerIPCService
+            _ = vpnProxyLauncher
 
-        let dryRun: Bool
+            let dryRun: Bool
 
 #if DEBUG
-        dryRun = true
+            dryRun = true
 #else
-        dryRun = false
+            dryRun = false
 #endif
 
-        let pixelSource: String
+            let pixelSource: String
 
 #if NETP_SYSTEM_EXTENSION
-        pixelSource = "vpnAgent"
+            pixelSource = "vpnAgent"
 #else
-        pixelSource = "vpnAgentAppStore"
+            pixelSource = "vpnAgentAppStore"
 #endif
 
-        PixelKit.setUp(dryRun: dryRun,
-                       appVersion: AppVersion.shared.versionNumber,
-                       source: pixelSource,
-                       defaultHeaders: [:],
-                       log: .networkProtectionPixel,
-                       defaults: .netP) { (pixelName: String, headers: [String: String], parameters: [String: String], _, _, onComplete: @escaping PixelKit.CompletionBlock) in
+            PixelKit.setUp(dryRun: dryRun,
+                           appVersion: AppVersion.shared.versionNumber,
+                           source: pixelSource,
+                           defaultHeaders: [:],
+                           log: .networkProtectionPixel,
+                           defaults: .netP) { (pixelName: String, headers: [String: String], parameters: [String: String], _, _, onComplete: @escaping PixelKit.CompletionBlock) in
 
-            let url = URL.pixelUrl(forPixelNamed: pixelName)
-            let apiHeaders = APIRequest.Headers(additionalHeaders: headers) // workaround - Pixel class should really handle APIRequest.Headers by itself
-            let configuration = APIRequest.Configuration(url: url, method: .get, queryParameters: parameters, headers: apiHeaders)
-            let request = APIRequest(configuration: configuration)
+                let url = URL.pixelUrl(forPixelNamed: pixelName)
+                let apiHeaders = APIRequest.Headers(additionalHeaders: headers) // workaround - Pixel class should really handle APIRequest.Headers by itself
+                let configuration = APIRequest.Configuration(url: url, method: .get, queryParameters: parameters, headers: apiHeaders)
+                let request = APIRequest(configuration: configuration)
 
-            request.fetch { _, error in
-                onComplete(error == nil, error)
+                request.fetch { _, error in
+                    onComplete(error == nil, error)
+                }
             }
-        }
 
-        vpnAppEventsHandler.appDidFinishLaunching()
+            vpnAppEventsHandler.appDidFinishLaunching()
 
-        let launchInformation = LoginItemLaunchInformation(agentBundleID: Bundle.main.bundleIdentifier!, defaults: .netP)
-        let launchedOnStartup = launchInformation.wasLaunchedByStartup
-        launchInformation.update()
+            let launchInformation = LoginItemLaunchInformation(agentBundleID: Bundle.main.bundleIdentifier!, defaults: .netP)
+            let launchedOnStartup = launchInformation.wasLaunchedByStartup
+            launchInformation.update()
 
-        if launchedOnStartup {
-            Task {
-                let isConnected = await tunnelController.isConnected
+            setUpSubscriptionMonitoring()
 
-                if !isConnected && tunnelSettings.connectOnLogin {
-                    await tunnelController.start()
+            if launchedOnStartup {
+                Task {
+                    let isConnected = await tunnelController.isConnected
+
+                    if !isConnected && tunnelSettings.connectOnLogin {
+                        await tunnelController.start()
+                    }
                 }
             }
         }
@@ -331,6 +354,41 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
             }
         }.store(in: &cancellables)
     }
+
+    private lazy var entitlementMonitor = NetworkProtectionEntitlementMonitor()
+
+    private func setUpSubscriptionMonitoring() {
+#if SUBSCRIPTION
+        let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+        guard accountManager.isUserAuthenticated else { return }
+        let entitlementsCheck = {
+            await accountManager.hasEntitlement(for: .networkProtection, cachePolicy: .reloadIgnoringLocalCacheData)
+        }
+
+        Task {
+            await entitlementMonitor.start(entitlementCheck: entitlementsCheck) { [weak self] result in
+                switch result {
+                case .validEntitlement:
+                    UserDefaults.netP.networkProtectionEntitlementsExpired = false
+                case .invalidEntitlement:
+                    UserDefaults.netP.networkProtectionEntitlementsExpired = true
+                    PixelKit.fire(VPNPrivacyProPixel.vpnAccessRevokedDialogShown, frequency: .dailyAndContinuous)
+
+                    guard let self else { return }
+                    Task {
+                        let isConnected = await self.tunnelController.isConnected
+                        if isConnected {
+                            await self.tunnelController.stop()
+                            DistributedNotificationCenter.default().post(.showExpiredEntitlementNotification)
+                        }
+                    }
+                case .error:
+                    break
+                }
+            }
+        }
+#endif
+    }
 }
 
 extension NSApplication {
diff --git a/DuckDuckGoVPN/DuckDuckGoVPNAppStore.entitlements b/DuckDuckGoVPN/DuckDuckGoVPNAppStore.entitlements
index 5e706138b5..fd8ab61887 100644
--- a/DuckDuckGoVPN/DuckDuckGoVPNAppStore.entitlements
+++ b/DuckDuckGoVPN/DuckDuckGoVPNAppStore.entitlements
@@ -2,8 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
 	<key>com.apple.developer.networking.networkextension</key>
 	<array>
+		<string>app-proxy-provider</string>
 		<string>packet-tunnel-provider</string>
 	</array>
 	<key>com.apple.security.app-sandbox</key>
@@ -15,7 +20,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(TeamIdentifierPrefix)com.duckduckgo.macos.browser.network-protection</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 		<string>$(NETP_APP_GROUP)</string>
 	</array>
 </dict>
diff --git a/DuckDuckGoVPN/DuckDuckGoVPNDebug.entitlements b/DuckDuckGoVPN/DuckDuckGoVPNDebug.entitlements
index 44a41ea69a..6fa17c3b42 100644
--- a/DuckDuckGoVPN/DuckDuckGoVPNDebug.entitlements
+++ b/DuckDuckGoVPN/DuckDuckGoVPNDebug.entitlements
@@ -12,6 +12,7 @@
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>$(NETP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
diff --git a/DuckDuckGoVPN/NetworkExtensionController.swift b/DuckDuckGoVPN/NetworkExtensionController.swift
index 6c74f850a6..d850bfbb80 100644
--- a/DuckDuckGoVPN/NetworkExtensionController.swift
+++ b/DuckDuckGoVPN/NetworkExtensionController.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import NetworkProtection
 import NetworkProtectionUI
 
 #if NETP_SYSTEM_EXTENSION
@@ -24,7 +25,7 @@ import SystemExtensionManager
 import SystemExtensions
 #endif
 
-/// Network Protection's network extension session object.
+/// The VPN's network extension session object.
 ///
 /// Through this class the app that owns the VPN can interact with the network extension.
 ///
@@ -32,11 +33,13 @@ final class NetworkExtensionController {
 
 #if NETP_SYSTEM_EXTENSION
     private let systemExtensionManager: SystemExtensionManager
+    private let defaults: UserDefaults
 #endif
 
-    init(extensionBundleID: String) {
+    init(extensionBundleID: String, defaults: UserDefaults = .netP) {
 #if NETP_SYSTEM_EXTENSION
         systemExtensionManager = SystemExtensionManager(extensionBundleID: extensionBundleID)
+        self.defaults = defaults
 #endif
     }
 
@@ -46,9 +49,11 @@ extension NetworkExtensionController {
 
     func activateSystemExtension(waitingForUserApproval: @escaping () -> Void) async throws {
 #if NETP_SYSTEM_EXTENSION
-        try await systemExtensionManager.activate(
+        let extensionVersion = try await systemExtensionManager.activate(
             waitingForUserApproval: waitingForUserApproval)
 
+        NetworkProtectionLastVersionRunStore(userDefaults: defaults).lastExtensionVersionRun = extensionVersion
+
         try? await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
 #endif
     }
diff --git a/DuckDuckGoVPN/NetworkProtection+VPNAgentConvenienceInitializers.swift b/DuckDuckGoVPN/NetworkProtection+VPNAgentConvenienceInitializers.swift
new file mode 100644
index 0000000000..b61f1779c1
--- /dev/null
+++ b/DuckDuckGoVPN/NetworkProtection+VPNAgentConvenienceInitializers.swift
@@ -0,0 +1,33 @@
+//
+//  NetworkProtection+VPNAgentConvenienceInitializers.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import NetworkProtection
+
+#if SUBSCRIPTION
+import Subscription
+#endif
+
+extension NetworkProtectionKeychainTokenStore {
+    convenience init() {
+        self.init(keychainType: .default,
+                  errorEvents: .networkProtectionAppDebugEvents,
+                  isSubscriptionEnabled: false,
+                  accessTokenProvider: { return nil })
+    }
+}
diff --git a/DuckDuckGoVPN/NetworkProtectionBouncer.swift b/DuckDuckGoVPN/NetworkProtectionBouncer.swift
index 2f3d8d2bdb..f50152e122 100644
--- a/DuckDuckGoVPN/NetworkProtectionBouncer.swift
+++ b/DuckDuckGoVPN/NetworkProtectionBouncer.swift
@@ -22,18 +22,33 @@ import NetworkProtection
 import ServiceManagement
 import AppKit
 
-/// Class that implements the necessary logic to ensure Network Protection is enabled, or prevent the app from running otherwise.
+#if SUBSCRIPTION
+import Subscription
+#endif
+
+/// Class that implements the necessary logic to ensure the VPN is enabled, or prevent the app from running otherwise.
 ///
 final class NetworkProtectionBouncer {
 
-    /// Simply verifies that the Network Protection feature is enabled and if not, takes care of killing the
+    /// Simply verifies that the VPN feature is enabled and if not, takes care of killing the
     /// current app.
     ///
-    func requireAuthTokenOrKillApp() {
-        let keychainStore = NetworkProtectionKeychainTokenStore(keychainType: .default, errorEvents: nil, isSubscriptionEnabled: false)
+    func requireAuthTokenOrKillApp(controller: TunnelController) async {
+#if SUBSCRIPTION
+        let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
 
+        guard !accountManager.isUserAuthenticated else {
+            return
+        }
+#endif
+        let keychainStore = NetworkProtectionKeychainTokenStore(keychainType: .default,
+                                                                errorEvents: nil,
+                                                                isSubscriptionEnabled: false,
+                                                                accessTokenProvider: { nil })
         guard keychainStore.isFeatureActivated else {
-            os_log(.error, log: .networkProtection, "🔴 Stopping: Network Protection not authorized.")
+            os_log(.error, log: .networkProtection, "🔴 Stopping: DuckDuckGo VPN not authorized. Missing token.")
+
+            await controller.stop()
 
             // EXIT_SUCCESS ensures the login item won't relaunch
             // Ref: https://developer.apple.com/documentation/servicemanagement/smappservice/register()
diff --git a/DuckDuckGoVPN/UserText.swift b/DuckDuckGoVPN/UserText.swift
index ae4b186de1..57ea5e3c3b 100644
--- a/DuckDuckGoVPN/UserText.swift
+++ b/DuckDuckGoVPN/UserText.swift
@@ -22,6 +22,7 @@ final class UserText {
     // MARK: - Status Menu
 
     static let networkProtectionStatusMenuVPNSettings = NSLocalizedString("network.protection.status.menu.vpn.settings", value: "VPN Settings…", comment: "The status menu 'VPN Settings' menu item")
+    static let networkProtectionStatusMenuFAQ = NSLocalizedString("network.protection.status.menu.faq", value: "Frequently Asked Questions…", comment: "The status menu 'FAQ' menu item")
     static let networkProtectionStatusMenuOpenDuckDuckGo = NSLocalizedString("network.protection.status.menu.vpn.open-duckduckgo", value: "Open DuckDuckGo…", comment: "The status menu 'Open DuckDuckGo' menu item")
     static let networkProtectionStatusMenuShareFeedback = NSLocalizedString("network.protection.status.menu.share.feedback", value: "Send VPN Feedback…", comment: "The status menu 'Send VPN Feedback' menu item")
 }
diff --git a/DuckDuckGoVPN/VPNAppEventsHandler.swift b/DuckDuckGoVPN/VPNAppEventsHandler.swift
index 0dc1b0364f..5ac88e4a2b 100644
--- a/DuckDuckGoVPN/VPNAppEventsHandler.swift
+++ b/DuckDuckGoVPN/VPNAppEventsHandler.swift
@@ -30,20 +30,20 @@ final class VPNAppEventsHandler {
 
     func appDidFinishLaunching() {
         let currentVersion = AppVersion.shared.versionAndBuildNumber
-        let versionStore = NetworkProtectionLastVersionRunStore()
+        let versionStore = NetworkProtectionLastVersionRunStore(userDefaults: .netP)
         defer {
-            versionStore.lastVersionRun = currentVersion
+            versionStore.lastAgentVersionRun = currentVersion
         }
 
         let restartTunnel = {
-            os_log(.info, log: .networkProtection, "App updated from %{public}s to %{public}s: updating login items", versionStore.lastVersionRun ?? "null", currentVersion)
+            os_log(.info, log: .networkProtection, "App updated from %{public}s to %{public}s: updating login items", versionStore.lastAgentVersionRun ?? "null", currentVersion)
             self.restartTunnel()
         }
 
 #if DEBUG || REVIEW // Since DEBUG and REVIEW builds may not change version No. we want them to always reset.
         restartTunnel()
 #else
-        if versionStore.lastVersionRun != currentVersion {
+        if versionStore.lastAgentVersionRun != currentVersion {
             restartTunnel()
         }
 #endif
diff --git a/DuckDuckGoVPN/VPNUninstaller.swift b/DuckDuckGoVPN/VPNUninstaller.swift
new file mode 100644
index 0000000000..52593d9faa
--- /dev/null
+++ b/DuckDuckGoVPN/VPNUninstaller.swift
@@ -0,0 +1,60 @@
+//
+//  VPNUninstaller.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import NetworkProtection
+import NetworkProtectionIPC
+
+protocol VPNUninstalling {
+    func uninstall(includingSystemExtension: Bool) async
+}
+
+final class VPNUninstaller: VPNUninstalling {
+    let networkExtensionController: NetworkExtensionController
+    let vpnConfiguration: VPNConfigurationManager
+    let defaults: UserDefaults
+
+    init(networkExtensionController: NetworkExtensionController, vpnConfigurationManager: VPNConfigurationManager, defaults: UserDefaults = .netP) {
+        self.networkExtensionController = networkExtensionController
+        self.vpnConfiguration = vpnConfigurationManager
+        self.defaults = defaults
+    }
+
+    func uninstall(includingSystemExtension: Bool) async {
+#if NETP_SYSTEM_EXTENSION
+        if includingSystemExtension {
+            do {
+                try await networkExtensionController.deactivateSystemExtension()
+                defaults.networkProtectionOnboardingStatus = .isOnboarding(step: .userNeedsToAllowExtension)
+            } catch {
+
+            }
+        }
+#endif
+
+        await vpnConfiguration.removeVPNConfiguration()
+
+        if defaults.networkProtectionOnboardingStatus == .completed {
+            defaults.networkProtectionOnboardingStatus = .isOnboarding(step: .userNeedsToAllowVPNConfiguration)
+        }
+
+        defaults.networkProtectionShouldShowVPNUninstalledMessage = true
+
+        exit(EXIT_SUCCESS)
+    }
+}
diff --git a/IntegrationTests/AutoconsentIntegrationTests.swift b/IntegrationTests/AutoconsentIntegrationTests.swift
index b674b41635..63f54da582 100644
--- a/IntegrationTests/AutoconsentIntegrationTests.swift
+++ b/IntegrationTests/AutoconsentIntegrationTests.swift
@@ -39,7 +39,7 @@ class AutoconsentIntegrationTests: XCTestCase {
     @MainActor
     override func setUp() {
         // disable GPC redirects
-        PrivacySecurityPreferences.shared.gpcEnabled = false
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = false
 
         window = WindowsManager.openNewWindow(with: Tab(content: .none))
     }
@@ -49,7 +49,7 @@ class AutoconsentIntegrationTests: XCTestCase {
         window.close()
         window = nil
 
-        PrivacySecurityPreferences.shared.gpcEnabled = true
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = true
     }
 
     // MARK: - Tests
@@ -57,9 +57,8 @@ class AutoconsentIntegrationTests: XCTestCase {
     @MainActor
     func testWhenAutoconsentEnabled_cookieConsentManaged() async throws {
         // enable the feature
-        PrivacySecurityPreferences.shared.autoconsentEnabled = true
+        CookiePopupProtectionPreferences.shared.isAutoconsentEnabled = true
         let url = URL(string: "http://privacy-test-pages.site/features/autoconsent/")!
-
         let tab = self.tabViewModel.tab
 
         // expect cookieConsentManaged to be published
@@ -84,9 +83,8 @@ class AutoconsentIntegrationTests: XCTestCase {
     @MainActor
     func testCosmeticRule_whenFakeCookieBannerIsDisplayed_bannerIsHidden() async throws {
         // enable the feature
-        PrivacySecurityPreferences.shared.autoconsentEnabled = true
+        CookiePopupProtectionPreferences.shared.isAutoconsentEnabled = true
         let url = URL(string: "http://privacy-test-pages.site/features/autoconsent/banner.html")!
-
         let tab = self.tabViewModel.tab
         // expect `cosmetic` to be published
         let cookieConsentManagedPromise = tab.privacyInfoPublisher
@@ -135,9 +133,8 @@ class AutoconsentIntegrationTests: XCTestCase {
     @MainActor
     func testCosmeticRule_whenFakeCookieBannerIsDisplayedAndScriptsAreReloaded_bannerIsHidden() async throws {
         // enable the feature
-        PrivacySecurityPreferences.shared.autoconsentEnabled = true
+        CookiePopupProtectionPreferences.shared.isAutoconsentEnabled = true
         let url = URL(string: "http://privacy-test-pages.site/features/autoconsent/banner.html")!
-
         let tab = self.tabViewModel.tab
         // expect `cosmetic` to be published
         let cookieConsentManagedPromise = tab.privacyInfoPublisher
@@ -160,8 +157,8 @@ class AutoconsentIntegrationTests: XCTestCase {
             os_log("navigationResponse: %s", "\(String(describing: response))")
 
             // cause UserScripts reload (ContentBlockingUpdating)
-            PrivacySecurityPreferences.shared.gpcEnabled = true
-            PrivacySecurityPreferences.shared.gpcEnabled = false
+            WebTrackingProtectionPreferences.shared.isGPCEnabled = true
+            WebTrackingProtectionPreferences.shared.isGPCEnabled = false
 
             return .allow
         })
diff --git a/IntegrationTests/Common/TestsURLExtension.swift b/IntegrationTests/Common/TestsURLExtension.swift
index da6cb33722..95da2cd8ca 100644
--- a/IntegrationTests/Common/TestsURLExtension.swift
+++ b/IntegrationTests/Common/TestsURLExtension.swift
@@ -17,8 +17,7 @@
 //
 
 import Foundation
-
-@testable import DuckDuckGo_Privacy_Browser
+import Common
 
 // Integration Tests helpers
 extension URL {
@@ -55,7 +54,7 @@ extension URL {
             let value = URL(string: "/")!.appendingParameters(headers).query!
             url = url.appendingParameter(name: "headers", value: value)
         }
-        if let dataStr = data?.utf8String() {
+        if let data, let dataStr = String(data: data, encoding: .utf8) {
             url = url.appendingParameter(name: "data", value: dataStr)
         } else if let data {
             url = url.appendingParameter(name: "data", value: data.base64EncodedString())
diff --git a/IntegrationTests/HTTPSUpgrade/HTTPSUpgradeIntegrationTests.swift b/IntegrationTests/HTTPSUpgrade/HTTPSUpgradeIntegrationTests.swift
index 14c8527e8a..9dbc287a0a 100644
--- a/IntegrationTests/HTTPSUpgrade/HTTPSUpgradeIntegrationTests.swift
+++ b/IntegrationTests/HTTPSUpgrade/HTTPSUpgradeIntegrationTests.swift
@@ -38,7 +38,7 @@ class HTTPSUpgradeIntegrationTests: XCTestCase {
     @MainActor
     override func setUp() async throws {
         // disable GPC redirects
-        PrivacySecurityPreferences.shared.gpcEnabled = false
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = false
 
         window = WindowsManager.openNewWindow(with: .none)!
 
@@ -51,7 +51,7 @@ class HTTPSUpgradeIntegrationTests: XCTestCase {
         window.close()
         window = nil
 
-        PrivacySecurityPreferences.shared.gpcEnabled = true
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = true
     }
 
     // MARK: - Tests
diff --git a/IntegrationTests/History/HistoryIntegrationTests.swift b/IntegrationTests/History/HistoryIntegrationTests.swift
index 33d06a3436..9a59e297f0 100644
--- a/IntegrationTests/History/HistoryIntegrationTests.swift
+++ b/IntegrationTests/History/HistoryIntegrationTests.swift
@@ -63,7 +63,7 @@ class HistoryIntegrationTests: XCTestCase {
     override func tearDown() async throws {
         window?.close()
         window = nil
-        PrivacySecurityPreferences.shared.gpcEnabled = true
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = true
     }
 
     // MARK: - Tests
@@ -199,7 +199,7 @@ class HistoryIntegrationTests: XCTestCase {
 
     @MainActor
     func testWhenScriptTrackerLoaded_trackerAddedToHistory() async throws {
-        PrivacySecurityPreferences.shared.gpcEnabled = false
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = false
 
         let tab = Tab(content: .newtab)
         window = WindowsManager.openNewWindow(with: tab)!
@@ -227,7 +227,7 @@ class HistoryIntegrationTests: XCTestCase {
 
     @MainActor
     func testWhenSurrogateTrackerLoaded_trackerAddedToHistory() async throws {
-        PrivacySecurityPreferences.shared.gpcEnabled = false
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = false
 
         let tab = Tab(content: .newtab)
         window = WindowsManager.openNewWindow(with: tab)!
diff --git a/IntegrationTests/NavigationProtection/NavigationProtectionIntegrationTests.swift b/IntegrationTests/NavigationProtection/NavigationProtectionIntegrationTests.swift
index 13417aaecb..f36748c64b 100644
--- a/IntegrationTests/NavigationProtection/NavigationProtectionIntegrationTests.swift
+++ b/IntegrationTests/NavigationProtection/NavigationProtectionIntegrationTests.swift
@@ -47,7 +47,7 @@ class NavigationProtectionIntegrationTests: XCTestCase {
         window?.close()
         window = nil
 
-        PrivacySecurityPreferences.shared.gpcEnabled = true
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = true
     }
 
     // MARK: - Tests
@@ -55,7 +55,7 @@ class NavigationProtectionIntegrationTests: XCTestCase {
     @MainActor
     func testAMPLinks() async throws {
         // disable GPC redirects
-        PrivacySecurityPreferences.shared.gpcEnabled = false
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = false
 
         var onDidCancel: ((NavigationAction, [ExpectedNavigation]?) -> Void)?
         var onWillStart: ((Navigation) -> Void)?
@@ -132,7 +132,7 @@ class NavigationProtectionIntegrationTests: XCTestCase {
     @MainActor
     func testReferrerTrimming() async throws {
         // disable GPC redirects
-        PrivacySecurityPreferences.shared.gpcEnabled = false
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = false
 
         var lastRedirectedNavigation: Navigation?
         var onDidFinish: ((Navigation) -> Void)?
@@ -205,11 +205,11 @@ class NavigationProtectionIntegrationTests: XCTestCase {
 
         let url = URL(string: "https://privacy-test-pages.site/privacy-protections/gpc/")!
         // disable GPC redirects
-        PrivacySecurityPreferences.shared.gpcEnabled = false
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = false
         _=try await tab.setUrl(url, source: .link)?.result.get()
 
         // enable GPC redirects
-        PrivacySecurityPreferences.shared.gpcEnabled = true
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = true
 
         // expect popup to open and then close
         var oldValue: TabViewModel! = self.tabViewModel
diff --git a/IntegrationTests/PrivacyDashboard/PrivacyDashboardIntegrationTests.swift b/IntegrationTests/PrivacyDashboard/PrivacyDashboardIntegrationTests.swift
index 169b967391..6af50b4681 100644
--- a/IntegrationTests/PrivacyDashboard/PrivacyDashboardIntegrationTests.swift
+++ b/IntegrationTests/PrivacyDashboard/PrivacyDashboardIntegrationTests.swift
@@ -33,7 +33,7 @@ class PrivacyDashboardIntegrationTests: XCTestCase {
     @MainActor
     override func setUp() {
         // disable GPC redirects
-        PrivacySecurityPreferences.shared.gpcEnabled = false
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = false
 
         window = WindowsManager.openNewWindow(with: .none)!
     }
@@ -43,7 +43,7 @@ class PrivacyDashboardIntegrationTests: XCTestCase {
         window.close()
         window = nil
 
-        PrivacySecurityPreferences.shared.gpcEnabled = true
+        WebTrackingProtectionPreferences.shared.isGPCEnabled = true
     }
 
     // MARK: - Tests
diff --git a/LocalPackages/BuildToolPlugins/Plugins/InputFilesChecker/InputFilesChecker.swift b/LocalPackages/BuildToolPlugins/Plugins/InputFilesChecker/InputFilesChecker.swift
index 00053f594d..cd6186444d 100644
--- a/LocalPackages/BuildToolPlugins/Plugins/InputFilesChecker/InputFilesChecker.swift
+++ b/LocalPackages/BuildToolPlugins/Plugins/InputFilesChecker/InputFilesChecker.swift
@@ -26,8 +26,6 @@ let nonSandboxedExtraInputFiles: Set<InputFile> = [
     .init("BWManager.swift", .source),
     .init("UpdateController.swift", .source),
     .init("PFMoveApplication.m", .source),
-    .init("NetworkProtectionSubscriptionEventHandler.swift", .source),
-    .init("DataBrokerProtectionSubscriptionEventHandler.swift", .source),
     .init("DuckDuckGo VPN.app", .unknown),
     .init("DuckDuckGo Notifications.app", .unknown),
     .init("DuckDuckGo Personal Information Removal.app", .unknown)
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index 3c3138ae1b..863df4a2e9 100644
--- a/LocalPackages/DataBrokerProtection/Package.swift
+++ b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "122.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "132.0.0-1"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Bundle/BundleExtension.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Bundle/BundleExtension.swift
index 5cdaaf9fff..8c77c78cf3 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Bundle/BundleExtension.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Bundle/BundleExtension.swift
@@ -20,13 +20,11 @@ import Foundation
 
 extension Bundle {
 
-    struct Keys {
-        static let appGroup = "DBP_APP_GROUP"
-    }
+    static let dbpAppGroupName = "DBP_APP_GROUP"
 
     var appGroupName: String {
-        guard let appGroup = object(forInfoDictionaryKey: Keys.appGroup) as? String else {
-            fatalError("Info.plist is missing \(Keys.appGroup)")
+        guard let appGroup = object(forInfoDictionaryKey: Bundle.dbpAppGroupName) as? String else {
+            fatalError("Info.plist is missing \(Bundle.dbpAppGroupName)")
         }
         return appGroup
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
index c596488888..be97096c4e 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
@@ -24,7 +24,7 @@ import Common
 
 protocol CCFCommunicationDelegate: AnyObject {
     func loadURL(url: URL) async
-    func extractedProfiles(profiles: [ExtractedProfile]) async
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async
     func captchaInformation(captchaInfo: GetCaptchaInfoResponse) async
     func solveCaptcha(with response: SolveCaptchaResponse) async
     func success(actionId: String, actionType: ActionType) async
@@ -101,7 +101,7 @@ struct DataBrokerProtectionFeature: Subfeature {
                 await delegate?.onError(error: DataBrokerProtectionError.malformedURL)
             }
         case .extract(let profiles):
-            await delegate?.extractedProfiles(profiles: profiles)
+            await delegate?.extractedProfiles(profiles: profiles, meta: success.meta)
         case .getCaptchaInfo(let captchaInfo):
             await delegate?.captchaInformation(captchaInfo: captchaInfo)
         case .solveCaptcha(let response):
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/WebViewHandler.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/WebViewHandler.swift
index c89644eec4..7b87d1631d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/WebViewHandler.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/WebViewHandler.swift
@@ -25,10 +25,13 @@ import Common
 protocol WebViewHandler: NSObject {
     func initializeWebView(showWebView: Bool) async
     func load(url: URL) async throws
-    func waitForWebViewLoad(timeoutInSeconds: Int) async throws
+    func takeSnaphost(path: String, fileName: String) async throws
+    func saveHTML(path: String, fileName: String) async throws
+    func waitForWebViewLoad() async throws
     func finish() async
     func execute(action: Action, data: CCFRequestData) async
     func evaluateJavaScript(_ javaScript: String) async throws
+    func setCookies(_ cookies: [HTTPCookie]) async
 }
 
 @MainActor
@@ -36,7 +39,7 @@ final class DataBrokerProtectionWebViewHandler: NSObject, WebViewHandler {
     private var activeContinuation: CheckedContinuation<Void, Error>?
 
     private let isFakeBroker: Bool
-    private let webViewConfiguration: WKWebViewConfiguration
+    private var webViewConfiguration: WKWebViewConfiguration?
     private var userContentController: DataBrokerUserContentController?
 
     private var webView: WebView?
@@ -46,6 +49,7 @@ final class DataBrokerProtectionWebViewHandler: NSObject, WebViewHandler {
         let configuration = WKWebViewConfiguration()
         configuration.applyDataBrokerConfiguration(privacyConfig: privacyConfig, prefs: prefs, delegate: delegate)
         configuration.preferences.setValue(true, forKey: "developerExtrasEnabled")
+        configuration.websiteDataStore = WKWebsiteDataStore.nonPersistent()
 
         self.webViewConfiguration = configuration
         self.isFakeBroker = isFakeBroker
@@ -56,7 +60,11 @@ final class DataBrokerProtectionWebViewHandler: NSObject, WebViewHandler {
     }
 
     func initializeWebView(showWebView: Bool) async {
-        webView = WebView(frame: CGRect(origin: .zero, size: CGSize(width: 1024, height: 1024)), configuration: webViewConfiguration)
+        guard let configuration = self.webViewConfiguration else {
+            return
+        }
+
+        webView = WebView(frame: CGRect(origin: .zero, size: CGSize(width: 1024, height: 1024)), configuration: configuration)
         webView?.navigationDelegate = self
 
         if showWebView {
@@ -75,37 +83,36 @@ final class DataBrokerProtectionWebViewHandler: NSObject, WebViewHandler {
     func load(url: URL) async throws {
         webView?.load(url)
         os_log("Loading URL: %@", log: .action, String(describing: url.absoluteString))
-        try await waitForWebViewLoad(timeoutInSeconds: 120)
+        try await waitForWebViewLoad()
+    }
+
+    func setCookies(_ cookies: [HTTPCookie]) async {
+        for cookie in cookies {
+            await webView?.configuration.websiteDataStore.httpCookieStore.setCookie(cookie)
+        }
     }
 
     func finish() {
         os_log("WebViewHandler finished", log: .action)
-
         webView?.stopLoading()
         userContentController?.cleanUpBeforeClosing()
+        WKWebsiteDataStore.default().removeData(ofTypes: [WKWebsiteDataTypeDiskCache, WKWebsiteDataTypeMemoryCache], modifiedSince: Date(timeIntervalSince1970: 0)) {
+            os_log("WKWebView data store deleted correctly", log: .action)
+        }
 
+        webViewConfiguration = nil
         userContentController = nil
         webView?.navigationDelegate = nil
         webView = nil
     }
 
     deinit {
-        print("WebViewHandler Deinit")
+        os_log("WebViewHandler Deinit", log: .action)
     }
 
-    func waitForWebViewLoad(timeoutInSeconds: Int = 0) async throws {
+    func waitForWebViewLoad() async throws {
         try await withCheckedThrowingContinuation { continuation in
             self.activeContinuation = continuation
-
-            if timeoutInSeconds > 0 {
-                Task {
-                    try await Task.sleep(nanoseconds: UInt64(timeoutInSeconds) * NSEC_PER_SEC)
-                    if self.activeContinuation != nil {
-                        self.activeContinuation?.resume()
-                        self.activeContinuation = nil
-                    }
-                }
-            }
         }
     }
 
@@ -122,6 +129,75 @@ final class DataBrokerProtectionWebViewHandler: NSObject, WebViewHandler {
     func evaluateJavaScript(_ javaScript: String) async throws {
         _ = webView?.evaluateJavaScript(javaScript, in: nil, in: WKContentWorld.page)
     }
+
+    func takeSnaphost(path: String, fileName: String) async throws {
+        let script = "document.body.scrollHeight"
+
+        let result = try await webView?.evaluateJavaScript(script)
+
+        if let height = result as? CGFloat {
+            webView?.frame = CGRect(origin: .zero, size: CGSize(width: 1024, height: height))
+            let configuration = WKSnapshotConfiguration()
+            configuration.rect = CGRect(x: 0, y: 0, width: webView?.frame.size.width ?? 0.0, height: height)
+            if let image = try await webView?.takeSnapshot(configuration: configuration) {
+                saveToDisk(image: image, path: path, fileName: fileName)
+            }
+        }
+    }
+
+    func saveHTML(path: String, fileName: String) async throws {
+        let result = try await webView?.evaluateJavaScript("document.documentElement.outerHTML")
+        let fileManager = FileManager.default
+
+        if let htmlString = result as? String {
+            do {
+                if !fileManager.fileExists(atPath: path) {
+                    try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
+                }
+
+                let fileURL = URL(fileURLWithPath: "\(path)/\(fileName)")
+                try htmlString.write(to: fileURL, atomically: true, encoding: .utf8)
+                print("HTML content saved to file: \(fileURL)")
+            } catch {
+                print("Error writing HTML content to file: \(error)")
+            }
+        }
+    }
+
+    private func saveToDisk(image: NSImage, path: String, fileName: String) {
+        guard let tiffData = image.tiffRepresentation else {
+            // Handle the case where tiff representation is not available
+            return
+        }
+
+        // Create a bitmap representation from the tiff data
+        guard let bitmapImageRep = NSBitmapImageRep(data: tiffData) else {
+            // Handle the case where bitmap representation cannot be created
+            return
+        }
+
+        let fileManager = FileManager.default
+
+        if !fileManager.fileExists(atPath: path) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
+            } catch {
+                print("Error creating folder: \(error)")
+            }
+        }
+
+        if let pngData = bitmapImageRep.representation(using: .png, properties: [:]) {
+            // Save the PNG data to a file
+            do {
+                let fileURL = URL(fileURLWithPath: "\(path)/\(fileName)")
+                try pngData.write(to: fileURL)
+            } catch {
+                print("Error writing PNG: \(error)")
+            }
+        } else {
+            print("Error png data was not respresented")
+        }
+    }
 }
 
 extension DataBrokerProtectionWebViewHandler: WKNavigationDelegate {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
index b7c731e20d..5f64595a74 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
@@ -23,7 +23,7 @@ public protocol DataBrokerProtectionDataManaging {
     var cache: InMemoryDataCache { get }
     var delegate: DataBrokerProtectionDataManagerDelegate? { get set }
 
-    init(fakeBrokerFlag: DataBrokerDebugFlag)
+    init(pixelHandler: EventMapping<DataBrokerProtectionPixels>, fakeBrokerFlag: DataBrokerDebugFlag)
     func saveProfile(_ profile: DataBrokerProtectionProfile) async throws
     func fetchProfile(ignoresCache: Bool) throws -> DataBrokerProtectionProfile?
     func fetchBrokerProfileQueryData(ignoresCache: Bool) async throws -> [BrokerProfileQueryData]
@@ -52,8 +52,8 @@ public class DataBrokerProtectionDataManager: DataBrokerProtectionDataManaging {
 
     internal let database: DataBrokerProtectionRepository
 
-    required public init(fakeBrokerFlag: DataBrokerDebugFlag = DataBrokerDebugFlagFakeBroker()) {
-        self.database = DataBrokerProtectionDatabase(fakeBrokerFlag: fakeBrokerFlag)
+    required public init(pixelHandler: EventMapping<DataBrokerProtectionPixels>, fakeBrokerFlag: DataBrokerDebugFlag = DataBrokerDebugFlagFakeBroker()) {
+        self.database = DataBrokerProtectionDatabase(fakeBrokerFlag: fakeBrokerFlag, pixelHandler: pixelHandler)
 
         cache.delegate = self
     }
@@ -111,6 +111,7 @@ extension DataBrokerProtectionDataManager: InMemoryDataCacheDelegate {
 
     public func removeAllData() throws {
         try database.deleteProfileData()
+        cache.invalidate()
 
         delegate?.dataBrokerProtectionDataManagerDidDeleteData()
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
index ecccb6631e..8dbfe0b9cb 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
@@ -53,13 +53,16 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
     private static let profileId: Int64 = 1 // At the moment, we only support one profile for DBP.
 
     private let fakeBrokerFlag: DataBrokerDebugFlag
+    private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
     private let vault: (any DataBrokerProtectionSecureVault)?
     private let secureVaultErrorReporter: SecureVaultErrorReporting?
 
     init(fakeBrokerFlag: DataBrokerDebugFlag = DataBrokerDebugFlagFakeBroker(),
+         pixelHandler: EventMapping<DataBrokerProtectionPixels>,
          vault: (any DataBrokerProtectionSecureVault)? = nil,
          secureVaultErrorReporter: SecureVaultErrorReporting? = DataBrokerProtectionSecureVaultErrorReporter.shared) {
         self.fakeBrokerFlag = fakeBrokerFlag
+        self.pixelHandler = pixelHandler
         self.vault = vault
         self.secureVaultErrorReporter = secureVaultErrorReporter
     }
@@ -75,6 +78,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             }
         } catch {
             os_log("Database error: save profile, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.save profile"))
             throw error
         }
     }
@@ -85,6 +89,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return try vault.fetchProfile(with: Self.profileId)
         } catch {
             os_log("Database error: fetchProfile, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchProfile"))
             throw error
         }
     }
@@ -95,6 +100,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             try vault.deleteProfileData()
         } catch {
             os_log("Database error: deleteProfileData, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.deleteProfileData"))
             throw error
         }
     }
@@ -105,6 +111,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return try vault.fetchChildBrokers(for: parentBroker)
         } catch {
             os_log("Database error: fetchChildBrokers, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchChildBrokers for parentBroker"))
             throw error
         }
     }
@@ -116,6 +123,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return try vault.save(extractedProfile: extractedProfile, brokerId: brokerId, profileQueryId: profileQueryId)
         } catch {
             os_log("Database error: extractedProfile, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.save extractedProfile brokerId profileQueryId"))
             throw error
         }
     }
@@ -128,6 +136,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
                   let scanOperation = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else {
                 let error = DataBrokerProtectionError.dataNotInDatabase
                 os_log("Database error: brokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
+                pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.brokerProfileQueryData for brokerId and profileQueryId"))
                 throw error
             }
 
@@ -141,6 +150,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             )
         } catch {
             os_log("Database error: brokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.brokerProfileQueryData for brokerId and profileQueryId"))
             throw error
         }
     }
@@ -151,6 +161,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return try vault.fetchExtractedProfiles(for: brokerId)
         } catch {
             os_log("Database error: fetchExtractedProfiles, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchExtractedProfiles for brokerId"))
             throw error
         }
     }
@@ -161,6 +172,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             try vault.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
         } catch {
             os_log("Database error: updatePreferredRunDate without extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.updatePreferredRunDate date brokerID profileQueryId"))
             throw error
         }
     }
@@ -176,6 +188,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
                 extractedProfileId: extractedProfileId)
         } catch {
             os_log("Database error: updatePreferredRunDate with extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.updatePreferredRunDate date brokerID profileQueryId extractedProfileID"))
             throw error
         }
     }
@@ -186,6 +199,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             try vault.updateLastRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
         } catch {
             os_log("Database error: updateLastRunDate without extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.updateLastRunDate date brokerID profileQueryId"))
             throw error
         }
     }
@@ -202,6 +216,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             )
         } catch {
             os_log("Database error: updateLastRunDate with extractedProfileID, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.updateLastRunDate date brokerId profileQueryId extractedProfileId"))
             throw error
         }
     }
@@ -212,6 +227,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             try vault.updateRemovedDate(for: extractedProfileId, with: date)
         } catch {
             os_log("Database error: updateRemovedDate, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.updateRemovedDate date on extractedProfileId"))
             throw error
         }
     }
@@ -227,6 +243,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             }
         } catch {
             os_log("Database error: add historyEvent, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.add historyEvent"))
             throw error
         }
     }
@@ -259,6 +276,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return brokerProfileQueryDataList
         } catch {
             os_log("Database error: fetchAllBrokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchAllBrokerProfileQueryData"))
             throw error
         }
     }
@@ -274,6 +292,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
                            preferredRunDate: optOut.preferredRunDate)
         } catch {
             os_log("Database error: saveOptOutOperation, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.saveOptOutOperation optOut extractedProfile"))
             throw error
         }
     }
@@ -286,6 +305,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return events.max(by: { $0.date < $1.date })
         } catch {
             os_log("Database error: fetchLastEvent, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "fetchLastEvent brokerId profileQueryId"))
             throw error
         }
     }
@@ -296,6 +316,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return try vault.hasMatches()
         } catch {
             os_log("Database error: hasMatches, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.hasMatches"))
             throw error
         }
     }
@@ -310,6 +331,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return scan.historyEvents
         } catch {
             os_log("Database error: fetchHistoryEvents, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "fetchScanHistoryEvents brokerId profileQueryId"))
             throw error
         }
     }
@@ -324,6 +346,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return optOut.historyEvents
         } catch {
             os_log("Database error: fetchHistoryEvents, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchOptOutHistoryEvents brokerId profileQueryId extractedProfileId"))
             throw error
         }
     }
@@ -334,6 +357,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return try vault.fetchAttemptInformation(for: extractedProfileId)
         } catch {
             os_log("Database error: fetchAttemptInformation, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchAttemptInformation for extractedProfileId"))
             throw error
         }
     }
@@ -348,6 +372,7 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
                            startTime: startTime)
         } catch {
             os_log("Database error: addAttempt, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.addAttempt extractedProfileId attemptUUID dataBroker lastStageDate startTime"))
             throw error
         }
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift
index 34694e848d..21cb003862 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift
@@ -31,12 +31,14 @@ final class DataBrokerProtectionSecureVaultErrorReporter: SecureVaultErrorReport
     }
 
     func secureVaultInitFailed(_ error: SecureStorageError) {
-// Actual pixels to follow once privacy triage is done
-//        switch error {
-//        case .initFailed, .failedToOpenDatabase:
-//            pixelHandler.fire(.debug(event: .secureVaultInitError, error: error))
-//        default:
-//            Pixel.fire(.debug(event: .secureVaultError, error: error))
-//        }
+        switch error {
+        case .initFailed, .failedToOpenDatabase:
+            pixelHandler.fire(.secureVaultInitError(error: error))
+        default:
+            pixelHandler.fire(.secureVaultError(error: error))
+        }
+
+        // Also fire the general pixel, since for now all errors are kept under one pixel
+        pixelHandler.fire(.generalError(error: error, functionOccurredIn: "secureVaultErrorReporter"))
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
index 02d5ef5bc8..7b7f458afd 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
@@ -31,7 +31,7 @@ final class DataBrokerDatabaseBrowserViewModel: ObservableObject {
             self.selectedTable = tables.first
             self.dataManager = nil
         } else {
-            self.dataManager = DataBrokerProtectionDataManager()
+            self.dataManager = DataBrokerProtectionDataManager(pixelHandler: DataBrokerProtectionPixelsHandler())
             self.tables = [DataBrokerDatabaseBrowserData.Table]()
             self.selectedTable = nil
             updateTables()
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONView.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONView.swift
index 33671421d5..22b8c6b90a 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONView.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONView.swift
@@ -28,26 +28,42 @@ struct DataBrokerRunCustomJSONView: View {
         if viewModel.results.isEmpty {
             VStack(alignment: .leading) {
                 Text("macOS App version: \(viewModel.appVersion())")
-                Text("C-S-S version: \(viewModel.contentScopeScriptsVersion())")
 
                 Divider()
 
-                HStack {
-                    TextField("First name", text: $viewModel.firstName)
-                        .padding()
-                    TextField("Last name", text: $viewModel.lastName)
-                        .padding()
-                    TextField("Middle", text: $viewModel.middle)
-                        .padding()
+                ForEach(viewModel.names.indices, id: \.self) { index in
+                    HStack {
+                        TextField("First name", text: $viewModel.names[index].first)
+                            .padding()
+                        TextField("Middle", text: $viewModel.names[index].middle)
+                            .padding()
+                        TextField("Last name", text: $viewModel.names[index].last)
+                            .padding()
+                    }
+                }
+
+                Button("Add other name") {
+                    viewModel.names.append(.empty())
                 }
 
                 Divider()
 
-                HStack {
-                    TextField("City", text: $viewModel.city)
-                        .padding()
-                    TextField("State", text: $viewModel.state)
-                        .padding()
+                ForEach(viewModel.addresses.indices, id: \.self) { index in
+                    HStack {
+                        TextField("City", text: $viewModel.addresses[index].city)
+                            .padding()
+                        TextField("State (two characters format)", text: $viewModel.addresses[index].state)
+                            .onChange(of: viewModel.addresses[index].state) { newValue in
+                                if newValue.count > 2 {
+                                    viewModel.addresses[index].state = String(newValue.prefix(2))
+                                }
+                            }
+                            .padding()
+                    }
+                }
+
+                Button("Add other address") {
+                    viewModel.addresses.append(.empty())
                 }
 
                 Divider()
@@ -76,6 +92,14 @@ struct DataBrokerRunCustomJSONView: View {
                 Button("Run") {
                     viewModel.runJSON(jsonString: jsonText)
                 }
+
+                if viewModel.isRunningOnAllBrokers {
+                    ProgressView("Scanning...")
+                } else {
+                    Button("Run all brokers") {
+                        viewModel.runAllBrokers()
+                    }
+                }
             }
             .padding()
             .frame(minWidth: 600, minHeight: 800)
@@ -88,19 +112,19 @@ struct DataBrokerRunCustomJSONView: View {
         } else {
             VStack {
                 VStack {
-                    List(viewModel.results, id: \.name) { extractedProfile in
+                    List(viewModel.results, id: \.id) { scanResult in
                         HStack {
-                            Text(extractedProfile.name ?? "No name")
+                            Text(scanResult.extractedProfile.name ?? "No name")
                                 .padding(.horizontal, 10)
                             Divider()
-                            Text(extractedProfile.addresses?.first?.fullAddress ?? "No address")
+                            Text(scanResult.extractedProfile.addresses?.first?.fullAddress ?? "No address")
                                 .padding(.horizontal, 10)
                             Divider()
-                            Text(extractedProfile.relatives?.joined(separator: ",") ?? "No relatives")
+                            Text(scanResult.extractedProfile.relatives?.joined(separator: ",") ?? "No relatives")
                                 .padding(.horizontal, 10)
                             Divider()
                             Button("Opt-out") {
-                                viewModel.runOptOut(extractedProfile: extractedProfile)
+                                viewModel.runOptOut(scanResult: scanResult)
                             }
                         }
                     }.navigationTitle("Results")
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
index 6e2c9df836..6057373923 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
@@ -22,6 +22,49 @@ import Common
 import ContentScopeScripts
 import Combine
 
+struct ExtractedAddress: Codable {
+    let state: String
+    let city: String
+}
+
+struct UserData: Codable {
+    let firstName: String
+    let lastName: String
+    let middleName: String?
+    let state: String
+    let email: String?
+    let city: String
+    let age: Int
+    let addresses: [ExtractedAddress]
+}
+
+struct ProfileUrl: Codable {
+    let profileUrl: String
+    let identifier: String
+}
+
+struct ScrapedData: Codable {
+    let name: String?
+    let alternativeNamesList: [String]?
+    let age: String?
+    let addressCityState: String?
+    let addressCityStateList: [ExtractedAddress]?
+    let relativesList: [String]?
+    let profileUrl: ProfileUrl?
+}
+
+struct ExtractResult: Codable {
+    let scrapedData: ScrapedData
+    let result: Bool
+    let score: Int
+    let matchedFields: [String]
+}
+
+struct Metadata: Codable {
+    let userData: UserData
+    let extractResults: [ExtractResult]
+}
+
 struct AlertUI {
     var title: String = ""
     var description: String = ""
@@ -30,28 +73,80 @@ struct AlertUI {
         AlertUI(title: "No results", description: "No results were found.")
     }
 
+    static func finishedScanningAllBrokers() -> AlertUI {
+        AlertUI(title: "Finished!", description: "We finished scanning all brokers. You should find the data inside ~/Desktop/PIR-Debug/")
+    }
+
     static func from(error: DataBrokerProtectionError) -> AlertUI {
         AlertUI(title: error.title, description: error.description)
     }
 }
 
-final class DataBrokerRunCustomJSONViewModel: ObservableObject {
+final class NameUI: ObservableObject {
+    let id = UUID()
+    @Published var first: String
+    @Published var middle: String
+    @Published var last: String
+
+    init(first: String, middle: String = "", last: String) {
+        self.first = first
+        self.middle = middle
+        self.last = last
+    }
 
-    @Published var firstName: String = ""
-    @Published var lastName: String = ""
-    @Published var middle: String = ""
-    @Published var city: String = ""
-    @Published var state: String = ""
+    static func empty() -> NameUI {
+        .init(first: "", middle: "", last: "")
+    }
+
+    func toModel() -> DataBrokerProtectionProfile.Name {
+        .init(firstName: first, lastName: last, middleName: middle.isEmpty ? nil : middle)
+    }
+}
+
+final class AddressUI: ObservableObject {
+    let id = UUID()
+    @Published var city: String
+    @Published var state: String
+
+    init(city: String, state: String) {
+        self.city = city
+        self.state = state
+    }
+
+    static func empty() -> AddressUI {
+        .init(city: "", state: "")
+    }
+
+    func toModel() -> DataBrokerProtectionProfile.Address {
+        .init(city: city, state: state)
+    }
+}
+
+struct ScanResult {
+    let id = UUID()
+    let dataBroker: DataBroker
+    let profileQuery: ProfileQuery
+    let extractedProfile: ExtractedProfile
+}
+
+final class DataBrokerRunCustomJSONViewModel: ObservableObject {
     @Published var birthYear: String = ""
-    @Published var results = [ExtractedProfile]()
+    @Published var results = [ScanResult]()
     @Published var showAlert = false
     @Published var showNoResults = false
+    @Published var isRunningOnAllBrokers = false
+    @Published var names = [NameUI.empty()]
+    @Published var addresses = [AddressUI.empty()]
+
     var alert: AlertUI?
     var selectedDataBroker: DataBroker?
 
     let brokers: [DataBroker]
 
     private let runnerProvider: OperationRunnerProvider
+    private let privacyConfigManager: PrivacyConfigurationManaging
+    private let contentScopeProperties: ContentScopeProperties
+    private let csvColumns = ["name_input", "age_input", "city_input", "state_input", "name_scraped", "age_scraped", "address_scraped", "relatives_scraped", "url", "broker name", "screenshot_id", "error", "matched_fields", "result_match", "expected_match"]
 
     init() {
         let privacyConfigurationManager = PrivacyConfigurationManagingMock()
@@ -69,45 +164,202 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         let contentScopeProperties = ContentScopeProperties(gpcEnabled: false,
                                                             sessionKey: sessionKey,
                                                             featureToggles: features)
+
         self.runnerProvider = DataBrokerOperationRunnerProvider(
             privacyConfigManager: privacyConfigurationManager,
             contentScopeProperties: contentScopeProperties,
             emailService: EmailService(),
             captchaService: CaptchaService())
+        self.privacyConfigManager = privacyConfigurationManager
+        self.contentScopeProperties = contentScopeProperties
 
         let fileResources = FileResources()
         self.brokers = (try? fileResources.fetchBrokerFromResourceFiles()) ?? [DataBroker]()
     }
 
-    func runJSON(jsonString: String) {
-        if firstName.isEmpty || lastName.isEmpty || city.isEmpty || state.isEmpty || birthYear.isEmpty {
+    func runAllBrokers() {
+        isRunningOnAllBrokers = true
+
+        let brokerProfileQueryData = createBrokerProfileQueryData()
+
+        Task.detached {
+            var scanResults = [DebugScanReturnValue]()
+            let semaphore = DispatchSemaphore(value: 10)
+            try await withThrowingTaskGroup(of: DebugScanReturnValue.self) { group in
+                for queryData in brokerProfileQueryData {
+                    semaphore.wait()
+                    let debugScanOperation = DebugScanOperation(privacyConfig: self.privacyConfigManager, prefs: self.contentScopeProperties, query: queryData) {
+                        true
+                    }
+
+                    group.addTask {
+                        defer {
+                            semaphore.signal()
+                        }
+                        do {
+                            return try await debugScanOperation.run(inputValue: (), showWebView: false)
+                        } catch {
+                            return DebugScanReturnValue(brokerURL: "ERROR - with broker: \(queryData.dataBroker.name)", extractedProfiles: [ExtractedProfile](), brokerProfileQueryData: queryData)
+                        }
+                    }
+                }
+
+                for try await result in group {
+                    scanResults.append(result)
+                }
+
+                self.formCSV(with: scanResults)
+
+                self.finishLoading()
+            }
+        }
+    }
+
+    private func finishLoading() {
+        DispatchQueue.main.async {
+            self.alert = AlertUI.finishedScanningAllBrokers()
             self.showAlert = true
-            self.alert = AlertUI(title: "Error", description: "Some required fields were not entered.")
-            return
+            self.isRunningOnAllBrokers = false
         }
+    }
+
+    private func formCSV(with scanResults: [DebugScanReturnValue]) {
+        var csvText = csvColumns.map { $0 }.joined(separator: ",")
+        csvText.append("\n")
+
+        for result in scanResults {
+            if let error = result.error {
+                csvText.append(append(error: error, for: result))
+            } else {
+                csvText.append(append(result))
+            }
+        }
+
+        save(csv: csvText)
+    }
 
+    private func append(error: Error, for result: DebugScanReturnValue) -> String {
+        if let dbpError = error as? DataBrokerProtectionError {
+            if dbpError.is404 {
+                return createRowFor(matched: false, result: result, error: "404 - No results")
+            } else {
+                return createRowFor(matched: false, result: result, error: "\(dbpError.title)-\(dbpError.description)")
+            }
+        } else {
+            return createRowFor(matched: false, result: result, error: error.localizedDescription)
+        }
+    }
+
+    private func append(_ result: DebugScanReturnValue) -> String {
+        var resultsText = ""
+
+        if let meta = result.meta{
+            do {
+                let jsonData = try JSONSerialization.data(withJSONObject: meta, options: [])
+                let decoder = JSONDecoder()
+                let decodedMeta = try decoder.decode(Metadata.self, from: jsonData)
+
+                for extractedResult in decodedMeta.extractResults {
+                    resultsText.append(createRowFor(matched: extractedResult.result, result: result, extractedResult: extractedResult))
+                }
+            } catch {
+                print("Error decoding JSON: \(error)")
+            }
+        } else {
+            print("No meta object")
+        }
+
+        return resultsText
+    }
+
+    private func createRowFor(matched: Bool,
+                              result: DebugScanReturnValue,
+                              error: String? = nil,
+                              extractedResult: ExtractResult? = nil) -> String {
+        let matchedString = matched ? "TRUE" : "FALSE"
+        let profileQuery = result.brokerProfileQueryData.profileQuery
+
+        var csvRow = ""
+
+        csvRow.append("\(profileQuery.fullName),") // Name (input)
+        csvRow.append("\(profileQuery.age),") // Age (input)
+        csvRow.append("\(profileQuery.city),") // City (input)
+        csvRow.append("\(profileQuery.state),") // State (input)
+
+        if let extractedResult = extractedResult {
+            csvRow.append("\(extractedResult.scrapedData.nameCSV),") // Name (scraped)
+            csvRow.append("\(extractedResult.scrapedData.ageCSV),") // Age (scraped)
+            csvRow.append("\(extractedResult.scrapedData.addressesCSV),") // Address (scraped)
+            csvRow.append("\(extractedResult.scrapedData.relativesCSV),") // Relatives (matched)
+        } else {
+            csvRow.append(",") // Name (scraped)
+            csvRow.append(",") // Age (scraped)
+            csvRow.append(",") // Address (scraped)
+            csvRow.append(",") // Relatives (scraped)
+        }
+
+        csvRow.append("\(result.brokerURL),") // Broker URL
+        csvRow.append("\(result.brokerProfileQueryData.dataBroker.name),") // Broker Name
+        csvRow.append("\(profileQuery.id ?? 0)_\(result.brokerProfileQueryData.dataBroker.name),") // Screenshot name
+
+        if let error = error {
+            csvRow.append("\(error),") // Error
+        } else {
+            csvRow.append(",") // Error empty
+        }
+
+        if let extractedResult = extractedResult {
+            csvRow.append("\(extractedResult.matchedFields.joined(separator: "-")),") // matched_fields
+        } else {
+            csvRow.append(",") // matched_fields
+        }
+
+        csvRow.append("\(matchedString),") // result_match
+        csvRow.append(",") // expected_match
+        csvRow.append("\n")
+
+        return csvRow
+    }
+
+    private func save(csv: String) {
+        do {
+            if let desktopPath = FileManager.default.urls(for: .desktopDirectory, in: .userDomainMask).first?.relativePath {
+                let path = desktopPath + "/PIR-Debug"
+                let fileName = "output.csv"
+                let fileURL = URL(fileURLWithPath: "\(path)/\(fileName)")
+                try csv.write(to: fileURL, atomically: true, encoding: .utf8)
+            } else {
+                os_log("Error getting path")
+            }
+        } catch {
+            os_log("Error writing to file: \(error)")
+        }
+    }
+
+    func runJSON(jsonString: String) {
         if let data = jsonString.data(using: .utf8) {
             do {
                 let decoder = JSONDecoder()
                 let dataBroker = try decoder.decode(DataBroker.self, from: data)
                 self.selectedDataBroker = dataBroker
                 let brokerProfileQueryData = createBrokerProfileQueryData(for: dataBroker)
-
                 let runner = runnerProvider.getOperationRunner()
 
-                Task {
-                    do {
-                        let extractedProfiles = try await runner.scan(brokerProfileQueryData, stageCalculator: FakeStageDurationCalculator(), showWebView: true) { true }
-
-                        DispatchQueue.main.async {
-                            if extractedProfiles.isEmpty {
-                                self.showNoResultsAlert()
-                            } else {
-                                self.results = extractedProfiles
+                for query in brokerProfileQueryData {
+                    Task {
+                        do {
+                            let extractedProfiles = try await runner.scan(query, stageCalculator: FakeStageDurationCalculator(), showWebView: true) { true }
+
+                            DispatchQueue.main.async {
+                                for extractedProfile in extractedProfiles {
+                                    self.results.append(ScanResult(dataBroker: query.dataBroker,
+                                                                   profileQuery: query.profileQuery,
+                                                                   extractedProfile: extractedProfile))
+                                }
                             }
+                        } catch {
+                            print("Error when scanning: \(error)")
                         }
-                    } catch {
-                        showAlert(for: error)
                     }
                 }
             } catch {
@@ -116,18 +368,16 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         }
     }
 
-    func runOptOut(extractedProfile: ExtractedProfile) {
+    func runOptOut(scanResult: ScanResult) {
         let runner = runnerProvider.getOperationRunner()
-        guard let dataBroker = self.selectedDataBroker else {
-            print("No broker selected")
-            return
-        }
-
-        let brokerProfileQueryData = createBrokerProfileQueryData(for: dataBroker)
-
+        let brokerProfileQueryData = BrokerProfileQueryData(
+            dataBroker: scanResult.dataBroker,
+            profileQuery: scanResult.profileQuery,
+            scanOperationData: ScanOperationData(brokerId: 1, profileQueryId: 1, historyEvents: [HistoryEvent]())
+        )
         Task {
             do {
-                try await runner.optOut(profileQuery: brokerProfileQueryData, extractedProfile: extractedProfile, stageCalculator: FakeStageDurationCalculator(), showWebView: true) {
+                try await runner.optOut(profileQuery: brokerProfileQueryData, extractedProfile: scanResult.extractedProfile, stageCalculator: FakeStageDurationCalculator(), showWebView: true) {
                     true
                 }
 
@@ -142,10 +392,54 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         }
     }
 
-    private func createBrokerProfileQueryData(for dataBroker: DataBroker) -> BrokerProfileQueryData {
-        let profile = createProfile()
-        let fakeScanOperationData = ScanOperationData(brokerId: 0, profileQueryId: 0, historyEvents: [HistoryEvent]())
-        return BrokerProfileQueryData(dataBroker: dataBroker, profileQuery: profile.profileQueries.first!, scanOperationData: fakeScanOperationData)
+    private func createBrokerProfileQueryData(for broker: DataBroker) -> [BrokerProfileQueryData] {
+        let profile: DataBrokerProtectionProfile =
+            .init(
+                names: names.map { $0.toModel() },
+                addresses: addresses.map { $0.toModel() },
+                phones: [String](),
+                birthYear: Int(birthYear) ?? 1990
+            )
+        let profileQueries = profile.profileQueries
+        var brokerProfileQueryData = [BrokerProfileQueryData]()
+
+        var profileQueryIndex: Int64 = 1
+        for profileQuery in profileQueries {
+            let fakeScanOperationData = ScanOperationData(brokerId: 0, profileQueryId: profileQueryIndex, historyEvents: [HistoryEvent]())
+            brokerProfileQueryData.append(
+                .init(dataBroker: broker, profileQuery: profileQuery.with(id: profileQueryIndex), scanOperationData: fakeScanOperationData)
+            )
+
+            profileQueryIndex += 1
+        }
+
+        return brokerProfileQueryData
+    }
+
+    private func createBrokerProfileQueryData() -> [BrokerProfileQueryData] {
+        let profile: DataBrokerProtectionProfile =
+            .init(
+                names: names.map { $0.toModel() },
+                addresses: addresses.map { $0.toModel() },
+                phones: [String](),
+                birthYear: Int(birthYear) ?? 1990
+            )
+        let profileQueries = profile.profileQueries
+        var brokerProfileQueryData = [BrokerProfileQueryData]()
+
+        var profileQueryIndex: Int64 = 1
+        for profileQuery in profileQueries {
+            let fakeScanOperationData = ScanOperationData(brokerId: 0, profileQueryId: profileQueryIndex, historyEvents: [HistoryEvent]())
+            for broker in brokers {
+                brokerProfileQueryData.append(
+                    .init(dataBroker: broker, profileQuery: profileQuery.with(id: profileQueryIndex), scanOperationData: fakeScanOperationData)
+                )
+            }
+
+            profileQueryIndex += 1
+        }
+
+        return brokerProfileQueryData
     }
 
     private func showNoResultsAlert() {
@@ -166,24 +460,14 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         }
     }
 
-    private func createProfile() -> DataBrokerProtectionProfile {
-        let names = DataBrokerProtectionProfile.Name(firstName: firstName, lastName: lastName, middleName: middle)
-        let addresses = DataBrokerProtectionProfile.Address(city: city, state: state)
-
-        return DataBrokerProtectionProfile(names: [names], addresses: [addresses], phones: [String](), birthYear: Int(birthYear) ?? 1990)
-    }
-
     func appVersion() -> String {
         AppVersion.shared.versionNumber
     }
-
-    func contentScopeScriptsVersion() -> String {
-        // How can I return this?
-        return "4.59.2"
-    }
 }
 
 final class FakeStageDurationCalculator: StageDurationCalculator {
+    var attemptId: UUID = UUID()
+
     func durationSinceLastStage() -> Double {
         0.0
     }
@@ -219,6 +503,9 @@ final class FakeStageDurationCalculator: StageDurationCalculator {
     func fireOptOutEmailConfirm() {
     }
 
+    func fireOptOutFillForm() {
+    }
+
     func fireOptOutValidate() {
     }
 
@@ -239,6 +526,9 @@ final class FakeStageDurationCalculator: StageDurationCalculator {
 
     func setStage(_ stage: Stage) {
     }
+
+    func setLastActionId(_ actionID: String) {
+    }
 }
 
 /*
@@ -361,4 +651,51 @@ extension DataBrokerProtectionError {
         default: return name
         }
     }
+
+    var is404: Bool {
+        switch self {
+        case .httpError(let code):
+            return code == 404
+        default: return false
+        }
+    }
+}
+
+extension ScrapedData {
+
+    var nameCSV: String {
+        if let name = self.name {
+            return name.replacingOccurrences(of: ",", with: "-")
+        } else if let alternativeNamesList = self.alternativeNamesList {
+            return alternativeNamesList.joined(separator: "/").replacingOccurrences(of: ",", with: "-")
+        } else {
+            return ""
+        }
+    }
+
+    var ageCSV: String {
+        if let age = self.age {
+            return age
+        } else {
+            return ""
+        }
+    }
+
+    var addressesCSV: String {
+        if let address = self.addressCityState {
+            return address
+        } else if let addressFull = self.addressCityStateList {
+            return addressFull.map { "\($0.city)-\($0.state)" }.joined(separator: "/")
+        } else {
+            return ""
+        }
+    }
+
+    var relativesCSV: String {
+        if let relatives = self.relativesList {
+            return relatives.joined(separator: "-").replacingOccurrences(of: ",", with: "-")
+        } else {
+            return ""
+        }
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift
new file mode 100644
index 0000000000..fb632105a3
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift
@@ -0,0 +1,198 @@
+//
+//  DebugScanOperation.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import WebKit
+import BrowserServicesKit
+import UserScript
+import Common
+
+struct DebugScanReturnValue {
+    let brokerURL: String
+    let extractedProfiles: [ExtractedProfile]
+    let error: Error?
+    let brokerProfileQueryData: BrokerProfileQueryData
+    let meta: [String: Any]?
+
+    init(brokerURL: String,
+         extractedProfiles: [ExtractedProfile] = [ExtractedProfile](),
+         error: Error? = nil,
+         brokerProfileQueryData: BrokerProfileQueryData,
+         meta: [String: Any]? = nil) {
+        self.brokerURL = brokerURL
+        self.extractedProfiles = extractedProfiles
+        self.error = error
+        self.brokerProfileQueryData = brokerProfileQueryData
+        self.meta = meta
+    }
+}
+
+struct EmptyCookieHandler: CookieHandler {
+    func getAllCookiesFromDomain(_ url: URL) async -> [HTTPCookie]? {
+        return nil
+    }
+}
+
+final class DebugScanOperation: DataBrokerOperation {
+    typealias ReturnValue = DebugScanReturnValue
+    typealias InputValue = Void
+
+    let privacyConfig: PrivacyConfigurationManaging
+    let prefs: ContentScopeProperties
+    let query: BrokerProfileQueryData
+    let emailService: EmailServiceProtocol
+    let captchaService: CaptchaServiceProtocol
+    let stageCalculator: StageDurationCalculator
+    var webViewHandler: WebViewHandler?
+    var actionsHandler: ActionsHandler?
+    var continuation: CheckedContinuation<DebugScanReturnValue, Error>?
+    var extractedProfile: ExtractedProfile?
+    private let operationAwaitTime: TimeInterval
+    let shouldRunNextStep: () -> Bool
+    var retriesCountOnError: Int = 0
+    var scanURL: String?
+    let clickAwaitTime: TimeInterval
+    let cookieHandler: CookieHandler
+
+    private let fileManager = FileManager.default
+    private let debugScanContentPath: String?
+
+    init(privacyConfig: PrivacyConfigurationManaging,
+         prefs: ContentScopeProperties,
+         query: BrokerProfileQueryData,
+         emailService: EmailServiceProtocol = EmailService(),
+         captchaService: CaptchaServiceProtocol = CaptchaService(),
+         operationAwaitTime: TimeInterval = 3,
+         clickAwaitTime: TimeInterval = 0,
+         shouldRunNextStep: @escaping () -> Bool
+    ) {
+        self.privacyConfig = privacyConfig
+        self.prefs = prefs
+        self.query = query
+        self.emailService = emailService
+        self.captchaService = captchaService
+        self.operationAwaitTime = operationAwaitTime
+        self.shouldRunNextStep = shouldRunNextStep
+        self.clickAwaitTime = clickAwaitTime
+        if let desktopPath = fileManager.urls(for: .desktopDirectory, in: .userDomainMask).first?.relativePath {
+            self.debugScanContentPath = desktopPath + "/PIR-Debug"
+        } else {
+            self.debugScanContentPath = nil
+        }
+        self.cookieHandler = EmptyCookieHandler()
+        stageCalculator = FakeStageDurationCalculator()
+    }
+
+    func run(inputValue: Void,
+             webViewHandler: WebViewHandler? = nil,
+             actionsHandler: ActionsHandler? = nil,
+             showWebView: Bool) async throws -> DebugScanReturnValue {
+        try await withCheckedThrowingContinuation { continuation in
+            self.continuation = continuation
+            Task {
+                await initialize(handler: webViewHandler, isFakeBroker: query.dataBroker.isFakeBroker, showWebView: showWebView)
+
+                do {
+                    let scanStep = try query.dataBroker.scanStep()
+                    if let actionsHandler = actionsHandler {
+                        self.actionsHandler = actionsHandler
+                    } else {
+                        self.actionsHandler = ActionsHandler(step: scanStep)
+                    }
+                    if self.shouldRunNextStep() {
+                        await executeNextStep()
+                    } else {
+                        failed(with: DataBrokerProtectionError.cancelled)
+                    }
+                } catch {
+                    failed(with: DataBrokerProtectionError.unknown(error.localizedDescription))
+                }
+            }
+        }
+    }
+
+    func runNextAction(_ action: Action) async {
+        if action as? ExtractAction != nil {
+            do {
+                if let path = self.debugScanContentPath {
+                    let fileName = "\(query.profileQuery.id ?? 0)_\(query.dataBroker.name)"
+                    try await webViewHandler?.takeSnaphost(path: path + "/screenshots/", fileName: "\(fileName).png")
+                    try await webViewHandler?.saveHTML(path: path + "/html/", fileName: "\(fileName).html")
+                }
+            } catch {
+                print("Error: \(error)")
+            }
+        }
+
+        await webViewHandler?.execute(action: action, data: .userData(query.profileQuery, self.extractedProfile))
+    }
+
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async {
+        if let scanURL = self.scanURL {
+            let debugScanReturnValue = DebugScanReturnValue(
+                brokerURL: scanURL,
+                extractedProfiles: profiles,
+                brokerProfileQueryData: query,
+                meta: meta
+            )
+            complete(debugScanReturnValue)
+        }
+
+        await executeNextStep()
+    }
+
+    func completeWith(error: Error) async {
+        if let scanURL = self.scanURL {
+            let debugScanReturnValue = DebugScanReturnValue(brokerURL: scanURL, error: error, brokerProfileQueryData: query)
+            complete(debugScanReturnValue)
+        }
+
+        await executeNextStep()
+    }
+
+    func executeNextStep() async {
+        retriesCountOnError = 0 // We reset the retries on error when it is successful
+        os_log("SCAN Waiting %{public}f seconds...", log: .action, operationAwaitTime)
+
+        try? await Task.sleep(nanoseconds: UInt64(operationAwaitTime) * 1_000_000_000)
+
+        if let action = actionsHandler?.nextAction() {
+            os_log("Next action: %{public}@", log: .action, String(describing: action.actionType.rawValue))
+            await runNextAction(action)
+        } else {
+            os_log("Releasing the web view", log: .action)
+            await webViewHandler?.finish() // If we executed all steps we release the web view
+            continuation = nil
+            webViewHandler = nil
+        }
+    }
+
+    func loadURL(url: URL) async {
+        do {
+            self.scanURL = url.absoluteString
+            try await webViewHandler?.load(url: url)
+            await executeNextStep()
+        } catch {
+            await completeWith(error: error)
+        }
+    }
+
+    deinit {
+        os_log("DebugScanOperation Deinit", log: .action)
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
index f81761e347..2069f8904f 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
@@ -23,7 +23,8 @@ final class DataBrokerForceOptOutViewModel: ObservableObject {
     private let dataManager: DataBrokerProtectionDataManager
     @Published var optOutData = [OptOutViewData]()
 
-    internal init(dataManager: DataBrokerProtectionDataManager = DataBrokerProtectionDataManager()) {
+    internal init(dataManager: DataBrokerProtectionDataManager =
+                  DataBrokerProtectionDataManager(pixelHandler: DataBrokerProtectionPixelsHandler())) {
         self.dataManager = dataManager
         loadNotRemovedOptOutData()
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCClient.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCClient.swift
index 2aa3953437..f651a62440 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCClient.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCClient.swift
@@ -102,42 +102,45 @@ extension DataBrokerProtectionIPCClient: IPCServerInterface {
         })
     }
 
-    public func optOutAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    public func optOutAllBrokers(showWebView: Bool,
+                                 completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         self.pixelHandler.fire(.ipcServerOptOutAllBrokers)
         xpc.execute(call: { server in
-            server.optOutAllBrokers(showWebView: showWebView) { error in
-                self.pixelHandler.fire(.ipcServerRunQueuedOperationsCompletion(error: error))
-                completion(error)
+            server.optOutAllBrokers(showWebView: showWebView) { errors in
+                self.pixelHandler.fire(.ipcServerRunQueuedOperationsCompletion(error: errors?.oneTimeError))
+                completion(errors)
             }
         }, xpcReplyErrorHandler: { error in
             self.pixelHandler.fire(.ipcServerRunQueuedOperationsCompletion(error: error))
-            completion(error)
+            completion(DataBrokerProtectionSchedulerErrorCollection(oneTimeError: error))
         })
     }
 
-    public func scanAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    public func scanAllBrokers(showWebView: Bool,
+                               completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         self.pixelHandler.fire(.ipcServerScanAllBrokers)
         xpc.execute(call: { server in
-            server.scanAllBrokers(showWebView: showWebView) { error in
-                self.pixelHandler.fire(.ipcServerScanAllBrokersCompletion(error: error))
-                completion(error)
+            server.scanAllBrokers(showWebView: showWebView) { errors in
+                self.pixelHandler.fire(.ipcServerScanAllBrokersCompletion(error: errors?.oneTimeError))
+                completion(errors)
             }
         }, xpcReplyErrorHandler: { error in
             self.pixelHandler.fire(.ipcServerScanAllBrokersCompletion(error: error))
-            completion(error)
+            completion(DataBrokerProtectionSchedulerErrorCollection(oneTimeError: error))
         })
     }
 
-    public func runQueuedOperations(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    public func runQueuedOperations(showWebView: Bool,
+                                    completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         self.pixelHandler.fire(.ipcServerRunQueuedOperations)
         xpc.execute(call: { server in
-            server.runQueuedOperations(showWebView: showWebView) { error in
-                self.pixelHandler.fire(.ipcServerRunQueuedOperationsCompletion(error: error))
-                completion(error)
+            server.runQueuedOperations(showWebView: showWebView) { errors in
+                self.pixelHandler.fire(.ipcServerRunQueuedOperationsCompletion(error: errors?.oneTimeError))
+                completion(errors)
             }
         }, xpcReplyErrorHandler: { error in
             self.pixelHandler.fire(.ipcServerRunQueuedOperationsCompletion(error: error))
-            completion(error)
+            completion(DataBrokerProtectionSchedulerErrorCollection(oneTimeError: error))
         })
     }
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCScheduler.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCScheduler.swift
index b69402626d..6f9bb8aa9f 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCScheduler.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCScheduler.swift
@@ -46,17 +46,20 @@ public final class DataBrokerProtectionIPCScheduler: DataBrokerProtectionSchedul
         ipcClient.stopScheduler()
     }
 
-    public func optOutAllBrokers(showWebView: Bool, completion: ((Error?) -> Void)?) {
+    public func optOutAllBrokers(showWebView: Bool,
+                                 completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
         let completion = completion ?? { _ in }
         ipcClient.optOutAllBrokers(showWebView: showWebView, completion: completion)
     }
 
-    public func scanAllBrokers(showWebView: Bool, completion: ((Error?) -> Void)?) {
+    public func scanAllBrokers(showWebView: Bool,
+                               completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
         let completion = completion ?? { _ in }
         ipcClient.scanAllBrokers(showWebView: showWebView, completion: completion)
     }
 
-    public func runQueuedOperations(showWebView: Bool, completion: ((Error?) -> Void)?) {
+    public func runQueuedOperations(showWebView: Bool,
+                                    completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
         let completion = completion ?? { _ in }
         ipcClient.runQueuedOperations(showWebView: showWebView, completion: completion)
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCServer.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCServer.swift
index a2bc3d0e56..33594703cb 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCServer.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCServer.swift
@@ -38,9 +38,12 @@ public protocol IPCServerInterface: AnyObject {
     ///
     func stopScheduler()
 
-    func optOutAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void))
-    func scanAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void))
-    func runQueuedOperations(showWebView: Bool, completion: @escaping ((Error?) -> Void))
+    func optOutAllBrokers(showWebView: Bool,
+                          completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
+    func scanAllBrokers(showWebView: Bool,
+                        completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
+    func runQueuedOperations(showWebView: Bool,
+                             completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
     func runAllOperations(showWebView: Bool)
 
     // MARK: - Debugging Features
@@ -73,9 +76,12 @@ protocol XPCServerInterface {
     ///
     func stopScheduler()
 
-    func optOutAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void))
-    func scanAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void))
-    func runQueuedOperations(showWebView: Bool, completion: @escaping ((Error?) -> Void))
+    func optOutAllBrokers(showWebView: Bool,
+                          completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
+    func scanAllBrokers(showWebView: Bool,
+                        completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
+    func runQueuedOperations(showWebView: Bool,
+                             completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
     func runAllOperations(showWebView: Bool)
 
     // MARK: - Debugging Features
@@ -143,15 +149,18 @@ extension DataBrokerProtectionIPCServer: XPCServerInterface {
         serverDelegate?.stopScheduler()
     }
 
-    func optOutAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    func optOutAllBrokers(showWebView: Bool,
+                          completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         serverDelegate?.optOutAllBrokers(showWebView: showWebView, completion: completion)
     }
 
-    func scanAllBrokers(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    func scanAllBrokers(showWebView: Bool,
+                        completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         serverDelegate?.scanAllBrokers(showWebView: showWebView, completion: completion)
     }
 
-    func runQueuedOperations(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    func runQueuedOperations(showWebView: Bool,
+                             completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         serverDelegate?.runQueuedOperations(showWebView: showWebView, completion: completion)
     }
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Expectaction.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Expectaction.swift
index 33722a5f84..d3669a3290 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Expectaction.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Expectaction.swift
@@ -21,13 +21,14 @@ import Foundation
 enum ItemType: String, Codable, Sendable {
     case text
     case url
-    case element = "elementExpectation"
+    case element
 }
 
 struct Item: Codable, Sendable {
     let type: ItemType
     let expect: String?
     let selector: String?
+    let parent: String?
 }
 
 internal struct ExpectationAction: Action {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUICommunicationModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUICommunicationModel.swift
index 5f242b34a2..dc664cf412 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUICommunicationModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUICommunicationModel.swift
@@ -171,14 +171,14 @@ struct DBPUIInitialScanState: DBPUISendableMessage {
     let scanProgress: DBPUIScanProgress
 }
 
-struct DBUIScanDate: DBPUISendableMessage {
+struct DBPUIScanDate: DBPUISendableMessage {
     let date: Double
     let dataBrokers: [DBPUIDataBroker]
 }
 
 struct DBPUIScanSchedule: DBPUISendableMessage {
-    let lastScan: DBUIScanDate
-    let nextScan: DBUIScanDate
+    let lastScan: DBPUIScanDate
+    let nextScan: DBPUIScanDate
 }
 
 struct DBPUIScanHistory: DBPUISendableMessage {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
index 37d5b71c94..fe1f46f531 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
@@ -36,6 +36,7 @@ final class DBPUIViewModel {
     private var communicationLayer: DBPUICommunicationLayer?
     private var webView: WKWebView?
     private let webUISettings: DataBrokerProtectionWebUIURLSettingsRepresentable
+    private let pixelHandler: EventMapping<DataBrokerProtectionPixels> = DataBrokerProtectionPixelsHandler()
 
     init(dataManager: DataBrokerProtectionDataManaging,
          scheduler: DataBrokerProtectionScheduler,
@@ -82,6 +83,7 @@ extension DBPUIViewModel: DBPUIScanOps {
             _ = try await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
         } catch {
             os_log("DBPUIViewModel error: updateCacheWithCurrentScans, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DBPUIViewModel.updateCacheWithCurrentScans"))
         }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBrokerProtectionProfile.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBrokerProtectionProfile.swift
index a77770d5f9..c76645a804 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBrokerProtectionProfile.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBrokerProtectionProfile.swift
@@ -69,7 +69,7 @@ public struct DataBrokerProtectionProfile: Codable {
     }
 }
 
-internal extension DataBrokerProtectionProfile {
+extension DataBrokerProtectionProfile {
     var profileQueries: [ProfileQuery] {
         return addresses.flatMap { address in
             names.map { name in
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/HistoryEvent.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/HistoryEvent.swift
index 111d6dad23..9ed693822b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/HistoryEvent.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/HistoryEvent.swift
@@ -27,6 +27,7 @@ public struct HistoryEvent: Identifiable, Sendable {
         case optOutRequested
         case optOutConfirmed
         case scanStarted
+        case reAppearence
     }
 
     public let extractedProfileId: Int64?
@@ -50,4 +51,13 @@ public struct HistoryEvent: Identifiable, Sendable {
         self.date = date
         self.type = type
     }
+
+    func matchesFound() -> Int {
+        switch type {
+        case .matchesFound(let matchesFound):
+            return matchesFound
+        default:
+            return 0
+        }
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift
index 0850e3027c..c2cbde5fa5 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift
@@ -117,6 +117,21 @@ extension ProfileQuery {
                              birthYear: birthYear,
                              deprecated: deprecated)
      }
+
+    func with(id: Int64) -> ProfileQuery {
+        return ProfileQuery(id: id,
+                            firstName: firstName,
+                            lastName: lastName,
+                            middleName: middleName,
+                            suffix: suffix,
+                            city: city,
+                            state: state,
+                            street: street,
+                            zipCode: zip,
+                            phone: phone,
+                            birthYear: birthYear,
+                            deprecated: deprecated)
+    }
 }
 
 extension ProfileQuery: Hashable {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift
index d421924f93..fb88d48e61 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift
@@ -31,19 +31,20 @@ protocol DataBrokerOperation: CCFCommunicationDelegate {
     var query: BrokerProfileQueryData { get }
     var emailService: EmailServiceProtocol { get }
     var captchaService: CaptchaServiceProtocol { get }
+    var cookieHandler: CookieHandler { get }
+    var stageCalculator: StageDurationCalculator { get }
 
     var webViewHandler: WebViewHandler? { get set }
     var actionsHandler: ActionsHandler? { get }
-    var stageCalculator: StageDurationCalculator? { get }
     var continuation: CheckedContinuation<ReturnValue, Error>? { get set }
     var extractedProfile: ExtractedProfile? { get set }
     var shouldRunNextStep: () -> Bool { get }
     var retriesCountOnError: Int { get set }
+    var clickAwaitTime: TimeInterval { get }
 
     func run(inputValue: InputValue,
              webViewHandler: WebViewHandler?,
              actionsHandler: ActionsHandler?,
-             stageCalculator: StageDurationCalculator,
              showWebView: Bool) async throws -> ReturnValue
 
     func executeNextStep() async
@@ -54,13 +55,11 @@ extension DataBrokerOperation {
     func run(inputValue: InputValue,
              webViewHandler: WebViewHandler?,
              actionsHandler: ActionsHandler?,
-             stageCalculator: StageDurationCalculator,
              shouldRunNextStep: @escaping () -> Bool) async throws -> ReturnValue {
 
         try await run(inputValue: inputValue,
                       webViewHandler: webViewHandler,
                       actionsHandler: actionsHandler,
-                      stageCalculator: stageCalculator,
                       showWebView: false)
     }
 }
@@ -69,10 +68,23 @@ extension DataBrokerOperation {
 
     // MARK: - Shared functions
 
+    // swiftlint:disable:next cyclomatic_complexity
     func runNextAction(_ action: Action) async {
+        switch action {
+        case is GetCaptchaInfoAction:
+            stageCalculator.setStage(.captchaParse)
+        case is ClickAction:
+            stageCalculator.setStage(.fillForm)
+        case is FillFormAction:
+            stageCalculator.setStage(.fillForm)
+        case is ExpectationAction:
+            stageCalculator.setStage(.submit)
+        default: ()
+        }
+
         if let emailConfirmationAction = action as? EmailConfirmationAction {
             do {
-                stageCalculator?.fireOptOutSubmit()
+                stageCalculator.fireOptOutSubmit()
                 try await runEmailConfirmationAction(action: emailConfirmationAction)
                 await executeNextStep()
             } catch {
@@ -84,10 +96,11 @@ extension DataBrokerOperation {
 
         if action as? SolveCaptchaAction != nil, let captchaTransactionId = actionsHandler?.captchaTransactionId {
             actionsHandler?.captchaTransactionId = nil
-            stageCalculator?.setStage(.captchaSolve)
+            stageCalculator.setStage(.captchaSolve)
             if let captchaData = try? await captchaService.submitCaptchaToBeResolved(for: captchaTransactionId,
+                                                                                     attemptId: stageCalculator.attemptId,
                                                                                      shouldRunNextStep: shouldRunNextStep) {
-                stageCalculator?.fireOptOutCaptchaSolve()
+                stageCalculator.fireOptOutCaptchaSolve()
                 await webViewHandler?.execute(action: action, data: .solveCaptcha(CaptchaToken(token: captchaData)))
             } else {
                 await onError(error: DataBrokerProtectionError.captchaServiceError(CaptchaServiceError.nilDataWhenFetchingCaptchaResult))
@@ -98,35 +111,32 @@ extension DataBrokerOperation {
 
         if action.needsEmail {
             do {
-                stageCalculator?.setStage(.emailGenerate)
-                let emailData = try await emailService.getEmail(dataBrokerURL: query.dataBroker.url)
+                stageCalculator.setStage(.emailGenerate)
+                let emailData = try await emailService.getEmail(dataBrokerURL: query.dataBroker.url, attemptId: stageCalculator.attemptId)
                 extractedProfile?.email = emailData.emailAddress
-                stageCalculator?.setEmailPattern(emailData.pattern)
-                stageCalculator?.fireOptOutEmailGenerate()
+                stageCalculator.setEmailPattern(emailData.pattern)
+                stageCalculator.fireOptOutEmailGenerate()
             } catch {
                 await onError(error: DataBrokerProtectionError.emailError(error as? EmailError))
                 return
             }
         }
 
-        if action as? GetCaptchaInfoAction != nil {
-            stageCalculator?.setStage(.captchaParse)
-        }
-
         await webViewHandler?.execute(action: action, data: .userData(query.profileQuery, self.extractedProfile))
     }
 
     private func runEmailConfirmationAction(action: EmailConfirmationAction) async throws {
         if let email = extractedProfile?.email {
-            stageCalculator?.setStage(.emailReceive)
+            stageCalculator.setStage(.emailReceive)
             let url =  try await emailService.getConfirmationLink(
                 from: email,
                 numberOfRetries: 100, // Move to constant
                 pollingInterval: action.pollingTime,
+                attemptId: stageCalculator.attemptId,
                 shouldRunNextStep: shouldRunNextStep
             )
-            stageCalculator?.fireOptOutEmailReceive()
-            stageCalculator?.setStage(.emailReceive)
+            stageCalculator.fireOptOutEmailReceive()
+            stageCalculator.setStage(.emailReceive)
             do {
                 try await webViewHandler?.load(url: url)
             } catch {
@@ -134,7 +144,7 @@ extension DataBrokerOperation {
                 return
             }
 
-            stageCalculator?.fireOptOutEmailConfirm()
+            stageCalculator.fireOptOutEmailConfirm()
         } else {
             throw EmailError.cantFindEmail
         }
@@ -166,17 +176,28 @@ extension DataBrokerOperation {
 
     func loadURL(url: URL) async {
         do {
+            // https://app.asana.com/0/1204167627774280/1206912494469284/f
+            if query.dataBroker.url == "spokeo.com" {
+                if let cookies = await cookieHandler.getAllCookiesFromDomain(url) {
+                    await webViewHandler?.setCookies(cookies)
+                }
+            }
             try await webViewHandler?.load(url: url)
             await executeNextStep()
         } catch {
-           await onError(error: error)
+            await onError(error: error)
         }
     }
 
     func success(actionId: String, actionType: ActionType) async {
         switch actionType {
         case .click:
-            try? await webViewHandler?.waitForWebViewLoad(timeoutInSeconds: 30)
+            stageCalculator.fireOptOutFillForm()
+            // We wait 40 seconds before tapping
+            try? await Task.sleep(nanoseconds: UInt64(clickAwaitTime) * 1_000_000_000)
+            await executeNextStep()
+        case .fillForm:
+            stageCalculator.fireOptOutFillForm()
             await executeNextStep()
         default: await executeNextStep()
         }
@@ -184,11 +205,13 @@ extension DataBrokerOperation {
 
     func captchaInformation(captchaInfo: GetCaptchaInfoResponse) async {
         do {
-            stageCalculator?.fireOptOutCaptchaParse()
-            stageCalculator?.setStage(.captchaSend)
-            actionsHandler?.captchaTransactionId = try await captchaService.submitCaptchaInformation(captchaInfo,
-                                                                                                     shouldRunNextStep: shouldRunNextStep)
-            stageCalculator?.fireOptOutCaptchaSend()
+            stageCalculator.fireOptOutCaptchaParse()
+            stageCalculator.setStage(.captchaSend)
+            actionsHandler?.captchaTransactionId = try await captchaService.submitCaptchaInformation(
+                captchaInfo,
+                attemptId: stageCalculator.attemptId,
+                shouldRunNextStep: shouldRunNextStep)
+            stageCalculator.fireOptOutCaptchaSend()
             await executeNextStep()
         } catch {
             if let captchaError = error as? CaptchaServiceError {
@@ -231,3 +254,33 @@ extension DataBrokerOperation {
         }
     }
 }
+
+protocol CookieHandler {
+    func getAllCookiesFromDomain(_ url: URL) async -> [HTTPCookie]?
+}
+
+struct BrokerCookieHandler: CookieHandler {
+
+    func getAllCookiesFromDomain(_ url: URL) async -> [HTTPCookie]? {
+        guard let domainURL = extractSchemeAndHostAsURL(from: url.absoluteString) else { return nil }
+        do {
+            let (_, response) = try await URLSession.shared.data(from: domainURL)
+            guard let httpResponse = response as? HTTPURLResponse,
+                  let allHeaderFields = httpResponse.allHeaderFields as? [String: String] else { return nil }
+
+            let cookies = HTTPCookie.cookies(withResponseHeaderFields: allHeaderFields, for: domainURL)
+            return cookies
+        } catch {
+            print("Error fetching data: \(error)")
+        }
+
+        return nil
+    }
+
+    private func extractSchemeAndHostAsURL(from url: String) -> URL? {
+        if let urlComponents = URLComponents(string: url), let scheme = urlComponents.scheme, let host = urlComponents.host {
+            return URL(string: "\(scheme)://\(host)")
+        }
+        return nil
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationRunner.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationRunner.swift
index 03b2f70ad6..15bfb11e9f 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationRunner.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationRunner.swift
@@ -86,9 +86,10 @@ final class DataBrokerOperationRunner: WebOperationRunner {
             query: profileQuery,
             emailService: emailService,
             captchaService: captchaService,
+            stageDurationCalculator: stageCalculator,
             shouldRunNextStep: shouldRunNextStep
         )
-        return try await scan.run(inputValue: (), stageCalculator: stageCalculator, showWebView: showWebView)
+        return try await scan.run(inputValue: (), showWebView: showWebView)
     }
 
     func optOut(profileQuery: BrokerProfileQueryData,
@@ -102,9 +103,10 @@ final class DataBrokerOperationRunner: WebOperationRunner {
             query: profileQuery,
             emailService: emailService,
             captchaService: captchaService,
+            stageCalculator: stageCalculator,
             shouldRunNextStep: shouldRunNextStep
         )
-        try await optOut.run(inputValue: extractedProfile, stageCalculator: stageCalculator, showWebView: showWebView)
+        try await optOut.run(inputValue: extractedProfile, showWebView: showWebView)
     }
 
     deinit {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
index 9bdbf236c9..063490dcab 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
@@ -19,6 +19,12 @@
 import Foundation
 import Common
 
+protocol DataBrokerOperationsCollectionErrorDelegate: AnyObject {
+    func dataBrokerOperationsCollection(_ dataBrokerOperationsCollection: DataBrokerOperationsCollection,
+                                        didError error: Error,
+                                        withDataBrokerName dataBrokerName: String?)
+}
+
 final class DataBrokerOperationsCollection: Operation {
 
     enum OperationType {
@@ -27,6 +33,9 @@ final class DataBrokerOperationsCollection: Operation {
         case all
     }
 
+    public var error: Error?
+    public weak var errorDelegate: DataBrokerOperationsCollectionErrorDelegate?
+
     private let dataBrokerID: Int64
     private let database: DataBrokerProtectionRepository
     private let id = UUID()
@@ -183,12 +192,10 @@ final class DataBrokerOperationsCollection: Operation {
 
             } catch {
                 os_log("Error: %{public}@", log: .dataBrokerProtection, error.localizedDescription)
-                if let error = error as? DataBrokerProtectionError,
-                   let dataBrokerName = brokerProfileQueriesData.first?.dataBroker.name {
-                    pixelHandler.fire(.error(error: error, dataBroker: dataBrokerName))
-                } else {
-                    os_log("Cant handle error", log: .dataBrokerProtection)
-                }
+                self.error = error
+                errorDelegate?.dataBrokerOperationsCollection(self,
+                                                              didError: error,
+                                                              withDataBrokerName: brokerProfileQueriesData.first?.dataBroker.name)
             }
         }
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
index d1c34903b6..f1e9a7b377 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
@@ -117,6 +117,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
             notificationCenter.post(name: DataBrokerProtectionNotifications.didFinishScan, object: brokerProfileQueryData.dataBroker.name)
         }
 
+        let eventPixels = DataBrokerProtectionEventPixels(database: database, handler: pixelHandler)
         let stageCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.name, handler: pixelHandler)
 
         do {
@@ -141,6 +142,9 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                     if doesProfileExistsInDatabase, let alreadyInDatabaseProfile = extractedProfilesForBroker.first(where: { $0.identifier == extractedProfile.identifier }), let id = alreadyInDatabaseProfile.id {
                         // If it was removed in the past but was found again when scanning, it means it appearead again, so we reset the remove date.
                         if alreadyInDatabaseProfile.removedDate != nil {
+                            let reAppereanceEvent = HistoryEvent(extractedProfileId: extractedProfile.id, brokerId: brokerId, profileQueryId: profileQueryId, type: .reAppearence)
+                            eventPixels.fireReAppereanceEventPixel()
+                            try database.add(reAppereanceEvent)
                             try database.updateRemovedDate(nil, on: id)
                         }
 
@@ -148,6 +152,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                     } else {
                         // If it's a new found profile, we'd like to opt-out ASAP
                         // If this broker has a parent opt out, we set the preferred date to nil, as we will only perform the operation within the parent.
+                        eventPixels.fireNewMatchEventPixel()
                         let broker = brokerProfileQueryData.dataBroker
                         let preferredRunOperation: Date? = broker.performsOptOutWithinParent() ? nil : Date()
 
@@ -280,7 +285,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
         }
 
         let retriesCalculatorUseCase = OperationRetriesCalculatorUseCase()
-        let stageDurationCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.name, handler: pixelHandler)
+        let stageDurationCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.url, handler: pixelHandler)
         stageDurationCalculator.fireOptOutStart()
         os_log("Running opt-out operation: %{public}@", log: .dataBrokerProtection, String(describing: brokerProfileQueryData.dataBroker.name))
 
@@ -325,7 +330,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
             stageDurationCalculator.fireOptOutSubmitSuccess(tries: tries)
 
             let updater = OperationPreferredDateUpdaterUseCase(database: database)
-            updater.updateChildrenBrokerForParentBroker(brokerProfileQueryData.dataBroker,
+            try updater.updateChildrenBrokerForParentBroker(brokerProfileQueryData.dataBroker,
                                                         profileQueryId: profileQueryId)
 
             try database.addAttempt(extractedProfileId: extractedProfileId,
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
index 7f6749e786..79020cde0b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
@@ -103,15 +103,18 @@ public struct DataBrokerProtectionBrokerUpdater {
     private let resources: ResourcesRepository
     private let vault: any DataBrokerProtectionSecureVault
     private let appVersion: AppVersionNumberProvider
+    private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
 
     init(repository: BrokerUpdaterRepository = BrokerUpdaterUserDefaults(),
          resources: ResourcesRepository = FileResources(),
          vault: any DataBrokerProtectionSecureVault,
-         appVersion: AppVersionNumberProvider = AppVersionNumber()) {
+         appVersion: AppVersionNumberProvider = AppVersionNumber(),
+         pixelHandler: EventMapping<DataBrokerProtectionPixels> = DataBrokerProtectionPixelsHandler()) {
         self.repository = repository
         self.resources = resources
         self.vault = vault
         self.appVersion = appVersion
+        self.pixelHandler = pixelHandler
     }
 
     public static func provide() -> DataBrokerProtectionBrokerUpdater? {
@@ -129,6 +132,7 @@ public struct DataBrokerProtectionBrokerUpdater {
             brokers = try resources.fetchBrokerFromResourceFiles()
         } catch {
             os_log("DataBrokerProtectionBrokerUpdater updateBrokers, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionBrokerUpdater.updateBrokers"))
             return
         }
         guard let brokers = brokers else { return }
@@ -138,6 +142,7 @@ public struct DataBrokerProtectionBrokerUpdater {
                 try update(broker)
             } catch {
                 os_log("Error updating broker: %{public}@, with version: %{public}@", log: .dataBrokerProtection, broker.name, broker.version)
+                pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionBrokerUpdater.updateBrokers"))
             }
         }
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateCalculator.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateCalculator.swift
index f5d2063be0..ca42eaedda 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateCalculator.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateCalculator.swift
@@ -41,14 +41,13 @@ struct OperationPreferredDateCalculator {
         }
 
         switch lastEvent.type {
-
         case .optOutConfirmed:
             if isDeprecated {
                 return nil
             } else {
                 return Date().addingTimeInterval(schedulingConfig.maintenanceScan.hoursToSeconds)
             }
-        case .noMatchFound, .matchesFound:
+        case .noMatchFound, .matchesFound, .reAppearence:
             return Date().addingTimeInterval(schedulingConfig.maintenanceScan.hoursToSeconds)
         case .error:
             return Date().addingTimeInterval(schedulingConfig.retryError.hoursToSeconds)
@@ -70,7 +69,7 @@ struct OperationPreferredDateCalculator {
         }
 
         switch lastEvent.type {
-        case .matchesFound:
+        case .matchesFound, .reAppearence:
             if let extractedProfileID = extractedProfileID, shouldScheduleNewOptOut(events: historyEvents,
                                                                                     extractedProfileId: extractedProfileID,
                                                                                     schedulingConfig: schedulingConfig) {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
index d4a832482b..73cb7fb2b1 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
@@ -33,7 +33,7 @@ protocol OperationPreferredDateUpdater {
                                   extractedProfileId: Int64?,
                                   schedulingConfig: DataBrokerScheduleConfig) throws
 
-    func updateChildrenBrokerForParentBroker(_ parentBroker: DataBroker, profileQueryId: Int64)
+    func updateChildrenBrokerForParentBroker(_ parentBroker: DataBroker, profileQueryId: Int64) throws
 }
 
 struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
@@ -70,9 +70,8 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
 
     /// 1, This method fetches scan operations with the profileQueryId and with child sites of parentBrokerId
     /// 2. Then for each one it updates the preferredRunDate of the scan to its confirm scan
-    func updateChildrenBrokerForParentBroker(_ parentBroker: DataBroker, profileQueryId: Int64) {
+    func updateChildrenBrokerForParentBroker(_ parentBroker: DataBroker, profileQueryId: Int64) throws {
         do {
-            // Temporary do/catch to allow merging error handling work in stages
             let childBrokers =  try database.fetchChildBrokers(for: parentBroker.name)
 
             try childBrokers.forEach { childBroker in
@@ -85,6 +84,7 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
             }
         } catch {
             os_log("OperationPreferredDateUpdaterUseCase error: updateChildrenBrokerForParentBroker, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
         }
     }
 
@@ -107,10 +107,10 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
         }
 
         if newScanPreferredRunDate != currentScanPreferredRunDate {
-            updatePreferredRunDate(newScanPreferredRunDate,
-                                   brokerId: brokerId,
-                                   profileQueryId: profileQueryId,
-                                   extractedProfileId: nil)
+            try updatePreferredRunDate(newScanPreferredRunDate,
+                                       brokerId: brokerId,
+                                       profileQueryId: profileQueryId,
+                                       extractedProfileId: nil)
         }
     }
 
@@ -134,10 +134,10 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
         }
 
         if newOptOutPreferredDate != currentOptOutPreferredRunDate {
-            updatePreferredRunDate(newOptOutPreferredDate,
-                                   brokerId: brokerId,
-                                   profileQueryId: profileQueryId,
-                                   extractedProfileId: extractedProfileId)
+            try updatePreferredRunDate(newOptOutPreferredDate,
+                                       brokerId: brokerId,
+                                       profileQueryId: profileQueryId,
+                                       extractedProfileId: extractedProfileId)
         }
     }
 
@@ -151,9 +151,8 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
     private func updatePreferredRunDate( _ date: Date?,
                                          brokerId: Int64,
                                          profileQueryId: Int64,
-                                         extractedProfileId: Int64?) {
+                                         extractedProfileId: Int64?) throws {
         do {
-            // Temporary do/catch to allow merging error handling work in stages
             if let extractedProfileId = extractedProfileId {
                 try database.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId)
             } else {
@@ -161,6 +160,7 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
             }
         } catch {
             os_log("OperationPreferredDateUpdaterUseCase error: updatePreferredRunDate, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
         }
 
         os_log("Updating preferredRunDate on operation with brokerId %{public}@ and profileQueryId %{public}@", log: .dataBrokerProtection, brokerId.description, profileQueryId.description)
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
index 4bc7420f91..bf5be40ecb 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
@@ -31,13 +31,15 @@ final class OptOutOperation: DataBrokerOperation {
     let query: BrokerProfileQueryData
     let emailService: EmailServiceProtocol
     let captchaService: CaptchaServiceProtocol
+    let cookieHandler: CookieHandler
+    let stageCalculator: StageDurationCalculator
     var webViewHandler: WebViewHandler?
     var actionsHandler: ActionsHandler?
     var continuation: CheckedContinuation<Void, Error>?
     var extractedProfile: ExtractedProfile?
-    var stageCalculator: StageDurationCalculator?
     private let operationAwaitTime: TimeInterval
     let shouldRunNextStep: () -> Bool
+    let clickAwaitTime: TimeInterval
 
     // Captcha is a third-party resource that sometimes takes more time to load
     // if we are not able to get the captcha information. We will try to run the action again
@@ -51,7 +53,10 @@ final class OptOutOperation: DataBrokerOperation {
          query: BrokerProfileQueryData,
          emailService: EmailServiceProtocol = EmailService(),
          captchaService: CaptchaServiceProtocol = CaptchaService(),
+         cookieHandler: CookieHandler = BrokerCookieHandler(),
          operationAwaitTime: TimeInterval = 3,
+         clickAwaitTime: TimeInterval = 40,
+         stageCalculator: StageDurationCalculator,
          shouldRunNextStep: @escaping () -> Bool
     ) {
         self.privacyConfig = privacyConfig
@@ -60,17 +65,18 @@ final class OptOutOperation: DataBrokerOperation {
         self.emailService = emailService
         self.captchaService = captchaService
         self.operationAwaitTime = operationAwaitTime
+        self.stageCalculator = stageCalculator
         self.shouldRunNextStep = shouldRunNextStep
+        self.clickAwaitTime = clickAwaitTime
+        self.cookieHandler = cookieHandler
     }
 
     func run(inputValue: ExtractedProfile,
              webViewHandler: WebViewHandler? = nil,
              actionsHandler: ActionsHandler? = nil,
-             stageCalculator: StageDurationCalculator,
              showWebView: Bool = false) async throws {
         try await withCheckedThrowingContinuation { continuation in
             self.extractedProfile = inputValue.merge(with: query.profileQuery)
-            self.stageCalculator = stageCalculator
             self.continuation = continuation
 
             Task {
@@ -99,7 +105,7 @@ final class OptOutOperation: DataBrokerOperation {
         }
     }
 
-    func extractedProfiles(profiles: [ExtractedProfile]) async {
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async {
         // No - op
     }
 
@@ -109,6 +115,7 @@ final class OptOutOperation: DataBrokerOperation {
         try? await Task.sleep(nanoseconds: UInt64(operationAwaitTime) * 1_000_000_000)
 
         if let action = actionsHandler?.nextAction(), self.shouldRunNextStep() {
+            stageCalculator.setLastActionId(action.id)
             await runNextAction(action)
         } else {
             await webViewHandler?.finish() // If we executed all steps we release the web view
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
index bedb36dd99..10bf5bb9e9 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
@@ -31,21 +31,26 @@ final class ScanOperation: DataBrokerOperation {
     let query: BrokerProfileQueryData
     let emailService: EmailServiceProtocol
     let captchaService: CaptchaServiceProtocol
+    let cookieHandler: CookieHandler
+    let stageCalculator: StageDurationCalculator
     var webViewHandler: WebViewHandler?
     var actionsHandler: ActionsHandler?
     var continuation: CheckedContinuation<[ExtractedProfile], Error>?
     var extractedProfile: ExtractedProfile?
-    var stageCalculator: StageDurationCalculator?
     private let operationAwaitTime: TimeInterval
     let shouldRunNextStep: () -> Bool
     var retriesCountOnError: Int = 0
+    let clickAwaitTime: TimeInterval
 
     init(privacyConfig: PrivacyConfigurationManaging,
          prefs: ContentScopeProperties,
          query: BrokerProfileQueryData,
          emailService: EmailServiceProtocol = EmailService(),
          captchaService: CaptchaServiceProtocol = CaptchaService(),
+         cookieHandler: CookieHandler = BrokerCookieHandler(),
          operationAwaitTime: TimeInterval = 3,
+         clickAwaitTime: TimeInterval = 0,
+         stageDurationCalculator: StageDurationCalculator,
          shouldRunNextStep: @escaping () -> Bool
     ) {
         self.privacyConfig = privacyConfig
@@ -54,16 +59,17 @@ final class ScanOperation: DataBrokerOperation {
         self.emailService = emailService
         self.captchaService = captchaService
         self.operationAwaitTime = operationAwaitTime
+        self.stageCalculator = stageDurationCalculator
         self.shouldRunNextStep = shouldRunNextStep
+        self.clickAwaitTime = clickAwaitTime
+        self.cookieHandler = cookieHandler
     }
 
     func run(inputValue: InputValue,
              webViewHandler: WebViewHandler? = nil,
              actionsHandler: ActionsHandler? = nil,
-             stageCalculator: StageDurationCalculator, // We do not need it for scans - for now.
              showWebView: Bool) async throws -> [ExtractedProfile] {
         try await withCheckedThrowingContinuation { continuation in
-            self.stageCalculator = stageCalculator
             self.continuation = continuation
             Task {
                 await initialize(handler: webViewHandler, isFakeBroker: query.dataBroker.isFakeBroker, showWebView: showWebView)
@@ -87,7 +93,7 @@ final class ScanOperation: DataBrokerOperation {
         }
     }
 
-    func extractedProfiles(profiles: [ExtractedProfile]) async {
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async {
         complete(profiles)
         await executeNextStep()
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift
new file mode 100644
index 0000000000..589ab33afb
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift
@@ -0,0 +1,165 @@
+//
+//  DataBrokerProtectionEventPixels.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import Common
+import BrowserServicesKit
+import PixelKit
+
+protocol DataBrokerProtectionEventPixelsRepository {
+    func markWeeklyPixelSent()
+
+    func getLatestWeeklyPixel() -> Date?
+}
+
+final class DataBrokerProtectionEventPixelsUserDefaults: DataBrokerProtectionEventPixelsRepository {
+
+    enum Consts {
+        static let weeklyPixelKey = "macos.browser.data-broker-protection.eventsWeeklyPixelKey"
+    }
+
+    private let userDefaults: UserDefaults
+
+    init(userDefaults: UserDefaults = .standard) {
+        self.userDefaults = userDefaults
+    }
+
+    func markWeeklyPixelSent() {
+        userDefaults.set(Date(), forKey: Consts.weeklyPixelKey)
+    }
+
+    func getLatestWeeklyPixel() -> Date? {
+        userDefaults.object(forKey: Consts.weeklyPixelKey) as? Date
+    }
+}
+
+final class DataBrokerProtectionEventPixels {
+
+    private let database: DataBrokerProtectionRepository
+    private let repository: DataBrokerProtectionEventPixelsRepository
+    private let handler: EventMapping<DataBrokerProtectionPixels>
+    private let calendar = Calendar.current
+
+    init(database: DataBrokerProtectionRepository,
+         repository: DataBrokerProtectionEventPixelsRepository = DataBrokerProtectionEventPixelsUserDefaults(),
+         handler: EventMapping<DataBrokerProtectionPixels>) {
+        self.database = database
+        self.repository = repository
+        self.handler = handler
+    }
+
+    func tryToFireWeeklyPixels() {
+        if shouldWeFireWeeklyPixel() {
+            fireWeeklyReportPixels()
+            repository.markWeeklyPixelSent()
+        }
+    }
+
+    func fireNewMatchEventPixel() {
+        handler.fire(.scanningEventNewMatch)
+    }
+
+    func fireReAppereanceEventPixel() {
+        handler.fire(.scanningEventReAppearance)
+    }
+
+    private func shouldWeFireWeeklyPixel() -> Bool {
+        guard let lastPixelFiredDate = repository.getLatestWeeklyPixel() else {
+            return true // Last pixel fired date is not present. We should fire it
+        }
+
+        return didWeekPassedBetweenDates(start: lastPixelFiredDate, end: Date())
+    }
+
+    private func fireWeeklyReportPixels() {
+        let data: [BrokerProfileQueryData]
+
+        do {
+            data = try database.fetchAllBrokerProfileQueryData()
+        } catch {
+            os_log("Database error: when attempting to fireWeeklyReportPixels, error: %{public}@", log: .error, error.localizedDescription)
+            return
+        }
+        let dataInThePastWeek = data.filter(hadScanThisWeek(_:))
+
+        var newMatchesFoundInTheLastWeek = 0
+        var reAppereancesInTheLastWeek = 0
+        var removalsInTheLastWeek = 0
+
+        for query in data {
+            let allHistoryEventsForQuery = query.scanOperationData.historyEvents + query.optOutOperationsData.flatMap { $0.historyEvents }
+            let historyEventsInThePastWeek = allHistoryEventsForQuery.filter {
+                !didWeekPassedBetweenDates(start: $0.date, end: Date())
+            }
+            let newMatches = historyEventsInThePastWeek.reduce(0, { result, next in
+                return result + next.matchesFound()
+            })
+            let reAppereances = historyEventsInThePastWeek.filter { $0.type == .reAppearence }.count
+            let removals = historyEventsInThePastWeek.filter { $0.type == .optOutConfirmed }.count
+
+            newMatchesFoundInTheLastWeek += newMatches
+            reAppereancesInTheLastWeek += reAppereances
+            removalsInTheLastWeek += removals
+        }
+
+        let totalBrokers = Dictionary(grouping: data, by: { $0.dataBroker.url }).count
+        let totalBrokersInTheLastWeek = Dictionary(grouping: dataInThePastWeek, by: { $0.dataBroker.url }).count
+        var percentageOfBrokersScanned: Int
+
+        if totalBrokers == 0 {
+            percentageOfBrokersScanned = 0
+        } else {
+            percentageOfBrokersScanned = (totalBrokersInTheLastWeek * 100) / totalBrokers
+        }
+
+        handler.fire(.weeklyReportScanning(hadNewMatch: newMatchesFoundInTheLastWeek > 0, hadReAppereance: reAppereancesInTheLastWeek > 0, scanCoverage: percentageOfBrokersScanned.toString))
+        handler.fire(.weeklyReportRemovals(removals: removalsInTheLastWeek))
+    }
+
+    private func hadScanThisWeek(_ brokerProfileQuery: BrokerProfileQueryData) -> Bool {
+        return brokerProfileQuery.scanOperationData.historyEvents.contains { historyEvent in
+            !didWeekPassedBetweenDates(start: historyEvent.date, end: Date())
+        }
+    }
+
+    private func didWeekPassedBetweenDates(start: Date, end: Date) -> Bool {
+        let components = calendar.dateComponents([.day], from: start, to: end)
+
+        if let differenceInDays = components.day {
+            return differenceInDays >= 7
+        } else {
+            return false
+        }
+    }
+}
+
+private extension Int {
+    var toString: String {
+        if self < 25 {
+            return "0-25"
+        } else if self < 50 {
+            return "25-50"
+        } else if self < 75 {
+            return "50-75"
+        } else if self <= 100 {
+            return "75-100"
+        } else {
+            return "error"
+        }
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
index eaf0c687c4..6c90e8b573 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
@@ -53,9 +53,17 @@ public enum DataBrokerProtectionPixels {
         static let errorDetailsKey = "error_details"
         static let pattern = "pattern"
         static let isParent = "is_parent"
+        static let actionIDKey = "action_id"
+        static let hadNewMatch = "had_new_match"
+        static let hadReAppereance = "had_re-appearance"
+        static let scanCoverage = "scan_coverage"
+        static let removals = "removals"
     }
 
     case error(error: DataBrokerProtectionError, dataBroker: String)
+    case generalError(error: Error, functionOccurredIn: String)
+    case secureVaultInitError(error: Error)
+    case secureVaultError(error: Error)
     case parentChildMatches(parent: String, child: String, value: Int)
 
     // Stage Pixels
@@ -69,11 +77,12 @@ public enum DataBrokerProtectionPixels {
     case optOutEmailConfirm(dataBroker: String, attemptId: UUID, duration: Double)
     case optOutValidate(dataBroker: String, attemptId: UUID, duration: Double)
     case optOutFinish(dataBroker: String, attemptId: UUID, duration: Double)
+    case optOutFillForm(dataBroker: String, attemptId: UUID, duration: Double)
 
     // Process Pixels
     case optOutSubmitSuccess(dataBroker: String, attemptId: UUID, duration: Double, tries: Int, emailPattern: String?)
     case optOutSuccess(dataBroker: String, attemptId: UUID, duration: Double, brokerType: DataBrokerHierarchy)
-    case optOutFailure(dataBroker: String, attemptId: UUID, duration: Double, stage: String, tries: Int, emailPattern: String?)
+    case optOutFailure(dataBroker: String, attemptId: UUID, duration: Double, stage: String, tries: Int, emailPattern: String?, actionID: String?)
 
     // Backgrond Agent events
     case backgroundAgentStarted
@@ -115,6 +124,12 @@ public enum DataBrokerProtectionPixels {
     case dailyActiveUser
     case weeklyActiveUser
     case monthlyActiveUser
+
+    // KPIs - events
+    case weeklyReportScanning(hadNewMatch: Bool, hadReAppereance: Bool, scanCoverage: String)
+    case weeklyReportRemovals(removals: Int)
+    case scanningEventNewMatch
+    case scanningEventReAppearance
 }
 
 extension DataBrokerProtectionPixels: PixelKitEvent {
@@ -133,6 +148,7 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
         case .optOutEmailConfirm: return "m_mac_dbp_macos_optout_stage_email-confirm"
         case .optOutValidate: return "m_mac_dbp_macos_optout_stage_validate"
         case .optOutFinish: return "m_mac_dbp_macos_optout_stage_finish"
+        case .optOutFillForm: return "m_mac_dbp_macos_optout_stage_fill-form"
 
             // Process Pixels
         case .optOutSubmitSuccess: return "m_mac_dbp_macos_optout_process_submit-success"
@@ -146,6 +162,9 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
 
             // Debug Pixels
         case .error: return "m_mac_data_broker_error"
+        case .generalError: return "m_mac_data_broker_error"
+        case .secureVaultInitError: return "m_mac_dbp_secure_vault_init_error"
+        case .secureVaultError: return "m_mac_dbp_secure_vault_error"
 
         case .backgroundAgentStarted: return "m_mac_dbp_background-agent_started"
         case .backgroundAgentStartedStoppingDueToAnotherInstanceRunning: return "m_mac_dbp_background-agent_started_stopping-due-to-another-instance-running"
@@ -187,6 +206,11 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
         case .dailyActiveUser: return "m_mac_dbp_engagement_dau"
         case .weeklyActiveUser: return "m_mac_dbp_engagement_wau"
         case .monthlyActiveUser: return "m_mac_dbp_engagement_mau"
+
+        case .weeklyReportScanning: return "m_mac_dbp_event_weekly-report_scanning"
+        case .weeklyReportRemovals: return "m_mac_dbp_event_weekly-report_removals"
+        case .scanningEventNewMatch: return "m_mac_dbp_event_scanning-events_new-match"
+        case .scanningEventReAppearance: return "m_mac_dbp_event_scanning-events_re-appearance"
         }
     }
 
@@ -205,6 +229,8 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
             } else {
                 return ["dataBroker": dataBroker, "name": error.name]
             }
+        case .generalError(_, let functionOccurredIn):
+            return ["functionOccurredIn": functionOccurredIn]
         case .parentChildMatches(let parent, let child, let value):
             return ["parent": parent, "child": child, "value": String(value)]
         case .optOutStart(let dataBroker, let attemptId):
@@ -227,6 +253,8 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
             return [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration)]
         case .optOutFinish(let dataBroker, let attemptId, let duration):
             return [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration)]
+        case .optOutFillForm(let dataBroker, let attemptId, let duration):
+            return [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration)]
         case .optOutSubmitSuccess(let dataBroker, let attemptId, let duration, let tries, let pattern):
             var params = [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration), Consts.triesKey: String(tries)]
             if let pattern = pattern {
@@ -235,12 +263,21 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
             return params
         case .optOutSuccess(let dataBroker, let attemptId, let duration, let type):
             return [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration), Consts.isParent: String(type.rawValue)]
-        case .optOutFailure(let dataBroker, let attemptId, let duration, let stage, let tries, let pattern):
+        case .optOutFailure(let dataBroker, let attemptId, let duration, let stage, let tries, let pattern, let actionID):
             var params = [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration), Consts.stageKey: stage, Consts.triesKey: String(tries)]
             if let pattern = pattern {
                 params[Consts.pattern] = pattern
             }
+
+            if let actionID = actionID {
+                params[Consts.actionIDKey] = actionID
+            }
+
             return params
+        case .weeklyReportScanning(let hadNewMatch, let hadReAppereance, let scanCoverage):
+            return [Consts.hadNewMatch: hadNewMatch ? "1" : "0", Consts.hadReAppereance: hadReAppereance ? "1" : "0", Consts.scanCoverage: scanCoverage.description]
+        case .weeklyReportRemovals(let removals):
+            return [Consts.removals: String(removals)]
         case .backgroundAgentStarted,
                 .backgroundAgentRunOperationsAndStartSchedulerIfPossible,
                 .backgroundAgentRunOperationsAndStartSchedulerIfPossibleNoSavedProfile,
@@ -256,7 +293,13 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
                 .dataBrokerProtectionNotificationOpenedAllRecordsRemoved,
                 .dailyActiveUser,
                 .weeklyActiveUser,
-                .monthlyActiveUser:
+                .monthlyActiveUser,
+
+                .scanningEventNewMatch,
+                .scanningEventReAppearance,
+
+                .secureVaultInitError,
+                .secureVaultError:
             return [:]
         case .ipcServerRegister,
                 .ipcServerStartScheduler,
@@ -287,6 +330,11 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
             switch event {
             case .error(let error, _):
                 PixelKit.fire(DebugEvent(event, error: error))
+            case .generalError(let error, _):
+                PixelKit.fire(DebugEvent(event, error: error))
+            case .secureVaultInitError(let error),
+                    .secureVaultError(let error):
+                PixelKit.fire(DebugEvent(event, error: error))
             case .ipcServerOptOutAllBrokersCompletion(error: let error),
                     .ipcServerScanAllBrokersCompletion(error: let error),
                     .ipcServerRunQueuedOperationsCompletion(error: let error):
@@ -303,6 +351,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .optOutValidate,
                     .optOutFinish,
                     .optOutSubmitSuccess,
+                    .optOutFillForm,
                     .optOutSuccess,
                     .optOutFailure,
                     .backgroundAgentStarted,
@@ -330,7 +379,11 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .dataBrokerProtectionNotificationOpenedAllRecordsRemoved,
                     .dailyActiveUser,
                     .weeklyActiveUser,
-                    .monthlyActiveUser:
+                    .monthlyActiveUser,
+                    .weeklyReportScanning,
+                    .weeklyReportRemovals,
+                    .scanningEventNewMatch,
+                    .scanningEventReAppearance:
 
                 PixelKit.fire(event)
             }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
index ef5879d122..f73f3706ad 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
@@ -32,9 +32,12 @@ enum Stage: String {
     case emailConfirm = "email-confirm"
     case validate
     case other
+    case fillForm = "fill-form"
 }
 
 protocol StageDurationCalculator {
+    var attemptId: UUID { get }
+
     func durationSinceLastStage() -> Double
     func durationSinceStartTime() -> Double
     func fireOptOutStart()
@@ -43,6 +46,7 @@ protocol StageDurationCalculator {
     func fireOptOutCaptchaSend()
     func fireOptOutCaptchaSolve()
     func fireOptOutSubmit()
+    func fireOptOutFillForm()
     func fireOptOutEmailReceive()
     func fireOptOutEmailConfirm()
     func fireOptOutValidate()
@@ -53,6 +57,7 @@ protocol StageDurationCalculator {
     func fireScanError(error: Error)
     func setStage(_ stage: Stage)
     func setEmailPattern(_ emailPattern: String?)
+    func setLastActionId(_ actionID: String)
 }
 
 final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator {
@@ -61,6 +66,7 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
     let dataBroker: String
     let startTime: Date
     var lastStateTime: Date
+    private (set) var actionID: String?
     private (set) var stage: Stage = .other
     private (set) var emailPattern: String?
 
@@ -137,13 +143,18 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
                                           emailPattern: emailPattern))
     }
 
+    func fireOptOutFillForm() {
+        handler.fire(.optOutFillForm(dataBroker: dataBroker, attemptId: attemptId, duration: durationSinceLastStage()))
+    }
+
     func fireOptOutFailure(tries: Int) {
         handler.fire(.optOutFailure(dataBroker: dataBroker,
                                     attemptId: attemptId,
                                     duration: durationSinceStartTime(),
                                     stage: stage.rawValue,
                                     tries: tries,
-                                    emailPattern: emailPattern))
+                                    emailPattern: emailPattern,
+                                    actionID: actionID))
     }
 
     func fireScanSuccess(matchesFound: Int) {
@@ -161,7 +172,12 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
             switch dataBrokerProtectionError {
             case .httpError(let httpCode):
                 if httpCode < 500 {
-                    errorCategory = .clientError(httpCode: httpCode)
+                    if httpCode == 404 {
+                        fireScanFailed()
+                        return
+                    } else {
+                        errorCategory = .clientError(httpCode: httpCode)
+                    }
                 } else {
                     errorCategory = .serverError(httpCode: httpCode)
                 }
@@ -190,10 +206,15 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
     // identifying the stage so we can know which one was the one that failed.
 
     func setStage(_ stage: Stage) {
+        lastStateTime = Date() // When we set a new stage we need to reset the lastStateTime so we count from there
         self.stage = stage
     }
 
     func setEmailPattern(_ emailPattern: String?) {
         self.emailPattern = emailPattern
     }
+
+    func setLastActionId(_ actionID: String) {
+        self.actionID = actionID
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/people-wizard.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/people-wizard.com.json
index b5b1d444c1..33b35506fb 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/people-wizard.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/people-wizard.com.json
@@ -1,7 +1,7 @@
 {
-  "name": "PeopleWizard",
+  "name": "People-Wizard.com",
   "url": "people-wizard.com",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "becd9238-85ac-4fa3-a267-9f347c577996",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "19d2fe20-8de2-4719-b6af-d6e405544697",
+          "url": "https://www.people-wizard.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "b8d264df-091f-4564-b1cf-0d7662deaf05",
+          "id": "1344b079-bb6b-417b-9c4d-eec858914b13",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json
index a91087e122..c51c669302 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeoplesWhizr",
   "url": "peopleswhizr.com",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "86c3ec08-ee4b-45b0-a1e1-bb53b0af872e",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "e1142da5-5cc5-4038-b23a-c6f13182caf0",
+          "url": "https://www.peopleswhizr.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "60a884f4-c42a-442e-9e9e-64b04b1c6177",
+          "id": "bc952139-373b-4461-8e24-83661038f657",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json
index baaa266635..7c3aa7d2c8 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeoplesWiz",
   "url": "peopleswiz.com",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "bc03dbc7-6c17-4d9e-bb6a-2b93dc930f32",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "48419647-ba1f-4625-8f9b-6531718c5c12",
+          "url": "https://www.peopleswiz.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "335ec52a-f039-4f1c-9537-3bf851c2bd1d",
+          "id": "9e1e6ff5-cb99-49aa-a37c-b3dc80012f19",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json
index 0b1f31b234..9d288252ab 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeoplesWizard",
   "url": "peopleswizard.com",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "fd568a28-ae42-41e1-922d-0461e6f43ba4",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "b92d9477-3e4a-4022-be5d-3a5d02a84c90",
+          "url": "https://www.peopleswizard.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "42fb5921-fd13-472c-99ff-779a542df5c7",
+          "id": "c538d04e-85ce-46a5-bbbd-3f9bd0fae078",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json
index 4266d710f9..861ede1a91 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json
@@ -1,8 +1,8 @@
 {
-  "name": "PeopleWhiz",
+  "name": "PeopleWhiz.com",
   "url": "peoplewhiz.com",
   "version": "0.1.6",
-  "addedDatetime": 1676181600000,
+  "addedDatetime": 1676160000000,
   "steps": [
     {
       "stepType": "scan",
@@ -10,12 +10,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "25f11594-f04a-4d46-a7ef-9fb3ed237c2d",
+          "id": "581295d7-1fd9-4039-a207-e9b8216b3d0f",
           "url": "https://www.peoplewhiz.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "eb93e81d-36d1-4a8a-ad3d-a87ae2018e74",
+          "id": "efa321f2-f214-411f-a87b-bc42feff7931",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
@@ -42,12 +42,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "ffb90236-10e7-4969-a305-1eb729a1177d",
+          "id": "2d9dd816-ec21-4210-91d1-3725837a11b1",
           "url": "https://www.peoplewhiz.com/optout/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "click",
-          "id": "4ee5b821-8b26-4a16-928b-5dd20a7292a2",
+          "id": "327e4f66-a554-4aaa-9a99-f789740112a8",
           "elements": [
             {
               "selector": "button",
@@ -74,7 +74,7 @@
         },
         {
           "actionType": "fillForm",
-          "id": "64f99a6d-f4bb-425e-a430-dded77ed24d0",
+          "id": "4c088375-cd04-4ce3-ab05-0833b55b82b4",
           "selector": "form",
           "elements": [
             {
@@ -85,7 +85,7 @@
         },
         {
           "actionType": "click",
-          "id": "c39d5b51-794a-4c2f-8acc-ed999b5b2245",
+          "id": "0d61b830-c740-4d55-a32e-dcc370ff0cdc",
           "elements": [
             {
               "type": "button",
@@ -95,7 +95,7 @@
         },
         {
           "actionType": "click",
-          "id": "9dec9932-00ba-4a7d-85b3-d3d5e5ee7bcc",
+          "id": "617dd625-36bb-4111-83f2-9e2a94beed7d",
           "elements": [
             {
               "type": "button",
@@ -105,7 +105,7 @@
         },
         {
           "actionType": "fillForm",
-          "id": "00405f21-3fcf-4114-9d56-233abceff54a",
+          "id": "271cfc3e-deb7-4da5-8e2a-c866d28cde02",
           "selector": "form",
           "elements": [
             {
@@ -116,17 +116,17 @@
         },
         {
           "actionType": "getCaptchaInfo",
-          "id": "4e2b5224-9293-45d0-98fa-2b088079ff83",
+          "id": "d5316049-1a13-4a51-b5fc-bf1607c0d6e9",
           "selector": "[class^='Confirm__ReCaptchaContainer-sc']"
         },
         {
           "actionType": "solveCaptcha",
-          "id": "006b796c-cf4e-4a7e-a10c-f5c202dfa52e",
+          "id": "a93d0de2-fc52-4c32-8b7e-74b7a5dc078e",
           "selector": "[class^='Confirm__ReCaptchaContainer-sc']"
         },
         {
           "actionType": "click",
-          "id": "003e51ee-6ccb-49eb-b820-e1af2e6fc407",
+          "id": "e0b1077d-4a8b-4d30-ba21-550367363d00",
           "elements": [
             {
               "type": "button",
@@ -136,7 +136,7 @@
         },
         {
           "actionType": "expectation",
-          "id": "9866e653-d719-4796-8153-4fa89f673d70",
+          "id": "5b261491-18ce-476d-9990-4afe2cbadfb3",
           "expectations": [
             {
               "type": "text",
@@ -147,12 +147,12 @@
         },
         {
           "actionType": "emailConfirmation",
-          "id": "efa0d7c1-2081-4bb5-bff9-5d60eef4e8c8",
+          "id": "86420965-0bd7-49ee-8034-bbea1d34c3d6",
           "pollingTime": 30
         },
         {
           "actionType": "expectation",
-          "id": "71781ca0-881f-4cc3-b918-0112f952a05e",
+          "id": "0884ae5d-b57b-4e62-92f5-01f4adf06005",
           "expectations": [
             {
               "type": "text",
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json
index 3fb6765b7d..697a7a94e1 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json
@@ -1,9 +1,9 @@
 {
-  "name": "PeopleWhiz",
+  "name": "PeopleWhiz.net",
   "url": "peoplewhiz.net",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
-  "addedDatetime": 1709445600000,
+  "addedDatetime": 1709424000000,
   "steps": [
     {
       "stepType": "scan",
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "bc6c05f9-d8e6-49b3-837f-389841e41d9c",
+          "id": "72348ba6-cfe1-493e-a6bf-a7b15eefe688",
           "url": "https://www.peoplewhiz.net/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "dc1767cd-bd01-49c7-b6b6-49f971a1a999",
+          "id": "9e0d566b-dd31-40a7-9315-ec6fba8d6233",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json
index fa5a1cf7a2..03a649fb82 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json
@@ -1,9 +1,9 @@
 {
-  "name": "PeopleWhized",
+  "name": "PeopleWhized.com",
   "url": "peoplewhized.com",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
-  "addedDatetime": 1709445600000,
+  "addedDatetime": 1709424000000,
   "steps": [
     {
       "stepType": "scan",
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "0c0c94cf-0886-4ca2-a68c-abb161d707e5",
+          "id": "d4cae653-4d48-425b-abe1-27c2c36a2503",
           "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "2671c7b6-a384-4266-a867-200f7d34904c",
+          "id": "77517554-f1e7-4e73-b0d1-92f56a0f247c",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json
index 3911f0497c..7ff6ee6216 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json
@@ -1,7 +1,7 @@
 {
-  "name": "PeopleWhized",
+  "name": "PeopleWhized.net",
   "url": "peoplewhized.net",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "f9e61593-21b0-4ffd-8546-511cd73a1696",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "3fc4b8b9-b6d0-4700-8855-e3d3a8ee562c",
+          "url": "https://www.peoplewhized.net/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "53e20125-4103-4fc3-b245-a4f33119252e",
+          "id": "440406f6-bd8a-4af7-b509-43eb24c79e4c",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json
index 2e0a5a622e..ff7542026a 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json
@@ -1,7 +1,7 @@
 {
-  "name": "PeopleWhizr",
+  "name": "PeopleWhizr.com",
   "url": "peoplewhizr.com",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "658a7e0c-060e-4c0d-b848-3b246f8de6a1",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "846e2915-d3bb-4db2-b212-992063c48254",
+          "url": "https://www.peoplewhizr.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "19868ef0-900c-4067-8b2c-ada35e81dd51",
+          "id": "21a783ce-7a7e-4a97-8dc2-ee4c2f3dc63a",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json
index 2034031ab2..a4c3be5697 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json
@@ -1,7 +1,7 @@
 {
-  "name": "PeopleWhizr",
+  "name": "PeopleWhizr.net",
   "url": "peoplewhizr.net",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "cd374da1-6abc-406c-ab66-aae135a14725",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "8cbdebad-158e-43ee-90f1-4f555feeef03",
+          "url": "https://www.peoplewhizr.net/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "9b76d10b-2b1e-46fa-8752-23a5931cb429",
+          "id": "2955fb45-374e-42f2-a72a-f7a2ffe4ebe5",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json
index 8b3067508d..3c4309d416 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWiz",
   "url": "peoplewiz.com",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "3b6a62aa-b056-4f82-aebf-6574e3e3fa21",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "723b8b9e-6f6d-4180-aaab-639682113875",
+          "url": "https://www.peoplewiz.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "bcd05ea5-27e7-4f29-8b02-8eba71869d1b",
+          "id": "36ba376d-03c1-4ecc-92ed-2fe12bd79d6f",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json
index 816bb06127..7715592055 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json
@@ -1,7 +1,7 @@
 {
-  "name": "PeopleWizard",
+  "name": "PeopleWizard.net",
   "url": "peoplewizard.net",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "c5189edf-4caa-43e5-885f-3ccf9ae410c5",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "177e5220-d31b-4405-8331-fe34fdb86266",
+          "url": "https://www.peoplewizard.net/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "19150e21-f760-4010-891e-d645511ff00e",
+          "id": "f6d41239-9208-419e-b101-c58e52a71d42",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json
index 398f82e010..db79a59baf 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWizr",
   "url": "peoplewizr.com",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "c9b7b998-3776-4d72-b4d1-7f9c4612edbb",
-          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+          "id": "20d29fc7-9def-4d28-b457-1784d705ae31",
+          "url": "https://www.peoplewizr.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "a8ac971d-81c2-41de-9183-607d6066df07",
+          "id": "53c86c5d-3960-44a9-91a3-143b71d1e07f",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/spokeo.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/spokeo.com.json
index f459f5a1d9..63ea425a0a 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/spokeo.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/spokeo.com.json
@@ -1,8 +1,8 @@
 {
   "name": "Spokeo",
   "url": "spokeo.com",
-  "version": "0.1.5",
-  "addedDatetime": 1692594000000,
+  "version": "0.1.6",
+  "addedDatetime": 1692572400000,
   "mirrorSites": [
     {
       "name": "CallerSmart",
@@ -36,12 +36,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "02538105-0a5d-46f1-9edc-c643b3f87f20",
+          "id": "1dd21871-1eee-4b1a-8338-fefeab90687f",
           "url": "https://www.spokeo.com/${firstName}-${lastName}/${state|stateFull}/${city}"
         },
         {
           "actionType": "extract",
-          "id": "569c27a3-6116-4136-84e7-67af0e73fe97",
+          "id": "bd52ece4-55ba-4839-8360-a201c99d6ae6",
           "selector": ".single-column-list-item",
           "profile": {
             "name": {
@@ -75,12 +75,23 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "4899529f-b55c-42ab-a91b-1a2abd91a369",
+          "id": "35347a66-bcc1-410d-b89b-dfe995603505",
           "url": "https://www.spokeo.com/optout"
         },
+        {
+          "actionType": "expectation",
+          "id": "9e58d407-0291-499f-8003-4a78c17773f1",
+          "expectations": [
+            {
+              "type": "element",
+              "selector": "#g-recaptcha",
+              "parent": ".optout_container"
+            }
+          ]
+        },
         {
           "actionType": "fillForm",
-          "id": "eeb19a12-9664-45ae-9fbc-b961f0925ef0",
+          "id": "9690a6f5-d16f-4068-b4e8-4eac82165071",
           "selector": ".optout_container",
           "elements": [
             {
@@ -95,17 +106,17 @@
         },
         {
           "actionType": "getCaptchaInfo",
-          "id": "1de65c74-7d06-4ffe-b569-b4b0619e7f79",
+          "id": "442e6845-03f7-41d9-8a83-33b0133b882d",
           "selector": "#g-recaptcha"
         },
         {
           "actionType": "solveCaptcha",
-          "id": "fcdc9be7-ce35-479b-8f05-eb81a1d77d51",
+          "id": "c4abef86-72c3-43dd-99b6-c5f030b8b398",
           "selector": "#g-recaptcha"
         },
         {
           "actionType": "click",
-          "id": "5bccd84d-cda2-4b55-815f-e1ca18168cc4",
+          "id": "016e68ea-f862-4378-9d8f-ed4dfd329297",
           "elements": [
             {
               "type": "button",
@@ -115,7 +126,7 @@
         },
         {
           "actionType": "expectation",
-          "id": "adcf6b50-f894-4501-8cde-9ab40048c4b2",
+          "id": "cfd69cf0-1995-4df9-a957-3a230c0a21f5",
           "expectations": [
             {
               "type": "text",
@@ -126,12 +137,12 @@
         },
         {
           "actionType": "emailConfirmation",
-          "id": "4bbfb20c-dd3c-46a5-b198-3502f778f373",
+          "id": "576295bc-1534-4326-8683-5234bfc69499",
           "pollingTime": 30
         },
         {
           "actionType": "expectation",
-          "id": "11e8206f-5cbc-4e1a-89e1-67a57537e8a3",
+          "id": "7a5f4deb-6c15-4a6f-831c-49617721b465",
           "expectations": [
             {
               "type": "text",
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionNoOpScheduler.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionNoOpScheduler.swift
index 98c06019ff..5427cfec47 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionNoOpScheduler.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionNoOpScheduler.swift
@@ -34,8 +34,8 @@ final class DataBrokerProtectionNoOpScheduler: DataBrokerProtectionScheduler {
 
     func startScheduler(showWebView: Bool) { }
     func stopScheduler() { }
-    func optOutAllBrokers(showWebView: Bool, completion: ((Error?) -> Void)?) { }
-    func runQueuedOperations(showWebView: Bool, completion: ((Error?) -> Void)?) { }
-    func scanAllBrokers(showWebView: Bool, completion: ((Error?) -> Void)?) { }
+    func optOutAllBrokers(showWebView: Bool, completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) { }
+    func runQueuedOperations(showWebView: Bool, completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) { }
+    func scanAllBrokers(showWebView: Bool, completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) { }
     func runAllOperations(showWebView: Bool) { }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
index 91b8cb5790..77c01fa5f1 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
@@ -33,6 +33,7 @@ final class DataBrokerProtectionProcessor {
     private var pixelHandler: EventMapping<DataBrokerProtectionPixels>
     private let userNotificationService: DataBrokerProtectionUserNotificationService
     private let engagementPixels: DataBrokerProtectionEngagementPixels
+    private let eventPixels: DataBrokerProtectionEventPixels
 
     init(database: DataBrokerProtectionRepository,
          config: SchedulerConfig,
@@ -50,16 +51,18 @@ final class DataBrokerProtectionProcessor {
         self.operationQueue.maxConcurrentOperationCount = config.concurrentOperationsDifferentBrokers
         self.userNotificationService = userNotificationService
         self.engagementPixels = DataBrokerProtectionEngagementPixels(database: database, handler: pixelHandler)
+        self.eventPixels = DataBrokerProtectionEventPixels(database: database, handler: pixelHandler)
     }
 
     // MARK: - Public functions
-    func runAllScanOperations(showWebView: Bool = false, completion: (() -> Void)? = nil) {
+    func runAllScanOperations(showWebView: Bool = false,
+                              completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)? = nil) {
         operationQueue.cancelAllOperations()
         runOperations(operationType: .scan,
                       priorityDate: nil,
-                      showWebView: showWebView) {
+                      showWebView: showWebView) { errors in
             os_log("Scans done", log: .dataBrokerProtection)
-            completion?()
+            completion?(errors)
             self.calculateMisMatches()
         }
     }
@@ -69,31 +72,34 @@ final class DataBrokerProtectionProcessor {
         mismatchUseCase.calculateMismatches()
     }
 
-    func runAllOptOutOperations(showWebView: Bool = false, completion: (() -> Void)? = nil) {
+    func runAllOptOutOperations(showWebView: Bool = false,
+                                completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)? = nil) {
         operationQueue.cancelAllOperations()
         runOperations(operationType: .optOut,
                       priorityDate: nil,
-                      showWebView: showWebView) {
+                      showWebView: showWebView) { errors in
             os_log("Optouts done", log: .dataBrokerProtection)
-            completion?()
+            completion?(errors)
         }
     }
 
-    func runQueuedOperations(showWebView: Bool = false, completion: (() -> Void)? = nil ) {
+    func runQueuedOperations(showWebView: Bool = false,
+                             completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)? = nil ) {
         runOperations(operationType: .all,
                       priorityDate: Date(),
-                      showWebView: showWebView) {
+                      showWebView: showWebView) { errors in
             os_log("Queued operations done", log: .dataBrokerProtection)
-            completion?()
+            completion?(errors)
         }
     }
 
-    func runAllOperations(showWebView: Bool = false, completion: (() -> Void)? = nil ) {
+    func runAllOperations(showWebView: Bool = false,
+                          completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)? = nil ) {
         runOperations(operationType: .all,
                       priorityDate: nil,
-                      showWebView: showWebView) {
+                      showWebView: showWebView) { errors in
             os_log("Queued operations done", log: .dataBrokerProtection)
-            completion?()
+            completion?(errors)
         }
     }
 
@@ -105,21 +111,23 @@ final class DataBrokerProtectionProcessor {
     private func runOperations(operationType: DataBrokerOperationsCollection.OperationType,
                                priorityDate: Date?,
                                showWebView: Bool,
-                               completion: @escaping () -> Void) {
+                               completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
 
         // Before running new operations we check if there is any updates to the broker files.
         if let vault = try? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil) {
-            let brokerUpdater = DataBrokerProtectionBrokerUpdater(vault: vault)
+            let brokerUpdater = DataBrokerProtectionBrokerUpdater(vault: vault, pixelHandler: pixelHandler)
             brokerUpdater.checkForUpdatesInBrokerJSONFiles()
         }
 
         // This will fire the DAU/WAU/MAU pixels,
         engagementPixels.fireEngagementPixel()
+        // This will try to fire the event weekly report pixels
+        eventPixels.tryToFireWeeklyPixels()
+        let dataBrokerOperationCollections: [DataBrokerOperationsCollection]
 
         do {
-            // Temporary do/catch to allow merging error handling work in stages
             let brokersProfileData = try database.fetchAllBrokerProfileQueryData()
-            let dataBrokerOperationCollections = createDataBrokerOperationCollections(from: brokersProfileData,
+            dataBrokerOperationCollections = createDataBrokerOperationCollections(from: brokersProfileData,
                                                                                       operationType: operationType,
                                                                                       priorityDate: priorityDate,
                                                                                       showWebView: showWebView)
@@ -129,10 +137,16 @@ final class DataBrokerProtectionProcessor {
             }
         } catch {
             os_log("DataBrokerProtectionProcessor error: runOperations, error: %{public}@", log: .error, error.localizedDescription)
+            operationQueue.addBarrierBlock {
+                completion(DataBrokerProtectionSchedulerErrorCollection(oneTimeError: error))
+            }
+            return
         }
 
         operationQueue.addBarrierBlock {
-            completion()
+            let operationErrors = dataBrokerOperationCollections.compactMap { $0.error }
+            let errorCollection = operationErrors.count != 0 ? DataBrokerProtectionSchedulerErrorCollection(operationErrors: operationErrors) : nil
+            completion(errorCollection)
         }
     }
 
@@ -158,6 +172,7 @@ final class DataBrokerProtectionProcessor {
                                                                 pixelHandler: pixelHandler,
                                                                 userNotificationService: userNotificationService,
                                                                 showWebView: showWebView)
+                collection.errorDelegate = self
                 collections.append(collection)
 
                 visitedDataBrokerIDs.insert(dataBrokerID)
@@ -171,3 +186,15 @@ final class DataBrokerProtectionProcessor {
         os_log("Deinit DataBrokerProtectionProcessor", log: .dataBrokerProtection)
     }
 }
+
+extension DataBrokerProtectionProcessor: DataBrokerOperationsCollectionErrorDelegate {
+
+    func dataBrokerOperationsCollection(_ dataBrokerOperationsCollection: DataBrokerOperationsCollection, didError error: Error, withDataBrokerName dataBrokerName: String?) {
+        if let error = error as? DataBrokerProtectionError,
+           let dataBrokerName = dataBrokerName {
+            pixelHandler.fire(.error(error: error, dataBroker: dataBrokerName))
+        } else {
+            os_log("Cant handle error", log: .dataBrokerProtection)
+        }
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift
index 8825842cf8..a6e5f15362 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift
@@ -27,6 +27,23 @@ public enum DataBrokerProtectionSchedulerStatus: Codable {
     case running
 }
 
+@objc
+public class DataBrokerProtectionSchedulerErrorCollection: NSObject {
+    /*
+     This needs to be an NSObject (rather than a struct) so it can be represented in Objective C
+     for the IPC layer
+     */
+
+    public let oneTimeError: Error?
+    public let operationErrors: [Error]?
+
+    public init(oneTimeError: Error? = nil, operationErrors: [Error]? = nil) {
+        self.oneTimeError = oneTimeError
+        self.operationErrors = operationErrors
+        super.init()
+    }
+}
+
 public protocol DataBrokerProtectionScheduler {
 
     var status: DataBrokerProtectionSchedulerStatus { get }
@@ -35,9 +52,9 @@ public protocol DataBrokerProtectionScheduler {
     func startScheduler(showWebView: Bool)
     func stopScheduler()
 
-    func optOutAllBrokers(showWebView: Bool, completion: ((Error?) -> Void)?)
-    func scanAllBrokers(showWebView: Bool, completion: ((Error?) -> Void)?)
-    func runQueuedOperations(showWebView: Bool, completion: ((Error?) -> Void)?)
+    func optOutAllBrokers(showWebView: Bool, completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?)
+    func scanAllBrokers(showWebView: Bool, completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?)
+    func runQueuedOperations(showWebView: Bool, completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?)
     func runAllOperations(showWebView: Bool)
 }
 
@@ -138,7 +155,17 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
             }
             self.status = .running
             os_log("Scheduler running...", log: .dataBrokerProtection)
-            self.dataBrokerProcessor.runQueuedOperations(showWebView: showWebView) { [weak self] in
+            self.dataBrokerProcessor.runQueuedOperations(showWebView: showWebView) { [weak self] errors in
+                if let errors = errors {
+                    if let oneTimeError = errors.oneTimeError {
+                        os_log("Error during startScheduler in dataBrokerProcessor.runQueuedOperations(), error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                        self?.pixelHandler.fire(.generalError(error: oneTimeError, functionOccurredIn: "DefaultDataBrokerProtectionScheduler.startScheduler"))
+                    }
+                    if let operationErrors = errors.operationErrors,
+                              operationErrors.count != 0 {
+                        os_log("Operation error(s) during startScheduler in dataBrokerProcessor.runQueuedOperations(), count: %{public}d", log: .dataBrokerProtection, operationErrors.count)
+                    }
+                }
                 self?.status = .idle
                 completion(.finished)
             }
@@ -154,23 +181,48 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
 
     public func runAllOperations(showWebView: Bool = false) {
         os_log("Running all operations...", log: .dataBrokerProtection)
-        self.dataBrokerProcessor.runAllOperations(showWebView: showWebView)
+        self.dataBrokerProcessor.runAllOperations(showWebView: showWebView) { [weak self] errors in
+            if let errors = errors {
+                if let oneTimeError = errors.oneTimeError {
+                    os_log("Error during DefaultDataBrokerProtectionScheduler.runAllOperations in dataBrokerProcessor.runAllOperations(), error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                    self?.pixelHandler.fire(.generalError(error: oneTimeError, functionOccurredIn: "DefaultDataBrokerProtectionScheduler.runAllOperations"))
+                }
+                if let operationErrors = errors.operationErrors,
+                          operationErrors.count != 0 {
+                    os_log("Operation error(s) during DefaultDataBrokerProtectionScheduler.runAllOperations in dataBrokerProcessor.runAllOperations(), count: %{public}d", log: .dataBrokerProtection, operationErrors.count)
+                }
+            }
+        }
     }
 
-    public func runQueuedOperations(showWebView: Bool = false, completion: ((Error?) -> Void)? = nil) {
+    public func runQueuedOperations(showWebView: Bool = false,
+                                    completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)? = nil) {
         os_log("Running queued operations...", log: .dataBrokerProtection)
         dataBrokerProcessor.runQueuedOperations(showWebView: showWebView,
-                                                completion: { completion?(nil) })
+                                                completion: { [weak self] errors in
+            if let errors = errors {
+                if let oneTimeError = errors.oneTimeError {
+                    os_log("Error during DefaultDataBrokerProtectionScheduler.runQueuedOperations in dataBrokerProcessor.runQueuedOperations(), error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                    self?.pixelHandler.fire(.generalError(error: oneTimeError, functionOccurredIn: "DefaultDataBrokerProtectionScheduler.runQueuedOperations"))
+                }
+                if let operationErrors = errors.operationErrors,
+                          operationErrors.count != 0 {
+                    os_log("Operation error(s) during DefaultDataBrokerProtectionScheduler.runQueuedOperations in dataBrokerProcessor.runQueuedOperations(), count: %{public}d", log: .dataBrokerProtection, operationErrors.count)
+                }
+            }
+            completion?(errors)
+        })
 
     }
 
-    public func scanAllBrokers(showWebView: Bool = false, completion: ((Error?) -> Void)? = nil) {
+    public func scanAllBrokers(showWebView: Bool = false,
+                               completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)? = nil) {
         stopScheduler()
 
         userNotificationService.requestNotificationPermission()
 
         os_log("Scanning all brokers...", log: .dataBrokerProtection)
-        dataBrokerProcessor.runAllScanOperations(showWebView: showWebView) { [weak self] in
+        dataBrokerProcessor.runAllScanOperations(showWebView: showWebView) { [weak self] errors in
             guard let self = self else { return }
 
             self.startScheduler(showWebView: showWebView)
@@ -182,13 +234,38 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
                 self.userNotificationService.scheduleCheckInNotificationIfPossible()
             }
 
-            completion?(nil)
+            if let errors = errors {
+                if let oneTimeError = errors.oneTimeError {
+                    os_log("Error during DefaultDataBrokerProtectionScheduler.scanAllBrokers in dataBrokerProcessor.runAllScanOperations(), error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                    self.pixelHandler.fire(.generalError(error: oneTimeError, functionOccurredIn: "DefaultDataBrokerProtectionScheduler.scanAllBrokers"))
+                }
+                if let operationErrors = errors.operationErrors,
+                          operationErrors.count != 0 {
+                    os_log("Operation error(s) during DefaultDataBrokerProtectionScheduler.scanAllBrokers in dataBrokerProcessor.runAllScanOperations(), count: %{public}d", log: .dataBrokerProtection, operationErrors.count)
+                }
+            }
+
+            completion?(errors)
         }
     }
 
-    public func optOutAllBrokers(showWebView: Bool = false, completion: ((Error?) -> Void)?) {
+    public func optOutAllBrokers(showWebView: Bool = false,
+                                 completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
         os_log("Opting out all brokers...", log: .dataBrokerProtection)
         self.dataBrokerProcessor.runAllOptOutOperations(showWebView: showWebView,
-                                                        completion: { completion?(nil) })
+                                                        completion: { [weak self] errors in
+            if let errors = errors {
+                if let oneTimeError = errors.oneTimeError {
+                    os_log("Error during DefaultDataBrokerProtectionScheduler.optOutAllBrokers in dataBrokerProcessor.runAllOptOutOperations(), error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                    self?.pixelHandler.fire(.generalError(error: oneTimeError, functionOccurredIn: "DefaultDataBrokerProtectionScheduler.optOutAllBrokers"))
+                }
+                if let operationErrors = errors.operationErrors,
+                          operationErrors.count != 0 {
+                    os_log("Operation error(s) during DefaultDataBrokerProtectionScheduler.optOutAllBrokers in dataBrokerProcessor.runAllOptOutOperations(), count: %{public}d", log: .dataBrokerProtection, operationErrors.count)
+                }
+            }
+
+            completion?(errors)
+        })
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/CaptchaService.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/CaptchaService.swift
index 2de1af14d7..9fec9302ac 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/CaptchaService.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/CaptchaService.swift
@@ -81,11 +81,14 @@ protocol CaptchaServiceProtocol {
     ///
     /// - Parameters:
     ///   - captchaInfo: A struct that containers a `siteKey`, `url` and `type`
+    ///   - pollingInterval: The time between each poll in seconds. Defaults to 1 second
+    ///   - attemptId: Identifies the scan or the opt-out attempt
     ///   - shouldRunNextStep: A closure that defines if the retry should keep happening
     /// - Returns: `CaptchaTransactionId` an identifier so we can later use to fetch the resolved captcha information
     func submitCaptchaInformation(_ captchaInfo: GetCaptchaInfoResponse,
                                   retries: Int,
                                   pollingInterval: TimeInterval,
+                                  attemptId: UUID,
                                   shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaTransactionId
 
     /// Fetches the resolved captcha information with the passed transaction ID.
@@ -94,21 +97,23 @@ protocol CaptchaServiceProtocol {
     ///   - transactionID: The transaction ID of the previous submitted captcha information
     ///   - retries: The number of retries until we timed out. Defaults to 100
     ///   - pollingInterval: The time between each poll in seconds. Defaults to 40 seconds
+    ///   - attemptId: Identifies the scan or the opt-out attempt
     ///   - shouldRunNextStep: A closure that defines if the retry should keep happening
     /// - Returns: `CaptchaResolveData` a string containing the data to resolve the captcha
     func submitCaptchaToBeResolved(for transactionID: CaptchaTransactionId,
                                    retries: Int,
                                    pollingInterval: TimeInterval,
+                                   attemptId: UUID,
                                    shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaResolveData
 }
 
 extension CaptchaServiceProtocol {
-    func submitCaptchaInformation(_ captchaInfo: GetCaptchaInfoResponse, shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaTransactionId {
-        try await submitCaptchaInformation(captchaInfo, retries: 5, pollingInterval: 1, shouldRunNextStep: shouldRunNextStep)
+    func submitCaptchaInformation(_ captchaInfo: GetCaptchaInfoResponse, attemptId: UUID, shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaTransactionId {
+        try await submitCaptchaInformation(captchaInfo, retries: 5, pollingInterval: 1, attemptId: attemptId, shouldRunNextStep: shouldRunNextStep)
     }
 
-    func submitCaptchaToBeResolved(for transactionID: CaptchaTransactionId, shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaResolveData {
-        try await submitCaptchaToBeResolved(for: transactionID, retries: 100, pollingInterval: 40, shouldRunNextStep: shouldRunNextStep)
+    func submitCaptchaToBeResolved(for transactionID: CaptchaTransactionId, attemptId: UUID, shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaResolveData {
+        try await submitCaptchaToBeResolved(for: transactionID, retries: 100, pollingInterval: 40, attemptId: attemptId, shouldRunNextStep: shouldRunNextStep)
     }
 }
 
@@ -132,8 +137,9 @@ struct CaptchaService: CaptchaServiceProtocol {
     func submitCaptchaInformation(_ captchaInfo: GetCaptchaInfoResponse,
                                   retries: Int = 5,
                                   pollingInterval: TimeInterval = 1,
+                                  attemptId: UUID,
                                   shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaTransactionId {
-        guard let captchaSubmitResult = try? await submitCaptchaInformationRequest(captchaInfo) else {
+        guard let captchaSubmitResult = try? await submitCaptchaInformationRequest(captchaInfo, attemptId: attemptId) else {
             throw CaptchaServiceError.errorWhenSubmittingCaptcha
         }
 
@@ -156,6 +162,7 @@ struct CaptchaService: CaptchaServiceProtocol {
             return try await submitCaptchaInformation(captchaInfo,
                                                       retries: retries - 1,
                                                       pollingInterval: pollingInterval,
+                                                      attemptId: attemptId,
                                                       shouldRunNextStep: shouldRunNextStep)
         case .failureCritical:
             throw CaptchaServiceError.criticalFailureWhenSubmittingCaptcha
@@ -164,9 +171,10 @@ struct CaptchaService: CaptchaServiceProtocol {
         }
     }
 
-    private func submitCaptchaInformationRequest(_ captchaInfo: GetCaptchaInfoResponse) async throws -> CaptchaTransaction {
+    private func submitCaptchaInformationRequest(_ captchaInfo: GetCaptchaInfoResponse, attemptId: UUID) async throws -> CaptchaTransaction {
         var urlComponents = URLComponents(url: settings.selectedEnvironment.endpointURL, resolvingAgainstBaseURL: true)
         urlComponents?.path = "\(Constants.endpointSubPath)/submit"
+        urlComponents?.queryItems = [URLQueryItem(name: "attemptId", value: attemptId.uuidString)]
 
         guard let url = urlComponents?.url else {
             throw CaptchaServiceError.cantGenerateCaptchaServiceURL
@@ -196,8 +204,9 @@ struct CaptchaService: CaptchaServiceProtocol {
     func submitCaptchaToBeResolved(for transactionID: CaptchaTransactionId,
                                    retries: Int = 100,
                                    pollingInterval: TimeInterval = 50,
+                                   attemptId: UUID,
                                    shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaResolveData {
-        guard let captchaResolveResult = try? await submitCaptchaToBeResolvedRequest(transactionID) else {
+        guard let captchaResolveResult = try? await submitCaptchaToBeResolvedRequest(transactionID, attemptId: attemptId) else {
             throw CaptchaServiceError.errorWhenFetchingCaptchaResult
         }
 
@@ -222,6 +231,7 @@ struct CaptchaService: CaptchaServiceProtocol {
             return try await submitCaptchaToBeResolved(for: transactionID,
                                                        retries: retries - 1,
                                                        pollingInterval: pollingInterval,
+                                                       attemptId: attemptId,
                                                        shouldRunNextStep: shouldRunNextStep)
         case .failure:
             os_log("Captcha failure ...", log: .service)
@@ -232,12 +242,14 @@ struct CaptchaService: CaptchaServiceProtocol {
         }
     }
 
-    private func submitCaptchaToBeResolvedRequest(_ transactionID: CaptchaTransactionId) async throws -> CaptchaResult {
+    private func submitCaptchaToBeResolvedRequest(_ transactionID: CaptchaTransactionId, attemptId: UUID) async throws -> CaptchaResult {
 
         var urlComponents = URLComponents(url: settings.selectedEnvironment.endpointURL, resolvingAgainstBaseURL: true)
         urlComponents?.path = "\(Constants.endpointSubPath)/result"
 
-        urlComponents?.queryItems = [URLQueryItem(name: "transactionId", value: transactionID)]
+        urlComponents?.queryItems = [
+            URLQueryItem(name: "transactionId", value: transactionID)
+        ]
 
         guard let url = urlComponents?.url else {
             throw CaptchaServiceError.cantGenerateCaptchaServiceURL
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/EmailService.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/EmailService.swift
index 11465c8d75..390484c9f7 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/EmailService.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/EmailService.swift
@@ -35,10 +35,11 @@ struct EmailData: Decodable {
 }
 
 protocol EmailServiceProtocol {
-    func getEmail(dataBrokerURL: String?) async throws -> EmailData
+    func getEmail(dataBrokerURL: String, attemptId: UUID) async throws -> EmailData
     func getConfirmationLink(from email: String,
                              numberOfRetries: Int,
                              pollingInterval: TimeInterval,
+                             attemptId: UUID,
                              shouldRunNextStep: @escaping () -> Bool) async throws -> URL
 }
 
@@ -59,13 +60,13 @@ struct EmailService: EmailServiceProtocol {
         self.settings = settings
     }
 
-    func getEmail(dataBrokerURL: String? = nil) async throws -> EmailData {
+    func getEmail(dataBrokerURL: String, attemptId: UUID) async throws -> EmailData {
         var urlComponents = URLComponents(url: settings.selectedEnvironment.endpointURL, resolvingAgainstBaseURL: true)
         urlComponents?.path = "\(Constants.endpointSubPath)/generate"
-
-        if let dataBrokerValue = dataBrokerURL {
-            urlComponents?.queryItems = [URLQueryItem(name: "dataBroker", value: dataBrokerValue)]
-        }
+        urlComponents?.queryItems = [
+            URLQueryItem(name: "dataBroker", value: dataBrokerURL),
+            URLQueryItem(name: "attemptId", value: attemptId.uuidString)
+        ]
 
         guard let url = urlComponents?.url else {
             throw EmailError.cantGenerateURL
@@ -87,10 +88,11 @@ struct EmailService: EmailServiceProtocol {
     func getConfirmationLink(from email: String,
                              numberOfRetries: Int = 100,
                              pollingInterval: TimeInterval = 30,
+                             attemptId: UUID,
                              shouldRunNextStep: @escaping () -> Bool) async throws -> URL {
         let pollingTimeInNanoSecondsSeconds = UInt64(pollingInterval * 1000) * NSEC_PER_MSEC
 
-        guard let emailResult = try? await extractEmailLink(email: email) else {
+        guard let emailResult = try? await extractEmailLink(email: email, attemptId: attemptId) else {
             throw EmailError.cantFindEmail
         }
 
@@ -116,16 +118,20 @@ struct EmailService: EmailServiceProtocol {
             return try await getConfirmationLink(from: email,
                                                  numberOfRetries: numberOfRetries - 1,
                                                  pollingInterval: pollingInterval,
+                                                 attemptId: attemptId,
                                                  shouldRunNextStep: shouldRunNextStep)
         case .unknown:
             throw EmailError.unknownStatusReceived(email: email)
         }
     }
 
-    private func extractEmailLink(email: String) async throws -> EmailResponse {
+    private func extractEmailLink(email: String, attemptId: UUID) async throws -> EmailResponse {
         var urlComponents = URLComponents(url: settings.selectedEnvironment.endpointURL, resolvingAgainstBaseURL: true)
         urlComponents?.path = "\(Constants.endpointSubPath)/links"
-        urlComponents?.queryItems = [URLQueryItem(name: "e", value: email)]
+        urlComponents?.queryItems = [
+            URLQueryItem(name: "e", value: email),
+            URLQueryItem(name: "attemptId", value: attemptId.uuidString)
+        ]
 
         guard let url = urlComponents?.url else {
             throw EmailError.cantGenerateURL
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/UIMapper.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/UIMapper.swift
index 454f1c75a9..d57e2d2442 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/UIMapper.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/UIMapper.swift
@@ -138,9 +138,8 @@ struct MapperToUI {
             }
         }.flatMap { $0 }
 
-        let nearestScanByBrokerURL = nearestRunDates(for: brokerProfileQueryData)
-        let lastScans = getLastScanInformation(brokerProfileQueryData: brokerProfileQueryData, nearestScanOperationByBroker: nearestScanByBrokerURL)
-        let nextScans = getNextScansInformation(brokerProfileQueryData: brokerProfileQueryData, nearestScanOperationByBroker: nearestScanByBrokerURL)
+        let lastScans = getLastScansInformation(brokerProfileQueryData: brokerProfileQueryData)
+        let nextScans = getNextScansInformation(brokerProfileQueryData: brokerProfileQueryData)
 
         return DBPUIScanAndOptOutMaintenanceState(
             inProgressOptOuts: inProgressOptOuts,
@@ -150,78 +149,69 @@ struct MapperToUI {
         )
     }
 
-    private func getLastScanInformation(brokerProfileQueryData: [BrokerProfileQueryData],
-                                        currentDate: Date = Date(),
-                                        format: String = "dd/MM/yyyy",
-                                        nearestScanOperationByBroker: [String: Date]) -> DBUIScanDate {
-        let scansGroupedByLastRunDate = Dictionary(grouping: brokerProfileQueryData, by: { $0.scanOperationData.lastRunDate?.toFormat(format) })
-        let closestScansBeforeToday = scansGroupedByLastRunDate
-            .filter { $0.key != nil && $0.key!.toDate(using: format) < currentDate }
-            .sorted { $0.key! < $1.key! }
-            .flatMap { [$0.key?.toDate(using: format): $0.value] }
-            .last
-
-        return scanDate(element: closestScansBeforeToday, nearestScanOperationByBroker: nearestScanOperationByBroker)
-    }
-
-    private func getNextScansInformation(brokerProfileQueryData: [BrokerProfileQueryData],
+    private func getLastScansInformation(brokerProfileQueryData: [BrokerProfileQueryData],
                                          currentDate: Date = Date(),
-                                         format: String = "dd/MM/yyyy",
-                                         nearestScanOperationByBroker: [String: Date]) -> DBUIScanDate {
-        let scansGroupedByPreferredRunDate = Dictionary(grouping: brokerProfileQueryData, by: { $0.scanOperationData.preferredRunDate?.toFormat(format) })
-        let closestScansAfterToday = scansGroupedByPreferredRunDate
-            .filter { $0.key != nil && $0.key!.toDate(using: format) > currentDate }
-            .sorted { $0.key! < $1.key! }
-            .flatMap { [$0.key?.toDate(using: format): $0.value] }
-            .first
-
-        return scanDate(element: closestScansAfterToday, nearestScanOperationByBroker: nearestScanOperationByBroker)
-    }
+                                         format: String = "dd/MM/yyyy") -> DBPUIScanDate {
+        let eightDaysBeforeToday = currentDate.addingTimeInterval(-8 * 24 * 60 * 60)
+        let scansInTheLastEightDays = brokerProfileQueryData
+            .filter { $0.scanOperationData.lastRunDate != nil && $0.scanOperationData.lastRunDate! <= currentDate && $0.scanOperationData.lastRunDate! > eightDaysBeforeToday }
+            .sorted { $0.scanOperationData.lastRunDate! < $1.scanOperationData.lastRunDate! }
+            .reduce(into: [BrokerProfileQueryData]()) { result, element in
+                if !result.contains(where: { $0.dataBroker.url == element.dataBroker.url }) {
+                    result.append(element)
+                }
+            }
+            .flatMap {
+                var brokers = [DBPUIDataBroker]()
+                brokers.append(DBPUIDataBroker(name: $0.dataBroker.name, url: $0.dataBroker.url, date: $0.scanOperationData.lastRunDate!.timeIntervalSince1970))
 
-    // A dictionary containing the closest scan by broker
-    private func nearestRunDates(for brokerData: [BrokerProfileQueryData]) -> [String: Date] {
-        let today = Date()
-        let nearestDates = brokerData.reduce(into: [String: Date]()) { result, data in
-            let url = data.dataBroker.url
-            if let operationDate = data.scanOperationData.preferredRunDate {
-                if operationDate > today {
-                    if let existingDate = result[url] {
-                        if operationDate < existingDate {
-                            result[url] = operationDate
-                        }
-                    } else {
-                        result[url] = operationDate
-                    }
+                for mirrorSite in $0.dataBroker.mirrorSites where mirrorSite.addedAt < $0.scanOperationData.lastRunDate! {
+                    brokers.append(DBPUIDataBroker(name: mirrorSite.name, url: mirrorSite.url, date: $0.scanOperationData.lastRunDate!.timeIntervalSince1970))
                 }
+
+                return brokers
             }
+
+        if scansInTheLastEightDays.isEmpty {
+            return DBPUIScanDate(date: currentDate.timeIntervalSince1970, dataBrokers: [DBPUIDataBroker]())
+        } else {
+            return DBPUIScanDate(date: scansInTheLastEightDays.first!.date!, dataBrokers: scansInTheLastEightDays)
         }
-        return nearestDates
     }
 
-    private func scanDate(element: Dictionary<Date?, [BrokerProfileQueryData]>.Element?,
-                          nearestScanOperationByBroker: [String: Date]) -> DBUIScanDate {
-        if let element = element, let date = element.key {
-            return DBUIScanDate(
-                date: date.timeIntervalSince1970,
-                dataBrokers: element.value.flatMap {
-                    let brokerOperationDate = nearestScanOperationByBroker[$0.dataBroker.url]
-
-                    var brokers = [DBPUIDataBroker(name: $0.dataBroker.name, url: $0.dataBroker.url, date: brokerOperationDate?.timeIntervalSince1970 ?? nil)]
-                    for mirrorSite in $0.dataBroker.mirrorSites where mirrorSite.shouldWeIncludeMirrorSite(for: date) {
-                        brokers.append(DBPUIDataBroker(name: mirrorSite.name, url: mirrorSite.url, date: brokerOperationDate?.timeIntervalSince1970 ?? nil))
-                    }
-
-                    return brokers
+    private func getNextScansInformation(brokerProfileQueryData: [BrokerProfileQueryData],
+                                         currentDate: Date = Date(),
+                                         format: String = "dd/MM/yyyy") -> DBPUIScanDate {
+        let eightDaysAfterToday = currentDate.addingTimeInterval(8 * 24 * 60 * 60)
+        let scansHappeningInTheNextEightDays = brokerProfileQueryData
+            .filter { $0.scanOperationData.preferredRunDate != nil && $0.scanOperationData.preferredRunDate! > currentDate && $0.scanOperationData.preferredRunDate! < eightDaysAfterToday }
+            .sorted { $0.scanOperationData.preferredRunDate! < $1.scanOperationData.preferredRunDate! }
+            .reduce(into: [BrokerProfileQueryData]()) { result, element in
+                if !result.contains(where: { $0.dataBroker.url == element.dataBroker.url }) {
+                    result.append(element)
                 }
-                    .reduce(into: []) { result, dataBroker in // Remove dupes
-                        guard !result.contains(where: { $0.url == dataBroker.url }) else {
-                            return
+            }
+            .flatMap {
+                var brokers = [DBPUIDataBroker]()
+                brokers.append(DBPUIDataBroker(name: $0.dataBroker.name, url: $0.dataBroker.url, date: $0.scanOperationData.preferredRunDate!.timeIntervalSince1970))
+
+                for mirrorSite in $0.dataBroker.mirrorSites {
+                    if let removedDate = mirrorSite.removedAt {
+                        if removedDate > $0.scanOperationData.preferredRunDate! {
+                            brokers.append(DBPUIDataBroker(name: mirrorSite.name, url: mirrorSite.url, date: $0.scanOperationData.preferredRunDate!.timeIntervalSince1970))
                         }
-                        result.append(dataBroker)
+                    } else {
+                        brokers.append(DBPUIDataBroker(name: mirrorSite.name, url: mirrorSite.url, date: $0.scanOperationData.preferredRunDate!.timeIntervalSince1970))
                     }
-            )
+                }
+
+                return brokers
+            }
+
+        if scansHappeningInTheNextEightDays.isEmpty {
+            return DBPUIScanDate(date: currentDate.timeIntervalSince1970, dataBrokers: [DBPUIDataBroker]())
         } else {
-            return DBUIScanDate(date: 0, dataBrokers: [DBPUIDataBroker]())
+            return DBPUIScanDate(date: scansHappeningInTheNextEightDays.first!.date!, dataBrokers: scansHappeningInTheNextEightDays)
         }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Utils/DataBrokerProtectionBundleExtension.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Utils/DataBrokerProtectionBundleExtension.swift
index d59312fb11..d6f4b9a011 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Utils/DataBrokerProtectionBundleExtension.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Utils/DataBrokerProtectionBundleExtension.swift
@@ -19,19 +19,15 @@
 import Foundation
 
 extension UserDefaults {
-    static let dbp = UserDefaults(suiteName: Bundle.main.appGroup(bundle: .dbp))!
+    static let dbp = UserDefaults(suiteName: Bundle.main.dbpAppGroup)!
 }
 
 extension Bundle {
-    func appGroup(bundle: BundleGroup) -> String {
 
-        guard let appGroup = object(forInfoDictionaryKey: "DBP_APP_GROUP") as? String else {
+    var dbpAppGroup: String {
+        guard let appGroup = object(forInfoDictionaryKey: Bundle.dbpAppGroupName) as? String else {
             fatalError("Info.plist is missing \(appGroupName)")
         }
         return appGroup
     }
 }
-
-enum BundleGroup {
-    case dbp
-}
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/CaptchaServiceTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/CaptchaServiceTests.swift
index 5983be8398..48cb7d84be 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/CaptchaServiceTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/CaptchaServiceTests.swift
@@ -42,7 +42,7 @@ final class CaptchaServiceTests: XCTestCase {
         let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, shouldRunNextStep: { true })
+            _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, attemptId: UUID(), shouldRunNextStep: { true })
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? CaptchaServiceError, case .errorWhenSubmittingCaptcha = error {
@@ -59,7 +59,7 @@ final class CaptchaServiceTests: XCTestCase {
         let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, shouldRunNextStep: { true })
+            _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, attemptId: UUID(), shouldRunNextStep: { true })
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? CaptchaServiceError, case .criticalFailureWhenSubmittingCaptcha = error {
@@ -76,7 +76,7 @@ final class CaptchaServiceTests: XCTestCase {
         let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, shouldRunNextStep: { true })
+            _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, attemptId: UUID(), shouldRunNextStep: { true })
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? CaptchaServiceError, case .invalidRequestWhenSubmittingCaptcha = error {
@@ -97,7 +97,7 @@ final class CaptchaServiceTests: XCTestCase {
         let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, retries: 2, pollingInterval: 0.01, shouldRunNextStep: { true })
+            _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, retries: 2, pollingInterval: 0.01, attemptId: UUID(), shouldRunNextStep: { true })
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? CaptchaServiceError, case .timedOutWhenSubmittingCaptcha = error {
@@ -116,7 +116,7 @@ final class CaptchaServiceTests: XCTestCase {
         let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.submitCaptchaToBeResolved(for: "123456", shouldRunNextStep: { true })
+            _ = try await sut.submitCaptchaToBeResolved(for: "123456", attemptId: UUID(), shouldRunNextStep: { true })
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? CaptchaServiceError, case .failureWhenFetchingCaptchaResult = error {
@@ -135,7 +135,7 @@ final class CaptchaServiceTests: XCTestCase {
         let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.submitCaptchaToBeResolved(for: "123456", shouldRunNextStep: { true })
+            _ = try await sut.submitCaptchaToBeResolved(for: "123456", attemptId: UUID(), shouldRunNextStep: { true })
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? CaptchaServiceError, case .invalidRequestWhenFetchingCaptchaResult = error {
@@ -154,7 +154,7 @@ final class CaptchaServiceTests: XCTestCase {
         let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.submitCaptchaToBeResolved(for: "123456", shouldRunNextStep: { true })
+            _ = try await sut.submitCaptchaToBeResolved(for: "123456", attemptId: UUID(), shouldRunNextStep: { true })
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? CaptchaServiceError, case .nilDataWhenFetchingCaptchaResult = error {
@@ -175,7 +175,7 @@ final class CaptchaServiceTests: XCTestCase {
         let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.submitCaptchaToBeResolved(for: "123456", retries: 2, pollingInterval: 0.01, shouldRunNextStep: { true })
+            _ = try await sut.submitCaptchaToBeResolved(for: "123456", retries: 2, pollingInterval: 0.01, attemptId: UUID(), shouldRunNextStep: { true })
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? CaptchaServiceError, case .timedOutWhenFetchingCaptchaResult = error {
@@ -194,7 +194,7 @@ final class CaptchaServiceTests: XCTestCase {
         let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            let data = try await sut.submitCaptchaToBeResolved(for: "123456", retries: 2, pollingInterval: 1, shouldRunNextStep: { true })
+            let data = try await sut.submitCaptchaToBeResolved(for: "123456", retries: 2, pollingInterval: 1, attemptId: UUID(), shouldRunNextStep: { true })
             XCTAssertEqual(data, "some data")
         } catch {
             XCTFail("Unexpected error thrown: \(error).")
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift
index c751a35976..fdfc8469bf 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift
@@ -46,11 +46,12 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
 
         do {
-            _ = try await sut.run(inputValue: extractedProfile, webViewHandler: webViewHandler, stageCalculator: stageCalulator)
+            _ = try await sut.run(inputValue: extractedProfile, webViewHandler: webViewHandler)
             XCTAssertEqual(webViewHandler.wasLoadCalledWithURL?.absoluteString, "https://www.duckduckgo.com")
             XCTAssertTrue(webViewHandler.wasFinishCalled)
         } catch {
@@ -69,11 +70,12 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
 
         do {
-            _ = try await sut.run(inputValue: noEmailExtractedProfile, webViewHandler: webViewHandler, stageCalculator: stageCalulator)
+            _ = try await sut.run(inputValue: noEmailExtractedProfile, webViewHandler: webViewHandler)
             XCTFail("Expected an error to be thrown")
         } catch {
             XCTAssertNil(webViewHandler.wasLoadCalledWithURL?.absoluteString)
@@ -99,11 +101,12 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
 
         do {
-            _ = try await sut.run(inputValue: extractedProfile, webViewHandler: webViewHandler, stageCalculator: stageCalulator)
+            _ = try await sut.run(inputValue: extractedProfile, webViewHandler: webViewHandler)
             XCTFail("Expected an error to be thrown")
         } catch {
             XCTAssertNil(webViewHandler.wasLoadCalledWithURL?.absoluteString)
@@ -127,6 +130,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -148,12 +152,13 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         emailService.shouldThrow = true
 
         do {
-            _ = try await sut.run(inputValue: ExtractedProfile(), webViewHandler: webViewHandler, stageCalculator: stageCalulator)
+            _ = try await sut.run(inputValue: ExtractedProfile(), webViewHandler: webViewHandler)
             XCTFail("Expected an error to be thrown")
         } catch {
             XCTAssertTrue(webViewHandler.wasFinishCalled)
@@ -174,13 +179,15 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            clickAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
 
         await sut.success(actionId: "1", actionType: .click)
 
-        XCTAssertTrue(webViewHandler.wasWaitForWebViewLoadCalled)
+        XCTAssertFalse(webViewHandler.wasWaitForWebViewLoadCalled)
         XCTAssertTrue(webViewHandler.wasFinishCalled)
     }
 
@@ -192,6 +199,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -212,6 +220,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -233,6 +242,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         let actionsHandler = ActionsHandler(step: step)
@@ -240,7 +250,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
         captchaService.shouldThrow = true
 
         do {
-            _ = try await sut.run(inputValue: ExtractedProfile(), webViewHandler: webViewHandler, actionsHandler: actionsHandler, stageCalculator: stageCalulator)
+            _ = try await sut.run(inputValue: ExtractedProfile(), webViewHandler: webViewHandler, actionsHandler: actionsHandler)
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? DataBrokerProtectionError, case .captchaServiceError(.nilDataWhenFetchingCaptchaResult) = error {
@@ -261,6 +271,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -282,6 +293,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         sut.retriesCountOnError = 0
@@ -304,6 +316,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -321,6 +334,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             emailService: emailService,
             captchaService: captchaService,
             operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -329,4 +343,122 @@ final class DataBrokerOperationActionTests: XCTestCase {
 
         XCTAssertEqual(webViewHandler.wasLoadCalledWithURL?.absoluteString, "https://www.duckduckgo.com")
     }
+
+    func testWhenGetCaptchaActionRuns_thenStageIsSetToCaptchaParse() async {
+        let mockStageCalculator = MockStageDurationCalculator()
+        let captchaAction = GetCaptchaInfoAction(id: "1", actionType: .getCaptchaInfo, selector: "captcha", dataSource: nil)
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(),
+            emailService: emailService,
+            captchaService: captchaService,
+            operationAwaitTime: 0,
+            stageCalculator: mockStageCalculator,
+            shouldRunNextStep: { true }
+        )
+
+        await sut.runNextAction(captchaAction)
+
+        XCTAssertEqual(mockStageCalculator.stage, .captchaParse)
+    }
+
+    func testWhenClickActionRuns_thenStageIsSetToSubmit() async {
+        let mockStageCalculator = MockStageDurationCalculator()
+        let clickAction = ClickAction(id: "1", actionType: .click, elements: [PageElement](), dataSource: nil)
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(),
+            emailService: emailService,
+            captchaService: captchaService,
+            operationAwaitTime: 0,
+            stageCalculator: mockStageCalculator,
+            shouldRunNextStep: { true }
+        )
+
+        await sut.runNextAction(clickAction)
+
+        XCTAssertEqual(mockStageCalculator.stage, .fillForm)
+    }
+
+    func testWhenExpectationActionRuns_thenStageIsSetToSubmit() async {
+        let mockStageCalculator = MockStageDurationCalculator()
+        let expectationAction = ExpectationAction(id: "1", actionType: .expectation, expectations: [Item](), dataSource: nil)
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(),
+            emailService: emailService,
+            captchaService: captchaService,
+            operationAwaitTime: 0,
+            stageCalculator: mockStageCalculator,
+            shouldRunNextStep: { true }
+        )
+
+        await sut.runNextAction(expectationAction)
+
+        XCTAssertEqual(mockStageCalculator.stage, .submit)
+    }
+
+    func testWhenFillFormActionRuns_thenStageIsSetToFillForm() async {
+        let mockStageCalculator = MockStageDurationCalculator()
+        let fillFormAction = FillFormAction(id: "1", actionType: .fillForm, selector: "", elements: [PageElement](), dataSource: nil)
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(),
+            emailService: emailService,
+            captchaService: captchaService,
+            operationAwaitTime: 0,
+            stageCalculator: mockStageCalculator,
+            shouldRunNextStep: { true }
+        )
+
+        await sut.runNextAction(fillFormAction)
+
+        XCTAssertEqual(mockStageCalculator.stage, .fillForm)
+    }
+
+    func testWhenLoadUrlOnSpokeo_thenSetCookiesIsCalled() async {
+        let mockCookieHandler = MockCookieHandler()
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(url: "spokeo.com"),
+            emailService: emailService,
+            captchaService: captchaService,
+            cookieHandler: mockCookieHandler,
+            operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
+            shouldRunNextStep: { true }
+        )
+
+        mockCookieHandler.cookiesToReturn = [.init()]
+        sut.webViewHandler = webViewHandler
+        await sut.loadURL(url: URL(string: "www.test.com")!)
+
+        XCTAssertTrue(webViewHandler.wasSetCookiesCalled)
+    }
+
+    func testWhenLoadUrlOnOtherBroker_thenSetCookiesIsNotCalled() async {
+        let mockCookieHandler = MockCookieHandler()
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(url: "verecor.com"),
+            emailService: emailService,
+            captchaService: captchaService,
+            cookieHandler: mockCookieHandler,
+            operationAwaitTime: 0,
+            stageCalculator: stageCalulator,
+            shouldRunNextStep: { true }
+        )
+
+        mockCookieHandler.cookiesToReturn = [.init()]
+        sut.webViewHandler = webViewHandler
+        await sut.loadURL(url: URL(string: "www.test.com")!)
+
+        XCTAssertFalse(webViewHandler.wasSetCookiesCalled)
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
index a61ef2a968..70619e8736 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
@@ -774,7 +774,7 @@ final class DataBrokerProfileQueryOperationManagerTests: XCTestCase {
         } catch {
             if let lastPixelFired = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last {
                 switch lastPixelFired {
-                case .optOutFailure(_, _, _, _, let tries, _):
+                case .optOutFailure(_, _, _, _, let tries, _, _):
                     XCTAssertEqual(tries, 3)
                 default: XCTFail("We should be firing the opt-out submit-success pixel last")
                 }
@@ -974,6 +974,10 @@ extension ScanOperationData {
             historyEvents: [HistoryEvent]()
         )
     }
+
+    static func mockWith(historyEvents: [HistoryEvent]) -> ScanOperationData {
+        ScanOperationData(brokerId: 1, profileQueryId: 1, historyEvents: historyEvents)
+    }
 }
 
 extension OptOutOperationData {
@@ -1035,6 +1039,19 @@ extension DataBroker {
             )
         )
     }
+
+    static func mockWithURL(_ url: String) -> DataBroker {
+        .init(name: "Test",
+              url: url,
+              steps: [Step](),
+              version: "1.0",
+              schedulingConfig: DataBrokerScheduleConfig(
+                retryError: 0,
+                confirmOptOutScan: 0,
+                maintenanceScan: 0
+            )
+        )
+    }
 }
 
 extension ProfileQuery {
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionEventPixelsTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionEventPixelsTests.swift
new file mode 100644
index 0000000000..998450fe12
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionEventPixelsTests.swift
@@ -0,0 +1,396 @@
+//
+//  DataBrokerProtectionEventPixelsTests.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+import Foundation
+@testable import DataBrokerProtection
+
+final class DataBrokerProtectionEventPixelsTests: XCTestCase {
+
+    let database = MockDatabase()
+    let repository = MockDataBrokerProtectionEventPixelsRepository()
+    let handler = MockDataBrokerProtectionPixelsHandler()
+    let calendar = Calendar.current
+
+    override func tearDown() {
+        handler.clear()
+        repository.clear()
+    }
+
+    func testWhenFireNewMatchEventPixelIsCalled_thenCorrectPixelIsFired() {
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.fireNewMatchEventPixel()
+
+        XCTAssertEqual(
+            MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last!.name,
+            DataBrokerProtectionPixels.scanningEventNewMatch.name
+        )
+    }
+
+    func testWhenFireReAppereanceEventPixelIsCalled_thenCorrectPixelIsFired() {
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.fireReAppereanceEventPixel()
+
+        XCTAssertEqual(
+            MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last!.name,
+            DataBrokerProtectionPixels.scanningEventReAppearance.name
+        )
+    }
+
+    func testWhenReportWasFiredInTheLastWeek_thenWeDoNotFireWeeklyPixels() {
+        repository.customGetLatestWeeklyPixel = Date().yesterday
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.tryToFireWeeklyPixels()
+
+        XCTAssertFalse(repository.wasMarkWeeklyPixelSentCalled)
+    }
+
+    func testWhenReportWasNotFiredInTheLastWeek_thenWeFireWeeklyPixels() {
+        guard let eightDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        repository.customGetLatestWeeklyPixel = eightDaysSinceToday
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.tryToFireWeeklyPixels()
+
+        XCTAssertTrue(repository.wasMarkWeeklyPixelSentCalled)
+    }
+
+    func testWhenLastWeeklyPixelIsNil_thenWeFireWeeklyPixels() {
+        repository.customGetLatestWeeklyPixel = nil
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.tryToFireWeeklyPixels()
+
+        XCTAssertTrue(repository.wasMarkWeeklyPixelSentCalled)
+    }
+
+    func testWhenReAppereanceOcurredInTheLastWeek_thenReAppereanceFlagIsTrue() {
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let reAppereanceThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .reAppearence, date: sixDaysSinceToday)
+        let dataBrokerProfileQueryWithReAppereance: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [reAppereanceThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithReAppereance
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let hadReAppereance = weeklyReportScanningPixel.params!["had_re-appearance"]!
+
+        XCTAssertEqual(hadReAppereance, "1")
+    }
+
+    func testWhenReAppereanceDidNotOcurrInTheLastWeek_thenReAppereanceFlagIsFalse() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let reAppereanceThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .reAppearence, date: eighDaysSinceToday)
+        let dataBrokerProfileQueryWithReAppereance: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [reAppereanceThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithReAppereance
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let hadReAppereance = weeklyReportScanningPixel.params!["had_re-appearance"]!
+
+        XCTAssertEqual(hadReAppereance, "0")
+    }
+
+    func testWhenNoMatchesHappendInTheLastWeek_thenHadNewMatchFlagIsFalse() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let newMatchesPriorToThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .matchesFound(count: 2), date: eighDaysSinceToday)
+        let dataBrokerProfileQueryWithMatches: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [newMatchesPriorToThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithMatches
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let hadNewMatch = weeklyReportScanningPixel.params!["had_new_match"]!
+
+        XCTAssertEqual(hadNewMatch, "0")
+    }
+
+    func testWhenMatchesHappendInTheLastWeek_thenHadNewMatchFlagIsTrue() {
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let newMatchesThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .matchesFound(count: 2), date: sixDaysSinceToday)
+        let dataBrokerProfileQueryWithMatches: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [newMatchesThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithMatches
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let hadNewMatch = weeklyReportScanningPixel.params!["had_new_match"]!
+
+        XCTAssertEqual(hadNewMatch, "1")
+    }
+
+    func testWhenNoRemovalsHappendInTheLastWeek_thenRemovalsCountIsZero() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let removalsPriorToThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .optOutConfirmed, date: eighDaysSinceToday)
+        let dataBrokerProfileQueryWithRemovals: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [removalsPriorToThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithRemovals
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last!
+        let removals = weeklyReportScanningPixel.params!["removals"]!
+
+        XCTAssertEqual("0", removals)
+    }
+
+    func testWhenRemovalsHappendInTheLastWeek_thenRemovalsCountIsCorrect() {
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let removalThisWeekEventOne = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .optOutConfirmed, date: sixDaysSinceToday)
+        let removalThisWeekEventTwo = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .optOutConfirmed, date: sixDaysSinceToday)
+        let dataBrokerProfileQueryWithRemovals: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [removalThisWeekEventOne, removalThisWeekEventTwo]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithRemovals
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last!
+        let removals = weeklyReportScanningPixel.params!["removals"]!
+
+        XCTAssertEqual("2", removals)
+    }
+
+    func testWhenNoHistoryEventsHappenedInTheLastWeek_thenBrokersScannedIsZero25Range() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let eventOne = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .optOutStarted, date: eighDaysSinceToday)
+        let eventTwo = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .error(error: .cancelled), date: eighDaysSinceToday)
+        let eventThree = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: eighDaysSinceToday)
+        let eventFour = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .noMatchFound, date: eighDaysSinceToday)
+        let dataBrokerProfileQueries: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventOne, eventTwo, eventThree, eventFour]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueries
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let scanCoverage = weeklyReportScanningPixel.params!["scan_coverage"]!
+
+        XCTAssertEqual("0-25", scanCoverage)
+    }
+
+    func testWhenHistoryEventsHappenedInTheLastWeek_thenBrokersScannedIs2550Range() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let eventOne = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: eighDaysSinceToday)
+        let eventTwo = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: sixDaysSinceToday)
+        let dataBrokerProfileQueries: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mockWithURL("www.brokerone.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventOne])),
+            .init(dataBroker: .mockWithURL("www.brokertwo.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventOne])),
+            .init(dataBroker: .mockWithURL("www.brokerthree.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventOne])),
+            .init(dataBroker: .mockWithURL("www.brokerfour.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventTwo]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueries
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let scanCoverage = weeklyReportScanningPixel.params!["scan_coverage"]!
+
+        XCTAssertEqual("25-50", scanCoverage)
+    }
+
+    func testWhenHistoryEventsHappenedInTheLastWeek_thenBrokersScannedIs5075Range() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let eventOne = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: eighDaysSinceToday)
+        let eventTwo = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: sixDaysSinceToday)
+        let dataBrokerProfileQueries: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mockWithURL("www.brokerone.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventOne])),
+            .init(dataBroker: .mockWithURL("www.brokertwo.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventOne])),
+            .init(dataBroker: .mockWithURL("www.brokerthree.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventTwo])),
+            .init(dataBroker: .mockWithURL("www.brokerfour.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventTwo]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueries
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let scanCoverage = weeklyReportScanningPixel.params!["scan_coverage"]!
+
+        XCTAssertEqual("50-75", scanCoverage)
+    }
+
+    func testWhenHistoryEventsHappenedInTheLastWeek_thenBrokersScannedIs75100Range() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let eventOne = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: eighDaysSinceToday)
+        let eventTwo = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: sixDaysSinceToday)
+        let dataBrokerProfileQueries: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mockWithURL("www.brokerone.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventTwo])),
+            .init(dataBroker: .mockWithURL("www.brokertwo.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventTwo])),
+            .init(dataBroker: .mockWithURL("www.brokerthree.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventTwo])),
+            .init(dataBroker: .mockWithURL("www.brokerfour.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventTwo]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueries
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let scanCoverage = weeklyReportScanningPixel.params!["scan_coverage"]!
+
+        XCTAssertEqual("75-100", scanCoverage)
+    }
+}
+
+final class MockDataBrokerProtectionEventPixelsRepository: DataBrokerProtectionEventPixelsRepository {
+
+    var wasMarkWeeklyPixelSentCalled = false
+    var customGetLatestWeeklyPixel: Date?
+
+    func markWeeklyPixelSent() {
+        wasMarkWeeklyPixelSentCalled = true
+    }
+
+    func getLatestWeeklyPixel() -> Date? {
+        return customGetLatestWeeklyPixel
+    }
+
+    func clear() {
+        wasMarkWeeklyPixelSentCalled = false
+        customGetLatestWeeklyPixel = nil
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionFeatureTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionFeatureTests.swift
index 4fe2f44458..280b30050d 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionFeatureTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionFeatureTests.swift
@@ -118,7 +118,7 @@ final class MockCSSCommunicationDelegate: CCFCommunicationDelegate {
         self.url = url
     }
 
-    func extractedProfiles(profiles: [ExtractedProfile]) {
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async {
         self.profiles = profiles
     }
 
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
index 85a9e62aa3..0668f38d35 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
@@ -162,7 +162,8 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
                                                                 database: SecureStorageDatabaseProviderMock(),
                                                                 keystore: EmptySecureStorageKeyStoreProviderMock()))
 
-        let database = DataBrokerProtectionDatabase(vault: vault)
+        let database = DataBrokerProtectionDatabase(pixelHandler: MockDataBrokerProtectionPixelsHandler(),
+                                                    vault: vault)
 
         let profile = DataBrokerProtectionProfile(
             names: [
@@ -188,7 +189,8 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
                                                                 database: SecureStorageDatabaseProviderMock(),
                                                                 keystore: EmptySecureStorageKeyStoreProviderMock()))
 
-        let database = DataBrokerProtectionDatabase(vault: vault)
+        let database = DataBrokerProtectionDatabase(pixelHandler: MockDataBrokerProtectionPixelsHandler(),
+                                                    vault: vault)
 
         vault.brokers = [DataBroker.mock]
         vault.profileQueries = [ProfileQuery.mock]
@@ -231,7 +233,8 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
                                                                 database: SecureStorageDatabaseProviderMock(),
                                                                 keystore: EmptySecureStorageKeyStoreProviderMock()))
 
-        let database = DataBrokerProtectionDatabase(vault: vault)
+        let database = DataBrokerProtectionDatabase(pixelHandler: MockDataBrokerProtectionPixelsHandler(),
+                                                    vault: vault)
 
         vault.brokers = [DataBroker.mock]
         vault.profileQueries = [ProfileQuery.mock]
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift
new file mode 100644
index 0000000000..8b899e12a1
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift
@@ -0,0 +1,141 @@
+//
+//  DataBrokerProtectionStageDurationCalculatorTests.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import BrowserServicesKit
+import Foundation
+import XCTest
+
+@testable import DataBrokerProtection
+
+final class DataBrokerProtectionStageDurationCalculatorTests: XCTestCase {
+    let handler = MockDataBrokerProtectionPixelsHandler()
+
+    override func tearDown() {
+        handler.clear()
+    }
+
+    func testWhenErrorIs404_thenWeFireScanFailedPixel() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+
+        sut.fireScanError(error: DataBrokerProtectionError.httpError(code: 404))
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanFailed(let broker, _, _):
+                XCTAssertEqual(broker, "broker")
+            default: XCTFail("The scan failed pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIs403_thenWeFireScanErrorPixelWithClientErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+
+        sut.fireScanError(error: DataBrokerProtectionError.httpError(code: 403))
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.clientError(httpCode: 403).toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIs500_thenWeFireScanErrorPixelWithServerErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+
+        sut.fireScanError(error: DataBrokerProtectionError.httpError(code: 500))
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.serverError(httpCode: 500).toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIsNotHttp_thenWeFireScanErrorPixelWithValidationErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+
+        sut.fireScanError(error: DataBrokerProtectionError.actionFailed(actionID: "Action-ID", message: "Some message"))
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.validationError.toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIsNotDBPErrorButItIsNSURL_thenWeFireScanErrorPixelWithNetworkErrorErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+        let nsURLError = NSError(domain: NSURLErrorDomain, code: NSURLErrorTimedOut)
+
+        sut.fireScanError(error: nsURLError)
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.networkError.toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIsNotDBPErrorAndNotURL_thenWeFireScanErrorPixelWithUnclassifiedErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+        let error = NSError(domain: NSCocoaErrorDomain, code: -1)
+
+        sut.fireScanError(error: error)
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.unclassified.toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/EmailServiceTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/EmailServiceTests.swift
index 0002c2aa3e..fb9fd38a29 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/EmailServiceTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/EmailServiceTests.swift
@@ -41,7 +41,7 @@ final class EmailServiceTests: XCTestCase {
         let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.getEmail(dataBrokerURL: "fakeBroker")
+            _ = try await sut.getEmail(dataBrokerURL: "fakeBroker", attemptId: UUID())
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? EmailError,
@@ -62,7 +62,7 @@ final class EmailServiceTests: XCTestCase {
         let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            _ = try await sut.getEmail(dataBrokerURL: "fakeBroker")
+            _ = try await sut.getEmail(dataBrokerURL: "fakeBroker", attemptId: UUID())
             XCTFail("Expected an error to be thrown")
         } catch {
             if let error = error as? EmailError, case .cantFindEmail = error {
@@ -81,7 +81,7 @@ final class EmailServiceTests: XCTestCase {
         let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
 
         do {
-            let emailData = try await sut.getEmail(dataBrokerURL: "fakeBroker")
+            let emailData = try await sut.getEmail(dataBrokerURL: "fakeBroker", attemptId: UUID())
             XCTAssertEqual("test@ddg.com", emailData.emailAddress)
         } catch {
             XCTFail("Unexpected. It should not throw")
@@ -101,6 +101,7 @@ final class EmailServiceTests: XCTestCase {
                 from: "some@email.com",
                 numberOfRetries: 20,
                 pollingInterval: 0.01,
+                attemptId: UUID(),
                 shouldRunNextStep: { true }
             )
         } catch {
@@ -127,6 +128,7 @@ final class EmailServiceTests: XCTestCase {
                 from: "some@email.com",
                 numberOfRetries: 2,
                 pollingInterval: 0.01,
+                attemptId: UUID(),
                 shouldRunNextStep: { true }
             )
         } catch {
@@ -156,6 +158,7 @@ final class EmailServiceTests: XCTestCase {
                 from: "some@email.com",
                 numberOfRetries: 2,
                 pollingInterval: 0.01,
+                attemptId: UUID(),
                 shouldRunNextStep: { true }
             )
             XCTAssertEqual(url.absoluteString, "www.duckduckgo.com")
@@ -176,6 +179,7 @@ final class EmailServiceTests: XCTestCase {
                 from: "some@email.com",
                 numberOfRetries: 20,
                 pollingInterval: 0.01,
+                attemptId: UUID(),
                 shouldRunNextStep: { true }
             )
         } catch {
@@ -199,6 +203,7 @@ final class EmailServiceTests: XCTestCase {
                 from: "some@email.com",
                 numberOfRetries: 1,
                 pollingInterval: 0.01,
+                attemptId: UUID(),
                 shouldRunNextStep: { true }
             )
         } catch {
@@ -222,6 +227,7 @@ final class EmailServiceTests: XCTestCase {
                 from: "some@email.com",
                 numberOfRetries: 1,
                 pollingInterval: 0.01,
+                attemptId: UUID(),
                 shouldRunNextStep: { true }
             )
             XCTAssertEqual(url.absoluteString, "www.duckduckgo.com")
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MapperToUITests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MapperToUITests.swift
index c59ee80486..6629f5c0be 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MapperToUITests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MapperToUITests.swift
@@ -139,10 +139,15 @@ final class MapperToUITests: XCTestCase {
     }
 
     func testLastScans_areMappedCorrectly() {
+        var dateComponent = DateComponents()
+        dateComponent.day = -10
+        let date10daysAgo = Calendar.current.date(byAdding: dateComponent, to: Date())!
+
         let brokerProfileQueryData: [BrokerProfileQueryData] = [
             .mock(dataBrokerName: "Broker #1", url: "broker1.com", lastRunDate: Date().yesterday),
             .mock(dataBrokerName: "Broker #2", url: "broker2.com", lastRunDate: Date().yesterday),
-            .mock(dataBrokerName: "Broker #3", url: "broker3.com")
+            .mock(dataBrokerName: "Broker #3", url: "broker3.com", lastRunDate: date10daysAgo),
+            .mock(dataBrokerName: "Broker #4", url: "broker4.com")
         ]
 
         let result = sut.maintenanceScanState(brokerProfileQueryData)
@@ -152,10 +157,15 @@ final class MapperToUITests: XCTestCase {
     }
 
     func testNextScans_areMappedCorrectly() {
+        var dateComponent = DateComponents()
+        dateComponent.day = 10
+        let date10daysFromNow = Calendar.current.date(byAdding: dateComponent, to: Date())!
+
         let brokerProfileQueryData: [BrokerProfileQueryData] = [
             .mock(dataBrokerName: "Broker #1", url: "broker1.com", preferredRunDate: Date().tomorrow),
             .mock(dataBrokerName: "Broker #2", url: "broker2.com", preferredRunDate: Date().tomorrow),
-            .mock(dataBrokerName: "Broker #3", url: "broker3.com")
+            .mock(dataBrokerName: "Broker #3", url: "broker3.com", preferredRunDate: date10daysFromNow),
+            .mock(dataBrokerName: "Broker #4", url: "broker4.com")
         ]
 
         let result = sut.maintenanceScanState(brokerProfileQueryData)
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
index 395ea949a3..dc8d0eda8c 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
@@ -182,6 +182,7 @@ final class WebViewHandlerMock: NSObject, WebViewHandler {
     var wasExecuteCalledForUserData = false
     var wasExecuteCalledForSolveCaptcha = false
     var wasExecuteJavascriptCalled = false
+    var wasSetCookiesCalled = false
 
     func initializeWebView(showWebView: Bool) async {
         wasInitializeWebViewCalled = true
@@ -191,7 +192,7 @@ final class WebViewHandlerMock: NSObject, WebViewHandler {
         wasLoadCalledWithURL = url
     }
 
-    func waitForWebViewLoad(timeoutInSeconds: Int) async throws {
+    func waitForWebViewLoad() async throws {
         wasWaitForWebViewLoadCalled = true
     }
 
@@ -214,6 +215,18 @@ final class WebViewHandlerMock: NSObject, WebViewHandler {
         wasExecuteJavascriptCalled = true
     }
 
+    func takeSnaphost(path: String, fileName: String) async throws {
+
+    }
+
+    func saveHTML(path: String, fileName: String) async throws {
+
+    }
+
+    func setCookies(_ cookies: [HTTPCookie]) async {
+        wasSetCookiesCalled = true
+    }
+
     func reset() {
         wasInitializeWebViewCalled = false
         wasLoadCalledWithURL = nil
@@ -222,6 +235,19 @@ final class WebViewHandlerMock: NSObject, WebViewHandler {
         wasExecuteCalledForSolveCaptcha = false
         wasExecuteJavascriptCalled = false
         wasExecuteCalledForUserData = false
+        wasSetCookiesCalled = false
+    }
+}
+
+final class MockCookieHandler: CookieHandler {
+    var cookiesToReturn: [HTTPCookie]?
+
+    func getAllCookiesFromDomain(_ url: URL) async -> [HTTPCookie]? {
+        return cookiesToReturn
+    }
+
+    func clear() {
+        cookiesToReturn = nil
     }
 }
 
@@ -229,7 +255,7 @@ final class EmailServiceMock: EmailServiceProtocol {
 
     var shouldThrow: Bool = false
 
-    func getEmail(dataBrokerURL: String?) async throws -> EmailData {
+    func getEmail(dataBrokerURL: String, attemptId: UUID) async throws -> EmailData {
         if shouldThrow {
             throw DataBrokerProtectionError.emailError(nil)
         }
@@ -237,7 +263,7 @@ final class EmailServiceMock: EmailServiceProtocol {
         return EmailData(pattern: nil, emailAddress: "test@duck.com")
     }
 
-    func getConfirmationLink(from email: String, numberOfRetries: Int, pollingInterval: TimeInterval, shouldRunNextStep: @escaping () -> Bool) async throws -> URL {
+    func getConfirmationLink(from email: String, numberOfRetries: Int, pollingInterval: TimeInterval, attemptId: UUID, shouldRunNextStep: @escaping () -> Bool) async throws -> URL {
         if shouldThrow {
             throw DataBrokerProtectionError.emailError(nil)
         }
@@ -256,7 +282,7 @@ final class CaptchaServiceMock: CaptchaServiceProtocol {
     var wasSubmitCaptchaToBeResolvedCalled = false
     var shouldThrow = false
 
-    func submitCaptchaInformation(_ captchaInfo: GetCaptchaInfoResponse, retries: Int, pollingInterval: TimeInterval, shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaTransactionId {
+    func submitCaptchaInformation(_ captchaInfo: GetCaptchaInfoResponse, retries: Int, pollingInterval: TimeInterval, attemptId: UUID, shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaTransactionId {
         if shouldThrow {
             throw CaptchaServiceError.errorWhenSubmittingCaptcha
         }
@@ -266,7 +292,7 @@ final class CaptchaServiceMock: CaptchaServiceProtocol {
         return "transactionID"
     }
 
-    func submitCaptchaToBeResolved(for transactionID: CaptchaTransactionId, retries: Int, pollingInterval: TimeInterval, shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaResolveData {
+    func submitCaptchaToBeResolved(for transactionID: CaptchaTransactionId, retries: Int, pollingInterval: TimeInterval, attemptId: UUID, shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaResolveData {
         if shouldThrow {
             throw CaptchaServiceError.errorWhenFetchingCaptchaResult
         }
@@ -824,3 +850,75 @@ final class MockAppVersion: AppVersionNumberProvider {
         self.versionNumber = versionNumber
     }
 }
+
+final class MockStageDurationCalculator: StageDurationCalculator {
+    var attemptId: UUID = UUID()
+    var stage: Stage?
+
+    func durationSinceLastStage() -> Double {
+        return 0.0
+    }
+
+    func durationSinceStartTime() -> Double {
+        return 0.0
+    }
+
+    func fireOptOutStart() {
+    }
+
+    func fireOptOutEmailGenerate() {
+    }
+
+    func fireOptOutCaptchaParse() {
+    }
+
+    func fireOptOutCaptchaSend() {
+    }
+
+    func fireOptOutCaptchaSolve() {
+    }
+
+    func fireOptOutSubmit() {
+    }
+
+    func fireOptOutEmailReceive() {
+    }
+
+    func fireOptOutEmailConfirm() {
+    }
+
+    func fireOptOutValidate() {
+    }
+
+    func fireOptOutSubmitSuccess(tries: Int) {
+    }
+
+    func fireOptOutFillForm() {
+    }
+
+    func fireOptOutFailure(tries: Int) {
+    }
+
+    func fireScanSuccess(matchesFound: Int) {
+    }
+
+    func fireScanFailed() {
+    }
+
+    func fireScanError(error: any Error) {
+    }
+
+    func setStage(_ stage: DataBrokerProtection.Stage) {
+        self.stage = stage
+    }
+
+    func setEmailPattern(_ emailPattern: String?) {
+    }
+
+    func setLastActionId(_ actionID: String) {
+    }
+
+    func clear() {
+        self.stage = nil
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/OperationPreferredDateUpdaterTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/OperationPreferredDateUpdaterTests.swift
index 369f80ee32..c95e90e182 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/OperationPreferredDateUpdaterTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/OperationPreferredDateUpdaterTests.swift
@@ -46,7 +46,7 @@ final class OperationPreferredDateUpdaterTests: XCTestCase {
         )
         databaseMock.childBrokers = [childBroker]
 
-        sut.updateChildrenBrokerForParentBroker(.mock, profileQueryId: profileQueryId)
+        XCTAssertNoThrow(try sut.updateChildrenBrokerForParentBroker(.mock, profileQueryId: profileQueryId))
 
         XCTAssertTrue(databaseMock.wasUpdatedPreferredRunDateForScanCalled)
         XCTAssertEqual(databaseMock.lastParentBrokerWhereChildSitesWhereFetched, "Test broker")
@@ -57,7 +57,7 @@ final class OperationPreferredDateUpdaterTests: XCTestCase {
     func testWhenParentBrokerHasNoChildsites_thenNoCallsToTheDatabaseAreDone() {
         let sut = OperationPreferredDateUpdaterUseCase(database: databaseMock)
 
-        sut.updateChildrenBrokerForParentBroker(.mock, profileQueryId: 1)
+        XCTAssertNoThrow(try sut.updateChildrenBrokerForParentBroker(.mock, profileQueryId: 1))
 
         XCTAssertFalse(databaseMock.wasDatabaseCalled)
     }
diff --git a/LocalPackages/LoginItems/Sources/LoginItems/LoginItem.swift b/LocalPackages/LoginItems/Sources/LoginItems/LoginItem.swift
index 87fda099f7..48a16a8689 100644
--- a/LocalPackages/LoginItems/Sources/LoginItems/LoginItem.swift
+++ b/LocalPackages/LoginItems/Sources/LoginItems/LoginItem.swift
@@ -52,6 +52,10 @@ public struct LoginItem: Equatable, Hashable {
             self == .enabled
         }
 
+        public var isInstalled: Bool {
+            self == .enabled || self == .requiresApproval
+        }
+
         @available(macOS 13.0, *)
         public init(_ status: SMAppService.Status) {
             switch status {
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index f4b8e03b9d..cc5cf18637 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -28,10 +28,10 @@ let package = Package(
     products: [
         .library(name: "NetworkProtectionIPC", targets: ["NetworkProtectionIPC"]),
         .library(name: "NetworkProtectionProxy", targets: ["NetworkProtectionProxy"]),
-        .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
+        .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "122.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "132.0.0-1"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
@@ -75,6 +75,7 @@ let package = Package(
                 .product(name: "NetworkProtection", package: "BrowserServicesKit"),
                 .product(name: "SwiftUIExtensions", package: "SwiftUIExtensions"),
                 .product(name: "LoginItems", package: "LoginItems"),
+                .product(name: "PixelKit", package: "PixelKit"),
             ],
             resources: [
                 .copy("Resources/Assets.xcassets")
@@ -84,14 +85,16 @@ let package = Package(
             ],
             plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
         ),
+
         .testTarget(
             name: "NetworkProtectionUITests",
             dependencies: [
                 "NetworkProtectionUI",
                 .product(name: "NetworkProtectionTestUtils", package: "BrowserServicesKit"),
                 .product(name: "LoginItems", package: "LoginItems"),
+                .product(name: "PixelKitTestingUtilities", package: "PixelKit"),
             ],
             plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
-        )
+        ),
     ]
 )
diff --git a/LocalPackages/NetworkProtectionMac/README.md b/LocalPackages/NetworkProtectionMac/README.md
index c9e9b62094..49354a0caa 100644
--- a/LocalPackages/NetworkProtectionMac/README.md
+++ b/LocalPackages/NetworkProtectionMac/README.md
@@ -1,6 +1,6 @@
 # NetworkProtectionMac
 
-This package contains several components of Network Protection that are specific to macOS.
+This package contains several components of VPN that are specific to macOS.
 
-- NetworkProtectionUI: UI elements used in Network Protection that are reusable across build targets.
-- NetworkProtectionIPC: code to support IPC communication between NetworkProtection targets.
+- NetworkProtectionUI: UI elements used in the VPN that are reusable across build targets.
+- NetworkProtectionIPC: code to support IPC communication between VPN targets.
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyProviderPixel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyProviderPixel.swift
index aff7421bea..4e4024d08c 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyProviderPixel.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyProviderPixel.swift
@@ -25,7 +25,7 @@ extension TransparentProxyProvider.StartError: ErrorWithPixelParameters {
         case .failedToUpdateNetworkSettings(let underlyingError):
             return [
                 PixelKit.Parameters.underlyingErrorCode: "\((underlyingError as NSError).code)",
-                PixelKit.Parameters.underlyingErrorDesc: (underlyingError as NSError).domain,
+                PixelKit.Parameters.underlyingErrorDomain: (underlyingError as NSError).domain,
             ]
         default:
             return [:]
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/AppLaunching/AppLaunching.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/AppLaunching/AppLaunching.swift
new file mode 100644
index 0000000000..e64f0a605a
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/AppLaunching/AppLaunching.swift
@@ -0,0 +1,40 @@
+//
+//  AppLaunching.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+// SPDX-License-Identifier: MIT
+// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved.
+
+import Foundation
+
+public enum AppLaunchCommand: Codable {
+    case justOpen
+    case shareFeedback
+    case showFAQ
+    case showStatus
+    case showSettings
+    case showVPNLocations
+    case startVPN
+    case stopVPN
+    case enableOnDemand
+    case moveAppToApplications
+    case showPrivacyPro
+}
+
+public protocol AppLaunching {
+    func launchApp(withCommand command: AppLaunchCommand) async
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserDefault+ShowVPNUninstalledMessage.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserDefault+ShowVPNUninstalledMessage.swift
new file mode 100644
index 0000000000..8f85e818ea
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserDefault+ShowVPNUninstalledMessage.swift
@@ -0,0 +1,44 @@
+//
+//  UserDefault+ShowVPNUninstalledMessage.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+public extension UserDefaults {
+    private enum Key {
+        static var networkProtectionShouldShowVPNUninstalledMessage = "networkProtectionShouldShowVPNUninstalledMessage"
+    }
+
+    // Convenience declaration
+    private var networkProtectionShowVPNUninstalledMessageRawValueKey: String {
+        Key.networkProtectionShouldShowVPNUninstalledMessage
+    }
+
+    /// For KVO to work across processes (Menu App + Main App) we need to declare this dynamic var in a `UserDefaults`
+    /// extension, and the key for this property must match its name exactly.
+    ///
+    @objc
+    dynamic var networkProtectionShouldShowVPNUninstalledMessage: Bool {
+        get {
+            value(forKey: networkProtectionShowVPNUninstalledMessageRawValueKey) as? Bool ?? false
+        }
+
+        set {
+            set(newValue, forKey: networkProtectionShowVPNUninstalledMessageRawValueKey)
+        }
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserDefaults+NetworkProtectionExpiredEntitlements.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserDefaults+NetworkProtectionExpiredEntitlements.swift
new file mode 100644
index 0000000000..0768592eff
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserDefaults+NetworkProtectionExpiredEntitlements.swift
@@ -0,0 +1,44 @@
+//
+//  UserDefaults+NetworkProtectionExpiredEntitlements.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+public extension UserDefaults {
+    private enum Key {
+        static var networkProtectionEntitlementsExpired = "networkProtectionEntitlementsExpired"
+    }
+
+    // Convenience declaration
+    private var networkProtectionEntitlementsExpiredRawValueKey: String {
+        Key.networkProtectionEntitlementsExpired
+    }
+
+    /// For KVO to work across processes (Menu App + Main App) we need to declare this dynamic var in a `UserDefaults`
+    /// extension, and the key for this property must match its name exactly.
+    ///
+    @objc
+    dynamic var networkProtectionEntitlementsExpired: Bool {
+        get {
+            value(forKey: networkProtectionEntitlementsExpiredRawValueKey) as? Bool ?? false
+        }
+
+        set {
+            set(newValue, forKey: networkProtectionEntitlementsExpiredRawValueKey)
+        }
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift
index ccd9a73ef7..402f85098f 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift
@@ -21,11 +21,11 @@ import Foundation
 final class UserText {
     static let networkProtectionStatusViewFeatureDesc = NSLocalizedString("network.protection.status.view.feature.description", value: "DuckDuckGo's VPN secures all of your device's Internet traffic anytime, anywhere.", comment: "Feature description shown in NetworkProtection's status view.")
     static let networkProtectionStatusViewConnDetails = NSLocalizedString("network.protection.status.view.connection.details", value: "Connection Details", comment: "Connection details label shown in NetworkProtection's status view.")
-    static let networkProtectionStatusViewConnLabel = NSLocalizedString("network.protection.status.view.connection.label", value: "Network Protection", comment: "Connection label shown in NetworkProtection's status view.")
+    static let networkProtectionStatusViewConnLabel = NSLocalizedString("network.protection.status.view.connection.label", value: "VPN", comment: "Connection label shown in NetworkProtection's status view.")
     static let networkProtectionStatusViewLocation = NSLocalizedString("network.protection.status.view.location", value: "Location", comment: "Location label shown in NetworkProtection's status view.")
     static let networkProtectionStatusViewIPAddress = NSLocalizedString("network.protection.status.view.ip.address", value: "IP Address", comment: "IP Address label shown in NetworkProtection's status view.")
-    static let networkProtectionStatusViewFeatureOff = NSLocalizedString("network.protection.status.view.feature.on", value: "Network Protection is OFF", comment: "Text shown in NetworkProtection's status view when NetP is OFF.")
-    static let networkProtectionStatusViewFeatureOn = NSLocalizedString("network.protection.status.view.feature.on", value: "Network Protection is ON", comment: "Text shown in NetworkProtection's status view when NetP is ON.")
+    static let networkProtectionStatusViewFeatureOff = NSLocalizedString("network.protection.status.view.feature.on", value: "DuckDuckGo VPN is OFF", comment: "Text shown in NetworkProtection's status view when NetP is OFF.")
+    static let networkProtectionStatusViewFeatureOn = NSLocalizedString("network.protection.status.view.feature.on", value: "DuckDuckGo VPN is ON", comment: "Text shown in NetworkProtection's status view when NetP is ON.")
     static let networkProtectionStatusViewTimerZero = "00:00:00"
 
     // MARK: - Onboarding
@@ -39,8 +39,8 @@ final class UserText {
     static let networkProtectionOnboardingAllowVPNTitle = NSLocalizedString("network.protection.onboarding.allow.vpn.title", value: "Add VPN Configuration", comment: "Title for the onboarding allow-VPN step")
     static let networkProtectionOnboardingAllowVPNDescPrefix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.prefix", value: "Select ", comment: "Non-bold prefix for the onboarding allow-VPN description")
     static let networkProtectionOnboardingAllowVPNDescAllow = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.allow", value: "Allow", comment: "'Allow' word between the prefix and suffix for the onboarding allow-VPN description")
-    static let networkProtectionOnboardingAllowVPNDescSuffix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.suffix", value: " when prompted to finish setting up Network Protection.", comment: "Non-bold suffix for the onboarding allow-VPN description")
-    static let networkProtectionOnboardingAllowVPNDescExpandedSuffix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.expanded.suffix", value: " when prompted to finish setting up Network Protection.\n\nThis adds a shortcut in the menu bar so you can still access the VPN if the browser isn't running.", comment: "Non-bold suffix for the onboarding allow-VPN description")
+    static let networkProtectionOnboardingAllowVPNDescSuffix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.suffix", value: " when prompted to finish setting up VPN.", comment: "Non-bold suffix for the onboarding allow-VPN description")
+    static let networkProtectionOnboardingAllowVPNDescExpandedSuffix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.expanded.suffix", value: " when prompted to finish setting up VPN.\n\nThis adds a shortcut in the menu bar so you can still access the VPN if the browser isn't running.", comment: "Non-bold suffix for the onboarding allow-VPN description")
     static let networkProtectionOnboardingAllowVPNAction = NSLocalizedString("network.protection.onboarding.allow.vpn.action", value: "Add VPN Configuration...", comment: "Action button title for the onboarding allow-VPN view")
 
     static let networkProtectionOnboardingMoveToApplicationsTitle = NSLocalizedString("network.protection.onboarding.move.to.applications.title", value: "Move DuckDuckGo App", comment: "Title for the onboarding move-app-to-applications step")
@@ -56,8 +56,8 @@ final class UserText {
 
     // MARK: - Connection Issues
 
-    static let networkProtectionInterruptedReconnecting = NSLocalizedString("network.protection.interrupted.reconnecting", value: "Your Network Protection connection was interrupted. Attempting to reconnect now...", comment: "The warning message shown in NetP's status view when the connection is interrupted and its attempting to reconnect.")
-    static let networkProtectionInterrupted = NSLocalizedString("network.protection.interrupted", value: "Network Protection was unable to connect at this time. Please try again later.", comment: "The warning message shown in NetP's status view when the connection is interrupted.")
+    static let networkProtectionInterruptedReconnecting = NSLocalizedString("network.protection.interrupted.reconnecting", value: "Your VPN connection was interrupted. Attempting to reconnect now...", comment: "The warning message shown in NetP's status view when the connection is interrupted and its attempting to reconnect.")
+    static let networkProtectionInterrupted = NSLocalizedString("network.protection.interrupted", value: "The VPN was unable to connect at this time. Please try again later.", comment: "The warning message shown in NetP's status view when the connection is interrupted.")
 
     // MARK: - Connection Information
 
@@ -67,4 +67,11 @@ final class UserText {
         let localized = NSLocalizedString("network.protection.server.location.link", value: "%@...", comment: "Clickable text linking to the server location picker screen")
         return String(format: localized, location)
     }
+
+    // MARK: Subscription Expired
+
+    static let networkProtectionSubscriptionExpiredTitle = NSLocalizedString("network.protection.subscription.expired.title", value: "VPN disconnected", comment: "Title for the prompt that tells the user their subscription expired.")
+    static let networkProtectionSubscriptionExpiredSubtitle = NSLocalizedString("network.protection.subscription.expired.subtitle", value: "Subscribe to Privacy Pro to reconnect DuckDuckGo VPN.", comment: "Subtitle for the prompt that tells the user their subscription expired.")
+    static let networkProtectionSubscriptionExpiredResubscribeButton = NSLocalizedString("network.protection.subscription.expired.resubscribe.button", value: "Subscribe to Privacy Pro", comment: "Button for the prompt that takes the user to the page to resubscribe.")
+    static let networkProtectionSubscriptionExpiredUninstallButton = NSLocalizedString("network.protection.subscription.expired.uninstall.button", value: "Uninstall DuckDuckGo VPN", comment: "Button for the prompt that uninstalls the VPN.")
 }
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/NavigationBarIconProvider.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/NavigationBarIconProvider.swift
index 657b3f5a8f..c9851d6b90 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/NavigationBarIconProvider.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/NavigationBarIconProvider.swift
@@ -19,7 +19,7 @@
 import AppKit
 import Foundation
 
-/// Network Protection icon shown in the navigation bar.
+/// VPN icon shown in the navigation bar.
 ///
 public final class NavigationBarIconProvider: IconProvider {
 
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift
index cba2d5573a..1833f8482e 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift
@@ -23,7 +23,7 @@ import SwiftUI
 import NetworkProtection
 import LoginItems
 
-/// Abstraction of the the Network Protection status bar menu with a simple interface.
+/// Abstraction of the the VPN status bar menu with a simple interface.
 ///
 @objc
 public final class StatusBarMenu: NSObject {
@@ -56,7 +56,9 @@ public final class StatusBarMenu: NSObject {
                 appLauncher: AppLaunching,
                 menuItems: @escaping () -> [MenuItem],
                 agentLoginItem: LoginItem?,
-                isMenuBarStatusView: Bool) {
+                isMenuBarStatusView: Bool,
+                userDefaults: UserDefaults,
+                uninstallHandler: @escaping () async -> Void) {
 
         self.model = model
         let statusItem = statusItem ?? NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
@@ -69,7 +71,10 @@ public final class StatusBarMenu: NSObject {
                                            appLauncher: appLauncher,
                                            menuItems: menuItems,
                                            agentLoginItem: agentLoginItem,
-                                           isMenuBarStatusView: isMenuBarStatusView)
+                                           isMenuBarStatusView: isMenuBarStatusView,
+                                           userDefaults: userDefaults,
+                                           uninstallHandler: uninstallHandler)
+
         popover.behavior = .transient
 
         super.init()
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionPopover.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionPopover.swift
index efbe5872eb..0acbf84065 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionPopover.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionPopover.swift
@@ -56,7 +56,9 @@ public final class NetworkProtectionPopover: NSPopover {
                          appLauncher: AppLaunching,
                          menuItems: @escaping () -> [MenuItem],
                          agentLoginItem: LoginItem?,
-                         isMenuBarStatusView: Bool) {
+                         isMenuBarStatusView: Bool,
+                         userDefaults: UserDefaults,
+                         uninstallHandler: @escaping () async -> Void) {
 
         self.statusReporter = statusReporter
         self.model = NetworkProtectionStatusView.Model(controller: controller,
@@ -66,7 +68,9 @@ public final class NetworkProtectionPopover: NSPopover {
                                                        appLauncher: appLauncher,
                                                        menuItems: menuItems,
                                                        agentLoginItem: agentLoginItem,
-                                                       isMenuBarStatusView: isMenuBarStatusView)
+                                                       isMenuBarStatusView: isMenuBarStatusView,
+                                                       userDefaults: userDefaults,
+                                                       uninstallHandler: uninstallHandler)
 
         super.init()
 
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Pixels/VPNPrivacyProPixel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Pixels/VPNPrivacyProPixel.swift
new file mode 100644
index 0000000000..2bbbf3a464
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Pixels/VPNPrivacyProPixel.swift
@@ -0,0 +1,52 @@
+//
+//  VPNPrivacyProPixel.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import PixelKit
+
+/// PrivacyPro pixels.
+///
+/// Ref: https://app.asana.com/0/0/1206836019887720/f
+///
+public enum VPNPrivacyProPixel: PixelKitEventV2 {
+
+    /// Fired when PrivacyPro VPN access is revoked, and the dialog is shown.
+    ///
+    case vpnAccessRevokedDialogShown
+
+    /// Fired only once when the VPN beta becomes disabled due to the start of PrivacyPro..
+    ///
+    case vpnBetaStoppedWhenPrivacyProEnabled
+
+    public var name: String {
+        switch self {
+        case .vpnAccessRevokedDialogShown:
+            return "vpn_access_revoked_dialog_shown"
+        case .vpnBetaStoppedWhenPrivacyProEnabled:
+            return "vpn_beta_stopped_when_privacy_pro_enabled"
+        }
+    }
+
+    public var error: Error? {
+        nil
+    }
+
+    public var parameters: [String: String]? {
+        nil
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Contents.json b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Contents.json
index 011b2db3d3..86f2574f00 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Contents.json
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "VPN-128.pdf",
+      "filename" : "Network-Protetion-VPN-128.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Network-Protetion-VPN-128.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Network-Protetion-VPN-128.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..54953a618cb9ffd53f43d172d78d4bf9cc0bd323
GIT binary patch
literal 14844
zcmeI(+pZm1bq3)3{S@m42_kv9&Ibu0r4OJeL6GiTAfa5C-J7P7+iq-k1bO;=|EyZG
zYTKsU4N;;<*+RH_)I5#zKgO)}qhEjW^C#_fzPoEL&E@6q{&;t}{Pd@nr~mesZyqjB
zfAg!~{qf=c4Vu5F|MKwS%Qt_xbOwI5lYa5)<+tCQCY1l)-jzAq#Lunw>e-9e-#mNu
z@Z$b2@4Ww~%bQo<K0G4->}UH9pMU$iH{~opfBEX`o%Y$o>zCiYx_@|GcK-CwZ+`Ll
zn`dtxw*P9&Kljfr&2?(>clp`Rw*T$3Kl<q9pD(}ly1Z?Uhqf7Rw0XHb{kvHX^ZL!J
zhi6~k{ps%Mr|sp-*LUsheO=~BeX8&J;W`iFu=JOHy!PEXHr?g^>$~PU40AKCb{?0Z
zZwC+Sgfv}V-@mx)*6Z9g>oOiE`}(f$u2a9Z%X}HG%RIDGd$D@oPGh%RS_{q7IE`o8
zbe-mA?x)NB-D%`{ZI`~^MmBxhuj8d_uT!_?sqe4D+Rj~f>H6zBFI_)p_UgRd;+XAv
z?b?1^*2~aeyK!ii>C(2>Wtsc-OzX3?Q<{7X?62cGkNvXE?dPSrAaz4Gk2|TI7o=fq
zn}wXp)Vy_?YrA&+G+hQy^Mb8Qd+mCgB9UFYuEThc9C^I1WYjeW@%bI@=6-4W?jZJ9
z?=2Tm&+9OC?d3hvzrXv#-S6*S-2Lm_-NTD7c1!RSZ@G&%Y;H5QZQd7ZU#Z{YOmzSM
z&Qu+yy3ltz(=c6^b?xT<L!60gG}AmamnZCeSev2mFJIrW<aM5xensxD&DwVhH(IaL
zTCC<t$IF^&jG>)~6MvmX)^eW(ZetnI$a|;m^869GyK<o7o(se41}6H14f2-J(cAet
z%zb>V5Z8HK+pLS+G~?3l<Yip>-7I==<>f}ieu%{dhcnRv!XD2MbGCJtj2-x1(+h=9
z9Cql2w#1x0{ypg|&+ohNm7v*{k)bYK$Nl(PGp*xHR%ol0xczkzd&u%cyT8MzV-9#a
zjU2CC*R)*vN$1hxrg!gC%Xj)&9A)>jeyM)OaZgEWPgf-Y{KmNt-#U_!JoX#0^F6O>
z%6TiH%(sM6&Ga_%ysC9SUCPLhetCKN%Wt2*`RbeJe@W_iJZj5`pH3e>w7c!!&_n+I
z>Z0QZk6dpfzn7=sHu8IS?>~6tDMkNvj*8^`-z}t0k5s*5kvV!i<>#lLJp9L3_Ya@_
z;-kyQpWmJS>;CnTyWyRi>3>(iS!3hfNZyiIGj*ekRkAm;_m}Mb)<d$l%(JZBI?H5h
zc4<W$FrXjhbbi=%!^$C_qm2z>@_9G6^6UQ4=Apd04Ntl)3$y~>-L`DoUbc;7V3|#@
zn%i->Ob~&krjl6~TcTjVA4*v9P$~C!-E}R*g9c>`)6mW+-83)bBKM9C><o3k%#)TI
zXQ=0T9$II7f1JL(u24-E%FZF2i9n214hcB&{oH^^H+elrYaPDO!q^a5=j??I5p|ro
z_CeVh%Ub)W${3^Vg`7Z$Fh<ICzl|}v5HoM*+8CoVk^FZ0jWMFE9PY2yP&PU23j{4y
zd2JgBw2{rUcFVwm3uE-?fKhrN;C|$)pGt|YC7W<vX*4|oU=c_d6KShG)cqi*VrFz!
z&lP)%5?EI~eYL>KVYSnZF><&+?77P8`Q2t_Ym6g|jnmnH3S-Mbsf^v5SB-IJY%{ZI
z#YPw-<#+w(NDD#VUC{Rjda#VY_L1NPWa#<w3=Ic=zwNk{5)WQ@a1RVR%98VTJb1pg
zyp`ozXIn8+n8z`wbds`*m2MARD0x-nVt5LGZGl+?A<-<$$F`07hJ}pRnHR8ASUXEK
zHt!<Z8Ku}joCb1;HB?G8-526PV-M3hIfIpKqF^A}cyNF07t0!m!x`$i5=D9r0=3uE
zvr=;CL)kgp-RLBTc-=frjp$S56%X!2k3tJ$ZA^bR^qsMI;!fEai?y9-g|YZ~KP>GQ
zPcc?v!M@)fF(T7?u8lD|i`VU^-xvb{D~H>wA+p)!uq{9Vk<BizjWISE?`itAW2YNq
zXoEtfD1AS2D7$_tCA#h<j>Cgv-zpy_v@zDT<1RM3sQblJcDt$PioHb%G+R$!EwFM}
z?X=1vplrA2DzE2vo0+lkjWHRc8r9C&aHbT-qMtfyXRO`K3`aX-s@l3=wTH(Z-2VU%
zJ|ad_r29XUf|HaVr{E;z<nSM!f?LiLuVn)@5?0FpofMoN#qO@D+6%TgQT}&QurT?z
zrr_b0f=_X%>ZdaHcc<W_+k$!K5=2T0PV*wj$m##?6g=Nja1h&WX2OHO1Y1-}W$eEv
z1rHzG0Bf7n#w7r1$s~JykOM0?b-KnA?kP!o&@4-o-0kr6pvU&;RbAkeQPQVco2lUT
zZFqMzDZ#l8uascIeR!qShj(Aq1>(^AqA<m_O&wkjT!&Z6;|Mu^xPa$UncxA|NwM;Q
z@+~@fOTL<T7I?3G-+q;jVXW<(vEjp;()Qui?CS7JDL8o>UTO8Au2d;?fjDH@Ip^HB
zsl%%@>+niB%ePj4_3eAQP2F@evsUp}{x;}XO1>D;u*!M?1nbyoHkQ`yFkGh%kLfDy
zhOc)UbO%{!wN`4k-0Y-<ftS3$95ii~=%OH-I<SKYhL#6_HkF7OO;z=fhRdL#rQE_+
ztK?CzSh-!5Zy`0!+AKjz)3sFz-72Ua$Pcfu=ZzG-9_&{kaS3uA^sP^g>67I4m#0K=
zEOK%~{n}nn3qm`V8@ro`k0}QY%B^z_>hW}Y3$VXu9T@DODlU|@-Fz7nf&pbUTu_QO
z-Hq0)1h;`Spwnz4mqjgn(GwiIcB00S(mTLd9aj}PXb4UtMV@F*{vLyPUfaok`mk#R
zLTM+>1YI{rU~Os3Cn7qP>jT==-}D$;T+(ygY%v8}v*;uW4U2rElcyCypRxnkiOF?f
zP}=_bse_^tJF6t3EKrTJ`bEL4z!cFMBLn|XTbBYV0@P90l-NSkRE0~?SRlDPrsX1`
z^h{49hpQH3+t}Oc^PIw*mt>n<Lr5B}<|xE8;uqsF+)x`?(~jh!&6u<4W-h(fX=pRK
zz-OT`?@^PFOSFx?XJ*F;6f^cgbx6(-9_C@)N4kH}0X?13xQ%AEi;p#OE3-H1kn=97
z>YY-hF}RXp7#&HejIG007gAvan$1%?r^?0mEN&<kn9DHsP(PYNZy7+$>@v<e(N>%&
z&)UU=I83L0bMl4u!{b7uN>3}U^x3_2@=7aw+hv#^jbzek)>y~LQIpq>t&l?z8?A3v
zyqX<DZwAk9UbNgX5gS?4LM}x$)po2Q@n~*@tVkf+DfomM=hY-9jZj_Wq+_6KO><hn
zXpAqtCiXq)iVcchw0=mV+w3J*JZToE-;aqnD+w)*S#E;XMVpOvrxUMJPd6%$F4nZ|
z4Xv}~P}$e0Rl?#2CXlPMMIXB##}bhVr%`7|x+@b&37Gb@eO$psLJp*?(QoG&I^m(Y
z24L3l$Mo9GNe~is%f%Hc#?mlHg(7n4C5upebUTnV<?%~2_YNk7HZ#fMC1x{*Sr8UH
zMnOi?K#q_h!tJ2K<Mw>KWdq`PI*9RFq6*(mNhPz^L#zo5Wc_AqqeT`&=Cq5z)(U&t
z^07L)BR+hYtxH6#(Kql&@8+~L&!^MJQyOB2-wECGvKE__m0SdnPstBbGJ}e>^m_iR
zE<t`KNwY&MmKs{yHJcW9n%Q*k_JCg=BbBMHX(*I{T)eniP;auwbQZ`~KcHoYrNkAt
z!b~B?{BSDGWNJvow;94DLlR9T-Rtb=cTOzxAY#39b-Yb=XG?@E$3NR@qf6VODUK^`
zHpR7cNQbOUYEu#e8_|Ag+q4B*al}n!3~|Lzu37l^gb!B7W?e+BjZREQiOeD<x4CpZ
z@IfkfEDRxmcN<4p&(-+JQHi{?DXy$NLA9>12swr=OgTJHk=|gH#K1@=4P~1&@sARK
z+tKOCuAvrZN_3XfTtN|&<1rHMwzQH(#I7c8T^u9kUZ`nJbwSJJ-3BLHj;jJ7;KS9l
z)p7yXthtLj;eilydlp!uJ=(Az@r3_z7m+0ab&B)4aC4{3bC8m@m_j^2;w~}PWg8s}
zKyj7MhH2l8(=v)^@u+f}hcOo6eyzCPV$(P~O;Odb63;B}Fm$FU+E1R+HsrtdlH1lL
z*J{!oX91L%Y?9ZQ<`f?R_pE``@?Nh^U<yJjb2m`}M&eWPzB1JZ0f{RrSbiqdn~I%L
zS4w<tbeAwKLM+q5#*53$+f=D#=7rA5w@N-RF1-o)fMY_5L02x}d98yW#Wuq#B5zv6
zHB;S4<}O^jYniQwH1I2)KwkQjG8$4Eg4@L;YnO|QN+jIbRk;{qVFRhe-i?Gp`m65)
z_|6$OmM*W!h=krHpm6|DmX;DpMB=h5NS2!hlCvl$a$xn1n2>}?Oi3ZpI^-tVP%!(F
zE@Cc1e1|mSuXR~zY6>Fa7lj4xjt&bD^1VcWZtgY#BJn?86p;0FkW5Wr=ASY9+qise
z;k<2}V@hcl3s>4Nq{9)%zL8B#)fgi(7srTPEvEyo>87-DVUV(GGG4(<Mr|ZhZ6@mA
zwGxq7pIypo<KRTn;=~bglU?~**_9KkrUVZzE+4^y#w}X60s(90lLK?&ySmt;lc4dY
zgaZ3Yv{v5io<%aBQcVaMVwI7Wd3@-DW;X6HY|cR?1oCEwg~q+v18GSZE-eZT@|H%-
z=9(g+kibj0Z_*hWI6%ZD%>X`8QxX%|;D*A`e8EyA=GI)wDL3SF5=bLF$OYhPu(=HB
znhLn_oe9?SR<Y*UY}9EOVj!8LyDtV6n3zZx8a!`kXnm7ep|QM%a?NJJFpvH^`StD#
z5@{C>-ix7u8Xzj`OIoo7{U`jXo!FY$@)-=3n>thxEKpC{W9UT!B8FyjlH7Yhd}>)P
zDp!Cj*>jq(+2pGR9o|(GL>1u6-CpD+GWR(>quVrjB;bR_*K(##9Dh6#-fuvZjAZ0M
zm~rsZobEZAU{W+m`##o5e?EYAgm>ct(4TUlpz3@rkgP;PkxKw)=RA8bTzP}I05&f|
zpt?G79QNT|BrV_s^6+zSeI611f`>N9!}xtj5m^NM^Z~YJ^NoIodZJ%|%zI>3WEn&%
z;$(S1Trea`Qd7$Xu!_n)&Jfz+eSlO3pxh4j<as={EteBp0-QzrAPOi)kd5QRfo^<_
z+e@T)fzSmQ9VCHzQ%k1a#^E$5I<P=1FGeBmY5sF$q&0U+LMA^;_=pUX?UXgf1uZjc
zDswuYYv5eo%O_qXpuf#)L;x%Bs3ar7Rs05Hi#2gbYsCX%|5&#YlgD(l47TL+mPAW#
z7ENJT8Hx4HvtcK`Kz|Z(P!xf5jFvB$4Tyqoi8NC>>voZLa*JJNi`gt<`zB4jiQy8H
zBns)Cl{l{Obf(eRt<bclR8~gvanT@64qmE07b|#i3VsnpJRF@NB^=dDASJ&V$=*_2
z;SBphf=(_%2sMc`P+v5|GUzgM;$x|N%gNo?xD+Kd-l##8PK%KcmIz&F8@4+VPsVLD
zQcDT%J4BMMRLDmYM~KcozTKPS9Zv3IQT$Haq#GX>@nG`zp;4kX2!TgNZ4Q%eNG&U}
zJhMyvLVIxu(BDXt*}zcZ2oAX@U@O(_fZ4GmIw0vpI+^V;4o;Tyq%hehHBNzsnz<{(
ze2<Y8_giI5!b#eTdCOC5kEOV7%@KnD;gTXdv^W;-WV?3DV+kkm1u|x#{Io=}zNfhC
z$#i7;ydGUtGg2`tl`Ilup2|9(F=!LOnY#$tC1JB#zRT{SaY$Bj<({CQK$EY(QnQyk
zRY6_Eu`8Vz#YO_X6~kp5vl+L0U6>|$?p<~xg``ndkQ62G`Ph=7ibCL23ZxQhslI%!
zDaeVb>4T(oCHNP&O#rkHn#>z<GbZVN>X(E|%t%LxaU_E0bWDU*|86u<99S(h1wSd3
z*>J2tmlLT9!>!qFbva6C+MjSmp)q%jXW<txq4&&|3IlMgNopdo_uP_DVybAq2upSJ
zKE5N5-~U7T;4(M<Q@Y_#Kb^}zziBU@y!0hzUM$;-b$ij>UVKo0cNBKEPHkfN)@w~m
zO;&Lu45$Wca<2+w%a^%PQvQlBZBIo><uO&_BJ`(EVIg3BD}J_d@xJY;E}5WRCY<h|
z>dU%Tr5r1q%cp&(+`sN?6_IAE(<u*Hi81@(4(jQtE_l$+JHsC0Ly=uPBWOcj;jsr*
z)Z8TMD;ma{E0%JWgDPOmX`tqWJ2l?3$tSxl!<x4T4eHy}wfWgLvZ}6pc)3p(satgl
z=c~JbYTM-FIF*zFxSTfX+lM_*4%bBCW0h7f)9U(_Qjc-EUK4Nj1LxxY9nR|dhXCp^
z4pPnr$(ACn3M$3^jacP>CW7;NN}y#5rBsw9=E&-h9skXzp2b2{$-Y}n-~x3er=+<+
zJE)BCQnU(+JQQrLXDD*#$(3fd=xOaV$SV~vNoOmafn!C<NiG&fgR|=1Sddo|W(CIW
zkS9~Byqsv2>5@IFTbVBcrt&V(Mf4Hovg%HC&c^q@oSR|jX=r{W1;FcxLxD(gESOk0
z62>*mLe-D(jbfmda91<|nn;T|@tL+eg4qZ4q%$&Jcc*zjwQ|LlkFon+l6O)b40oK#
znaLaePC`7NUg{synLhI=Ichki@IK`69?3n5ydM-t7n<IjJ>ept3<ydfT{ahe_n`z*
z=vISN5=t$v5lLt9dH_utxzSREGa~5%m=I-T9T`^FL_wi^rLF)jFH2E?1~B?gGs8DZ
z8VS(bX<mAee4>CQm9oxnV!a&cgF_9d)QP3GJnpsl2GMbyGf9=!%K3HX{axPrjY7GE
z(c#LC+(A<61b1bteWs!hY>2E>8u`TqXjOU2r%OH_3kt8Crw-K6l=N@Xf$IRRv=DEU
zto62BfAD3~Nui8Cr8bxNUWMj{NfG7~akzjOM4#=m*Icrli22g3)3jBTA0umweIhKn
zSf;`=DSh)&uph)!+<;(0_HDHUdr&JaSOB@~T1lL;p05(4ZLO7DMLelQo~QMoC`H=0
zI7pgHx1*ei`;m{;stAr<E2((c4sHH62gCLE>w}@?&Jt@0<a#MgElSMA80!y}eWeiy
z>42=!TxdeE-UsfqAsO3=7R<q8gJn<D;xdXLcZ(;gMuJ{|2w7;`J{FfzVaU+-6UBL<
zN!<@rrmok?rOWrsU^%~iB0#Gi(g=<xR2l$W>e6F2Lr4ZIeH~S|PPHFP2*tc6U19E{
zdgGmsXdr0rFhZ-dPm=Sgf%^hM^LcUa++yZPDX22BIQT)-ut@{_H2=iscl>}TpRjK~
zY*0(~Q~ll@C_MeN;U8bTc=_h_<+u4cn!o+`dB1-4<^Hp|r@wso;;Uyr_?K;2>i9KX
zeob-vW#7jyU%YvEVat4Xe<S`nKj3?F(St9f)7SYSZCvCBPyhVY7tVSK3!hzXNB;Qb
zx8}C*Fz|Z&h28Bte}&I^sj&FE?s%~N@v}G2p1=I^@!UVZdiedFB-h?;Kqdcw(b!N{
zq3?g$Ab*z^H&U*?-zM>r$0ViSyCl~zk4K5*xX#~gc{d7g@0d#l9rDMc{F?3^k_>Pg
z_2$*Hubw}=x{G-K=@Y{J@#~jgKm6qK<FCH>$tL2bpS^rZz7b#1*VE6x`p<{Rf|_2x
WdG_i}kxuR!y1O6!=+j^Q{J#K{cyrhQ

literal 0
HcmV?d00001

diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/VPN-128.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/VPN-128.pdf
deleted file mode 100644
index 7ae5315347df2908c170a81509bb8855d729fd1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11566
zcmeI2TW=-B5y#)pr<fNch?Md4y<0*^*=0c}L6F@%AfY@Mb66I6ZLrTqkWZgqb@x=a
z?Ir7d$wQJO#ExtFQdM2`uS?GdUw``9AI+K$2eWL;^>;rVmgVD*m$Se9_VaN$`{t|f
zemY*9pz%BV%kk>v>Bq$~@OdYFeslfi=V?OyyS=M(+Qb*EcXNJq`}6tD@#^BY2k*aF
zPB(9kcgUZ7(sy|A=DSnn<+JOX*PZtKczgZk=Hhr;cYgNk>GKz-^V6~YW$Hf{=gYR*
zwDDU$`K0~VXFqvz{p<2AujM7L^}*P@(@NZ*{?06zxjo$+&tD&YIh;K+%gft?+28Bz
zKkAddb7d{UgI!G8$6vfYY^#Ym+QiPT{&+~mnvj;;i>rh6>y~WJe%Y7I%j<*js|(TD
zGEu`Cv&$(he)VZ{W|qaQK1QG1a&fSBjn*gQ7ZwSQmCfQep8V#*;_T{uHqkELt#OMG
zmk=roDKguab@Seayo7CyA#AJ@>{>!J!7rYzor$a%c(P@)esO7aCS>QC4K<};j9nbu
zdY88-v$NS^*cQi};xcoBS?!ixNit3zeBV3dEtpD0)_{mUt=W5)TAUt|=PB7z@<fAk
zyCM#vO;ndx%Pt;%P-xz^$lHJn9w8TJ*1&-k*&Dq?XZ%(c%p#^_9jkM+Z66LPJ7WV}
z4B7^*6m-gLrJ91=#yY!P-lbYpEjnOU$Tp_MWX#2uz?sPDpaUbc<Th71vPcd~tb{ok
zbbyIim7KG+!f%>s+gdPj^oJFUk!$hLHW(U2xX8XBj}5C0mW`@ocvr%Lu%@IKfCw>T
z>*{(CL)<cOP;EQeIu5>yoow`N)_igJ@$kdp>hRaY;du3ZcP*X-ehvaJ4TrMN^1f2x
zW<sZqOV!iAK}mv0;-w94?g2vD0YUw8A2}dOp3a`dI`YYv%h{K2E>Ew1zWhxWy+73N
zi{i|JB7!n)`}-s97-|3g$nfZqZj5}#?lT(x?(UU!{<kaJ-%)ml{je*!pV!%^$A7%K
zI6nXU$@28YVfyRhcEBW|rS7_^Ma)n7(ipdo0|@$zij=qkKTPcYgCHe11FC@pIHOE5
z;AB{{%^`tS*sT1p@~{SvMT0V!HZyF008HB}T&@kzpi^BS7F?z+3*NPj7=8&Yvb@dE
z5=%J%X?3g)cx&_k!0T^N00gjAeuL&JGc3wV@RR|$$}&9Yez<KFO)z)o3$I-Pu$;i$
zDj3{@;Rxo0`!1nfjjSr7c0F7Wcp{8~<f^YrXjW(vLqsscG4I@~U=yXvu%R2JsbH+c
z0!Y{dL(95f6O6MEc{*QBFwRWm>D)KLU{ED&uYhLNLt6m7i%vx}^wl;(AwVp#$6LUt
z2?ol+pd5O`vw8%2J}QKqwXd?x;&&}K!OU)EoQ3X3fZKUczQo?-5I9-oUM)~1R6A8Y
zTnu|weO*EmGm~gn1<PSJpf1=$!@D?4v@TdRGspQ5lEq-fgzx*$KxWBwtYkWmbYX&1
zw+%@inkwJz!3J+fRk&s%{__(TCgi~%0TGUO7tU3B!XPnF%+$4qSUmcW6VF1C;i*8W
z0!kci%UWVY+X+h&oo>ian1WbU7?!vOStKroq@i)I*~K8qad&MFBF>b9Fv4op(5i+T
zCu3K!Fp&^els!QcBN!5g5Ll~tktn1K+S~~cRCS2=6%kp~(bXoNEI3qYA|9!qnzu?f
zQM#0qC#!55nH-oPa&#VaKWwKRiFlt_Ieaz2swXS=RWQLcm9V`c6;VBOoRDK`%W`yW
zqYx|77A$|u&?>+RMteDX@xS|Lq?C(8+>uskWJ^uUO)xM)%|iDRQ|acTe2Jy>vsLcZ
z5LH4oSJlJCp`SZ;tqQvoqF7rD5Jfa9fMG={+aRd{vfgBsJ&ts1<CLm+qU*7%n#Em*
zcJJZP3LqoRez!kAM3nzW<p1S}EH%b|G9pV>@ZTJf{iAyi)TTQ~N*!E(%ex(z5Y~n&
zcuKz_CZP`4)t3)n=>k(=v8%IvfxeQa`#M}Hk|OruO4EmjuXF(kNL@_jN{1`MI$SAt
z5i&el!BW^ZRarVD?dje6)uYh;MZZ#{|Bim|ztROJ{gN*33-sZGx1BYm)U>$`SDHTP
zN=ljbQ<^fY!&Mp`u9R87THEQ{y~VXH`p)S&-s_rqnp{CrgplbuNfuD(aFIMoEjVVu
zLiCaB`}IVWI8UNQ+lM^eZmxFUsut+_@KSz~X><}wdPpRKyEUg`C=PX`O48rWX_qvC
z<Yz%89p|$!K=WuBt3_4Y*mlrJkAn2uXs<1U8Zuogjyp;3j5LW-Xo*Iegqts|2S>Fh
zJvgX|yfab?Ne_-*9&-wPB|3BTnraU&B`QofbEJK>BPKmKaxdVN<Z(-(m^z!T9(t->
zJ(`$v4=(7jO$oyRX-hF#I(VASAdQJJNxw~daA1^+W~1we(nb%itdy(Xn7Ie1iOJN1
z8??Cxr_?(=xS6{5;K=<lyVic&-h)eYP`Bd4ogN$<r?MG(o1+IeOmFnyCK`r>4b&do
zpsJBxN-yjWwHfxyBfH8{LkefLt6ZoRXjck~SZgDhGfA#7DT*~0C&1nO!>+bCPJbz6
z(e!6G`~&1NIR)t`TD+>D4gxl%obz}{k$$mvbY1BwlCpAWmI6u21aEjtUzu(tzBtiH
zRVf-Q`{U6%63=1mwiSBSgNg|z_Q{Kh^sh~!)tX=#lSVZ9v_g?iBbm0Rt5`SOkQVo=
zSw&1_(ZWT_hW;egHpO3(2B=%<IZK5*NSvFs!L$~{J`O`PTf&T`2eA{$oq-R!xH2VX
z>3@n5Q-e6lL>l+bv#^qgS7<z#P_~K6f^|pFF^#c2;fK<>k*<4AnWAZ;McB?@95N58
zbn5ZhTpJ}ipI$wM#75ViGsMjUY~okAsno^-JkBJ%pKiH#q0r?9((urPA=3TF22efy
zdlV@rE1)1a;!KWs8#qDTvmp^)oqUk)|3r)UDkvj&3xgVK)Wurbn$Cf;)YbSSwJ|l1
z^wR+;Fa<o?B20l&%IBbAL1c^+N?7oq&hQxvM>b_6Z53<)eso-41lStOwU->@*jGu2
z0`Q<5?SRQR!DZ{g0LEDk0X5WvOEefEQI66vXX-;Dip8W%;95sUMhpnON@)qMRwu<>
zaiW=o$}zomQhgi;&e5}PTMrM#gt?E%E;VLi%#6UP%|;gj_<ZQ+?;n8`VWL|D29LDw
zMi_4ZIyrU$6M(32HSqc{sM7J`>P75h5Yc&XSfv;*FFD$Uh7&g*5XDRpFA_fojevws
z@EyX?pwe@re@V{+{0ri?VrNV*p@@$au8i!4K}{PgkF$E@4uGE5*|Svt;cns6YpyAN
zd2AP~5U5j;8xSz9#(pZ2dgBKodb#n#mE^t)XCa5-BBkE=!6>tELGe()TQ2<Y>rMp!
z0@%gb;!K4IEHd`RG1@*#N!60?6VW-?RScc>F&RzPaey){u}oCJ;gyCZ?GlL2`$(2y
z74*AI3u*#9v7<B`n%T~I>9Q-8DBQe<Q%c-Z0>Z$TMLv8C(Bg)#f;DD=rIYQEKLBlV
z3rB#7bPa1t0e*8I1qsiM+*t`8p=$2@ByJESiPb^`3xO=gZ48rcDkN?bxnXngMsih?
zBi2aRVk<$o3uOz?5!b~mx#%f$yEvnWuO(7ANZf3a8VSRMK~fs=U8(mAaLhF)hA5bU
zEs%N|<d2#|4^0gkEMxJYE$PLe;)A>Hd7B((xD48SN`p!ecEqk+st>gl8`O~wjIEW_
zY{p3-K&oL|avXVwTCRhcN?48cMut&XrAUlfZsZZ|CXl;M!lN25@3O?=iB$a?m5ZKr
zoLc^!gy@mY=b||sp+BH>5c}P=*l4O*GHB9a4v33(4w?omE<C6-{kXA~%TaFXEm?>3
zrl~T3mxbK2>P<2WjEcC5BCvS5wysxBU7HvI`58IT@IN^vE^X*K%hW!OM2x3;U92=i
zo>Bx^sXsCZ(KKC0wc%PkG7o=~;bM60D52?@>Pkw{{pR4=8B1Wb4g@2_kZ@G)>I20T
z#|(@CV&o>M9j;-FbS#(TfVi#>BRA+IS`wzD_nkMFB&U*`uc~}H2Bjf`v~i*(8Jb3d
z`~ndqT7AKKBBX|e?&rR9wJV8WgdozZ&LSi6Bl+QvT@uz-f85VPN}fR_`@!1zB7zK7
zq3f;0eZHt{3>}9q2`%cwVRqZ#2`qJC^F++ah>$#*EQQBzZ5SB`FJD)nay8XSZ%V7N
zY_BFB={z9lZhP2%w?e$97q8;|)Pm%#Jh(`@>|4+pKBprk((Puf#L0y8E$OjNe=89&
z`$82D-lsmw8hNE3UVjY?NG~WekOI@#YPD}RY|K<~&~P6+PHz%t5Z^A2+R-G<Sn{pJ
zdCC2Ih({+HW>bFk;;kZ{;B`d<q8t^Mcs{X;2T3%P4=k$}rIU=9z0^B|0KA7>fbwA6
z>Y-He9UOe@CzWDd1`k&%i7NOY>%@sl9PR4ecOjSznzBPQQEJ~(oNo|2Yc&+rU3Qd1
z#KDdVD%U}k@#!{9ioGhI1oh69KB(wQ(FG=e9QqUU9J<kzNv=Ie1AQx#`zDI#Shw_4
zxC<PlNd-#Ot>sQx7wPNj2Kq{eD+MgmBT`~@z6bkvc#{tXcE**Y3)hHU8Nm>gV;0n*
zLo__RZUXYES_U_RrbkqRN0;(W7NBmdXY!V|VWL-5Crj7D@|Bw8fMVU$)Y1eYS=;D<
zR6F3)weAssXuUuMf=O)($xZ#(4(H+~m3#myt$<AGjyIE7aIs7^fgey6);gzciTG{q
zbo~g|LX&0%p`XL103;YWpU6|CNZAaPja+V$F^DC=a;qx|I7B`I5ufWZ9zUdRh%6xq
z0I8)UD)b!apiv|ddASrN{z<0gUHxWHTBOi$l17u73zeB7xe-ZljC>H|<eQvMqHLjG
zK!T$)CEK>Swk~N4P==BDl9uze9-o29r*VAsH&Gl-CvQp9r+G9$P$D@2Ieh)V4lZas
zh{o!DJe|a*9tk^5wHybZ16JKiGXmkOmigAuQSra+u%?LjmXFEMQ~zv?-j~%6oCsyp
z*JOXXy1G8yF5k+hp8Wc^uV0_P?4P8beR=%;)%kmWH7ZMuFI7>kel`2_`s#GNVoMHI
ziC@ddv8RP|tfc94EFrZo;^fQRKfn4OUKbJJ`LeV8^!g2R%>w~$p-d}*mD5Th;jL~s
zB!7B-I={Srd3WlsH^(0i+fokI;G5OsAXo+D{*w<-<+l)N>W}K^A&Jboz8s_E^P@W?
zaz^?D_em16<+o3y5R#hXE=d|FJLz<D{_660a}c$C@hM9C@b>!k@uTI#SKoisRCo6L
m`uenpTIv_gXD?p;^N5V7?DlkibE-m9GH>DV!3WR2`s`ncm*2+#

diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Contents.json b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Contents.json
index 0b89f4df48..20e5eff4ab 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Contents.json
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "VPN-Disabled-128.pdf",
+      "filename" : "Network-Protetion-VPN-Disabled-128.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Network-Protetion-VPN-Disabled-128.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Network-Protetion-VPN-Disabled-128.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..bee84f6a0acf36ee399645f3fc3cf4fb7aec6efd
GIT binary patch
literal 14855
zcmeI(OOG7abqDZ$e~R81umh-B?+0KQh#oeK#IPe}VZg|O9*t!gBT^<uft^pE-~U$i
zt)3wfGIllrJPWCK>b}nVf6lG`(QiKg`6umVKAqZgbAJ8%Kb_9!pZ@gx;@|)J{r&mH
zZ-4#!Ki%IwqWOFAulKLMdHmzKGw{ou^ouvIfB61pLizXhuFTmcer3HkFJHa={^gtd
zS9gDX=lw6wk8ggse?tD*&-NX@`r-GF<t#sc{pP!!_T~NC*FU_uyMLRV>&Q<(ef^j7
z@6OGoDSyX9+YDFQyj-9D!&;`keSCBO^1IWYPwn+Zo&QOFs_**YG7sah^ygu`tj*AN
z?fLGzQ*#;n{MqvP!`r)8r>?y$!??`z`IC0Nj7`(_&H1}i*Id@ctmgcQ5yLR7>vTpO
zvu=p}WnAZJ8lDix%QAJ{xSsE_Kpnegfo>Si54YsLz4XmEj`P{ZZ95K)b^FfI`*~Q-
z?R@Fbmg$ywcX}`R;nX&lsqb6N-z+gWW79V+T5}n?Wu4|j@Sk+kr62nh=XZoOg>fT8
zU1nN2x0kM&R>uo%X!>Ot(Ux{1##`FmX}$DwH%{FxwY5&?NSmydZtUCU{9a+-o&I?G
z!|B!O-%h9dS6}Zs_Y`|S#hy3AAC@)m3zafI&K-t-xI=&L``A>!e3UyZ(QwnPS3~JI
z1EXX-GvgXB?c5C<i?j7Cp<}1ac%9d=yQT5ubz0cY-RT&~C8lN_STtJGxBWVv`B8kJ
z9dpWIwR(5%M&>s3<C59&oo;E1pG`Ju*7ML`J)`ZNq96L@hBjvFbsbDT23F$34bd|F
zIP&YEy-ee{bbai5n3i@v+jm~=JRKy5nJ!)14dV^*;pE(7zjR9+<~mtS>YBFrOFJ*)
zvYxwl<@!I`eGGTE`)R6nKUV4o(!lh8YWFpYe=y!(lTyh#zwOS+TYEY>QqJ?I7r$js
z9~^i+#M9X?zWB@IFTQ$w`FLNp{9-8oyL(9)d!~8+yyvTQf8)Hq%=`3L=NG^F;o<Sy
z?;rkJbKcV}p8o5_7wz9L@ja|uNiY7s1e^1G^Y--Oi>~~SLOy>jApaSq-(C#ci*9@I
zo=6>&+bni$s=>-PH-UObEQNDh#G1dX;(D&h>8cT_Yr_mzUZ0Dy>b#M$@>kb<KC){0
zgCoad_YbVOSpbXs;F_DtKQOW|=|9(0w>**Hj`Bq3O>%p-eDV4He|~#+|K%?}J%9Gq
z>E>T|Z;K9#av{kg9T~ZTr{k%<T$AHFKqxV_nab0LVHCu*tlcVb$~FF4X#*bX#~E50
zE?oyet?&;>(jd;E&8^73KeTx$udc%d&253UPaY`Cwv481B!`H+m!+BErZcFKrR0^1
zj5N+I3I_b4gaHqg0-9acLOf{QWg4bI*cafZ1nhGMI;~hb_RG9(9vf$<=Yr?3W<1P!
zJ$-ut6$iPbatOgAELX<JA%JUao4Jvkukw08lQK417#jjvbN0f<&e#oQXDn;&qbg%e
zvG3YmDlLqWa@}uZtel~qYh#Sg;K=LgH^$~Hv2(b;lFP1g*cV8aukzY9lCLA1X_XfR
zhQe5K_+^dKE4aAPPh}#y9?2Qkl}6JeJP?6|u>sb&+C$w>x-Vu%XZ2jMx0o60s;93O
zSUIeAx-mu$cc*I4RbCIL&CJ;N#uyk-jjA$MDb?`q%&W$@Gq#!8v|=NSk#gOy+QR`4
z5`{}#{zwmove!NmJP$eYM|$v*f@h^IMNG~c51ubAZ)LgG*;b4c=5g$&5pCG4bbA1m
zwpT?ihNlwS7MPnN(Jafywv7}952UQpnEUn&<;CC|n|EvmaD=~#)VR^ISwp2n(`uA3
zSZTyIt&=lY$tFtz(Gm~tkNsj<s<+V@>bVj{dd@i~ii9zzr%ZC_L)kgp-RMRR@jB&S
zBl=W%#e+N1qtL=w8`Ix?b7w4`xKnn<Vr@6H!Wh`(R7<<XQ;d~Zu<y59NMu^iwK3Lo
z#q0LdZ;UBMD~B6nLu9kdVOv0;h-`LwZH%$Wcu&)>9Xs6^LmMuG_<Dq<P<H+7Ok}O`
z(r<~Q(r9`~UAr;X!TX!o=%VfyPucCJo-6hiCD3d=eYL>KVYSmLhr3g?=PIuUg=)-<
zjc<&}7}bDw#)ex;VJ!NoqjtuM!2<Z=_r@40*ZrzJJoVs$qdwAukBHG+rTdQ*JQaig
zM+#1u{FoHnzb6Iv@ggqp_orYb+p`oLnD!AV*y;a&rr=TmRhV2u_In_7+q4($uq3En
zeAx2XhaFhMtxd=g5%&~Px|hQ;^f!IG`V#Va_Np#$lTo1gWo@QFr+s*Lv0lzrhgXXB
z;&phX)rWUq)diA?_C@P9b$C5+9bPF<BjlJ8^Wy|OUn>(>rvMz;@Pn;hU7ij1*ZngE
z{6IZqUSGcZsxELNU-<B<w0)(D{Oa&ZDL8o>UTO8Au2d;?fn?`$^qh0wrVg(MuEQ(k
zR=yu4Se@S8^t9IYry|&;{KM|gA4(5>y`E0~9bu<n$F34N!>XwWH_!UxZKpR^Pk3xt
zNrY5SQHd%O><x{k`!Tt`y}r9aSH~JR${N5b=W8_Z>S|+mW%QVG(1f%)=b#=>?|XZ!
z0|~unb-4GS4wn|>bD}YQ4h?)jr@O|CVd1nerm$UUPBdIr#n6+HaIB(28!|T%b?l7}
z0=4HhbE;lA(a`1!gTyPbYVe`9<v;TN1>5bU_$OQee(YA)1jTkdZ1*qEA7VQT7`^mq
z66g+V@5)T6J5=M-swYs1Ad!oeoisKbc&<&{_03d9Y2OZW3Tv{NEvK+v(<w*?*J*~y
zRYXWc?5YI`44k!od;71$I*+D~7l3|H-y^yfF<G5pDbX@h8?6kds|P+v0h_b5ii@47
z;Cw(_mT6W{SZ^3ywFGVgjgxw)=L$;Wc|p<??<fW-&NBz+Sg&zov?PBt?Kp8BE%ja{
zKAd&qb756ZH|0nw@>S1<NtC8HMX!BY&a=jR(+d4v6w~UXbWzOOHac(G?o%r2+-@~)
zvXZ^4KZQ6sNve3odt=6S(KWA3%;aux3q;X?akFGI#@i2V?y_(_cC##>V8^n%RzVK3
zcg;8lE|2a77&IGMh(hEgoOw`rp3}`==BWsPrl@LI3mjL#Tf>c9Gf$;S)3@uW3D7ch
zkwrJDcQ0YF@Q*mmW4i_<t;xdnB7i}O=eofaAyaUXB|WtZH$oaMUy6R?`fkM;qAmlQ
z%2ezakp@De_AxcboEAb9Lt1^ER0xRdN&XIT?pCEAl2WNBS^bE<FHxswVtp6(V|LvX
zT^lzmmdkCy<d!gZDvB{zl7-|Lqe~C+Qaw|wsVP_8otT<Pz!@U{d0ppB)k$zcvqVch
zcZ^D=#0%9OQVHWlOr-}gx|B?bF?C8aQ>T`(mj=q>Y6Qs!TNO=m?HV9rSAheIGzRXq
zbFKqvUDqqVZ+krhHKyC1dFZ+(#rB+PIE7)-^~8u*L}Klu5&|2$j;*m*SFxB8z*^ek
zCY59=v3HYe$b-n7`&L!l#yO^ix5dJlZG_2TNB67cE>_t_WXfa2ZfJ8lDTZ#S8mV!6
zW!Fj6=@W`7$*w|?8W^vY=qhI%={QATuBp;7C^yIbl&P(|)1p^IO@xW*dYEahjH4#)
z)mSs1my9yk@(E*Tvx_wMr1nklSl3vp5J(vvNkx#ZtROcuvU_sqgJw4FFuc#+M{+$^
zWsaSZ+`D1>)Voj;V?}do=E-cXDI&Vj<0Y=MXF&&T8rDU?Kx1e8B(%=OqL>^9L&HOn
z*t)j4?PVuILqk2eejb~`1E-Lq^a5RfyGe}gdJ7W>cV?qb!@%Xr9K9#aTmg?|arw|D
zUe0RJdUM$$S}af4He2m&1{)#2cBJ4fm<ynqOwOxa%!_m3M>FDHtW+GB%#b>`cp_b)
zIuHju526Xo!vEQ6BNwN24H{(=Qen>GbQiCXs*H@|=l(MKc1oV2EuNh0j$HnwdH01b
z^@{|o?LO4WoLmI!`dI|W*|_!{YG@2nOhI$|IwWu0(p<@QCF$KzWj3c3oXo+&z;2R5
zu*3XGcVzt=P2kv^GSns=>N5<{&RRERr2ZXa4GlBtWf?~(5@$(OZNtrT@@NO<Gg|_S
z!5fJOA!;aj&YYs<<K)I|G_wH@VLkRxsXpImn3^c*<a|S}2|5xsTegPRf$+Cn$9H4|
z@7*Z3aseI(-X__~c4&Hu3;#sxe954ZX~l^Nl)Gg(iUW4?jlG$i+vlX}W$hW+HIv6a
zkCXHG4Fwdw?Lr>6BUw;#G;WM^qa2yCH7SaPh1NGKeVWZ`JND!<A$=_YTfV{#F9;80
zZn6}|j)|%jL`Wdp6)!13dTjxUP(@(+M(b!!FE2>awTO`=q=_PPq4EAL2rpt!-^kzg
z(SHtFvbS6InJjXi#Z8VCNpfWwPA<H6u_h<CkF+Kgh8p`4k7DsmV1qins5P2hGGgOx
zq`NYaWUPD^W1sj&iJlxYaY9elHCt#4^(-O}-Q;r?-WI+oyrfE6=AR>}@muNJnn|Cl
zWa;E2O?kd^K<lwX7HBel!;?$4T;igxX5b)zFgcH;RV1`HXd=R6z3j&Zpr3ep;yO|7
zS&vEr=VDD-C`o(d=N88)Aa!9Pu|*a&PE-g@)QfGGy*qqaiOj(X2rf}GeP;IHJaQJ(
zDbaOFOpYG%g+)nViMb+b_zpx-Cdldm8Z=g76l5453k?btC(5`&vp0KSfV6y2;VTdq
ztR$cbFr(z?gLDg=)^Zj`oSWhW?i@$x_5Bc|!f9%}eO&SFiiyjpLQ3gblt}elaS^x)
zbpY-uXI+~vL59ocDvr>ILOv#Z;bu>52Qvo^GlCE+4-UQ^DRu@LgqAOjN}5Wr7Pvzb
z1qvdKC^&pVOQ6%#T8G!cRZ@2R+-x>S?J{M;1(Wg>6T#cr8NmYvYoHIBVAf(jCNNHc
zC8-@PDP_Cv#9wS{GaoYIehI?d0RzFMOo2Ia7V>cmLED?*Ka*LJWxSiIW_dwvVdZLU
zt_qeRf~h{j0c^xhmdP9Vq<Ro*!Aq^X1S!muU|ZV#scaM&ri%F#3>P@<hJPeV+K|w1
zNRaD>Bkpo5w2#B70O-Rnio__p<2!owQz=f?Tmdm@z(a<Ric@0oJN{Tahpm~)RecE*
zsLNd@DV<}y%WFgcTS06==dns&GHupW5DLoy+LN`51A{*ainOeb6XFt%dRaGt2g9o8
z0-$l~Rw{s;{!}K+C<5`dQ<Ko`EvJ?YNN#eOof|ti9Et!?wou3-a@iyZ_3%*{nZhBZ
zV0Hu)OW)&4qp@q!w&s-@9~3FgW(Uf$c#J>^_1RGv_K{MXWJ>k^1WJ3eCy+buSz|sP
z1bW<+u+@CWG^Y%113Zdn#YSSk;@fs|7c4Gk*$Zz3;Z$H5DVhT|g|?-+1BqwcHT5w;
zAl7xx%}Ax-Dw#%mLR7ErrDP`;WK$?oDcyip{D}P3Ku(Uz`V0JIzo`{V)zknrW|v%$
zkIsY<VKj!3n;4ZG6AFi1v<JOv@Nq03395K+NH=DCjFYWIV8u#F_BbiYQ#t5N?=iCC
ze(+l^=Myes-W*IMV=0uCBL<$xdZe6Aoirl}0f)RZ#_nLuB)&k#oPrIPNY>{A%yMT*
zGlb*y2(K_~F)OG5Ny>v#1Y-|PlUC&>LUu_3tTy=5ZZvL~eYvMvm;n;MT1$D3Pw(=j
zsi|~g6iMSW|95!FKoBa0k5agN-}WxMkpcq?W(+0@LMa#PqLBJB38;ixs`ssE1S)yw
z^G}Y2rDWZhY^T>DbSub&Pse7+@(xad?lB`cQ7M{Mh*%I>N=<@56U7rdLIa*Q2S%Os
z8;V=Yu;Nh}i5+vCk}rX@g(hS(bK$pd*hy62MB=@wGSno2ps;**3zZjCDATq<^zY$2
z^7z9)mG4$_K|ekFaO$JltqUnFB(j-^>Oe*E5$#rB44$HM3Qq56VT*EC8U|dl5&<xw
z7^p2eZ>Qu;_`v^}6$PioQECtQSg_zz>_kOUF3%5=aj8j<sVq%};TDxOr5>9TM#={a
zTwKS9uS3%Talkg*CnA@+Enjiol8h2FZ>HXza+w0&5jo$I(o>>6p=s%*xK9q;Cex<O
zU%W#6XM9*Xn9D~f5kg!vhF^pr_RWgOLfYjgG^Q9Wa@k3&<6SwYDJp2$ItVO@p7_(T
zEZwZc=!2Ng8`57*XRD5kGe{%O2-Zq6@JS^xWlc4mo8-xT*j6?w<m*~u7SH4Qb<0YL
zKK8R!TGWwVs*qV}!nZ~P3$Lr+Q0f^f?Ko;(>R_nuc#z^56r`yFUrLOs7lAc*Eed<z
zfuRNei4wWYpq`A<WeT=VW`R@#3wBD{l1vhAIcUYkKsJtD$2ptTlO?aKGfqpEG5Z<R
zT|%Oi%)a!A)ZyvVrn3gv(w!L3<bd5P#Q|du*?ONxZN`Y2SxXj6qvLu72xVkgYSUX%
zMiIcx%qpFv%CvW#A~P0!%XB2uN)}`f5-4FDfKX>vxju<QHR@dVKMv=qz8%HA?LsG&
z`u4Q7>S1G1IjuWQ$Mg_2e*@jhHIJ{q%O?>fPnA!MXcf-9QhC_0<`)a`we9KVZRu+S
z796zFbBE;xhJ#qU(8nqVsV;KUtrlgrHR{8A##hpo0=Lsu;<0;O;~*s~Z`?-K0k{!a
zgn;pcmQvHG2=cAlL1m<xX6ok+RS1O8Lm>j{%#1$@oghGRyu_%#hQt)L)I$=<(u`Cb
zL(E(C0s?@j;(fXQ4DbdwG&Zw{gxs~Nwt_%_5q_q;V2cVZJTt0BgS5*>O*)6x%Sj<s
z=5CzwAmD||EYk!)S`FYTt*Kx)aZ{MfuGVm1@eDrUxM}0U7^bor1&pMOhcRu;?3!{*
zR4jc_K|n`2*CG)KU&p@-7jr{X8%Z<PQ=g?=4^2Au`H{0I*-}M81*&>^Js(qXn-WFA
zF5l#HS<P;@LD@B-z!gM3!3@u?3=8{d<R&_Z^MWkN<x{Ox{`tajy8@D)nucwJC>F!l
zTYBR03Dl`h(jG5$8-U_yaNSh;A^=#fV8DGT3GVWMq_*jCjaA)T%OW-Ecn0t4M5x)O
zT4qpNdR=Xbp%f)EwdYh=4)(jD%G*<Q%qTK|;-Fy^&SR%Ub5KDK*CeQRI;bETHO7t$
zo-F%tX8qNq(BnjvmKMR)Au91fjhJ3ZDuhZTv@O!uZr|h})zjR3E*TAN2hUev*U7T-
z#^JF=720u>O1cS;@A+t5RNlW&cPlt9^{Z<^{rV!mwD{*&uU<dCJ^wDhOY^t?0Pi<1
zzuA8m_u^OgUw`}ZfBh4;EOq=`F5k*uf4cYC>sOEWuWTs<SK@E-3%y59y3=mH5-+sv
z>-(JdU%vg?Y58PEp0B6=?DY?s{tgdsw_n>`zc|-pxaB=uzCAWQ*#GS1<I9KF-#nfC
zmpAu+II+I|RCK*5JVpC>M&JK(uKb-}T}dv8-XTHgPe-*nJMWN`Qcp)Ike`n#oz!Qe
zMz!%1l43^Kc}7aV<{3%1=Q+u*4lC*L&C72e?%$lEhF^Y82|s@O`n&s|oPYf7*FV`b
q@#4$Zuc@K_QuD=E-~QKqBu1ZaA78$CEHVr>A5TB}(HFn|`F{h(E_+=7

literal 0
HcmV?d00001

diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/VPN-Disabled-128.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/VPN-Disabled-128.pdf
deleted file mode 100644
index c1ed98cd5dc031d4e8ab8635c9657c3050092833..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11174
zcmeI2TW=&s702J_Q}j!u1j*yBYgbFrN@TN%5Fo;aw}=NbJJ~Gq+F%<L`1Jh#RW+yD
zmt-9x@qjXsvgOm&r_TLW{n1ySe{tsa%WmhUdAk0~Uw6~=>8I2AtMBi={QB<V?%4iX
z>OY5zY2MFa<~O}~!Olm&^H=%VJLA~tgz|@R`mxjh_|Ej~onh?!!0B%6{NdAIypTkW
zS8pW3oxdl`-yN^s-hDR(fUmXd_U`6*@qTyy`SG9c4#(GDem1@Qdi&SmcK7$)`71ZQ
zz1^Xk%JDp%A^OJrSlL78!s%%;;Nksl-lw1+dV9FIJzVXUeOO$KVT$`A+-`cmOZ(zW
zTFR96Zq;wP1eT&NIRf*EH+*0Cm4zOq)VG(+LJ0CY9d-?^i&Hy@?U%qZ=zRgUfGW%!
z9)x0<%87?~S{UT83;W#IH(02|fD}y7RF)}JlA*!QJM4UA4H}HDOJIxkyFtC*M;HsD
zzH{jJPFTfim%{;ZX7O5vye@%x!4_a*%q96qqtqDNK>8!$>Puq`Od!Ay8e>S=&TEXJ
z3-QzGYK);X@zbeqj6tAr*dE0QL@GuO4FPhOOvM`VY6l^ZOJD)E7acCf7Lk*sbQw`6
z+4N%&={nY@+g)ACjWKsJGib2$4%k+w!RV5`NeO7ys5c8V4$V$Y4u@gSCa+6iGBc=e
zjFmLZ%osD1GR6+O4XiU(&5Y=Wro|Xie(XPo-FLfhcUQYVRu}d^!G-;Dl5R?;)rURU
z;q8bD*If2BI?07gr7tgXjFStOs@7GmQDml}E%F+XhcsRU(e`BpQW;E`NJH!0)K9{a
zB-0uGS1(|-jWp$b5|TVQf1*C076T-8cWDkFQ9|(|3R^X_D&a=SI8_!V4k5+JQ#5gk
zA$c%?Qf0LgNN2RU6G70#A@5tovc%EFCQnuzsxYy)Yz*GGGlMtgHlA#}&3h1~BtAL~
zb{@9VR3h(_l|xr!ta`FhUl~(OGY;D$CrFn=j}uZ;LyPL#K`GZryJGos0agR7Vsw=5
z<$v9ijSYhwcKH-(4Yr)5+!!M!m|56)GL>#VMwcw5>(;0@Lo^P}Tuly#UDrEyZ34R#
zP}Y_cK(XeRjkOtX!?27w@NKNJ=aFu0XsNO%S&viAEbcpW_z4be0VE7Me#yu+gY``G
zOGd^Ee>@}4|Kp6Ts^I@QBS$%~Rmc|Lo+_!mrQvA7;~5EgpB|J!^7*_7I>N3U{P+<$
zup!ta7QYX^Bj}i{+_&upQHj{M8_X7u9~lBAq<XUG?8n%4BiObZ<bH%q&la$^V#}|m
zgFh@^Q-z%``K}LSZVw+nG6Wm>QZAklbWDS`6KMviWpmqZFk2WVgKW+-m{DchjbPhu
zkga^5Wx2uh=&Yu!f?dlTDB3vv!9u-Ys_7fOPjTLt6lmhq4VL|ymb^MaQw%A(DbITf
z&O)shNyziOMk<Sy9*oAsPdLls=8~Nv2`;p{ywXg<yU%{6*a_tB1wy85yaq_puWVrC
z?65D3Uf)1XDzWUHpG#nDanexe((#;Zz>b7sZlLQA<224S5ZVPzbcyoWfC6!pQz<3Q
z7hZLoA9Ga21;od~sX;vq{Zy+QW1Rgolz~)BT&c_k$WevPj$WHrhtisLq}q%PXxfLB
z>Mc!_6FwmrI9j2hB>JSP9G_?qft5^qy?_(-Q204G@gg$0h2qhK4lE}x4mL2iho{*q
z4Lk*<;2!U@3Y6`rTy<Fqah|-#NNAerkdaSWvrmGRCFD}MT=$qz#)$BKmqVoL4~1$u
z&j{C3X3wb<q((%5j3rN=>Ts>Nkr8i~WrhnBH?Ka^#XymY(%H?c1iMBAQ@LDa9W<|0
za%oL;4KeRSPAOOHbSikdxI|tQ$(dRmX<^svJSFh>GE?RPE35OK>A@53fq_2(z1*~b
zKhIxF^-~P&;X?j842Fu@Cr=;oUIw@zBHR$M6$F5I>7i+n7-X#U4Jq>s5dOzTK&i}*
zu8^dGr-zVz?cg#t>{NTGD=kPAV~dQCct1#WIWr-cCr4X8Bc7^coJOJ_Fg%!d@=_A5
zo$ah;JZhSmHVi0)_*v5yhYjSi^2$OI$}(Q3mLY2Zfe9dsIbr))mBV!yw`gQR6FAc=
zR8uP+lSB?U2`!c9jmSHidz?UYWe!JF-!y>C9Ok9e5!C?F;3K+%@$BQ`*TO^s%LJQ(
z60xsDnX-YvM{Hb|Ofx;8NRij+N^yY!MY6cZ3Kgg$L1V<&2P_kV(?Spcr$I4wd?(QN
zRL%7FiKv8DVs6DwGYpwA(FT_#;S@6ikfji0;-VoS`jQ-RN{6zE_K03>Vy!f#S>gm^
zJputSkg-+(lR_UZAW{0jIU87pGeDY54QRG10p)0z1A0FR8qpX|i3Ug#I6p8l2$TvI
zOCXw6Si+#iJ628<$f%i}XqII)U(AoJb1#E*E(fe;5C`eF{D8Iyt|^WpODx0~1J$6e
zj-8VYNZyEy{bbrQw2ICi4(S@G5?$+qO~Hp8ER>tS{)|YGHEweYPG2+o!vJ9+Ly<z^
znLtaUL4RA^g6|S429#zR<3s7hQrn8vIEKU62kk%%<l*TIzbJDi0$?+s%fyWVtHE$Z
zpi~$G$}CTmhS-N83yRh23vnLxtMK!+YOsR`jX$~YDHv@GxKcGCKd($Nt9Wvn38m=y
z;X>ju#i3qYe1<Cm=^lv%GR=y8uB2Ps-MQq*6Vx<u!CeVZIF8J@VW_^Up+cH98#LhM
z4lZGmNWqLEB;M8hB9T0Wo`GB8)hDRf@~?}P=XNfn$<;GQW^|43lHnEUR3$$&N`ut;
z5ABlbRH5zXjAwY2e~5%QS_A4zVSx7~k_XieK0@_^Gms_{=0<GI1TeOf>+3|S)}E{U
zmGBf5il`l^8dtdWd!=9U2DD0JgnN{eXT&3?M_?*qB-xlKVHn<ONE8bzhRFmm^112;
zrf1~%#s>ymOCFv@@|D!IYND@Gi8UHcQo<I*jr<u$%|u_AAb_bLQLrIEW{_i{@^lJd
z_!e(70bLoD{J5$-cr2;=s#^XFRYB!KNkjhmu&PXNXCzp%-GXW9;)b+SFxfNjkP$hr
zChb7V4syxV4j@;fU@AmxdIKcQP?4<*g?|SVQ|jG<;<sNAO52SR&@&?~p;!SD%S8h@
zcLNN2ng%inQr&<d7ynWjO8y$V(F+r36&a+*K(5ER&Zq-af{`rHl}oD2&KMX`WS|vn
zgs_6|;b=e^_s$SVsu5KRRjkNf`1}SYSy5&5RCU@3_JxAACZHuy%zzQ?6Dg=3IEB=j
zNSTDR5|Y{<&ZeY7B9f|78k6GM4@ByNS=T?ynll#7HtywA!4UePs@fR9>XEboM59Pm
zAz5%!G?R)#Wsxe1T84?`+AR5uCGD0bMNesdYkSYDH?4%n_<KxfS)~5KA@wp)e$^K>
zJ}6zTwLc__occq0L2|Y-IjJN1b#_^~mN>Z(f8=^Gs>oOF_tg8i9=s;%EU6(;Ltze>
z9Fa;zpGt1*ZS@pg6FII^htT?Jz-o0FJXH>*nC&zHkz+FIMCJw>Shm?6avBnhv#*|b
z!$4L07@M;YFB4TUD(>514i6Cs&%+k$t6_;U91LsKWlIH8j8&`atRZb;<4R04ZiujR
z4z-mYK#WPPcEN525Z_Hi>egHm?&|&RBkAE4_1A2;uMJ3Lu4<n~SC^g-pPru81lX`_
z1!^zQW?||$|8#l-Y|8Wc)!MDC2CTN4MA*dj#eh<Q()&B|OpUkMi7HxO(lX(J08WZh
zrCY6tMxm&Mlapdy&`2mJJ9FCyjJ!>4KQYU|+ESZa&}9Zv5^rPIl$f|M7EBsbq7V$Z
z>-GVd%odDK*nfNbp;v6nI(qrcMHz(>d5Z>sB(+)eXA8Y@^14H&oTMz$4M%mzhj;dN
zi!X;9R~qy<nB0s@z26Z_kr|mpoll2SaAFdvHciZRl*LgrH6a2ZSCDlzO@JA4EdP=I
zRG>wyXxIVDq=yI~F-_CG5$NVxrw<@4M59I5xK-6y0wn;6TtSu!0Q2Pt)YA6R{WOah
zAbgw9Ne^B&`^*IgwgIwJx2|pU>2B{t3NsTr1@bIOl7W`GCWU1BVmz;s0(AsrGEOFR
zcd2N+K*pk>)<~le7?ByNR8y!b`HeOV1{<2CGxoZ-vnZjGDhy$r&qU3?SoM=-nh>@`
zZbqq>I*B}IHql09n*KCSc<01jXIa`DP?ep0y`einUg}$)1P+yMw+`LYibFf)fSCw#
z#Nk82T<+NtnD9yZe9>Nwu1(++B@wyV=0<J?s~PQA{TBVXU%<>m#kRtUHW{%n{3Jb*
zvB*xu5IGSF?DCK!)E`b{2nKLtLiUuzZLdEG+`c}(3$TOiohPmzilt^<N;bl3Oklb|
z6Ac%b230K!<{&DwYfP{vb0~Vl&Hz5mj@gk>h8Y;jCxKg(gT-en&5+k_0XAFUD?|y_
z8g~RPyID}K2_hzq4u&ln*K;Ml;SsYZpRe_c7YcxxLQF%f`lE>>O0E?11B9b6UlAHS
z+%}S1i4Ve4r!xKZk#A3@kZ?_CgPdBP-ak^4%FR~Bbdbi|{ghL`2#bRpV^nwYmGI3c
z2^e2PVsq+VeQ>U3U5#}^VF)$>auBSPHDqJemYRyVdS<Hf;?9sob*wwhGzRKx`?G;j
zar3bR3}$#Yi-+57^HxO$tj_o7{2ty^z?=v-&_)Cr!|8`1m<@q&K#es#ydF}MXQyyz
zXh_9W1WFTCtpr*i)3<^B!@tv4f+(|pap`97y?s4MnZNlG^Ve5b*LSzmH-B#5Tb}>v
zUw=DJ=U-jCJ$AtFk8j>xe0Kf)^o`u4{>Fm)ffH<n|Mv8R>h<yV`X4uk<LyK|nO=8%
zFR!oej#nH>m1@ARE^dHLbT<{W`PNaO@!jZe-@Sp>Ni4jcPUpP5{s-^6M-1Eo*<d0x
zZ!n3&TRV_1O*`i=FYYcbuixH(_4}LSw>v)M*fkFI|A|>Y(*(f%$DpFFCL&1tF<H0|
za?AuC>;gn6x%VQIR^0^Ycftio7i%4KcXRRX@_4h;hqS->9C3Vnd;R|S$@KBNH=i`2
ooWH)lzMI5wmHPSD@BV#+`ucI`#m!x1hms??-A5n2`okCh0UT+7O#lD@

diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusView.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusView.swift
index a70e22f729..aae033b17d 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusView.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusView.swift
@@ -50,7 +50,14 @@ public struct NetworkProtectionStatusView: View {
 
     public var body: some View {
         VStack(spacing: 0) {
-            if let promptActionViewModel = model.promptActionViewModel {
+            if model.shouldShowSubscriptionExpired {
+                SubscriptionExpiredView {
+                    model.openPrivacyPro()
+                } uninstallButtonHandler: {
+                    model.uninstallVPN()
+                }
+                .padding(5)
+            } else if let promptActionViewModel = model.promptActionViewModel {
                 PromptActionView(model: promptActionViewModel)
                     .padding(.horizontal, 5)
                     .padding(.top, 5)
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift
index 80ba7a9255..7df51daf58 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift
@@ -23,8 +23,8 @@ import NetworkProtection
 import ServiceManagement
 import SwiftUI
 
-/// This view can be shown from any location where we want the user to be able to interact with NetP.
-/// This view shows status information about Network Protection, and offers a chance to toggle it ON and OFF.
+/// This view can be shown from any location where we want the user to be able to interact with VPN.
+/// This view shows status information about the VPN, and offers a chance to toggle it ON and OFF.
 ///
 extension NetworkProtectionStatusView {
 
@@ -57,7 +57,7 @@ extension NetworkProtectionStatusView {
         private(set) var onboardingStatus: OnboardingStatus = .completed
 
         var tunnelControllerViewDisabled: Bool {
-            onboardingStatus != .completed || loginItemNeedsApproval
+            onboardingStatus != .completed || loginItemNeedsApproval || shouldShowSubscriptionExpired
         }
 
         @MainActor
@@ -94,6 +94,10 @@ extension NetworkProtectionStatusView {
         ///
         private let runLoopMode: RunLoop.Mode?
 
+        private let appLauncher: AppLaunching
+
+        private let uninstallHandler: () async -> Void
+
         private var cancellables = Set<AnyCancellable>()
 
         // MARK: - Dispatch Queues
@@ -113,7 +117,9 @@ extension NetworkProtectionStatusView {
                     menuItems: @escaping () -> [MenuItem],
                     agentLoginItem: LoginItem?,
                     isMenuBarStatusView: Bool,
-                    runLoopMode: RunLoop.Mode? = nil) {
+                    runLoopMode: RunLoop.Mode? = nil,
+                    userDefaults: UserDefaults,
+                    uninstallHandler: @escaping () async -> Void) {
 
             self.tunnelController = controller
             self.onboardingStatusPublisher = onboardingStatusPublisher
@@ -123,6 +129,8 @@ extension NetworkProtectionStatusView {
             self.agentLoginItem = agentLoginItem
             self.isMenuBarStatusView = isMenuBarStatusView
             self.runLoopMode = runLoopMode
+            self.appLauncher = appLauncher
+            self.uninstallHandler = uninstallHandler
 
             tunnelControllerViewModel = TunnelControllerViewModel(controller: tunnelController,
                                                                   onboardingStatusPublisher: onboardingStatusPublisher,
@@ -146,8 +154,14 @@ extension NetworkProtectionStatusView {
             onboardingStatusPublisher
                 .receive(on: DispatchQueue.main)
                 .sink { [weak self] status in
-                    self?.onboardingStatus = status
-                }
+                self?.onboardingStatus = status
+            }
+            .store(in: &cancellables)
+
+            userDefaults
+                .publisher(for: \.networkProtectionEntitlementsExpired)
+                .receive(on: DispatchQueue.main)
+                .assign(to: \.shouldShowSubscriptionExpired, onWeaklyHeld: self)
                 .store(in: &cancellables)
         }
 
@@ -164,6 +178,18 @@ extension NetworkProtectionStatusView {
             }
         }
 
+        func openPrivacyPro() {
+            Task {
+                await appLauncher.launchApp(withCommand: .showPrivacyPro)
+            }
+        }
+
+        func uninstallVPN() {
+            Task {
+                await uninstallHandler()
+            }
+        }
+
         private func subscribeToStatusChanges() {
             statusReporter.statusObserver.publisher
                 .receive(on: DispatchQueue.main)
@@ -280,6 +306,9 @@ extension NetworkProtectionStatusView {
 
         let tunnelControllerViewModel: TunnelControllerViewModel
 
+        @Published
+        var shouldShowSubscriptionExpired: Bool = false
+
         var promptActionViewModel: PromptActionView.Model? {
 #if !APPSTORE && !DEBUG
             guard Bundle.main.isInApplicationDirectory else {
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/SubscriptionExpiredView/SubscriptionExpiredView.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/SubscriptionExpiredView/SubscriptionExpiredView.swift
new file mode 100644
index 0000000000..666aed9e4f
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/SubscriptionExpiredView/SubscriptionExpiredView.swift
@@ -0,0 +1,74 @@
+//
+//  SubscriptionExpiredView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import SwiftUI
+import SwiftUIExtensions
+
+struct SubscriptionExpiredView: View {
+    enum Constants {
+        static let backgroundCornerRadius = 6.0
+    }
+
+    let subscribeButtonHandler: () -> Void
+    let uninstallButtonHandler: () -> Void
+
+    public var body: some View {
+        VStack(alignment: .leading, spacing: 5) {
+            Text(UserText.networkProtectionSubscriptionExpiredTitle)
+                .font(.system(size: 13).weight(.bold))
+                .foregroundColor(Color(.defaultText))
+                .multilineText()
+
+            Text(UserText.networkProtectionSubscriptionExpiredSubtitle)
+                .font(.system(size: 13))
+                .foregroundColor(Color(.defaultText))
+                .multilineText()
+
+            Button(UserText.networkProtectionSubscriptionExpiredResubscribeButton, action: subscribeButtonHandler)
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+                .padding(.top, 3)
+
+            Divider()
+                .padding(.top, 8)
+                .padding(.bottom, 3)
+
+            Button(UserText.networkProtectionSubscriptionExpiredUninstallButton, action: uninstallButtonHandler)
+                .buttonStyle(TransparentActionButtonStyle(enabled: true))
+                .foregroundColor(.accentColor)
+                .padding(.top, 3)
+        }
+        .padding(.vertical, 16)
+        .padding(.horizontal, 10)
+        .cornerRadius(8)
+        .background(
+            RoundedRectangle(cornerRadius: Constants.backgroundCornerRadius, style: .circular)
+                .stroke(Color(.onboardingStepBorder), lineWidth: 1)
+                .background(
+                    RoundedRectangle(cornerRadius: Constants.backgroundCornerRadius, style: .circular)
+                        .fill(Color(.onboardingStepBackground))
+                )
+        )
+    }
+}
+
+struct SubscriptionExpiredView_Preview: PreviewProvider {
+    static var previews: some View {
+        SubscriptionExpiredView(subscribeButtonHandler: {}, uninstallButtonHandler: {})
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift
index 0ed003c366..f2dae8b810 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift
@@ -95,7 +95,7 @@ public final class TunnelControllerViewModel: ObservableObject {
 
         connectionStatus = statusReporter.statusObserver.recentValue
         internalServerAddress = statusReporter.serverInfoObserver.recentValue.serverAddress
-        internalServerLocation = statusReporter.serverInfoObserver.recentValue.serverLocation
+        internalServerLocation = statusReporter.serverInfoObserver.recentValue.serverLocation?.serverLocation
 
         // Particularly useful when unit testing with an initial status of our choosing.
         refreshInternalIsRunning()
@@ -146,7 +146,7 @@ public final class TunnelControllerViewModel: ObservableObject {
 
             Task { @MainActor in
                 self.internalServerAddress = serverInfo.serverAddress
-                self.internalServerLocation = serverInfo.serverLocation
+                self.internalServerLocation = serverInfo.serverLocation?.serverLocation
             }
         }
             .store(in: &cancellables)
@@ -437,9 +437,9 @@ public final class TunnelControllerViewModel: ObservableObject {
         }
     }
 
-    // MARK: - Toggling Network Protection
+    // MARK: - Toggling VPN
 
-    /// Start network protection.
+    /// Start the VPN.
     ///
     func startNetworkProtection() {
         if shouldFlipToggle {
@@ -454,7 +454,7 @@ public final class TunnelControllerViewModel: ObservableObject {
         }
     }
 
-    /// Stop network protection.
+    /// Stop the VPN.
     ///
     func stopNetworkProtection() {
         toggleTransition = .switchingOff(locallyInitiated: true)
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/AppLaunching/MockAppLauncher.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/AppLaunching/MockAppLauncher.swift
new file mode 100644
index 0000000000..07f0d58fd8
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/AppLaunching/MockAppLauncher.swift
@@ -0,0 +1,30 @@
+//
+//  MockAppLauncher.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import NetworkProtectionUI
+
+public final class MockAppLauncher: AppLaunching {
+    public init() {
+    }
+
+    public var spyLaunchAppCommand: AppLaunchCommand?
+    public func launchApp(withCommand command: AppLaunchCommand) async {
+        spyLaunchAppCommand = command
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionStatusBarMenuTests.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionStatusBarMenuTests.swift
index b680b062b6..5b9e7e0dea 100644
--- a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionStatusBarMenuTests.swift
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionStatusBarMenuTests.swift
@@ -56,7 +56,9 @@ final class StatusBarMenuTests: XCTestCase {
             appLauncher: MockAppLauncher(),
             menuItems: { [] },
             agentLoginItem: nil,
-            isMenuBarStatusView: false)
+            isMenuBarStatusView: false,
+            userDefaults: .standard,
+            uninstallHandler: { })
 
         menu.show()
 
@@ -79,7 +81,9 @@ final class StatusBarMenuTests: XCTestCase {
             appLauncher: MockAppLauncher(),
             menuItems: { [] },
             agentLoginItem: nil,
-            isMenuBarStatusView: false)
+            isMenuBarStatusView: false,
+            userDefaults: .standard,
+            uninstallHandler: { })
 
         menu.hide()
 
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/Pixels/VPNPrivacyProPixelTests.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/Pixels/VPNPrivacyProPixelTests.swift
new file mode 100644
index 0000000000..05e05a5827
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/Pixels/VPNPrivacyProPixelTests.swift
@@ -0,0 +1,72 @@
+//
+//  VPNPrivacyProPixelTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import PixelKit
+import PixelKitTestingUtilities
+import XCTest
+@testable import NetworkProtectionUI
+
+final class VPNPrivacyProPixelTests: XCTestCase {
+
+    private enum TestError: CustomNSError {
+        case testError
+        case underlyingError
+
+        /// The domain of the error.
+        static var errorDomain: String {
+            "testDomain"
+        }
+
+        /// The error code within the given domain.
+        var errorCode: Int {
+            switch self {
+            case .testError: return 1
+            case .underlyingError: return 2
+            }
+        }
+
+        /// The user-info dictionary.
+        var errorUserInfo: [String: Any] {
+            switch self {
+            case .testError:
+                return [NSUnderlyingErrorKey: TestError.underlyingError]
+            case .underlyingError:
+                return [:]
+            }
+        }
+    }
+
+    // MARK: - Test Firing Pixels
+
+    /// This test verifies validates expectations when firing `VPNPrivacyProPixel`.
+    ///
+    /// This test verifies a few different things:
+    ///  - That the pixel name is not changed by mistake.
+    ///  - That when the pixel is fired its name and parameters are exactly what's expected.
+    ///
+    func testVPNPixelFireExpectations() {
+        fire(VPNPrivacyProPixel.vpnAccessRevokedDialogShown,
+             and: .expect(pixelName: "m_mac_vpn_access_revoked_dialog_shown"),
+             file: #filePath,
+             line: #line)
+        fire(VPNPrivacyProPixel.vpnBetaStoppedWhenPrivacyProEnabled,
+             and: .expect(pixelName: "m_mac_vpn_beta_stopped_when_privacy_pro_enabled"),
+             file: #filePath,
+             line: #line)
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift
index a67d7dfc6a..83caf2cff6 100644
--- a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift
@@ -28,7 +28,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
 
     private class MockStatusReporter: NetworkProtectionStatusReporter {
         static let defaultServerInfo = NetworkProtectionStatusServerInfo(
-            serverLocation: "New York, USA",
+            serverLocation: TunnelControllerViewModelTests.serverAttributes(),
             serverAddress: "127.0.0.1")
 
         let statusObserver: ConnectionStatusObserver
@@ -138,14 +138,13 @@ final class TunnelControllerViewModelTests: XCTestCase {
     ///
     @MainActor
     func testProperlyReflectsStatusConnected() async throws {
-        let mockServerLocation = "Los Angeles, United States"
         let mockServerIP = "127.0.0.1"
         let mockDate = Date().addingTimeInterval(-59)
         let mockDateString = "00:00:59"
 
         let controller = MockTunnelController()
         let serverInfo = NetworkProtectionStatusServerInfo(
-            serverLocation: mockServerLocation,
+            serverLocation: Self.serverAttributes(),
             serverAddress: mockServerIP)
         let statusReporter = MockStatusReporter(status: .connected(connectedDate: mockDate), serverInfo: serverInfo)
         let model = TunnelControllerViewModel(
@@ -161,7 +160,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
         XCTAssertEqual(model.featureStatusDescription, UserText.networkProtectionStatusViewFeatureOn)
         XCTAssertTrue(model.showServerDetails)
         XCTAssertEqual(model.serverAddress, mockServerIP)
-        XCTAssertEqual(model.serverLocation, "Los Angeles, United States...")
+        XCTAssertEqual(model.serverLocation, "El Segundo, CA...")
     }
 
     /// We expect the model to properly reflect the connecting status.
@@ -182,7 +181,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
         XCTAssertFalse(model.showServerDetails)
     }
 
-    /// We expect that setting the model's `isRunning` to `true`, will start network protection.
+    /// We expect that setting the model's `isRunning` to `true`, will start the VPN.
     ///
     @MainActor
     func testStartsNetworkProtection() async throws {
@@ -193,7 +192,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
             onboardingStatusPublisher: Just(OnboardingStatus.completed).eraseToAnyPublisher(),
             statusReporter: statusReporter,
             appLauncher: MockAppLauncher())
-        let networkProtectionWasStarted = expectation(description: "The model started network protection when appropriate")
+        let networkProtectionWasStarted = expectation(description: "The model started the VPN when appropriate")
 
         controller.startCallback = {
             networkProtectionWasStarted.fulfill()
@@ -206,16 +205,15 @@ final class TunnelControllerViewModelTests: XCTestCase {
         await fulfillment(of: [networkProtectionWasStarted], timeout: 0.1)
     }
 
-    /// We expect that setting the model's `isRunning` to `false`, will stop network protection.
+    /// We expect that setting the model's `isRunning` to `false`, will stop the VPN.
     ///
     @MainActor
     func testStopsNetworkProtection() async throws {
         let mockDate = Date().addingTimeInterval(-59)
-        let mockServerLocation = "Los Angeles, United States"
         let mockServerIP = "127.0.0.1"
 
         let controller = MockTunnelController()
-        let serverInfo = NetworkProtectionStatusServerInfo(serverLocation: mockServerLocation, serverAddress: mockServerIP)
+        let serverInfo = NetworkProtectionStatusServerInfo(serverLocation: Self.serverAttributes(), serverAddress: mockServerIP)
         let statusReporter = MockStatusReporter(
             status: .connected(connectedDate: mockDate),
             serverInfo: serverInfo)
@@ -225,7 +223,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
             statusReporter: statusReporter,
             appLauncher: MockAppLauncher())
 
-        let networkProtectionWasStopped = expectation(description: "The model stopped network protection when appropriate")
+        let networkProtectionWasStopped = expectation(description: "The model stopped the VPN when appropriate")
 
         controller.stopCallback = {
             networkProtectionWasStopped.fulfill()
@@ -237,4 +235,21 @@ final class TunnelControllerViewModelTests: XCTestCase {
 
         await fulfillment(of: [networkProtectionWasStopped], timeout: 0.1)
     }
+
+    fileprivate static func serverAttributes() -> NetworkProtectionServerInfo.ServerAttributes {
+         let json = """
+         {
+             "city": "El Segundo",
+             "country": "us",
+             "latitude": 33.9192,
+             "longitude": -118.4165,
+             "region": "North America",
+             "state": "ca",
+             "tzOffset": -28800
+         }
+         """
+
+         // swiftlint:disable:next force_try
+         return try! JSONDecoder().decode(NetworkProtectionServerInfo.ServerAttributes.self, from: json.data(using: .utf8)!)
+     }
 }
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
index 7a25f133ff..e368d38db5 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
@@ -20,7 +20,7 @@ import Foundation
 
 public extension PixelKit {
 
-    enum Parameters {
+    enum Parameters: Hashable {
         public static let duration = "duration"
         public static let test = "test"
         public static let appVersion = "appVersion"
@@ -28,14 +28,12 @@ public extension PixelKit {
         public static let osMajorVersion = "osMajorVersion"
 
         public static let errorCode = "e"
-        public static let errorDomain = "errorDomain"
-        public static let errorDesc = "d"
+        public static let errorDomain = "d"
         public static let errorCount = "c"
         public static let errorSource = "error_source"
         public static let sourceBrowserVersion = "source_browser_version"
         public static let underlyingErrorCode = "ue"
-        public static let underlyingErrorDomain = "underlyingErrorDomain"
-        public static let underlyingErrorDesc = "ud"
+        public static let underlyingErrorDomain = "ud"
         public static let underlyingErrorSQLiteCode = "sqlrc"
         public static let underlyingErrorSQLiteExtendedCode = "sqlerc"
 
@@ -95,12 +93,10 @@ public extension Error {
 
         params[PixelKit.Parameters.errorCode] = "\(nsError.code)"
         params[PixelKit.Parameters.errorDomain] = nsError.domain
-        params[PixelKit.Parameters.errorDesc] = nsError.localizedDescription
 
         if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError {
             params[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
             params[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
-            params[PixelKit.Parameters.underlyingErrorDesc] = underlyingError.localizedDescription
         }
 
         if let sqlErrorCode = nsError.userInfo["SQLiteResultCode"] as? NSNumber {
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift
index 9c616d0060..5370432743 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift
@@ -204,7 +204,7 @@ public final class PixelKit {
 
     private func printDebugInfo(pixelName: String, parameters: [String: String], skipped: Bool = false) {
 #if DEBUG
-        let params = parameters.filter { key, _ in !["appVersion", "test"].contains(key) }
+        let params = parameters.filter { key, _ in !["test"].contains(key) }
         os_log(.debug, log: log, "👾 [%{public}@] %{public}@ %{public}@", skipped ? "SKIPPED" : "FIRED", pixelName.replacingOccurrences(of: "_", with: "."), params)
 #endif
     }
@@ -377,7 +377,6 @@ extension Dictionary where Key == String, Value == String {
 
         self[PixelKit.Parameters.errorCode] = "\(nsError.code)"
         self[PixelKit.Parameters.errorDomain] = nsError.domain
-        self[PixelKit.Parameters.errorDesc] = nsError.localizedDescription
 
         if let error = error as? PixelKitEventErrorDetails,
            let underlyingError = error.underlyingError {
@@ -385,7 +384,6 @@ extension Dictionary where Key == String, Value == String {
             let underlyingNSError = underlyingError as NSError
             self[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingNSError.code)"
             self[PixelKit.Parameters.underlyingErrorDomain] = underlyingNSError.domain
-            self[PixelKit.Parameters.underlyingErrorDesc] = underlyingNSError.localizedDescription
         } else if let underlyingError = nsError.userInfo["NSUnderlyingError"] as? NSError {
             self[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
             self[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift
index bc87070df3..ca352f3347 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift
@@ -79,11 +79,11 @@ public final class DebugEvent: PixelKitEvent {
             let nsError = error as NSError
 
             params[PixelKit.Parameters.errorCode] = "\(nsError.code)"
-            params[PixelKit.Parameters.errorDesc] = nsError.domain
+            params[PixelKit.Parameters.errorDomain] = nsError.domain
 
             if let underlyingError = nsError.userInfo["NSUnderlyingError"] as? NSError {
                 params[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
-                params[PixelKit.Parameters.underlyingErrorDesc] = underlyingError.domain
+                params[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
             }
 
             if let sqlErrorCode = nsError.userInfo["SQLiteResultCode"] as? NSNumber {
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
index 7048519e32..811bf4643d 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
@@ -30,8 +30,7 @@ extension PixelKitEventErrorDetails {
 
         return [
             PixelKit.Parameters.underlyingErrorCode: "\(nsError.code)",
-            PixelKit.Parameters.underlyingErrorDomain: nsError.domain,
-            PixelKit.Parameters.underlyingErrorDesc: nsError.localizedDescription
+            PixelKit.Parameters.underlyingErrorDomain: nsError.domain
         ]
     }
 }
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift
index 067eee091e..db56d6664b 100644
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import PixelKit
 
 /// Structure containing information about a pixel fire event.
 ///
@@ -27,10 +28,35 @@ public struct PixelFireExpectations {
     let pixelName: String
     var error: Error?
     var underlyingError: Error?
+    var customFields: [String: String]?
 
-    public init(pixelName: String, error: Error? = nil, underlyingError: Error? = nil) {
+    /// Convenience initializer for cleaner semantics
+    ///
+    public static func expect(pixelName: String, error: Error? = nil, underlyingError: Error? = nil, customFields: [String: String]? = nil) -> PixelFireExpectations {
+
+        .init(pixelName: pixelName, error: error, underlyingError: underlyingError, customFields: customFields)
+    }
+
+    public init(pixelName: String, error: Error? = nil, underlyingError: Error? = nil, customFields: [String: String]? = nil) {
         self.pixelName = pixelName
         self.error = error
         self.underlyingError = underlyingError
+        self.customFields = customFields
+    }
+
+    public var parameters: [String: String] {
+        var parameters = customFields ?? [String: String]()
+
+        if let nsError = error as? NSError {
+            parameters[PixelKit.Parameters.errorCode] = String(nsError.code)
+            parameters[PixelKit.Parameters.errorDomain] = nsError.domain
+        }
+
+        if let nsUnderlyingError = underlyingError as? NSError {
+            parameters[PixelKit.Parameters.underlyingErrorCode] = String(nsUnderlyingError.code)
+            parameters[PixelKit.Parameters.underlyingErrorDomain] = nsUnderlyingError.domain
+        }
+
+        return parameters
     }
 }
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift
index a56f128454..00547deb5b 100644
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift
@@ -44,7 +44,7 @@ public final class PixelRequestValidator {
 
         if let error = expectedError as? NSError {
             XCTAssertEqual(parameters[PixelKit.Parameters.errorCode], "\(error.code)")
-            XCTAssertEqual(parameters[PixelKit.Parameters.errorDesc], error.domain)
+            XCTAssertEqual(parameters[PixelKit.Parameters.errorDomain], error.domain)
         }
     }
 }
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
index 5088ba1371..9017d8774a 100644
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
@@ -38,16 +38,14 @@ public extension XCTestCase {
     ///
     private static var errorPixelParameters = [
         PixelKit.Parameters.errorCode,
-        PixelKit.Parameters.errorDomain,
-        PixelKit.Parameters.errorDesc
+        PixelKit.Parameters.errorDomain
     ]
 
     /// List of underlying error pixel parameters
     ///
     private static var underlyingErrorPixelParameters = [
         PixelKit.Parameters.underlyingErrorCode,
-        PixelKit.Parameters.underlyingErrorDomain,
-        PixelKit.Parameters.underlyingErrorDesc
+        PixelKit.Parameters.underlyingErrorDomain
     ]
 
     /// Filter out the standard parameters.
@@ -68,20 +66,23 @@ public extension XCTestCase {
 #endif
     }
 
-    func expectedParameters(for event: PixelKitEventV2) -> [String: String] {
+    /// These parameters are known to be expected just based on the event definition.
+    ///
+    /// They're not a complete list of parameters for the event, as the fire call may contain extra information
+    /// that results in additional parameters.  Ideally we want most (if not all) that information to eventually
+    /// make part of the pixel definition.
+    ///
+    func knownExpectedParameters(for event: PixelKitEventV2) -> [String: String] {
         var expectedParameters = [String: String]()
 
         if let error = event.error {
             let nsError = error as NSError
             expectedParameters[PixelKit.Parameters.errorCode] = "\(nsError.code)"
             expectedParameters[PixelKit.Parameters.errorDomain] = nsError.domain
-            expectedParameters[PixelKit.Parameters.errorDesc] = nsError.localizedDescription
 
-            if let underlyingError = (error as? PixelKitEventErrorDetails)?.underlyingError {
-                let underlyingNSError = underlyingError as NSError
-                expectedParameters[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingNSError.code)"
-                expectedParameters[PixelKit.Parameters.underlyingErrorDomain] = underlyingNSError.domain
-                expectedParameters[PixelKit.Parameters.underlyingErrorDesc] = underlyingNSError.localizedDescription
+            if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError {
+                expectedParameters[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
+                expectedParameters[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
             }
         }
 
@@ -96,16 +97,23 @@ public extension XCTestCase {
 
     // MARK: - Pixel Firing Expectations
 
+    func fire(_ event: PixelKitEventV2, and expectations: PixelFireExpectations, file: StaticString, line: UInt) {
+        verifyThat(event, meets: expectations, file: file, line: line)
+    }
+
     /// Provides some snapshot of a fired pixel so that external libraries can validate all the expected info is included.
     ///
     /// This method also checks that there is internal consistency in the expected fields.
     ///
     func verifyThat(_ event: PixelKitEventV2, meets expectations: PixelFireExpectations, file: StaticString, line: UInt) {
 
-        let expectedPixelName = Self.pixelPlatformPrefix + event.name
-        let expectedParameters = expectedParameters(for: event)
+        let expectedPixelName = event.name.hasPrefix(Self.pixelPlatformPrefix) ? event.name : Self.pixelPlatformPrefix + event.name
+        let knownExpectedParameters = knownExpectedParameters(for: event)
         let callbackExecutedExpectation = expectation(description: "The PixelKit callback has been executed")
 
+        // Ensure PixelKit is torn down before setting it back up, avoiding unit test race conditions:
+        PixelKit.tearDown()
+
         PixelKit.setUp(dryRun: false,
                        appVersion: "1.0.5",
                        source: "test-app",
@@ -119,25 +127,14 @@ public extension XCTestCase {
             // Internal validations
 
             XCTAssertEqual(firedPixelName, expectedPixelName, file: file, line: line)
-            XCTAssertEqual(firedParameters, expectedParameters, file: file, line: line)
 
-            // Expectations
+            XCTAssertTrue(knownExpectedParameters.allSatisfy { (key, value) in
+                firedParameters[key] == value
+            })
 
+            // Expectations
             XCTAssertEqual(firedPixelName, expectations.pixelName)
-
-            if let error = expectations.error {
-                let nsError = error as NSError
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.errorCode], String(nsError.code), file: file, line: line)
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.errorDomain], nsError.domain, file: file, line: line)
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.errorDesc], nsError.localizedDescription, file: file, line: line)
-            }
-
-            if let underlyingError = expectations.underlyingError {
-                let nsError = underlyingError as NSError
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.underlyingErrorCode], String(nsError.code), file: file, line: line)
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.underlyingErrorDomain], nsError.domain, file: file, line: line)
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.underlyingErrorDesc], nsError.localizedDescription, file: file, line: line)
-            }
+            XCTAssertEqual(firedParameters, expectations.parameters)
 
             completion(true, nil)
         }
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index 51258b7e71..17c5430114 100644
--- a/LocalPackages/SubscriptionUI/Package.swift
+++ b/LocalPackages/SubscriptionUI/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "122.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "132.0.0-1"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/DebugMenu/SubscriptionDebugMenu.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/DebugMenu/SubscriptionDebugMenu.swift
index 1012fd4085..4ab7eadd32 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/DebugMenu/SubscriptionDebugMenu.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/DebugMenu/SubscriptionDebugMenu.swift
@@ -75,6 +75,7 @@ public final class SubscriptionDebugMenu: NSMenuItem {
         menu.addItem(NSMenuItem(title: "Get Subscription Info", action: #selector(getSubscriptionDetails), target: self))
         menu.addItem(NSMenuItem(title: "Restore Subscription from App Store transaction", action: #selector(restorePurchases), target: self))
         menu.addItem(NSMenuItem(title: "Post didSignIn notification", action: #selector(postDidSignInNotification), target: self))
+        menu.addItem(NSMenuItem(title: "Post subscriptionDidChange notification", action: #selector(postSubscriptionDidChangeNotification), target: self))
         menu.addItem(.separator())
         if #available(macOS 12.0, *) {
             menu.addItem(NSMenuItem(title: "Sync App Store AppleID Account (re- sign-in)", action: #selector(syncAppleIDAccount), target: self))
@@ -202,7 +203,7 @@ public final class SubscriptionDebugMenu: NSMenuItem {
 
             let entitlements: [Entitlement.ProductName] = [.networkProtection, .dataBrokerProtection, .identityTheftRestoration]
             for entitlement in entitlements {
-                if case let .success(result) = await accountManager.hasEntitlement(for: entitlement) {
+                if case let .success(result) = await accountManager.hasEntitlement(for: entitlement, cachePolicy: .reloadIgnoringLocalCacheData) {
                     let resultSummary = "Entitlement check for \(entitlement.rawValue): \(result)"
                     results.append(resultSummary)
                     print(resultSummary)
@@ -217,7 +218,7 @@ public final class SubscriptionDebugMenu: NSMenuItem {
     func getSubscriptionDetails() {
         Task {
             guard let token = accountManager.accessToken else { return }
-            switch await SubscriptionService.getSubscription(accessToken: token) {
+            switch await SubscriptionService.getSubscription(accessToken: token, cachePolicy: .reloadIgnoringLocalCacheData) {
             case .success(let response):
                 showAlert(title: "Subscription info", message: "\(response)")
             case .failure(let error):
@@ -271,7 +272,7 @@ public final class SubscriptionDebugMenu: NSMenuItem {
 
     private func askAndUpdateEnvironment(to newEnvironmentString: String) {
         let alert = makeAlert(title: "Are you sure you want to change the environment to \(newEnvironmentString.capitalized)",
-                              message: "Please make sure you have manually removed your current active Subscription and reset all related features. \nYou may also need to change environment of related features e.g. Network Protection's to a matching one.",
+                              message: "Please make sure you have manually removed your current active Subscription and reset all related features. \nYou may also need to change environment of related features.",
                               buttonNames: ["Yes", "No"])
         let response = alert.runModal()
 
@@ -286,6 +287,11 @@ public final class SubscriptionDebugMenu: NSMenuItem {
         NotificationCenter.default.post(name: .accountDidSignIn, object: self, userInfo: nil)
     }
 
+    @objc
+    func postSubscriptionDidChangeNotification(_ sender: Any?) {
+        NotificationCenter.default.post(name: .subscriptionDidChange, object: self, userInfo: nil)
+    }
+
     @objc
     func restorePurchases(_ sender: Any?) {
         if #available(macOS 12.0, *) {
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/NSAlert+Subscription.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/NSAlert+Subscription.swift
index d79042d247..7080cdd43f 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/NSAlert+Subscription.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/NSAlert+Subscription.swift
@@ -29,14 +29,6 @@ public extension NSAlert {
         return alert
     }
 
-    static func somethingWentWrongStripeAlert() -> NSAlert {
-        let alert = NSAlert()
-        alert.messageText = UserText.somethingWentWrongAlertTitle
-        alert.informativeText = UserText.somethingWentWrongStripeAlertDescription
-        alert.addButton(withTitle: UserText.okButtonTitle)
-        return alert
-    }
-
     static func subscriptionNotFoundAlert() -> NSAlert {
         let alert = NSAlert()
         alert.messageText = UserText.subscriptionNotFoundAlertTitle
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift
index 8a0392ec37..f18041dace 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift
@@ -18,11 +18,14 @@
 
 import AppKit
 import Subscription
+import struct Combine.AnyPublisher
+import enum Combine.Publishers
 
 public final class PreferencesSubscriptionModel: ObservableObject {
 
     @Published var isUserAuthenticated: Bool = false
     @Published var subscriptionDetails: String?
+    @Published var subscriptionStatus: Subscription.Status?
 
     @Published var hasAccessToVPN: Bool = false
     @Published var hasAccessToDBP: Bool = false
@@ -42,6 +45,7 @@ public final class PreferencesSubscriptionModel: ObservableObject {
 
     private var signInObserver: Any?
     private var signOutObserver: Any?
+    private var subscriptionChangeObserver: Any?
 
     public enum UserEvent {
         case openVPN,
@@ -58,6 +62,30 @@ public final class PreferencesSubscriptionModel: ObservableObject {
              removeSubscriptionClick
     }
 
+    lazy var statePublisher: AnyPublisher<PreferencesSubscriptionState, Never> = {
+        let isSubscriptionActivePublisher: AnyPublisher<Bool?, Never> = $subscriptionStatus.map {
+            guard let status = $0 else { return nil}
+            return status != .expired && status != .inactive
+        }.eraseToAnyPublisher()
+
+        let hasAnyEntitlementPublisher = Publishers.CombineLatest3($hasAccessToVPN, $hasAccessToDBP, $hasAccessToITR).map {
+            return $0 || $1 || $2
+        }.eraseToAnyPublisher()
+
+        return Publishers.CombineLatest3($isUserAuthenticated, isSubscriptionActivePublisher, hasAnyEntitlementPublisher)
+            .map { isUserAuthenticated, isSubscriptionActive, hasAnyEntitlement in
+                switch (isUserAuthenticated, isSubscriptionActive, hasAnyEntitlement) {
+                case (false, _, _): return PreferencesSubscriptionState.noSubscription
+                case (true, .some(false), _): return PreferencesSubscriptionState.subscriptionExpired
+                case (true, nil, _): return PreferencesSubscriptionState.subscriptionPendingActivation
+                case (true, .some(true), false): return PreferencesSubscriptionState.subscriptionPendingActivation
+                case (true, .some(true), true): return PreferencesSubscriptionState.subscriptionActive
+                }
+            }
+            .removeDuplicates()
+            .eraseToAnyPublisher()
+    }()
+
     public init(openURLHandler: @escaping (URL) -> Void,
                 userEventHandler: @escaping (UserEvent) -> Void,
                 sheetActionHandler: SubscriptionAccessActionHandlers,
@@ -70,12 +98,10 @@ public final class PreferencesSubscriptionModel: ObservableObject {
 
         self.isUserAuthenticated = accountManager.isUserAuthenticated
 
-        if let token = accountManager.accessToken {
+        if accountManager.isUserAuthenticated {
             Task {
-                let subscriptionResult = await SubscriptionService.getSubscription(accessToken: token)
-                if case .success(let subscription) = subscriptionResult {
-                    self.updateDescription(for: subscription.expiresOrRenewsAt)
-                }
+                await self.updateSubscription(with: .returnCacheDataElseLoad)
+                await self.updateAllEntitlement(with: .returnCacheDataElseLoad)
             }
         }
 
@@ -86,6 +112,12 @@ public final class PreferencesSubscriptionModel: ObservableObject {
         signOutObserver = NotificationCenter.default.addObserver(forName: .accountDidSignOut, object: nil, queue: .main) { [weak self] _ in
             self?.updateUserAuthenticatedState(false)
         }
+
+        subscriptionChangeObserver = NotificationCenter.default.addObserver(forName: .subscriptionDidChange, object: nil, queue: .main) { _ in
+            Task { [weak self] in
+                await self?.updateSubscription(with: .returnCacheDataDontLoad)
+            }
+        }
     }
 
     deinit {
@@ -96,6 +128,10 @@ public final class PreferencesSubscriptionModel: ObservableObject {
         if let signOutObserver {
             NotificationCenter.default.removeObserver(signOutObserver)
         }
+
+        if let subscriptionChangeObserver {
+            NotificationCenter.default.removeObserver(subscriptionChangeObserver)
+        }
     }
 
     private func makeSubscriptionAccessModel() -> SubscriptionAccessModel {
@@ -123,6 +159,7 @@ public final class PreferencesSubscriptionModel: ObservableObject {
 
     @MainActor
     func changePlanOrBillingAction() async -> ChangePlanOrBillingAction {
+
         switch subscriptionPlatform {
         case .apple:
             if await confirmIfSignedInToSameAccount() {
@@ -176,6 +213,7 @@ public final class PreferencesSubscriptionModel: ObservableObject {
 
     @MainActor
     func removeFromThisDeviceAction() {
+        userEventHandler(.removeSubscriptionClick)
         accountManager.signOut()
     }
 
@@ -199,9 +237,24 @@ public final class PreferencesSubscriptionModel: ObservableObject {
         openURLHandler(.subscriptionFAQ)
     }
 
-    // swiftlint:disable cyclomatic_complexity
+    @MainActor
+    func refreshSubscriptionPendingState() {
+        if SubscriptionPurchaseEnvironment.current == .appStore {
+            if #available(macOS 12.0, *) {
+                Task {
+                    _ = await AppStoreRestoreFlow.restoreAccountFromPastPurchase(subscriptionAppGroup: subscriptionAppGroup)
+                    fetchAndUpdateSubscriptionDetails()
+                }
+            }
+        } else {
+            fetchAndUpdateSubscriptionDetails()
+        }
+    }
+
     @MainActor
     func fetchAndUpdateSubscriptionDetails() {
+        self.isUserAuthenticated = accountManager.isUserAuthenticated
+
         guard fetchSubscriptionDetailsTask == nil else { return }
 
         fetchSubscriptionDetailsTask = Task { [weak self] in
@@ -209,62 +262,79 @@ public final class PreferencesSubscriptionModel: ObservableObject {
                 self?.fetchSubscriptionDetailsTask = nil
             }
 
-            guard let token = self?.accountManager.accessToken else { return }
+            await self?.updateSubscription(with: .reloadIgnoringLocalCacheData)
+            await self?.updateAllEntitlement(with: .reloadIgnoringLocalCacheData)
+        }
+    }
 
-            let subscriptionResult = await SubscriptionService.getSubscription(accessToken: token)
+    @MainActor
+    private func updateSubscription(with cachePolicy: SubscriptionService.CachePolicy) async {
+        guard let token = accountManager.accessToken else {
+            SubscriptionService.signOut()
+            return
+        }
 
-            if case .success(let subscription) = subscriptionResult {
-                self?.updateDescription(for: subscription.expiresOrRenewsAt)
-                self?.subscriptionPlatform = subscription.platform
+        switch await SubscriptionService.getSubscription(accessToken: token, cachePolicy: cachePolicy) {
+        case .success(let subscription):
+            updateDescription(for: subscription.expiresOrRenewsAt, status: subscription.status, period: subscription.billingPeriod)
+            subscriptionPlatform = subscription.platform
+            subscriptionStatus = subscription.status
+        case .failure:
+            break
+        }
+    }
 
-                if subscription.expiresOrRenewsAt.timeIntervalSinceNow < 0 || !subscription.isActive {
-                    self?.hasAccessToVPN = false
-                    self?.hasAccessToDBP = false
-                    self?.hasAccessToITR = false
+    @MainActor
+    private func updateAllEntitlement(with cachePolicy: AccountManager.CachePolicy) async {
+        switch await self.accountManager.hasEntitlement(for: .networkProtection, cachePolicy: cachePolicy) {
+        case let .success(result):
+            hasAccessToVPN = result
+        case .failure:
+            hasAccessToVPN = false
+        }
 
-                    if !subscription.isActive {
-                        self?.accountManager.signOut()
-                        return
-                    }
-                }
-            } else {
-                self?.accountManager.signOut()
-            }
+        switch await self.accountManager.hasEntitlement(for: .dataBrokerProtection, cachePolicy: cachePolicy) {
+        case let .success(result):
+            hasAccessToDBP = result
+        case .failure:
+            hasAccessToDBP = false
+        }
 
-            if let self {
-                switch await self.accountManager.hasEntitlement(for: .networkProtection) {
-                case let .success(result):
-                    hasAccessToVPN = result
-                case .failure:
-                    hasAccessToVPN = false
-                }
+        switch await self.accountManager.hasEntitlement(for: .identityTheftRestoration, cachePolicy: cachePolicy) {
+        case let .success(result):
+            hasAccessToITR = result
+        case .failure:
+            hasAccessToITR = false
+        }
+    }
 
-                switch await self.accountManager.hasEntitlement(for: .dataBrokerProtection) {
-                case let .success(result):
-                    hasAccessToDBP = result
-                case .failure:
-                    hasAccessToDBP = false
-                }
+    @MainActor
+    func updateDescription(for date: Date, status: Subscription.Status, period: Subscription.BillingPeriod) {
 
-                switch await self.accountManager.hasEntitlement(for: .identityTheftRestoration) {
-                case let .success(result):
-                    hasAccessToITR = result
-                case .failure:
-                    hasAccessToITR = false
-                }
-            }
+        let formattedDate = dateFormatter.string(from: date)
+
+        let billingPeriod: String
+
+        switch period {
+        case .monthly: billingPeriod = UserText.monthlySubscriptionBillingPeriod.lowercased()
+        case .yearly: billingPeriod = UserText.yearlySubscriptionBillingPeriod.lowercased()
+        case .unknown: billingPeriod = ""
         }
-    }
-    // swiftlint:enable cyclomatic_complexity
 
-    private func updateDescription(for date: Date) {
-        self.subscriptionDetails = UserText.preferencesSubscriptionActiveCaption(formattedDate: dateFormatter.string(from: date))
+        switch status {
+        case .autoRenewable:
+            self.subscriptionDetails = UserText.preferencesSubscriptionActiveRenewCaption(period: billingPeriod, formattedDate: formattedDate)
+        case .expired, .inactive:
+            self.subscriptionDetails = UserText.preferencesSubscriptionExpiredCaption(formattedDate: formattedDate)
+        default:
+            self.subscriptionDetails = UserText.preferencesSubscriptionActiveExpireCaption(period: billingPeriod, formattedDate: formattedDate)
+        }
     }
 
     private var dateFormatter = {
         let dateFormatter = DateFormatter()
-        dateFormatter.dateStyle = .medium
-        dateFormatter.timeStyle = .short
+        dateFormatter.dateStyle = .long
+        dateFormatter.timeStyle = .none
 
         return dateFormatter
     }()
@@ -277,3 +347,7 @@ enum ManageSubscriptionSheet: Identifiable {
         return self
     }
 }
+
+enum PreferencesSubscriptionState: String {
+    case noSubscription, subscriptionPendingActivation, subscriptionActive, subscriptionExpired
+}
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
index f17fcb0ea8..db764f58e1 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
@@ -21,6 +21,9 @@ import SwiftUI
 import SwiftUIExtensions
 
 public struct PreferencesSubscriptionView: View {
+
+    @State private var state: PreferencesSubscriptionState = .noSubscription
+
     @ObservedObject var model: PreferencesSubscriptionModel
     @State private var showingSheet = false
     @State private var showingRemoveConfirmationDialog = false
@@ -39,41 +42,14 @@ public struct PreferencesSubscriptionView: View {
                     SubscriptionAccessView(model: model.sheetModel)
                 }
                 .sheet(isPresented: $showingRemoveConfirmationDialog) {
-                    SubscriptionDialog(imageName: "Privacy-Pro-128",
-                                       title: UserText.removeSubscriptionDialogTitle,
-                                       description: UserText.removeSubscriptionDialogDescription,
-                                       buttons: {
-                        Button(UserText.removeSubscriptionDialogCancel) { showingRemoveConfirmationDialog = false }
-                        Button(action: {
-                            showingRemoveConfirmationDialog = false
-                            model.removeFromThisDeviceAction()
-                        }, label: {
-                            Text(UserText.removeSubscriptionDialogConfirm)
-                                .foregroundColor(.red)
-                        })
-                    })
-                    .frame(width: 320)
+                    removeConfirmationDialog
                 }
                 .sheet(item: $manageSubscriptionSheet) { sheet in
                     switch sheet {
                     case .apple:
-                        SubscriptionDialog(imageName: "app-store",
-                                           title: UserText.changeSubscriptionDialogTitle,
-                                           description: UserText.changeSubscriptionAppleDialogDescription,
-                                           buttons: {
-                            Button(UserText.changeSubscriptionDialogDone) { manageSubscriptionSheet = nil }
-                                .buttonStyle(DefaultActionButtonStyle(enabled: true))
-                        })
-                        .frame(width: 360)
+                        manageSubscriptionAppStoreDialog
                     case .google:
-                        SubscriptionDialog(imageName: "google-play",
-                                           title: UserText.changeSubscriptionDialogTitle,
-                                           description: UserText.changeSubscriptionGoogleDialogDescription,
-                                           buttons: {
-                            Button(UserText.changeSubscriptionDialogDone) { manageSubscriptionSheet = nil }
-                                .buttonStyle(DefaultActionButtonStyle(enabled: true))
-                        })
-                        .frame(width: 360)
+                        manageSubscriptionGooglePlayDialog
                     }
                 }
 
@@ -81,93 +57,26 @@ public struct PreferencesSubscriptionView: View {
                 .frame(height: 20)
 
             VStack {
-                if model.isUserAuthenticated {
-                    UniversalHeaderView {
-                        Image(.subscriptionActiveIcon)
-                            .padding(4)
-                    } content: {
-                        TextMenuItemHeader(UserText.preferencesSubscriptionActiveHeader)
-                        TextMenuItemCaption(model.subscriptionDetails ?? "")
-                    } buttons: {
-                        Button(UserText.addToAnotherDeviceButton) {
-                            model.userEventHandler(.addToAnotherDeviceClick)
-                            showingSheet.toggle()
-                        }
-
-                        Menu {
-                            Button(UserText.changePlanOrBillingButton, action: {
-                                model.userEventHandler(.changePlanOrBillingClick)
-                                Task {
-                                    switch await model.changePlanOrBillingAction() {
-                                    case .presentSheet(let sheet):
-                                        manageSubscriptionSheet = sheet
-                                    case .navigateToManageSubscription(let navigationAction):
-                                        navigationAction()
-                                    }
-                                }
-                            })
-                            Button(UserText.removeFromThisDeviceButton, action: {
-                                model.userEventHandler(.removeSubscriptionClick)
-                                showingRemoveConfirmationDialog.toggle()
-                            })
-                        } label: {
-                            Text(UserText.manageSubscriptionButton)
-                        }
-                        .fixedSize()
-                    }
-                    .onAppear {
-                        model.fetchAndUpdateSubscriptionDetails()
-                    }
-
-                } else {
-                    UniversalHeaderView {
-                        Image(.privacyPro)
-                            .padding(4)
-                            .background(Color("BadgeBackground", bundle: .module))
-                            .cornerRadius(4)
-                    } content: {
-                        TextMenuItemHeader(UserText.preferencesSubscriptionInactiveHeader)
-                        TextMenuItemCaption(UserText.preferencesSubscriptionInactiveCaption)
-                    } buttons: {
-                        Button(UserText.purchaseButton) { model.purchaseAction() }
-                            .buttonStyle(DefaultActionButtonStyle(enabled: true))
-                        Button(UserText.haveSubscriptionButton) {
-                            showingSheet.toggle()
-                            model.userEventHandler(.iHaveASubscriptionClick)
-                        }
-                    }
+                switch state {
+                case .noSubscription:
+                    unauthenticatedHeaderView
+                case .subscriptionPendingActivation:
+                    pendingActivationHeaderView
+                case .subscriptionActive:
+                    authenticatedHeaderView
+                case .subscriptionExpired:
+                    expiredHeaderView
                 }
 
                 Divider()
                     .foregroundColor(Color.secondary)
                     .padding(.horizontal, -10)
 
-                SectionView(iconName: "VPN-Icon",
-                            title: UserText.vpnServiceTitle,
-                            description: UserText.vpnServiceDescription,
-                            buttonName: model.isUserAuthenticated ? UserText.vpnServiceButtonTitle : nil,
-                            buttonAction: { model.openVPN() },
-                            enabled: !model.isUserAuthenticated || model.hasAccessToVPN)
-
-                Divider()
-                    .foregroundColor(Color.secondary)
-
-                SectionView(iconName: "PIR-Icon",
-                            title: UserText.personalInformationRemovalServiceTitle,
-                            description: UserText.personalInformationRemovalServiceDescription,
-                            buttonName: model.isUserAuthenticated ? UserText.personalInformationRemovalServiceButtonTitle : nil,
-                            buttonAction: { model.openPersonalInformationRemoval() },
-                            enabled: !model.isUserAuthenticated || model.hasAccessToDBP)
-
-                Divider()
-                    .foregroundColor(Color.secondary)
-
-                SectionView(iconName: "ITR-Icon",
-                            title: UserText.identityTheftRestorationServiceTitle,
-                            description: UserText.identityTheftRestorationServiceDescription,
-                            buttonName: model.isUserAuthenticated ? UserText.identityTheftRestorationServiceButtonTitle : nil,
-                            buttonAction: { model.openIdentityTheftRestoration() },
-                            enabled: !model.isUserAuthenticated || model.hasAccessToITR)
+                if state == .subscriptionActive {
+                    servicesRowsForActiveSubscriptionView
+                } else {
+                    servicesRowsForNoSubscriptionView
+                }
             }
             .padding(10)
             .roundedBorder()
@@ -175,19 +84,225 @@ public struct PreferencesSubscriptionView: View {
             Spacer()
                 .frame(height: 24)
 
-            PreferencePaneSection {
-                TextMenuItemHeader(UserText.preferencesSubscriptionFooterTitle)
-                HStack(alignment: .top, spacing: 6) {
-                    TextMenuItemCaption(UserText.preferencesSubscriptionFooterCaption)
-                    Button(UserText.viewFaqsButton) { model.openFAQ() }
-                }
-            }
+            footerView
         }
         .onAppear(perform: {
             if model.isUserAuthenticated {
                 model.userEventHandler(.activeSubscriptionSettingsClick)
             }
         })
+        .onReceive(model.statePublisher, perform: updateState(state:))
+    }
+
+    private func updateState(state: PreferencesSubscriptionState) {
+        self.state = state
+    }
+
+    @ViewBuilder
+    private var authenticatedHeaderView: some View {
+        UniversalHeaderView {
+            Image(.subscriptionActiveIcon)
+                .padding(4)
+        } content: {
+            TextMenuItemHeader(UserText.preferencesSubscriptionActiveHeader)
+            TextMenuItemCaption(model.subscriptionDetails ?? "")
+        } buttons: {
+            Button(UserText.addToAnotherDeviceButton) {
+                model.userEventHandler(.addToAnotherDeviceClick)
+                showingSheet.toggle()
+            }
+
+            Menu {
+                Button(UserText.changePlanOrBillingButton, action: {
+                    model.userEventHandler(.changePlanOrBillingClick)
+                    Task {
+                        switch await model.changePlanOrBillingAction() {
+                        case .presentSheet(let sheet):
+                            manageSubscriptionSheet = sheet
+                        case .navigateToManageSubscription(let navigationAction):
+                            navigationAction()
+                        }
+                    }
+                })
+                Button(UserText.removeFromThisDeviceButton, action: {
+                    showingRemoveConfirmationDialog.toggle()
+                })
+            } label: {
+                Text(UserText.manageSubscriptionButton)
+            }
+            .fixedSize()
+        }
+        .onAppear {
+            model.fetchAndUpdateSubscriptionDetails()
+        }
+    }
+
+    @ViewBuilder
+    private var unauthenticatedHeaderView: some View {
+        UniversalHeaderView {
+            Image(.privacyPro)
+                .padding(4)
+                .background(Color("BadgeBackground", bundle: .module))
+                .cornerRadius(4)
+        } content: {
+            TextMenuItemHeader(UserText.preferencesSubscriptionInactiveHeader)
+            TextMenuItemCaption(UserText.preferencesSubscriptionInactiveCaption)
+        } buttons: {
+            Button(UserText.purchaseButton) { model.purchaseAction() }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+            Button(UserText.haveSubscriptionButton) {
+                showingSheet.toggle()
+                model.userEventHandler(.iHaveASubscriptionClick)
+            }
+            .buttonStyle(DismissActionButtonStyle())
+        }
+    }
+
+    @ViewBuilder
+    private var pendingActivationHeaderView: some View {
+        UniversalHeaderView {
+            Image(.subscriptionPendingIcon)
+                .padding(4)
+        } content: {
+            TextMenuItemHeader(UserText.preferencesSubscriptionPendingHeader)
+            TextMenuItemCaption(UserText.preferencesSubscriptionPendingCaption)
+        } buttons: {
+            Button(UserText.restorePurchaseButton) { model.refreshSubscriptionPendingState() }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+        }
+        .onAppear {
+            model.fetchAndUpdateSubscriptionDetails()
+        }
+    }
+
+    @ViewBuilder
+    private var expiredHeaderView: some View {
+        UniversalHeaderView {
+            Image(.subscriptionExpiredIcon)
+                .padding(4)
+        } content: {
+            TextMenuItemHeader(model.subscriptionDetails ?? UserText.preferencesSubscriptionInactiveHeader)
+            TextMenuItemCaption(UserText.preferencesSubscriptionExpiredCaption)
+        } buttons: {
+            // We need to improve re-purchase flow
+            /* Button(UserText.viewPlansButtonTitle) { model.purchaseAction() }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true)) */
+            Menu {
+                Button(UserText.removeFromThisDeviceButton, action: {
+                    showingRemoveConfirmationDialog.toggle()
+                })
+            } label: {
+                Text(UserText.manageDevicesButton)
+            }
+            .fixedSize()
+        }
+        .onAppear {
+            model.fetchAndUpdateSubscriptionDetails()
+        }
+    }
+
+    @ViewBuilder
+    private var servicesRowsForNoSubscriptionView: some View {
+        SectionView(iconName: "VPN-Icon",
+                    title: UserText.vpnServiceTitle,
+                    description: UserText.vpnServiceDescription)
+
+        Divider()
+            .foregroundColor(Color.secondary)
+
+        SectionView(iconName: "PIR-Icon",
+                    title: UserText.personalInformationRemovalServiceTitle,
+                    description: UserText.personalInformationRemovalServiceDescription)
+
+        Divider()
+            .foregroundColor(Color.secondary)
+
+        SectionView(iconName: "ITR-Icon",
+                    title: UserText.identityTheftRestorationServiceTitle,
+                    description: UserText.identityTheftRestorationServiceDescription)
+    }
+
+    @ViewBuilder
+    private var servicesRowsForActiveSubscriptionView: some View {
+        SectionView(iconName: "VPN-Icon",
+                    title: UserText.vpnServiceTitle,
+                    description: UserText.vpnServiceDescription,
+                    buttonName: UserText.vpnServiceButtonTitle,
+                    buttonAction: { model.openVPN() },
+                    enabled: model.hasAccessToVPN)
+
+        Divider()
+            .foregroundColor(Color.secondary)
+
+        SectionView(iconName: "PIR-Icon",
+                    title: UserText.personalInformationRemovalServiceTitle,
+                    description: UserText.personalInformationRemovalServiceDescription,
+                    buttonName: UserText.personalInformationRemovalServiceButtonTitle,
+                    buttonAction: { model.openPersonalInformationRemoval() },
+                    enabled: model.hasAccessToDBP)
+
+        Divider()
+            .foregroundColor(Color.secondary)
+
+        SectionView(iconName: "ITR-Icon",
+                    title: UserText.identityTheftRestorationServiceTitle,
+                    description: UserText.identityTheftRestorationServiceDescription,
+                    buttonName: UserText.identityTheftRestorationServiceButtonTitle,
+                    buttonAction: { model.openIdentityTheftRestoration() },
+                    enabled: model.hasAccessToITR)
+    }
+
+    @ViewBuilder
+    private var footerView: some View {
+        PreferencePaneSection {
+            TextMenuItemHeader(UserText.preferencesSubscriptionFooterTitle)
+            HStack(alignment: .top, spacing: 6) {
+                TextMenuItemCaption(UserText.preferencesSubscriptionFooterCaption)
+                Button(UserText.viewFaqsButton) { model.openFAQ() }
+            }
+        }
+    }
+
+    @ViewBuilder
+    private var removeConfirmationDialog: some View {
+        SubscriptionDialog(imageName: "Privacy-Pro-128",
+                           title: UserText.removeSubscriptionDialogTitle,
+                           description: UserText.removeSubscriptionDialogDescription,
+                           buttons: {
+            Button(UserText.removeSubscriptionDialogCancel) { showingRemoveConfirmationDialog = false }
+            Button(action: {
+                showingRemoveConfirmationDialog = false
+                model.removeFromThisDeviceAction()
+            }, label: {
+                Text(UserText.removeSubscriptionDialogConfirm)
+                    .foregroundColor(.red)
+            })
+        })
+        .frame(width: 320)
+    }
+
+    @ViewBuilder
+    private var manageSubscriptionAppStoreDialog: some View {
+        SubscriptionDialog(imageName: "app-store",
+                           title: UserText.changeSubscriptionDialogTitle,
+                           description: UserText.changeSubscriptionAppleDialogDescription,
+                           buttons: {
+            Button(UserText.changeSubscriptionDialogDone) { manageSubscriptionSheet = nil }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+        })
+        .frame(width: 360)
+    }
+
+    @ViewBuilder
+    private var manageSubscriptionGooglePlayDialog: some View {
+        SubscriptionDialog(imageName: "google-play",
+                           title: UserText.changeSubscriptionDialogTitle,
+                           description: UserText.changeSubscriptionGoogleDialogDescription,
+                           buttons: {
+            Button(UserText.changeSubscriptionDialogDone) { manageSubscriptionSheet = nil }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+        })
+        .frame(width: 360)
     }
 }
 
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/Contents.json b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/Contents.json
new file mode 100644
index 0000000000..0feb43913c
--- /dev/null
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "subscription-expired-icon.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/subscription-expired-icon.pdf b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/subscription-expired-icon.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d43daeb9b999065914b2ae55c80a3467fee00e9a
GIT binary patch
literal 2374
zcmbVOOHbS|5Wf3Y%moQ5tz#!~oJa_%ETyX2s&wfM^^j%_Y{e$+CRDV)zGKH88y2aL
z9MJ6NnQtB*&v0;YcD|5YGbTa6@Z~E5I6j7x6K49g{mJqa&)%8-X1av}!Ijk-r=4lH
zEITtlHl10$K859F`l}n+cP6=TABZ3<NJ`FBQ1U{zWrEjQsJceWqEw=>LO!dFUC*Qn
zgqnM!Z2}g&P`a*4kdjwrE{iHgKn4^^$4H+r684XXpu;GAe$fx<KNDhvIu<P=nn)CP
z#1g-^?3(rL<KI?T^V}5)6js$rfEA|t?+dQNyqHxLubeel6T%uTq^<#N8)bzmxDec#
ziHO)Tm7=WkJYs^&nN)Gllpx-pwewmc#Bi5lxo#{evD0l(41{34L!^XJHrQD+Q-V+o
zgi#&t*#DMaQXYS<KjpB{p$hf_q;2OCA}B-uFDkC<274VZ#Xkvz{Ds;41BfNB1ilW`
z3v85I^h%JuhQd83SP)1>M98y6DDj$tKDx+8iAApjb^lsq@<f80B4vf2#vYM{&Xuxb
zpv1w_fbH>`o-d7)Eh|yA6hcFMdGUovURSDVY>oZPCl1$Q^MoP_686;zaiicVYxEr{
zD8|$!fjCbBNtEc6Od_$ZFx86A?c@zJE$5}Ib9~$dSGCmm)MOP7$sj_Q2w6llk)Amv
z8Z;*E=#DHXC^8_#PH!I`VI=Gy5rONl7jBH&mFM?aSblcT%}Y`0qM)5v5{$btd)fEH
zG{V(q+@1JkpMHKbkX^Jl#slxodefc`4{#Ot55*P}j#6M+nQ^$^b!G&+omZZ2IrNk1
z(W70>0la8;hyk{?gOUYqAzJL&+szt71)ISNf}iDZkG66z{t=Oc3D;-BWD^|8VN874
zPVL=r^VsxZXRet5&E~GMf1y&UP=K)iqyQ&DPf&qz+K(XYM7)zHP>F#(f^s37JqVv`
z(3*Db=FaSxy}dVQSdPPS*qS3a+^mo0qGYRKn7}6N3Y=YTei@A3{m0YpCYMewRn86$
IUVS+K4Zq#t=Kufz

literal 0
HcmV?d00001

diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Contents.json b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Contents.json
new file mode 100644
index 0000000000..d161417381
--- /dev/null
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Info-Color-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Info-Color-16.pdf b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Info-Color-16.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..42f3cc015dc1fe46421444dd220b6daad5be740b
GIT binary patch
literal 1745
zcma)7O^?(#5WV|X)MX?<!g1N<F9{*R%!1G^VraM_4oxNujb=Jar&+Q5dY&_h6KD?j
z(5il}D%X21SI#ako;_q8m0~i~fB3A39zCMRk5#w7Du0z-<IO+a{`&Zd9KcQS8jgo<
zd#jp@?!R5zZJs}+^Ec~%?V!FW)@EE}X5(SCPWS3od#j9g<3gn5WL$=kz0JZjw0o82
zd{Ye5tzxT%lZ|OUjfuU^<07Yh;%My(sySM<_$^6RR+vw#AzYzWEvYM5nJh^vRCBZ-
zImuH~RHO2$?iFd(C-w1x+N;-ps&LR=QnCpu1d$j$LE)<ZsZkU*I=aj*P}JThiwh{1
zGGR$GTPK-Vb7qc?l8$Vw@j$YZBxylfWwnde8Cfu^QBMfPs}$szDiU=vft{feH+e;E
zvyZ{U%R3v9DQHAT2{<nr_AV_5u2Wmd-tdCe$^%kHLBSQN{EDsy`4h7tuRV*40jyDd
zkZ1~)Ob*%7&2KR9w(O%oV;ml&C=ruLvMAd5<i&y!;{u?e!KQ>LQjFv{cr>Oq33Q7R
z0Sr^wvTOv-MTy|pT0z;tc@7R<;*;@yYIboYr37o@f|L&P!C2hlUH8DN_8hhtGS6G!
zR}z3>sk3^a_RJn^jOKtYC_RK%2oQ*~#z0EZ98Ct%5+{Zu?p1WKW1T=iDtoAB@cv+&
zYP{;`GJU4eGS8tha_;66E=KBjf)>lzYM$)({c)go?=i-(nz#S|+fj45z3wL9Wp}mP
zKJCBJyR`(<`&*v#V$GR0-OztMwB0~uP;RDl=l%ZJ?Qvq6k~4U@Jpdz69HG@LEl{1Y
z&ELB#luCuchURn5`>%-QllliBt4z4BRi;94s0S{@&$q|zO@IA!=(j`nQ5lNrj&=E^
z;Jxz%cv@)v(IQNMX*twcR)v`J31k_4_p?`N^IsqdOW^Ua-Q9Etg^y12;sSEq8~WSs
qKHb}0-M<s1+4TL93gJ=U=FRSVhw8_V&-QQ}>9Ds>ot^#l>e&xM_ijW0

literal 0
HcmV?d00001

diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ActivateSubscriptionAccessModel.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ActivateSubscriptionAccessModel.swift
index 41063cca08..3e14765641 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ActivateSubscriptionAccessModel.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ActivateSubscriptionAccessModel.swift
@@ -17,12 +17,13 @@
 //
 
 import Foundation
+import Subscription
 
 public final class ActivateSubscriptionAccessModel: SubscriptionAccessModel, PurchaseRestoringSubscriptionAccessModel {
     private var actionHandlers: SubscriptionAccessActionHandlers
 
     public var title = UserText.activateModalTitle
-    public var description = UserText.activateModalDescription
+    public var description = UserText.activateModalDescription(platform: SubscriptionPurchaseEnvironment.current)
 
     public var email: String?
     public var emailLabel: String { UserText.email }
@@ -31,7 +32,7 @@ public final class ActivateSubscriptionAccessModel: SubscriptionAccessModel, Pur
 
     public private(set) var shouldShowRestorePurchase: Bool
     public var restorePurchaseDescription = UserText.restorePurchaseDescription
-    public var restorePurchaseButtonTitle = UserText.restorePurchasesButton
+    public var restorePurchaseButtonTitle = UserText.restorePurchaseButton
 
     public init(actionHandlers: SubscriptionAccessActionHandlers, shouldShowRestorePurchase: Bool) {
         self.actionHandlers = actionHandlers
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ShareSubscriptionAccessModel.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ShareSubscriptionAccessModel.swift
index 5ebc6d5433..9e007f4e7e 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ShareSubscriptionAccessModel.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ShareSubscriptionAccessModel.swift
@@ -21,7 +21,7 @@ import Subscription
 
 public final class ShareSubscriptionAccessModel: SubscriptionAccessModel {
     public var title = UserText.shareModalTitle
-    public var description = UserText.shareModalDescription
+    public var description = UserText.shareModalDescription(platform: SubscriptionPurchaseEnvironment.current)
 
     private let subscriptionAppGroup: String
     private var actionHandlers: SubscriptionAccessActionHandlers
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/SubscriptionAccessView.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/SubscriptionAccessView.swift
index 8be8b6f333..bf1931a6fc 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/SubscriptionAccessView.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/SubscriptionAccessView.swift
@@ -115,6 +115,7 @@ public struct SubscriptionAccessView: View {
                 Button("Cancel") {
                     dismiss()
                 }
+                .buttonStyle(DismissActionButtonStyle())
             }
             .padding(.horizontal, 20)
             .padding(.vertical, 16)
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift
index 05c1ff1a5f..1bd2c1503d 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import Subscription
 
 enum UserText {
     // MARK: - Subscription preferences
@@ -42,11 +43,25 @@ enum UserText {
 
     // MARK: Preferences when subscription is active
     static let preferencesSubscriptionActiveHeader = NSLocalizedString("subscription.preferences.subscription.active.header", value: "Privacy Pro is active on this device", comment: "Header for the subscription preferences pane when the subscription is active")
-    static func preferencesSubscriptionActiveCaption(formattedDate: String) -> String {
-        let localized = NSLocalizedString("subscription.preferences.subscription.active.caption", value: "Your monthly Privacy Pro subscription renews on %@", comment: "Caption for the subscription preferences pane when the subscription is active")
+
+    static func preferencesSubscriptionActiveRenewCaption(period: String, formattedDate: String) -> String {
+        let localized = NSLocalizedString("subscription.preferences.subscription.active.renew.caption", value: "Your %@ Privacy Pro subscription renews on %@.", comment: "Caption for the subscription preferences pane when the subscription is active and will renew. First parameter is renewal period (monthly/yearly). Second parameter is date.")
+        return String(format: localized, period, formattedDate)
+    }
+
+    static func preferencesSubscriptionActiveExpireCaption(period: String, formattedDate: String) -> String {
+        let localized = NSLocalizedString("subscription.preferences.subscription.active.expire.caption", value: "Your %@ Privacy Pro subscription expires on %@.", comment: "Caption for the subscription preferences pane when the subscription is active but will expire. First parameter is renewal period (monthly/yearly). Second parameter is date.")
+        return String(format: localized, period, formattedDate)
+    }
+
+    static func preferencesSubscriptionExpiredCaption(formattedDate: String) -> String {
+        let localized = NSLocalizedString("subscription.preferences.subscription.expired.caption", value: "Your Privacy Pro subscription expired on %@.", comment: "Caption for the subscription preferences pane when the subscription has expired. The parameter is date of expiry.")
         return String(format: localized, formattedDate)
     }
 
+    static let monthlySubscriptionBillingPeriod = NSLocalizedString("subscription.billing.period.monthly", value: "Monthly", comment: "Type of subscription billing period that lasts a month")
+    static let yearlySubscriptionBillingPeriod = NSLocalizedString("subscription.billing.period.yearly", value: "Yearly", comment: "Type of subscription billing period that lasts a year")
+
     static let addToAnotherDeviceButton = NSLocalizedString("subscription.preferences.add.to.another.device.button", value: "Add to Another Device…", comment: "Button to add subscription to another device")
     static let manageSubscriptionButton = NSLocalizedString("subscription.preferences.manage.subscription.button", value: "Manage Subscription", comment: "Button to manage subscription")
     static let changePlanOrBillingButton = NSLocalizedString("subscription.preferences.change.plan.or.billing.button", value: "Change Plan or Billing...", comment: "Button to add subscription to another device")
@@ -59,6 +74,15 @@ enum UserText {
     static let purchaseButton = NSLocalizedString("subscription.preferences.purchase.button", value: "Get Privacy Pro", comment: "Button to open a page where user can learn more and purchase the subscription")
     static let haveSubscriptionButton = NSLocalizedString("subscription.preferences.i.have.a.subscription.button", value: "I Have a Subscription", comment: "Button enabling user to activate a subscription user bought earlier or on another device")
 
+    // MARK: Preferences when subscription activation is pending
+    static let preferencesSubscriptionPendingHeader = NSLocalizedString("subscription.preferences.subscription.pending.header", value: "Your Subscription is Being Activated", comment: "Header for the subscription preferences pane when the subscription activation is pending")
+    static let preferencesSubscriptionPendingCaption = NSLocalizedString("subscription.preferences.subscription.pending.caption", value: "This is taking longer than usual, please check back later.", comment: "Caption for the subscription preferences pane when the subscription activation is pending")
+
+    // MARK: Preferences when subscription is expired
+    static let preferencesSubscriptionExpiredCaption = NSLocalizedString("subscription.preferences.subscription.expired.caption", value: "Subscribe again to continue using Privacy Pro.", comment: "Caption for the subscription preferences pane when the subscription activation is pending")
+
+    static let manageDevicesButton = NSLocalizedString("subscription.preferences.manage.devices.button", value: "Manage Devices", comment: "Button to manage devices")
+
     // MARK: - Change plan or billing dialogs
     static let changeSubscriptionDialogTitle = NSLocalizedString("subscription.dialog.change.title", value: "Change Plan or Billing", comment: "Change plan or billing dialog title")
     static let changeSubscriptionGoogleDialogDescription = NSLocalizedString("subscription.dialog.change.google.description", value: "Your subscription was purchased through the Google Play Store. To change your plan or billing settings, please open Google Play Store subscription settings on a device signed in to the same Google Account used to purchase your subscription.", comment: "Change plan or billing dialog subtitle description for subscription purchased via Google")
@@ -76,14 +100,28 @@ enum UserText {
 
     // MARK: - Activate subscription modal
     static let activateModalTitle = NSLocalizedString("subscription.activate.modal.title", value: "Activate your subscription on this device", comment: "Activate subscription modal view title")
-    static let activateModalDescription = NSLocalizedString("subscription.activate.modal.description", value: "Access your subscription on other devices via Apple ID or an 
email address.", comment: "Activate subscription modal view subtitle description")
+    static func activateModalDescription(platform: SubscriptionPurchaseEnvironment.Environment) -> String {
+        switch platform {
+        case .appStore:
+            NSLocalizedString("subscription.appstore.activate.modal.description", value: "Access your Privacy Pro subscription on this device via Apple ID or an email address.", comment: "Activate subscription modal view subtitle description")
+        case .stripe:
+            NSLocalizedString("subscription.activate.modal.description", value: "Access your Privacy Pro subscription via an email address.", comment: "Activate subscription modal view subtitle description")
+        }
+    }
 
-    static let activateModalEmailDescription = NSLocalizedString("subscription.activate.modal.email.description", value: "Use your email to access your subscription on this device.", comment: "Activate subscription modal description for email address channel")
+    static let activateModalEmailDescription = NSLocalizedString("subscription.activate.modal.email.description", value: "Use your email to activate your subscription on this device.", comment: "Activate subscription modal description for email address channel")
     static let restorePurchaseDescription = NSLocalizedString("subscription.activate.modal.restore.purchase.description", value: "Your subscription is automatically available in DuckDuckGo on any device signed in to your Apple ID.", comment: "Activate subscription modal description via restore purchase from Apple ID")
 
     // MARK: - Share subscription modal
-    static let shareModalTitle = NSLocalizedString("subscription.share.modal.title", value: "Use your subscription on all your devices", comment: "Share subscription modal view title")
-    static let shareModalDescription = NSLocalizedString("subscription.share.modal.description", value: "Access your Privacy Pro subscription on any of your devices via Sync, Apple ID or by adding an email address.", comment: "Share subscription modal view subtitle description")
+    static let shareModalTitle = NSLocalizedString("subscription.share.modal.title", value: "Use your subscription on other devices", comment: "Share subscription modal view title")
+    static func shareModalDescription(platform: SubscriptionPurchaseEnvironment.Environment) -> String {
+        switch platform {
+        case .appStore:
+            NSLocalizedString("subscription.appstore.share.modal.description", value: "Access your subscription via Apple ID or by adding an email address.", comment: "Share subscription modal view subtitle description")
+        case .stripe:
+            NSLocalizedString("subscription.share.modal.description", value: "Activate your Privacy Pro subscription via an email address.", comment: "Share subscription modal view subtitle description")
+        }
+    }
 
     static let shareModalHasEmailDescription = NSLocalizedString("subscription.share.modal.has.email.description", value: "Use this email to activate your subscription on other devices. Open the DuckDuckGo app on another device and find Privacy Pro in browser settings.", comment: "Share subscription modal description for email address channel")
     static let shareModalNoEmailDescription = NSLocalizedString("subscription.share.modal.no.email.description", value: "Add an email address to access your subscription in DuckDuckGo on other devices. We’ll only use this address to verify your subscription.", comment: "Share subscription modal description for email address channel")
@@ -91,7 +129,7 @@ enum UserText {
     static let restorePurchasesDescription = NSLocalizedString("subscription.share.modal.restore.purchases.description", value: "Your subscription is automatically available in DuckDuckGo on any device signed in to your Apple ID.", comment: "Share subscription modal description for restoring Apple ID purchases")
 
     // MARK: - Activate/share modal buttons
-    static let restorePurchasesButton = NSLocalizedString("subscription.modal.restore.purchases.button", value: "Restore Purchases", comment: "Button for restoring past subscription purchases")
+    static let restorePurchaseButton = NSLocalizedString("subscription.modal.restore.purchase.button", value: "Restore Purchase", comment: "Button for restoring past subscription purchase")
     static let manageEmailButton = NSLocalizedString("subscription.modal.manage.email.button", value: "Manage Email", comment: "Button for opening manage email address page")
     static let enterEmailButton = NSLocalizedString("subscription.modal.enter.email.button", value: "Enter Email", comment: "Button for opening page to enter email address")
     static let addEmailButton = NSLocalizedString("subscription.modal.add.email.button", value: "Add Email", comment: "Button for opening page to add email address")
@@ -103,8 +141,7 @@ enum UserText {
     static let restoreButtonTitle = NSLocalizedString("subscription.alert.button.restore", value: "Restore", comment: "Alert button for restoring past subscription purchases")
 
     static let somethingWentWrongAlertTitle = NSLocalizedString("subscription.alert.something.went.wrong.title", value: "Something Went Wrong", comment: "Alert title when unknown error has occurred")
-    static let somethingWentWrongAlertDescription = NSLocalizedString("subscription.alert.something.went.wrong.description", value: "The App Store was not able to process your purchase. Please try again later.", comment: "Alert message when unknown error has occurred")
-    static let somethingWentWrongStripeAlertDescription = NSLocalizedString("subscription.alert.something.went.wrong.stripe.description", value: "We were not able to start your purchase process. Please try again later.", comment: "Alert message when unknown error has occurred")
+    static let somethingWentWrongAlertDescription = NSLocalizedString("subscription.alert.something.went.wrong.description", value: "We’re having trouble connecting. Please try again later.", comment: "Alert message when unknown error has occurred")
 
     static let subscriptionNotFoundAlertTitle = NSLocalizedString("subscription.alert.subscription.not.found.title", value: "Subscription Not Found", comment: "Alert title when subscription was not found")
     static let subscriptionNotFoundAlertDescription = NSLocalizedString("subscription.alert.subscription.not.found.description", value: "We couldn’t find a subscription associated with this Apple ID.", comment: "Alert message when subscription was not found")
diff --git a/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Constants.swift b/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Constants.swift
index 7c15b69516..beb1f64ec6 100644
--- a/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Constants.swift
+++ b/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Constants.swift
@@ -34,6 +34,7 @@ public enum Const {
 
     public enum Fonts {
         public static let popUpButton: NSFont = .preferredFont(forTextStyle: .title1, options: [:])
+        public static let sideBarHeader: Font = .system(size: 11)
         public static let sideBarItem: Font = .body
         public static let preferencePaneTitle: Font = .title2.weight(.semibold)
         public static let preferencePaneSectionHeader: Font = .title3.weight(.semibold)
diff --git a/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/ButtonStyles.swift b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/ButtonStyles.swift
index 718f9b029d..e5c7c83424 100644
--- a/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/ButtonStyles.swift
+++ b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/ButtonStyles.swift
@@ -69,6 +69,34 @@ public struct DefaultActionButtonStyle: ButtonStyle {
     }
 }
 
+public struct TransparentActionButtonStyle: ButtonStyle {
+
+    public let enabled: Bool
+
+    public init(enabled: Bool) {
+        self.enabled = enabled
+    }
+
+    public func makeBody(configuration: Self.Configuration) -> some View {
+
+        let enabledForegroundColor = configuration.isPressed ? Color(NSColor.controlAccentColor).opacity(0.5) : Color(NSColor.controlAccentColor)
+        let disabledForegroundColor = Color.gray.opacity(0.1)
+
+        configuration.label
+            .font(.system(size: 13))
+            .multilineTextAlignment(.center)
+            .fixedSize(horizontal: false, vertical: true)
+            .frame(minWidth: 44) // OK buttons will match the width of "Cancel" at least in English
+            .padding(.top, 2.5)
+            .padding(.bottom, 3)
+            .padding(.horizontal, 0)
+            .background(Color.clear)
+            .foregroundColor(enabled ? enabledForegroundColor : disabledForegroundColor)
+            .cornerRadius(5)
+
+    }
+}
+
 public struct DismissActionButtonStyle: ButtonStyle {
     @Environment(\.colorScheme) var colorScheme
 
diff --git a/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/Dialog.swift b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/Dialogs/Dialog.swift
similarity index 100%
rename from LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/Dialog.swift
rename to LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/Dialogs/Dialog.swift
diff --git a/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/Dialogs/TieredDialogView.swift b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/Dialogs/TieredDialogView.swift
new file mode 100644
index 0000000000..541941304b
--- /dev/null
+++ b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/Dialogs/TieredDialogView.swift
@@ -0,0 +1,70 @@
+//
+//  TieredDialogView.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+/// A view to arrange its subviews in a three vertical sections separated by dividers.
+public struct TieredDialogView<Top: View, Center: View, Bottom: View>: View {
+    private let verticalSpacing: CGFloat
+    private let horizontalAlignment: HorizontalAlignment
+    private let horizontalPadding: CGFloat?
+    @ViewBuilder private let top: () -> Top
+    @ViewBuilder private let center: () -> Center
+    @ViewBuilder private let bottom: () -> Bottom
+
+    /// Creates an instance with the given vertical spacing, horizontal alignment, horizontal padding and views created by the specified view builders.
+    /// - Parameters:
+    ///   - verticalSpacing: The distance between adjacent sections.
+    ///   - horizontalAlignment: The guide for aligning the sections in the vertical stack. This guide has the same vertical screen coordinate for every subview.
+    ///   - horizontalPadding: The padding amount to add to the horizontal edges of the sections.
+    ///   - top: A view builder that creates the content of the top section of the dialog.
+    ///   - center: A view builder that creates the content of the central section of the dialog.
+    ///   - bottom: A view builder that creates the content of the bottom section of the dialog.
+    public init(
+        verticalSpacing: CGFloat = 10.0,
+        horizontalAlignment: HorizontalAlignment = .leading,
+        horizontalPadding: CGFloat? = nil,
+        @ViewBuilder top: @escaping () -> Top,
+        @ViewBuilder center: @escaping () -> Center,
+        @ViewBuilder bottom: @escaping () -> Bottom
+    ) {
+        self.horizontalAlignment = horizontalAlignment
+        self.verticalSpacing = verticalSpacing
+        self.horizontalPadding = horizontalPadding
+        self.top = top
+        self.center = center
+        self.bottom = bottom
+    }
+
+    public var body: some View {
+        VStack(alignment: horizontalAlignment, spacing: verticalSpacing) {
+            top()
+                .padding(.horizontal, horizontalPadding)
+
+            Divider()
+
+            center()
+                .padding(.horizontal, horizontalPadding)
+
+            Divider()
+
+            bottom()
+                .padding(.horizontal, horizontalPadding)
+        }
+    }
+}
diff --git a/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/TwoColumnsListView.swift b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/TwoColumnsListView.swift
new file mode 100644
index 0000000000..55bb57bca0
--- /dev/null
+++ b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/TwoColumnsListView.swift
@@ -0,0 +1,62 @@
+//
+//  TwoColumnsListView.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+/// A view to arrange its subviews in two-column equally spaced rows.
+public struct TwoColumnsListView<Left: View, Right: View>: View {
+    private let rowHeight: CGFloat?
+    private let horizontalSpacing: CGFloat?
+    private let verticalSpacing: CGFloat?
+    @ViewBuilder private let leftColumn: () -> Left
+    @ViewBuilder private let rightColumn: () -> Right
+
+    /// Creates an instance with the given horizontal and vertical spacing, row height and
+    /// - Parameters:
+    ///   - horizontalSpacing: The horizontal distance between adjacent subviews.
+    ///   - verticalSpacing: The vertical distance between adjacent subviews.
+    ///   - rowHeight: The height of the rows in the stack.
+    ///   - leftColumn: A view builder that creates the content of the left section of the view.
+    ///   - rightColumn: A view builder that creates the content of the right section of the view.
+    public init(
+        horizontalSpacing: CGFloat? = nil,
+        verticalSpacing: CGFloat? = nil,
+        rowHeight: CGFloat? = nil,
+        @ViewBuilder leftColumn: @escaping () -> Left,
+        @ViewBuilder rightColumn: @escaping () -> Right
+    ) {
+        self.horizontalSpacing = horizontalSpacing
+        self.verticalSpacing = verticalSpacing
+        self.rowHeight = rowHeight
+        self.leftColumn = leftColumn
+        self.rightColumn = rightColumn
+    }
+
+    public var body: some View {
+        HStack(alignment: .center, spacing: horizontalSpacing) {
+            VStack(alignment: .leading, spacing: verticalSpacing) {
+                leftColumn()
+                    .frame(height: rowHeight)
+            }
+            VStack(alignment: .leading, spacing: verticalSpacing) {
+                rightColumn()
+                    .frame(height: rowHeight)
+            }
+        }
+    }
+}
diff --git a/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/View+ConditionalModifiers.swift b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/View+ConditionalModifiers.swift
new file mode 100644
index 0000000000..af223c4439
--- /dev/null
+++ b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/View+ConditionalModifiers.swift
@@ -0,0 +1,47 @@
+//
+//  View+ConditionalModifiers.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+public extension View {
+    /// Applies the given transform if the given condition evaluates to `true`.
+    /// - Parameters:
+    ///   - condition: The condition to evaluate.
+    ///   - transform: The transform to apply to the source `View`.
+    /// - Returns: Either the original `View` or the modified `View` if the condition is `true`.
+    @ViewBuilder func `if`<Content: View>(_ condition: Bool, transform: (Self) -> Content) -> some View {
+        if condition {
+            transform(self)
+        } else {
+            self
+        }
+    }
+
+    /// Applies the given transform if the given optional value is not `nil`.
+    /// - Parameters:
+    ///   - value: The optional value to evaluate.
+    ///   - transform: The transform to apply to the source `View`.
+    /// - Returns: Either the original `View` or the modified `View` if the optional value is not `nil`.
+    @ViewBuilder func `ifLet`<Content: View, Value>(_ value: Value?, transform: (Self, Value) -> Content) -> some View {
+        if let value = value {
+            transform(self, value)
+        } else {
+            self
+        }
+    }
+}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Resources/Localizable.xcstrings b/LocalPackages/SyncUI/Sources/SyncUI/Resources/Localizable.xcstrings
index 230beb36fa..f4b5506ac5 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Resources/Localizable.xcstrings
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Resources/Localizable.xcstrings
@@ -4739,6 +4739,78 @@
         }
       }
     },
+    "prefrences.sync.invalid-bookmarks-present-description-many" : {
+      "comment" : "Alert message for multiple invalid bookmark being filtered out of synced data",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
+          }
+        }
+      }
+    },
+    "prefrences.sync.invalid-bookmarks-present-description-one" : {
+      "comment" : "Alert message for 1 invalid bookmark being filtered out of synced data",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        }
+      }
+    },
+    "prefrences.sync.invalid-bookmarks-present-title" : {
+      "comment" : "Alert title for invalid bookmarks being filtered out of synced data",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
+          }
+        }
+      }
+    },
+    "prefrences.sync.invalid-credentials-present-description-many" : {
+      "comment" : "Alert message for multiple invalid logins being filtered out of synced data",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
+          }
+        }
+      }
+    },
+    "prefrences.sync.invalid-credentials-present-description-one" : {
+      "comment" : "Alert message for 1 invalid login being filtered out of synced data",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        }
+      }
+    },
+    "prefrences.sync.invalid-credentials-present-title" : {
+      "comment" : "Alert title for invalid logins being filtered out of synced data",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Some logins are not syncing due to excessively long content in certain fields."
+          }
+        }
+      }
+    },
     "prefrences.sync.keep-favicons-updated" : {
       "comment" : "Title of the confirmation button for favicons fetching",
       "extractionState" : "extracted_with_value",
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementViewModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementViewModel.swift
index 26580aee97..0ad1a50478 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementViewModel.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementViewModel.swift
@@ -33,6 +33,9 @@ public protocol ManagementViewModel: ObservableObject {
     var isSyncBookmarksPaused: Bool { get }
     var isSyncCredentialsPaused: Bool { get }
 
+    var invalidBookmarksTitles: [String] { get }
+    var invalidCredentialsTitles: [String] { get }
+
     var recoveryCode: String? { get }
     var codeToDisplay: String? { get }
     var devices: [SyncDevice] { get }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/ManagementView/SyncEnabledView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/ManagementView/SyncEnabledView.swift
index f11064d54f..4affcab8b7 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/ManagementView/SyncEnabledView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/ManagementView/SyncEnabledView.swift
@@ -32,6 +32,12 @@ struct SyncEnabledView<ViewModel>: View where ViewModel: ManagementViewModel {
             if model.isSyncCredentialsPaused {
                 syncPaused(for: .credentials)
             }
+            if !model.invalidBookmarksTitles.isEmpty {
+                syncHasInvalidItems(for: .bookmarks)
+            }
+            if !model.invalidCredentialsTitles.isEmpty {
+                syncHasInvalidItems(for: .credentials)
+            }
         }
 
         // Sync Enabled
@@ -107,6 +113,47 @@ struct SyncEnabledView<ViewModel>: View where ViewModel: ManagementViewModel {
         }
     }
 
+    @ViewBuilder
+    func syncHasInvalidItems(for itemType: LimitedItemType) -> some View {
+        var title: String {
+            switch itemType {
+            case .bookmarks:
+                return UserText.invalidBookmarksPresentTitle
+            case .credentials:
+                return UserText.invalidCredentialsPresentTitle
+            }
+        }
+        var description: String {
+            switch itemType {
+            case .bookmarks:
+                assert(!model.invalidBookmarksTitles.isEmpty)
+                let firstInvalidBookmarkTitle = model.invalidBookmarksTitles.first ?? ""
+                return UserText.invalidBookmarksPresentDescription(firstInvalidBookmarkTitle, numberOfInvalidItems: model.invalidBookmarksTitles.count)
+
+            case .credentials:
+                assert(!model.invalidCredentialsTitles.isEmpty)
+                let firstInvalidCredentialTitle = model.invalidCredentialsTitles.first ?? ""
+                return UserText.invalidCredentialsPresentDescription(firstInvalidCredentialTitle, numberOfInvalidItems: model.invalidCredentialsTitles.count)
+            }
+        }
+        var actionTitle: String {
+            switch itemType {
+            case .bookmarks:
+                return UserText.bookmarksLimitExceededAction
+            case .credentials:
+                return UserText.credentialsLimitExceededAction
+            }
+        }
+        SyncWarningMessage(title: title, message: description, buttonTitle: actionTitle) {
+            switch itemType {
+            case .bookmarks:
+                model.manageBookmarks()
+            case .credentials:
+                model.manageLogins()
+            }
+        }
+    }
+
     @ViewBuilder
     fileprivate func syncUnavailableView() -> some View {
         if model.isDataSyncingAvailable {
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift b/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift
index 3d9356af3e..ad9b47b13e 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift
@@ -148,6 +148,47 @@ enum UserText {
     static let credentialsLimitExceededDescription = NSLocalizedString("prefrences.sync.credentials-limit-exceeded-description", bundle: Bundle.module, value: "Logins limit exceeded. Delete some to resume syncing.", comment: "Description for sync credentials limits exceeded warning")
     static let bookmarksLimitExceededAction = NSLocalizedString("prefrences.sync.bookmarks-limit-exceeded-action", bundle: Bundle.module, value: "Manage Bookmarks", comment: "Button title for sync bookmarks limits exceeded warning to go to manage bookmarks")
     static let credentialsLimitExceededAction = NSLocalizedString("prefrences.sync.credentials-limit-exceeded-action", bundle: Bundle.module, value: "Manage passwords…", comment: "Button title for sync credentials limits exceeded warning to go to manage passwords")
+    static let invalidBookmarksPresentTitle = NSLocalizedString("prefrences.sync.invalid-bookmarks-present-title", bundle: Bundle.module, value: "Some bookmarks are not syncing due to excessively long content in certain fields.", comment: "Alert title for invalid bookmarks being filtered out of synced data")
+    static let invalidCredentialsPresentTitle = NSLocalizedString("prefrences.sync.invalid-credentials-present-title", bundle: Bundle.module, value: "Some logins are not syncing due to excessively long content in certain fields.", comment: "Alert title for invalid logins being filtered out of synced data")
+
+    static func invalidBookmarksPresentDescription(_ invalidItemTitle: String, numberOfInvalidItems: Int) -> String {
+        guard numberOfInvalidItems > 1 else {
+            let message = NSLocalizedString(
+                "prefrences.sync.invalid-bookmarks-present-description-one",
+                bundle: Bundle.module,
+                value: "Your bookmark for %@ can't sync because one of its fields exceeds the character limit.",
+                comment: "Alert message for 1 invalid bookmark being filtered out of synced data"
+            )
+            return String(format: message, invalidItemTitle)
+        }
+        let message = NSLocalizedString(
+            "prefrences.sync.invalid-bookmarks-present-description-many",
+            bundle: Bundle.module,
+            value: "Some bookmarks (%d) can't sync because some of their fields exceed the character limit.",
+            comment: "Alert message for multiple invalid bookmark being filtered out of synced data"
+        )
+        return String(format: message, numberOfInvalidItems)
+    }
+
+    static func invalidCredentialsPresentDescription(_ invalidItemTitle: String, numberOfInvalidItems: Int) -> String {
+        guard numberOfInvalidItems > 1 else {
+            let message = NSLocalizedString(
+                "prefrences.sync.invalid-credentials-present-description-one",
+                bundle: Bundle.module,
+                value: "Your password for %@ can't sync because one of its fields exceeds the character limit.",
+                comment: "Alert message for 1 invalid login being filtered out of synced data"
+            )
+            return String(format: message, invalidItemTitle)
+        }
+        let message = NSLocalizedString(
+            "prefrences.sync.invalid-credentials-present-description-many",
+            bundle: Bundle.module,
+            value: "Some passwords (n) can't sync because some of their fields exceed the character limit.",
+            comment: "Alert message for multiple invalid logins being filtered out of synced data"
+        )
+        return String(format: message, numberOfInvalidItems)
+    }
+
     static let syncErrorAlertTitle = NSLocalizedString("alert.sync-error", bundle: Bundle.module, value: "Sync & Backup Error", comment: "Title for sync error alert")
     static let unableToSyncToServerDescription = NSLocalizedString("alert.unable-to-sync-to-server-description", bundle: Bundle.module, value: "Unable to connect to the server.", comment: "Description for unable to sync to server error")
     static let unableToSyncWithAnotherDeviceDescription = NSLocalizedString("alert.unable-to-sync-with-another-device-description", bundle: Bundle.module, value: "Unable to Sync with another device.", comment: "Description for unable to sync with another device error")
diff --git a/LocalPackages/SystemExtensionManager/Sources/SystemExtensionManager/SystemExtensionManager.swift b/LocalPackages/SystemExtensionManager/Sources/SystemExtensionManager/SystemExtensionManager.swift
index 956b79e3af..6b9f61a851 100644
--- a/LocalPackages/SystemExtensionManager/Sources/SystemExtensionManager/SystemExtensionManager.swift
+++ b/LocalPackages/SystemExtensionManager/Sources/SystemExtensionManager/SystemExtensionManager.swift
@@ -44,7 +44,9 @@ public struct SystemExtensionManager {
         self.workspace = workspace
     }
 
-    public func activate(waitingForUserApproval: @escaping () -> Void) async throws {
+    /// - Returns: The system extension version.
+    /// 
+    public func activate(waitingForUserApproval: @escaping () -> Void) async throws -> String {
         /// Documenting a workaround for the issue discussed in https://app.asana.com/0/0/1205275221447702/f
         ///     Background: For a lot of users, the system won't show the system-extension-blocked alert if there's a previous request
         ///         to activate the extension.  You can see active requests in your console using command `systemextensionsctl list`.
@@ -62,11 +64,14 @@ public struct SystemExtensionManager {
             openSystemSettingsSecurity()
         }
 
-        return try await SystemExtensionRequest.activationRequest(
+        let activationRequest = SystemExtensionRequest.activationRequest(
             forExtensionWithIdentifier: extensionBundleID,
             manager: manager,
             waitingForUserApproval: waitingForUserApproval)
-        .submit()
+
+        try await activationRequest.submit()
+
+        return activationRequest.version ?? "unknown"
     }
 
     public func deactivate() async throws {
@@ -113,6 +118,7 @@ final class SystemExtensionRequest: NSObject {
     private let request: OSSystemExtensionRequest
     private let manager: OSSystemExtensionManager
     private let waitingForUserApproval: (() -> Void)?
+    private(set) var version: String?
 
     private var continuation: CheckedContinuation<Void, Error>?
 
@@ -144,12 +150,30 @@ final class SystemExtensionRequest: NSObject {
             manager.submitRequest(request)
         }
     }
+
+    private func updateVersion(to version: String) {
+        self.version = version
+    }
+
+    private func updateVersionNumberIfMissing() {
+        guard version == nil,
+              let versionString = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else {
+            return
+        }
+
+        var extensionVersion = versionString
+
+        if let buildString = Bundle.main.infoDictionary?[kCFBundleVersionKey as String] as? String {
+            extensionVersion = extensionVersion + "." + buildString
+        }
+    }
 }
 
 extension SystemExtensionRequest: OSSystemExtensionRequestDelegate {
 
     func request(_ request: OSSystemExtensionRequest, actionForReplacingExtension existing: OSSystemExtensionProperties, withExtension ext: OSSystemExtensionProperties) -> OSSystemExtensionRequest.ReplacementAction {
 
+        updateVersion(to: ext.bundleShortVersion + "." + ext.bundleVersion)
         return .replace
     }
 
@@ -160,6 +184,7 @@ extension SystemExtensionRequest: OSSystemExtensionRequestDelegate {
     func request(_ request: OSSystemExtensionRequest, didFinishWithResult result: OSSystemExtensionRequest.Result) {
         switch result {
         case .completed:
+            updateVersionNumberIfMissing()
             continuation?.resume()
         case .willCompleteAfterReboot:
             continuation?.resume(throwing: SystemExtensionRequestError.willActivateAfterReboot)
diff --git a/LocalPackages/XPCHelper/Sources/XPCHelper/XPCServer.swift b/LocalPackages/XPCHelper/Sources/XPCHelper/XPCServer.swift
index ab7f17fd71..0b2756d9f2 100644
--- a/LocalPackages/XPCHelper/Sources/XPCHelper/XPCServer.swift
+++ b/LocalPackages/XPCHelper/Sources/XPCHelper/XPCServer.swift
@@ -23,7 +23,7 @@ private class XPCConnectionsManager: NSObject, NSXPCListenerDelegate {
 
     private let clientInterface: NSXPCInterface
     private let serverInterface: NSXPCInterface
-    private let queue: DispatchQueue
+    fileprivate let queue: DispatchQueue
     weak var delegate: AnyObject?
 
     /// The active connections
@@ -135,16 +135,18 @@ extension XPCServer {
     }
 
     public func forEachClient(do callback: @escaping (ClientInterface) -> Void) {
-        for connection in connectionsManager.connections {
-            let client: ClientInterface
+        connectionsManager.queue.async {
+            for connection in self.connectionsManager.connections {
+                let client: ClientInterface
+
+                do {
+                    client = try self.client(for: connection)
+                } catch {
+                    continue
+                }
 
-            do {
-                client = try self.client(for: connection)
-            } catch {
-                continue
+                callback(client)
             }
-
-            callback(client)
         }
     }
 }
diff --git a/NetworkProtectionAppExtension/InfoPlist.xcstrings b/NetworkProtectionAppExtension/InfoPlist.xcstrings
new file mode 100644
index 0000000000..cd83eb4310
--- /dev/null
+++ b/NetworkProtectionAppExtension/InfoPlist.xcstrings
@@ -0,0 +1,186 @@
+{
+  "sourceLanguage" : "en",
+  "strings" : {
+    "CFBundleDisplayName" : {
+      "comment" : "Bundle display name",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        }
+      }
+    },
+    "CFBundleName" : {
+      "comment" : "Bundle name",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NetworkProtectionAppExtension"
+          }
+        }
+      }
+    },
+    "NSHumanReadableCopyright" : {
+      "comment" : "Copyright (human-readable)",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Copyright © 2023 DuckDuckGo. Alle Rechte vorbehalten."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Copyright © 2023 DuckDuckGo. All rights reserved."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Copyright © 2023 DuckDuckGo. Todos los derechos reservados."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Copyright © 2023 DuckDuckGo. Tous droits réservés."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Copyright © 2023 DuckDuckGo. Tutti i diritti riservati."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Copyright © 2023 DuckDuckGo. Alle rechten voorbehouden."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Copyright © 2023 DuckDuckGo. Wszelkie prawa zastrzeżone."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Copyright © 2023 DuckDuckGo. Todos os direitos reservados."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "© 2023 DuckDuckGo. Все права защищены."
+          }
+        }
+      }
+    }
+  },
+  "version" : "1.0"
+}
\ No newline at end of file
diff --git a/NetworkProtectionSystemExtension/NetworkProtectionAgentNotificationsPresenter.swift b/NetworkProtectionSystemExtension/NetworkProtectionAgentNotificationsPresenter.swift
index 7787d3d93b..8f2ffe08d6 100644
--- a/NetworkProtectionSystemExtension/NetworkProtectionAgentNotificationsPresenter.swift
+++ b/NetworkProtectionSystemExtension/NetworkProtectionAgentNotificationsPresenter.swift
@@ -48,11 +48,11 @@ final class NetworkProtectionAgentNotificationsPresenter: NetworkProtectionNotif
         notificationCenter.post(.showVPNSupersededNotification)
     }
 
-    func showTestNotification() {
-        notificationCenter.post(.showTestNotification)
+    func showEntitlementNotification() {
+        notificationCenter.post(.showExpiredEntitlementNotification)
     }
 
-    func showEntitlementNotification() {
-        // todo
+    func showTestNotification() {
+        notificationCenter.post(.showTestNotification)
     }
 }
diff --git a/NetworkProtectionSystemExtension/NetworkProtectionSystemExtension_Debug.entitlements b/NetworkProtectionSystemExtension/NetworkProtectionSystemExtension_Debug.entitlements
index 4252e67c8e..b4ac77d2d7 100644
--- a/NetworkProtectionSystemExtension/NetworkProtectionSystemExtension_Debug.entitlements
+++ b/NetworkProtectionSystemExtension/NetworkProtectionSystemExtension_Debug.entitlements
@@ -11,8 +11,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(TeamIdentifierPrefix)com.duckduckgo.macos.browser.network-protection.system-extension</string>
-		<string>$(TeamIdentifierPrefix)com.duckduckgo.macos.browser.network-protection</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 		<string>$(NETP_APP_GROUP)</string>
 	</array>
 	<key>com.apple.security.network.client</key>
diff --git a/NetworkProtectionSystemExtension/NetworkProtectionSystemExtension_Release.entitlements b/NetworkProtectionSystemExtension/NetworkProtectionSystemExtension_Release.entitlements
index 23068f001f..dba238c9ed 100644
--- a/NetworkProtectionSystemExtension/NetworkProtectionSystemExtension_Release.entitlements
+++ b/NetworkProtectionSystemExtension/NetworkProtectionSystemExtension_Release.entitlements
@@ -11,8 +11,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(TeamIdentifierPrefix)com.duckduckgo.macos.browser.network-protection</string>
-		<string>$(TeamIdentifierPrefix)com.duckduckgo.macos.browser.network-protection.system-extension</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 		<string>$(NETP_APP_GROUP)</string>
 	</array>
 	<key>com.apple.security.network.client</key>
diff --git a/SyncE2EUITests/CriticalPathsTests.swift b/SyncE2EUITests/CriticalPathsTests.swift
index fd1c305f05..32a1115a2b 100644
--- a/SyncE2EUITests/CriticalPathsTests.swift
+++ b/SyncE2EUITests/CriticalPathsTests.swift
@@ -62,14 +62,14 @@ final class CriticalPathsTests: XCTestCase {
         debugMenuBarItem = menuBarsQuery.menuBarItems["Debug"]
 
         debugMenuBarItem.click()
-        let resetDataMenuItem = menuBarsQuery.menuItems["Reset Data"]
+        let resetDataMenuItem = menuBarsQuery.menuItems["MainMenu.resetData"]
         resetDataMenuItem.hover()
-        let resetBookMarksData = resetDataMenuItem.menuItems["Reset Bookmarks"]
+        let resetBookMarksData = resetDataMenuItem.menuItems["MainMenu.resetBookmarks"]
         resetBookMarksData.click()
 
         debugMenuBarItem.click()
         resetDataMenuItem.hover()
-        let resetAutofillData = resetDataMenuItem.menuItems["Reset Autofill Data"]
+        let resetAutofillData = resetDataMenuItem.menuItems["MainMenu.resetSecureVaultData"]
         resetAutofillData.click()
     }
 
@@ -296,7 +296,7 @@ final class CriticalPathsTests: XCTestCase {
 
     private func addLogin() {
         let bookmarksWindow = app.windows["Bookmarks"]
-        bookmarksWindow.buttons["Options Button"].click()
+        bookmarksWindow.buttons["NavigationBarViewController.optionsButton"].click()
         bookmarksWindow.menuItems["Autofill"].click()
         bookmarksWindow.popovers.buttons["add item"].click()
         bookmarksWindow.popovers.menuItems["createNewLogin"].click()
@@ -361,7 +361,7 @@ final class CriticalPathsTests: XCTestCase {
 
     private func checkLogins() {
         let bookmarksWindow = app.windows["Bookmarks"]
-        bookmarksWindow.buttons["Options Button"].click()
+        bookmarksWindow.buttons["NavigationBarViewController.optionsButton"].click()
         bookmarksWindow.menuItems["Autofill"].click()
         let elementsQuery = bookmarksWindow.popovers.scrollViews.otherElements
         elementsQuery.buttons["Da, Dax Login, daxthetest"].click()
diff --git a/UITests/AutocompleteTests.swift b/UITests/AutocompleteTests.swift
new file mode 100644
index 0000000000..2b02369b58
--- /dev/null
+++ b/UITests/AutocompleteTests.swift
@@ -0,0 +1,213 @@
+//
+//  AutocompleteTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Common
+import XCTest
+
+class AutocompleteTests: XCTestCase {
+    private var app: XCUIApplication!
+    private var addBookmarkButton: XCUIElement!
+    private var resetBookMarksMenuItem: XCUIElement!
+    private var historyMenuBarItem: XCUIElement!
+    private var clearAllHistoryMenuItem: XCUIElement!
+    private var addressBarTextField: XCUIElement!
+    private var suggestionsTableView: XCUIElement!
+    private var clearAllHistoryAlertClearButton: XCUIElement!
+    private var fakeFireButton: XCUIElement!
+    private var siteTitleForBookmarkedSite: String!
+    private var siteTitleForHistorySite: String!
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+        app = XCUIApplication()
+        app.launchEnvironment["UITEST_MODE"] = "1"
+        addBookmarkButton = app.buttons["BookmarkDialogButtonsView.defaultButton"]
+        resetBookMarksMenuItem = app.menuItems["MainMenu.resetBookmarks"]
+        historyMenuBarItem = app.menuBarItems["History"]
+        clearAllHistoryMenuItem = app.menuItems["HistoryMenu.clearAllHistory"]
+        addressBarTextField = app.windows.textFields["AddressBarViewController.addressBarTextField"]
+        suggestionsTableView = app.tables["SuggestionViewController.tableView"]
+        clearAllHistoryAlertClearButton = app.buttons["ClearAllHistoryAndDataAlert.clearButton"]
+        fakeFireButton = app.buttons["FireViewController.fakeFireButton"]
+        let siteTitleLength = 12
+        siteTitleForBookmarkedSite = UITests.randomPageTitle(length: siteTitleLength)
+        siteTitleForHistorySite = UITests.randomPageTitle(length: siteTitleLength)
+        app.launch()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+        try resetAndArrangeBookmarksAndHistory() // Manually reset to a clean state
+    }
+
+    func test_suggestions_showsTypedTitleOfBookmarkedPageAsBookmark() throws {
+        let siteTitleForBookmarkedSite = try XCTUnwrap(siteTitleForBookmarkedSite)
+        app.typeText(siteTitleForBookmarkedSite)
+        XCTAssertTrue(
+            suggestionsTableView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Suggestions tableView didn't become available in a reasonable timeframe."
+        )
+
+        let suggestionCellWithBookmarkedSite = suggestionsTableView.tableRows.cells.staticTexts[siteTitleForBookmarkedSite].firstMatch
+        XCTAssertTrue( // It should match something in suggestions
+            suggestionCellWithBookmarkedSite.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The expected table view cell with the suggestion for the bookmarked site didn't become available in a reasonable timeframe."
+        )
+        let containerCellForBookmarkedSuggestion = app.tables.cells.containing(.any, identifier: suggestionCellWithBookmarkedSite.identifier)
+            .firstMatch
+
+        XCTAssertTrue(
+            containerCellForBookmarkedSuggestion.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The enclosing cell for the suggestion cell for the bookmarked site didn't become available in a reasonable timeframe. If this is unexpected, it could be due to a significant change in the layout of this interface."
+        )
+        // And that should be a bookmark suggestion
+        XCTAssertEqual(
+            containerCellForBookmarkedSuggestion.images.firstMatch.label,
+            "BookmarkSuggestion",
+            "Although the suggestion was found, it didn't have the \"BookmarkSuggestion\" image next to it in suggestions."
+        )
+    }
+
+    func test_suggestions_showsTypedTitleOfHistoryPageAsHistory() throws {
+        let siteTitleForHistorySite = try XCTUnwrap(siteTitleForHistorySite)
+        app.typeText(siteTitleForHistorySite)
+        XCTAssertTrue(
+            suggestionsTableView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Suggestions tableView didn't become available in a reasonable timeframe."
+        )
+
+        let suggestionCellWithHistorySite = suggestionsTableView.tableRows.cells.staticTexts[siteTitleForHistorySite].firstMatch
+        XCTAssertTrue( // It should match something in suggestions
+            suggestionCellWithHistorySite.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The expected table view cell with the suggestion for the history site didn't become available in a reasonable timeframe."
+        )
+        let containerCellForHistorySuggestion = app.tables.cells.containing(.any, identifier: suggestionCellWithHistorySite.identifier)
+            .firstMatch
+
+        XCTAssertTrue(
+            containerCellForHistorySuggestion.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The enclosing cell for the suggestion cell for the history site didn't become available in a reasonable timeframe. If this is unexpected, it could be due to a significant change in the layout of this interface."
+        )
+        // And that should be a history suggestion
+        XCTAssertEqual(
+            containerCellForHistorySuggestion.images.firstMatch.label,
+            "HistorySuggestion",
+            "Although the suggestion was found, it didn't have the \"HistorySuggestion\" image next to it in suggestions."
+        )
+    }
+
+    func test_suggestions_showsTypedTitleOfWebsiteNotInBookmarksOrHistoryAsWebsite() throws {
+        let websiteURLString = "https://www.duckduckgo.com"
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe."
+        )
+        addressBarTextField.typeText(websiteURLString)
+        XCTAssertTrue(
+            suggestionsTableView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Suggestions tableView didn't become available in a reasonable timeframe."
+        )
+
+        let suggestionCellWithWebsite = suggestionsTableView.tableRows.cells.staticTexts[websiteURLString].firstMatch
+        XCTAssertTrue( // It should match something in suggestions
+            suggestionCellWithWebsite.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The expected table view cell with the suggestion for the website didn't become available in a reasonable timeframe."
+        )
+        let containerCellForWebsiteSuggestion = app.tables.cells.containing(.any, identifier: suggestionCellWithWebsite.identifier)
+            .firstMatch
+        XCTAssertTrue(
+            containerCellForWebsiteSuggestion.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The enclosing cell for the suggestion cell for the website didn't become available in a reasonable timeframe. If this is unexpected, it could be due to a significant change in the layout of this interface."
+        )
+
+        // And that should be a website suggestion
+        XCTAssertEqual(
+            containerCellForWebsiteSuggestion.images.firstMatch.label,
+            "Web",
+            "Although the suggestion was found, it didn't have the \"Web\" image next to it in suggestions."
+        )
+    }
+}
+
+private extension AutocompleteTests {
+    /// Make sure there is exactly one site in the history, and exactly one site in the bookmarks, and they aren't the same site.
+    func resetAndArrangeBookmarksAndHistory() throws {
+        let siteTitleForHistorySite = try XCTUnwrap(siteTitleForHistorySite)
+        let siteTitleForBookmarkedSite = try XCTUnwrap(siteTitleForBookmarkedSite)
+
+        XCTAssertTrue(
+            resetBookMarksMenuItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Reset bookmarks menu item didn't become available in a reasonable timeframe."
+        )
+
+        resetBookMarksMenuItem.click()
+        let urlForBookmarks = UITests.simpleServedPage(titled: siteTitleForBookmarkedSite)
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe."
+        )
+
+        addressBarTextField.typeText("\(urlForBookmarks.absoluteString)\r")
+        XCTAssertTrue(
+            app.windows.webViews[siteTitleForBookmarkedSite].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Visited site didn't load with the expected title in a reasonable timeframe."
+        )
+
+        app.typeKey("d", modifierFlags: [.command]) // Bookmark the page
+        XCTAssertTrue(
+            addBookmarkButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Bookmark button didn't appear with the expected title in a reasonable timeframe."
+        )
+        addBookmarkButton.click()
+
+        XCTAssertTrue(
+            historyMenuBarItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "History menu bar item didn't appear in a reasonable timeframe."
+        )
+        historyMenuBarItem.click()
+
+        XCTAssertTrue(
+            clearAllHistoryMenuItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Clear all history item didn't appear in a reasonable timeframe."
+        )
+        clearAllHistoryMenuItem.click()
+
+        XCTAssertTrue(
+            clearAllHistoryAlertClearButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Clear all history item didn't appear in a reasonable timeframe."
+        )
+        clearAllHistoryAlertClearButton.click() // Manually remove the history
+        XCTAssertTrue( // Let any ongoing fire animation or data processes complete
+            fakeFireButton.waitForNonExistence(timeout: UITests.Timeouts.fireAnimation),
+            "Fire animation didn't finish and cease existing in a reasonable timeframe."
+        )
+
+        let urlForHistory = UITests.simpleServedPage(titled: siteTitleForHistorySite)
+
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe."
+        )
+
+        addressBarTextField.typeText("\(urlForHistory.absoluteString)\r")
+        XCTAssertTrue(
+            app.windows.webViews[siteTitleForHistorySite].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Visited site didn't load with the expected title in a reasonable timeframe."
+        )
+        app.typeKey("w", modifierFlags: [.command, .option, .shift])
+        app.typeKey("n", modifierFlags: .command)
+    }
+}
diff --git a/UITests/BrowsingHistoryTests.swift b/UITests/BrowsingHistoryTests.swift
new file mode 100644
index 0000000000..53aaade7e5
--- /dev/null
+++ b/UITests/BrowsingHistoryTests.swift
@@ -0,0 +1,168 @@
+//
+//  BrowsingHistoryTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+
+class BrowsingHistoryTests: XCTestCase {
+    private var app: XCUIApplication!
+    private var historyMenuBarItem: XCUIElement!
+    private var clearAllHistoryMenuItem: XCUIElement!
+    private var clearAllHistoryAlertClearButton: XCUIElement!
+    private var fakeFireButton: XCUIElement!
+    private var addressBarTextField: XCUIElement!
+    private let lengthForRandomPageTitle = 8
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+        app = XCUIApplication()
+        app.launchEnvironment["UITEST_MODE"] = "1"
+        historyMenuBarItem = app.menuBarItems["History"]
+        clearAllHistoryMenuItem = app.menuItems["HistoryMenu.clearAllHistory"]
+        clearAllHistoryAlertClearButton = app.buttons["ClearAllHistoryAndDataAlert.clearButton"]
+        fakeFireButton = app.buttons["FireViewController.fakeFireButton"]
+        addressBarTextField = app.windows.textFields["AddressBarViewController.addressBarTextField"]
+        app.launch()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+
+        XCTAssertTrue(
+            historyMenuBarItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "History menu bar item didn't appear in a reasonable timeframe."
+        )
+        historyMenuBarItem.click()
+
+        XCTAssertTrue(
+            clearAllHistoryMenuItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Clear all history item didn't appear in a reasonable timeframe."
+        )
+        clearAllHistoryMenuItem.click()
+
+        XCTAssertTrue(
+            clearAllHistoryAlertClearButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Clear all history item didn't appear in a reasonable timeframe."
+        )
+        clearAllHistoryAlertClearButton.click() // Manually remove the history
+        XCTAssertTrue( // Let any ongoing fire animation or data processes complete
+            fakeFireButton.waitForNonExistence(timeout: UITests.Timeouts.fireAnimation),
+            "Fire animation didn't finish and cease existing in a reasonable timeframe."
+        )
+    }
+
+    func test_recentlyVisited_showsLastVisitedSite() throws {
+        let historyPageTitleExpectedToBeFirstInRecentlyVisited = UITests.randomPageTitle(length: lengthForRandomPageTitle)
+        let url = UITests.simpleServedPage(titled: historyPageTitleExpectedToBeFirstInRecentlyVisited)
+        let firstSiteInRecentlyVisitedSection = app.menuItems["HistoryMenu.recentlyVisitedMenuItem.0"]
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe."
+        )
+
+        addressBarTextField.typeText("\(url.absoluteString)\r")
+        XCTAssertTrue(
+            app.windows.webViews[historyPageTitleExpectedToBeFirstInRecentlyVisited]
+                .waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Visited site didn't load with the expected title in a reasonable timeframe."
+        )
+        XCTAssertTrue(
+            historyMenuBarItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "History menu bar item didn't appear in a reasonable timeframe."
+        )
+        historyMenuBarItem.click() // The visited sites identifiers will not be available until after the History menu has been accessed.
+        XCTAssertTrue(
+            firstSiteInRecentlyVisitedSection.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The first site in the recently visited section didn't appear in a reasonable timeframe."
+        )
+
+        XCTAssertEqual(historyPageTitleExpectedToBeFirstInRecentlyVisited, firstSiteInRecentlyVisitedSection.title)
+    }
+
+    func test_history_showsVisitedSiteAfterClosingAndReopeningWindow() throws {
+        let historyPageTitleExpectedToBeFirstInTodayHistory = UITests.randomPageTitle(length: lengthForRandomPageTitle)
+        let url = UITests.simpleServedPage(titled: historyPageTitleExpectedToBeFirstInTodayHistory)
+        let firstSiteInHistory = app.menuItems["HistoryMenu.historyMenuItem.Today.0"]
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe."
+        )
+
+        addressBarTextField.typeText("\(url.absoluteString)\r")
+        XCTAssertTrue(
+            app.windows.webViews[historyPageTitleExpectedToBeFirstInTodayHistory].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Visited site didn't load with the expected title in a reasonable timeframe."
+        )
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close all windows
+        app.typeKey("n", modifierFlags: .command) // New window
+        XCTAssertTrue(
+            historyMenuBarItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "History menu bar item didn't appear in a reasonable timeframe."
+        )
+        historyMenuBarItem.click() // The visited sites identifiers will not be available until after the History menu has been accessed.
+        XCTAssertTrue(
+            firstSiteInHistory.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The first site in the recently visited section didn't appear in a reasonable timeframe."
+        )
+
+        XCTAssertEqual(historyPageTitleExpectedToBeFirstInTodayHistory, firstSiteInHistory.title)
+    }
+
+    func test_reopenLastClosedWindowMenuItem_canReopenTabsOfLastClosedWindow() throws {
+        let titleOfFirstTabWhichShouldRestore = UITests.randomPageTitle(length: lengthForRandomPageTitle)
+        let titleOfSecondTabWhichShouldRestore = UITests.randomPageTitle(length: lengthForRandomPageTitle)
+        let urlForFirstTab = UITests.simpleServedPage(titled: titleOfFirstTabWhichShouldRestore)
+        let urlForSecondTab = UITests.simpleServedPage(titled: titleOfSecondTabWhichShouldRestore)
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe."
+        )
+        addressBarTextField.typeText("\(urlForFirstTab.absoluteString)\r")
+        XCTAssertTrue(
+            app.windows.webViews[titleOfFirstTabWhichShouldRestore].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Visited site didn't load with the expected title in a reasonable timeframe."
+        )
+        app.typeKey("t", modifierFlags: .command)
+
+        addressBarTextField.typeText("\(urlForSecondTab.absoluteString)\r")
+        XCTAssertTrue(
+            app.windows.webViews[titleOfSecondTabWhichShouldRestore].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Visited site didn't load with the expected title in a reasonable timeframe."
+        )
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close all windows
+        app.typeKey("n", modifierFlags: .command) // New window
+        XCTAssertTrue(
+            historyMenuBarItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "History menu bar item didn't appear in a reasonable timeframe."
+        )
+        historyMenuBarItem.click() // The visited sites identifiers will not be available until after the History menu has been accessed.
+        let reopenLastClosedWindowMenuItem = app.menuItems["HistoryMenu.reopenLastClosedWindow"]
+        XCTAssertTrue(
+            reopenLastClosedWindowMenuItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Reopen Last Closed Window\" menu item didn't appear in a reasonable timeframe."
+        )
+        reopenLastClosedWindowMenuItem.click()
+
+        XCTAssertTrue(
+            app.windows.webViews[titleOfFirstTabWhichShouldRestore].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Restored visited tab 1 wasn't available with the expected title in a reasonable timeframe."
+        )
+        app.typeKey("w", modifierFlags: [.command])
+        XCTAssertTrue(
+            app.windows.webViews[titleOfSecondTabWhichShouldRestore].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Restored visited tab 2 wasn't available with the expected title in a reasonable timeframe."
+        )
+    }
+}
diff --git a/UITests/Common/UITests.swift b/UITests/Common/UITests.swift
new file mode 100644
index 0000000000..3d97fb6a96
--- /dev/null
+++ b/UITests/Common/UITests.swift
@@ -0,0 +1,51 @@
+//
+//  UITests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+/// Helper values for the UI tests
+enum UITests {
+    /// Timeout constants for different test requirements
+    enum Timeouts {
+        /// Mostly, we use timeouts to wait for element existence. This is about 3x longer than needed, for CI resilience
+        static let elementExistence: Double = 2.5
+        /// The fire animation time has environmental dependencies, so we want to wait for completion so we don't try to type into it
+        static let fireAnimation: Double = 30.0
+    }
+
+    /// A page simple enough to test favorite, bookmark, and history storage
+    /// - Parameter title: The title of the page to match
+    /// - Returns: A URL that can be served by `tests-server`
+    static func simpleServedPage(titled title: String) -> URL {
+        return URL.testsServer
+            .appendingTestParameters(data: """
+            <html>
+            <head>
+            <title>\(title)</title>
+            </head>
+            <body>
+            <p>Sample text</p>
+            </body>
+            </html>
+            """.utf8data)
+    }
+
+    static func randomPageTitle(length: Int) -> String {
+        return String(UUID().uuidString.prefix(length))
+    }
+}
diff --git a/UITests/Common/XCUIElementExtension.swift b/UITests/Common/XCUIElementExtension.swift
new file mode 100644
index 0000000000..8558cd9a7e
--- /dev/null
+++ b/UITests/Common/XCUIElementExtension.swift
@@ -0,0 +1,42 @@
+//
+//  XCUIElementExtension.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+
+extension XCUIElement {
+
+    // https://stackoverflow.com/a/63089781/119717
+    // Licensed under https://creativecommons.org/licenses/by-sa/4.0/
+    // Credit: Adil Hussain
+
+    /**
+     * Waits the specified amount of time for the element’s `exists` property to become `false`.
+     *
+     * - Parameter timeout: The amount of time to wait.
+     * - Returns: `false` if the timeout expires without the element coming out of existence.
+     */
+    func waitForNonExistence(timeout: TimeInterval) -> Bool {
+        let timeStart = Date().timeIntervalSince1970
+
+        while Date().timeIntervalSince1970 <= (timeStart + timeout) {
+            if !exists { return true }
+        }
+
+        return false
+    }
+}
diff --git a/UITests/FindInPageTests.swift b/UITests/FindInPageTests.swift
new file mode 100644
index 0000000000..f3337f0cc7
--- /dev/null
+++ b/UITests/FindInPageTests.swift
@@ -0,0 +1,539 @@
+//
+//  FindInPageTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+
+class FindInPageTests: XCTestCase {
+    private var app: XCUIApplication!
+    private var addressBarTextField: XCUIElement!
+    private var loremIpsumWebView: XCUIElement!
+    private var findInPageCloseButton: XCUIElement!
+    private let minimumExpectedMatchingPixelsInFindHighlight = 150
+
+    override class func setUp() {
+        saveLocalHTML()
+    }
+
+    override class func tearDown() {
+        removeLocalHTML()
+    }
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+        app = XCUIApplication()
+        app.launchEnvironment["UITEST_MODE"] = "1"
+        addressBarTextField = app.windows.textFields["AddressBarViewController.addressBarTextField"]
+        loremIpsumWebView = app.windows.webViews["Lorem Ipsum"]
+        findInPageCloseButton = app.windows.buttons["FindInPageController.closeButton"]
+        app.launch()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Let's enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+    }
+
+    func test_findInPage_canBeOpenedWithKeyCommand() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+
+        app.typeKey("f", modifierFlags: .command)
+
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" with command-f, the elements of the \"Find in Page\" interface should exist."
+        )
+    }
+
+    func test_findInPage_canBeOpenedWithMenuBarItem() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+        let findInPageMenuBarItem = app.menuItems["MainMenu.findInPage"]
+        XCTAssertTrue(
+            findInPageMenuBarItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find \"Find in Page\" main menu bar item in a reasonable timeframe."
+        )
+
+        findInPageMenuBarItem.click()
+
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" via the menu items Edit->Find->\"Find in Page\", the elements of the \"Find in Page\" interface should exist."
+        )
+    }
+
+    func test_findInPage_canBeOpenedWithMoreOptionsMenuItem() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+        let optionsButton = app.windows.buttons["NavigationBarViewController.optionsButton"]
+        XCTAssertTrue(optionsButton.waitForExistence(timeout: UITests.Timeouts.elementExistence), "Couldn't find options item in a reasonable timeframe.")
+        optionsButton.click()
+
+        let findInPageMoreOptionsMenuItem = app.menuItems["MoreOptionsMenu.findInPage"]
+        XCTAssertTrue(
+            findInPageMoreOptionsMenuItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find More Options \"Find in Page\" menu item in a reasonable timeframe."
+        )
+        findInPageMoreOptionsMenuItem.click()
+
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" via the More Options \"Find in Page\" menu item, the elements of the \"Find in Page\" interface should exist."
+        )
+    }
+
+    func test_findInPage_canBeClosedWithEscape() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+        app.typeKey("f", modifierFlags: .command)
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" with command-f, the elements of the \"Find in Page\" interface should exist."
+        )
+
+        app.typeKey(.escape, modifierFlags: [])
+
+        XCTAssertTrue(
+            findInPageCloseButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "After closing \"Find in Page\" with escape, the elements of the \"Find in Page\" interface should no longer exist."
+        )
+    }
+
+    func test_findInPage_canBeClosedWithShiftCommandF() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+        app.typeKey("f", modifierFlags: .command)
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" with command-f, the elements of the \"Find in Page\" interface should exist."
+        )
+
+        app.typeKey("f", modifierFlags: [.command, .shift])
+
+        XCTAssertTrue(
+            findInPageCloseButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "After closing \"Find in Page\" with escape, the elements of the \"Find in Page\" interface should no longer exist."
+        )
+    }
+
+    func test_findInPage_canBeClosedWithHideFindMenuItem() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+        app.typeKey("f", modifierFlags: .command)
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" with command-f, the elements of the \"Find in Page\" interface should exist."
+        )
+
+        let findInPageDoneMenuBarItem = app.menuItems["MainMenu.findInPageDone"]
+        XCTAssertTrue(
+            findInPageDoneMenuBarItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find \"Find in Page\" done main menu item in a reasonable timeframe."
+        )
+        findInPageDoneMenuBarItem.click()
+
+        XCTAssertTrue(
+            findInPageCloseButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "After closing \"Find in Page\" with escape, the elements of the \"Find in Page\" interface should no longer exist."
+        )
+    }
+
+    func test_findInPage_showsCorrectNumberOfOccurrences() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+
+        app.typeKey("f", modifierFlags: .command)
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" with command-f, the elements of the \"Find in Page\" interface should exist."
+        )
+
+        app.typeText("maximus\r")
+        let statusField = app.textFields["FindInPageController.statusField"]
+        XCTAssertTrue(
+            statusField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find \"Find in Page\" statusField in a reasonable timeframe."
+        )
+        let statusFieldTextContent = try XCTUnwrap(statusField.value as? String)
+        XCTAssertEqual(statusFieldTextContent, "1 of 4") // Note: this is not a localized test element, and it should have a localization strategy.
+    }
+
+    func test_findInPage_showsFocusAndOccurrenceHighlighting() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+        app.typeKey("f", modifierFlags: .command)
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" with command-f, the elements of the \"Find in Page\" interface should exist."
+        )
+
+        app.typeText("maximus\r")
+        let statusField = app.textFields["FindInPageController.statusField"]
+        XCTAssertTrue(
+            statusField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find \"Find in Page\" statusField in a reasonable timeframe."
+        )
+        let statusFieldTextContent = try XCTUnwrap(statusField.value as? String)
+        // Note: the following is not a localized test element, but it should have a localization strategy.
+        XCTAssertEqual(statusFieldTextContent, "1 of 4", "Unexpected status field text content after a \"Find in Page\" operation.")
+
+        let webViewWithSelectedWordsScreenshot = loremIpsumWebView.screenshot()
+        let highlightedPixelsInScreenshot = webViewWithSelectedWordsScreenshot.image.matchingPixels(of: .findHighlightColor)
+        XCTAssertGreaterThan(
+            highlightedPixelsInScreenshot.count,
+            minimumExpectedMatchingPixelsInFindHighlight,
+            "There are expected to be more than \(minimumExpectedMatchingPixelsInFindHighlight) pixels of NSColor.findHighlightColor in a screenshot of a \"Find in Page\" search where there is a match, but this test found \(highlightedPixelsInScreenshot) matching pixels."
+        )
+    }
+
+    func test_findNext_menuItemGoesToNextOccurrence() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+        app.typeKey("f", modifierFlags: .command)
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" with command-f, the elements of the \"Find in Page\" interface should exist."
+        )
+        app.typeText("maximus\r")
+        let statusField = app.textFields["FindInPageController.statusField"]
+        XCTAssertTrue(
+            statusField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find \"Find in Page\" statusField in a reasonable timeframe."
+        )
+        let statusFieldTextContent = try XCTUnwrap(statusField.value as? String)
+        // Note: the following is not a localized test element, but it should have a localization strategy.
+        XCTAssertEqual(statusFieldTextContent, "1 of 4", "Unexpected status field text content after a \"Find in Page\" operation.")
+        let findInPageScreenshot = loremIpsumWebView.screenshot()
+        let highlightedPixelsInFindScreenshot = findInPageScreenshot.image.matchingPixels(of: .findHighlightColor)
+        let findHighlightPoints = Set(highlightedPixelsInFindScreenshot.map { $0.point }) // Coordinates of highlighted pixels in the find screenshot
+
+        let findNextMenuBarItem = app.menuItems["MainMenu.findNext"]
+        XCTAssertTrue(
+            findNextMenuBarItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find \"Find Next\" main menu bar item in a reasonable timeframe."
+        )
+        findNextMenuBarItem.click()
+        let updatedStatusField = app.textFields["FindInPageController.statusField"]
+        let updatedStatusFieldTextContent = updatedStatusField.value as! String
+        XCTAssertTrue(
+            updatedStatusField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find the updated \"Find in Page\" statusField in a reasonable timeframe."
+        )
+        XCTAssertEqual(updatedStatusFieldTextContent, "2 of 4", "Unexpected status field text content after a \"Find Next\" operation.")
+        let findNextScreenshot = loremIpsumWebView.screenshot()
+        let highlightedPixelsInFindNextScreenshot = Set(findNextScreenshot.image
+            .matchingPixels(of: .findHighlightColor)) // Coordinates of highlighted pixels in the find next screenshot
+        let findNextHighlightPoints = highlightedPixelsInFindNextScreenshot.map { $0.point }
+        let pixelSetIntersection = findHighlightPoints
+            .intersection(findNextHighlightPoints) // If the highlighted text has moved as expected, this should not have many elements
+
+        XCTAssertGreaterThan(
+            highlightedPixelsInFindNextScreenshot.count,
+            minimumExpectedMatchingPixelsInFindHighlight,
+            "There are expected to be more than \(minimumExpectedMatchingPixelsInFindHighlight) pixels of NSColor.findHighlightColor in a screenshot of a \"Find in Page\" search where there is a match for a \"Find next\" operation, but this test found \(highlightedPixelsInFindNextScreenshot) matching pixels."
+        )
+        XCTAssertTrue(
+            pixelSetIntersection.count <= findNextHighlightPoints.count / 2,
+            "When the selection rectangle has moved as expected, fewer than half of the highlighted pixel coordinates from \"Find Next\" should intersect with the highlighted pixel coordinates from the initial \"Find\" operation."
+        )
+    }
+
+    func test_findNext_nextArrowGoesToNextOccurrence() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+        app.typeKey("f", modifierFlags: .command)
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" with command-f, the elements of the \"Find in Page\" interface should exist."
+        )
+        app.typeText("maximus\r")
+        let statusField = app.textFields["FindInPageController.statusField"]
+        XCTAssertTrue(
+            statusField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find \"Find in Page\" statusField in a reasonable timeframe."
+        )
+        let statusFieldTextContent = try XCTUnwrap(statusField.value as? String)
+        // Note: the following is not a localized test element, but it should have a localization strategy.
+        XCTAssertEqual(statusFieldTextContent, "1 of 4", "Unexpected status field text content after a \"Find in Page\" operation.")
+        let findInPageScreenshot = loremIpsumWebView.screenshot()
+        let highlightedPixelsInFindScreenshot = findInPageScreenshot.image.matchingPixels(of: .findHighlightColor)
+        let findHighlightPoints = Set(highlightedPixelsInFindScreenshot.map { $0.point }) // Coordinates of highlighted pixels in the find screenshot
+        let findInPageNextButton = app.windows.buttons["FindInPageController.nextButton"]
+        XCTAssertTrue(
+            findInPageNextButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find \"Find Next\" main menu bar item in a reasonable timeframe."
+        )
+
+        findInPageNextButton.click()
+        let updatedStatusField = app.textFields["FindInPageController.statusField"]
+        let updatedStatusFieldTextContent = updatedStatusField.value as! String
+        XCTAssertTrue(
+            updatedStatusField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find the updated \"Find in Page\" statusField in a reasonable timeframe."
+        )
+        XCTAssertEqual(updatedStatusFieldTextContent, "2 of 4", "Unexpected status field text content after a \"Find Next\" operation.")
+        let findNextScreenshot = loremIpsumWebView.screenshot()
+        let highlightedPixelsInFindNextScreenshot = findNextScreenshot.image.matchingPixels(of: .findHighlightColor)
+        let findNextHighlightPoints = highlightedPixelsInFindNextScreenshot.map { $0.point }
+        let pixelSetIntersection = findHighlightPoints
+            .intersection(findNextHighlightPoints) // If the highlighted text has moved as expected, this should not have many elements
+
+        XCTAssertGreaterThan(
+            highlightedPixelsInFindNextScreenshot.count,
+            minimumExpectedMatchingPixelsInFindHighlight,
+            "There are expected to be more than \(minimumExpectedMatchingPixelsInFindHighlight) pixels of NSColor.findHighlightColor in a screenshot of a \"Find in Page\" search where there is a match, but this test found \(highlightedPixelsInFindNextScreenshot) matching pixels."
+        )
+        XCTAssertTrue(
+            pixelSetIntersection.count <= findNextHighlightPoints.count / 2,
+            "When the selection rectangle has moved as expected, fewer than half of the highlighted pixel coordinates from \"Find Next\" should intersect with the highlighted pixel coordinates from the initial \"Find\" operation."
+        )
+    }
+
+    func test_findNext_commandGGoesToNextOccurrence() throws {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        XCTAssertTrue(
+            loremIpsumWebView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Local \"Lorem Ipsum\" web page didn't load with the expected title in a reasonable timeframe. If this is unexpected, it can also be due to the timeout being too short."
+        )
+        app.typeKey("f", modifierFlags: .command)
+        XCTAssertTrue(
+            findInPageCloseButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "After invoking \"Find in Page\" with command-f, the elements of the \"Find in Page\" interface should exist."
+        )
+        app.typeText("maximus\r")
+        let statusField = app.textFields["FindInPageController.statusField"]
+        XCTAssertTrue(
+            statusField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find \"Find in Page\" statusField in a reasonable timeframe."
+        )
+        let statusFieldTextContent = try XCTUnwrap(statusField.value as? String)
+
+        // Note: the following is not a localized test element, but it should have a localization strategy.
+        XCTAssertEqual(statusFieldTextContent, "1 of 4", "Unexpected status field text content after a \"Find in Page\" operation.")
+        let findInPageScreenshot = loremIpsumWebView.screenshot()
+        let highlightedPixelsInFindScreenshot = findInPageScreenshot.image.matchingPixels(of: .findHighlightColor)
+        let findHighlightPoints = Set(highlightedPixelsInFindScreenshot.map { $0.point }) // Coordinates of highlighted pixels in the find screenshot
+        app.typeKey("g", modifierFlags: [.command])
+        let updatedStatusField = app.textFields["FindInPageController.statusField"]
+        let updatedStatusFieldTextContent = updatedStatusField.value as! String
+        XCTAssertTrue(
+            updatedStatusField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Couldn't find the updated \"Find in Page\" statusField in a reasonable timeframe."
+        )
+
+        XCTAssertEqual(updatedStatusFieldTextContent, "2 of 4", "Unexpected status field text content after a \"Find Next\" operation.")
+        let findNextScreenshot = loremIpsumWebView.screenshot()
+        let highlightedPixelsInFindNextScreenshot = findNextScreenshot.image.matchingPixels(of: .findHighlightColor)
+        let findNextHighlightPoints = highlightedPixelsInFindNextScreenshot.map { $0.point }
+        let pixelSetIntersection = findHighlightPoints
+            .intersection(findNextHighlightPoints) // If the highlighted text has moved as expected, this should not have many elements
+
+        XCTAssertGreaterThan(
+            highlightedPixelsInFindNextScreenshot.count,
+            minimumExpectedMatchingPixelsInFindHighlight,
+            "There are expected to be more than \(minimumExpectedMatchingPixelsInFindHighlight) pixels of NSColor.findHighlightColor in a screenshot of a \"Find in Page\" search where there is a match, but this test found \(highlightedPixelsInFindNextScreenshot) matching pixels."
+        )
+        XCTAssertTrue(
+            pixelSetIntersection.count <= findNextHighlightPoints.count / 2,
+            "When the selection rectangle has moved as expected, fewer than half of the highlighted pixel coordinates from \"Find Next\" should intersect with the highlighted pixel coordinates from the initial \"Find\" operation."
+        )
+    }
+}
+
+/// Helpers for the Find in Page tests
+private extension FindInPageTests {
+    /// A shared URL to reference the local HTML file
+    class var loremIpsumFileURL: URL {
+        let loremIpsumFileName = "lorem_ipsum.html"
+        XCTAssertNotNil(
+            FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first,
+            "It wasn't possible to obtain a local file URL for the sandbox Documents directory."
+        )
+        let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
+        let loremIpsumHTMLFileURL = documentsDirectory.appendingPathComponent(loremIpsumFileName)
+        return loremIpsumHTMLFileURL
+    }
+
+    /// Save a local HTML file for testing find behavor against
+    class func saveLocalHTML() {
+        let loremIpsumHTML = """
+        <html><head>
+        <title>Lorem Ipsum</title></head><body><table><tr><td><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac sem nisi. Cras fermentum mi vitae turpis efficitur malesuada. Donec eget maxima ligula, et tincidunt sapien. Suspendisse posuere diam maxima, dignissim ex at, fringilla elit. Maecenas enim tellus, ornare non pretium a, sodales nec lectus. Vestibulum quis augue orci. Donec eget mi sed magna consequat auctor a a nulla. Etiam condimentum, neque at congue semper, arcu sem commodo tellus, venenatis finibus ex magna vitae erat. Nunc non enim sit amet mi posuere egestas. Donec nibh nisl, pretium sit amet aliquet, porta id nibh. Pellentesque ullamcorper mauris quam, semper hendrerit mi dictum non. Nullam pulvinar, nulla a maximus egestas, velit mi volutpat neque, vitae placerat eros sapien vitae tellus. Pellentesque malesuada accumsan dolor, ut feugiat enim. Curabitur nunc quam, maximus venenatis augue vel, accumsan eros.</p>
+
+        <p>Donec consequat ultrices ante non maximus. Quisque eu semper diam. Nunc ullamcorper eget ex id luctus. Duis metus ex, dapibus sit amet vehicula eget, rhoncus eget lacus. Nulla maximus quis turpis vel pulvinar. Duis neque ligula, tristique et diam ut, fringilla sagittis arcu. Vestibulum suscipit semper lectus, quis placerat ex euismod eu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae;</p>
+
+        <p>Maecenas odio orci, eleifend et ipsum nec, interdum dictum turpis. Nunc nec velit diam. Sed nisl risus, imperdiet sit amet tempor ut, laoreet sed lorem. Aenean egestas ullamcorper sem. Sed accumsan vehicula augue, vitae tempor augue tincidunt id. Morbi ullamcorper posuere lacus id tempus. Ut vel tincidunt quam, quis consectetur velit. Mauris id lorem vitae odio consectetur vehicula. Vestibulum viverra scelerisque porta. Vestibulum eu consequat urna. Etiam dignissim ullamcorper faucibus.</p></td></tr></table></body></html>
+        """
+        let loremIpsumData = Data(loremIpsumHTML.utf8)
+
+        do {
+            try loremIpsumData.write(to: loremIpsumFileURL, options: [])
+        } catch {
+            XCTFail("It wasn't possible to write out the required local HTML file for the tests: \(error.localizedDescription)")
+        }
+    }
+
+    /// Remove it when done
+    class func removeLocalHTML() {
+        do {
+            try FileManager.default.removeItem(at: loremIpsumFileURL)
+        } catch {
+            XCTFail("It wasn't possible to remove the required local HTML file for the tests: \(error.localizedDescription)")
+        }
+    }
+}
+
+private extension NSImage {
+    /// Find matching pixels in an NSImage for a specific NSColor
+    /// - Parameter colorToMatch: the NSColor to match
+    /// - Returns: An array of Pixel structs
+    func matchingPixels(of colorToMatch: NSColor) -> [Pixel] {
+        let cgImage = cgImage(forProposedRect: nil, context: nil, hints: nil)
+        XCTAssertNotNil(cgImage, "It wasn't possible to obtain the CGImage of the NSImage.")
+        let bitmap = NSBitmapImageRep(cgImage: cgImage!)
+        let colorSpace = bitmap.colorSpace
+
+        XCTAssertNotNil(
+            colorToMatch.usingColorSpace(colorSpace),
+            "It wasn't possible to get the color to match in the local colorspace."
+        )
+        let colorToMatchWithColorSpace = colorToMatch
+            .usingColorSpace(colorSpace)! // Compare the color we want to look for in the image after it is in the same colorspace as the image
+
+        XCTAssertNotNil(bitmap.bitmapData, "It wasn't possible to obtain the bitmapData of the bitmap.")
+        var bitmapData: UnsafeMutablePointer<UInt8> = bitmap.bitmapData!
+        var redInImage, greenInImage, blueInImage, alphaInImage: UInt8
+
+        let redToMatch = UInt8(colorToMatchWithColorSpace.redComponent * 255.999999) // color components in 0-255 values in this colorspace
+        let greenToMatch = UInt8(colorToMatchWithColorSpace.greenComponent * 255.999999)
+        let blueToMatch = UInt8(colorToMatchWithColorSpace.blueComponent * 255.999999)
+
+        var pixels: [Pixel] = []
+
+        for yPoint in 0 ..< bitmap.pixelsHigh {
+            for xPoint in 0 ..< bitmap.pixelsWide {
+                redInImage = bitmapData.pointee
+                bitmapData = bitmapData.advanced(by: 1)
+                greenInImage = bitmapData.pointee
+                bitmapData = bitmapData.advanced(by: 1)
+                blueInImage = bitmapData.pointee
+                bitmapData = bitmapData.advanced(by: 1)
+                alphaInImage = bitmapData.pointee
+                bitmapData = bitmapData.advanced(by: 1)
+                if redInImage == redToMatch, greenInImage == greenToMatch, blueInImage == blueToMatch { // We aren't matching alpha
+                    pixels.append(Pixel(
+                        red: redInImage,
+                        green: greenInImage,
+                        blue: blueInImage,
+                        alpha: alphaInImage,
+                        point: CGPoint(x: xPoint, y: yPoint)
+                    ))
+                }
+            }
+        }
+        return pixels
+    }
+}
+
+/// A struct of pixel color and coordinate values in 0-255 color values
+private struct Pixel: Hashable {
+    var red: UInt8
+    var green: UInt8
+    var blue: UInt8
+    var alpha: UInt8
+    var point: CGPoint
+}
+
+extension CGPoint: Hashable {
+    /// So we can do set operations with sets of CGPoints
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(x)
+        hasher.combine(y)
+    }
+}
diff --git a/UITests/TabBarTests.swift b/UITests/TabBarTests.swift
index f59ef6991c..2480e2f71f 100644
--- a/UITests/TabBarTests.swift
+++ b/UITests/TabBarTests.swift
@@ -19,24 +19,27 @@
 import XCTest
 
 class TabBarTests: XCTestCase {
+    private var app: XCUIApplication!
 
     override func setUpWithError() throws {
         continueAfterFailure = false
-        XCUIApplication().launch()
+        app = XCUIApplication()
+        app.launchEnvironment["UITEST_MODE"] = "1"
+        app.launch()
     }
 
     func testWhenClickingAddTab_ThenTabsOpen() throws {
-        let app = XCUIApplication()
-
-        let tabbarviewitemElementsQuery = app.windows.collectionViews.otherElements.containing(.group, identifier: "TabBarViewItem")
-        // click on add tab button twice
-        tabbarviewitemElementsQuery.children(matching: .group).element(boundBy: 1).children(matching: .button).element.click()
-        tabbarviewitemElementsQuery.children(matching: .group).element(boundBy: 2).children(matching: .button).element.click()
-
-        let tabs = app.windows.collectionViews.otherElements.containing(.group, identifier: "TabBarViewItem").children(matching: .group)
-            .matching(identifier: "TabBarViewItem")
-
-        XCTAssertEqual(tabs.count, 3)
+//        let app = XCUIApplication()
+//
+//        let tabbarviewitemElementsQuery = app.windows.collectionViews.otherElements.containing(.group, identifier: "TabBarViewItem")
+//        // click on add tab button twice
+//        tabbarviewitemElementsQuery.children(matching: .group).element(boundBy: 1).children(matching: .button).element.click()
+//        tabbarviewitemElementsQuery.children(matching: .group).element(boundBy: 2).children(matching: .button).element.click()
+//
+//        let tabs = app.windows.collectionViews.otherElements.containing(.group, identifier: "TabBarViewItem").children(matching: .group)
+//            .matching(identifier: "TabBarViewItem")
+//
+//        XCTAssertEqual(tabs.count, 3)
+        _ = XCTSkip("Test needs accessibility identifier debugging before usage")
     }
-
 }
diff --git a/UnitTests/Autoconsent/AutoconsentMessageProtocolTests.swift b/UnitTests/Autoconsent/AutoconsentMessageProtocolTests.swift
index d8a1a6f356..a3cc50adfc 100644
--- a/UnitTests/Autoconsent/AutoconsentMessageProtocolTests.swift
+++ b/UnitTests/Autoconsent/AutoconsentMessageProtocolTests.swift
@@ -26,7 +26,7 @@ class AutoconsentMessageProtocolTests: XCTestCase {
     let userScript = AutoconsentUserScript(
         scriptSource: ScriptSourceProvider(configStorage: MockConfigurationStore(),
                                            privacyConfigurationManager: MockPrivacyConfigurationManager(),
-                                           privacySettings: PrivacySecurityPreferences.shared, // todo: mock
+                                           webTrackingProtectionPreferences: WebTrackingProtectionPreferences.shared, // mock
                                            contentBlockingManager: ContentBlockerRulesManagerMock(),
                                            trackerDataManager: TrackerDataManager(etag: ConfigurationStore.shared.loadEtag(for: .trackerDataSet),
                                                                                   data: ConfigurationStore.shared.loadData(for: .trackerDataSet),
@@ -38,7 +38,7 @@ class AutoconsentMessageProtocolTests: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        PrivacySecurityPreferences.shared.autoconsentEnabled = true
+        CookiePopupProtectionPreferences.shared.isAutoconsentEnabled = true
     }
 
     func replyToJson(msg: Any) -> String {
diff --git a/UnitTests/Bookmarks/Extensions/Bookmarks+TabTests.swift b/UnitTests/Bookmarks/Extensions/Bookmarks+TabTests.swift
new file mode 100644
index 0000000000..5226ead0c6
--- /dev/null
+++ b/UnitTests/Bookmarks/Extensions/Bookmarks+TabTests.swift
@@ -0,0 +1,61 @@
+//
+//  Bookmarks+TabTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+@MainActor
+final class Bookmarks_TabTests: XCTestCase {
+
+    func testWhenBuildTabsWithContentOfFolderThenItShouldReturnAsManyTabsAsBookmarksWithinTheFolder() {
+        // GIVEN
+        let bookmark1 = Bookmark(id: "A", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: false)
+        let bookmark2 = Bookmark(id: "B", url: URL.atb, title: "ATB", isFavorite: false)
+        let subFolder = BookmarkFolder(id: "C", title: "Child")
+        let folder = BookmarkFolder(id: "1", title: "Test", children: [bookmark1, subFolder, bookmark2])
+
+        // WHEN
+        let tab = Tab.withContentOfBookmark(folder: folder, burnerMode: .regular)
+
+        // THEN
+        XCTAssertEqual(tab.count, 2)
+        XCTAssertEqual(tab.first?.url?.absoluteString, bookmark1.url)
+        XCTAssertEqual(tab.first?.burnerMode, .regular)
+        XCTAssertEqual(tab.last?.url?.absoluteString, bookmark2.url)
+        XCTAssertEqual(tab.last?.burnerMode, .regular)
+    }
+
+    func testWhenBuildTabCollectionWithContentOfFolderThenItShouldReturnACollectionWithAsManyTabsAsBookmarksWithinTheFolder() {
+        // GIVEN
+        let bookmark1 = Bookmark(id: "A", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: false)
+        let bookmark2 = Bookmark(id: "B", url: URL.atb, title: "ATB", isFavorite: false)
+        let subFolder = BookmarkFolder(id: "C", title: "Child")
+        let folder = BookmarkFolder(id: "1", title: "Test", children: [bookmark1, subFolder, bookmark2])
+
+        // WHEN
+        let tabCollection = TabCollection.withContentOfBookmark(folder: folder, burnerMode: .regular)
+
+        // THEN
+        XCTAssertEqual(tabCollection.tabs.count, 2)
+        XCTAssertEqual(tabCollection.tabs.first?.url?.absoluteString, bookmark1.url)
+        XCTAssertEqual(tabCollection.tabs.first?.burnerMode, .regular)
+        XCTAssertEqual(tabCollection.tabs.last?.url?.absoluteString, bookmark2.url)
+        XCTAssertEqual(tabCollection.tabs.last?.burnerMode, .regular)
+    }
+
+}
diff --git a/UnitTests/Bookmarks/Factory/BookmarksBarMenuFactoryTests.swift b/UnitTests/Bookmarks/Factory/BookmarksBarMenuFactoryTests.swift
new file mode 100644
index 0000000000..df9f76ec4e
--- /dev/null
+++ b/UnitTests/Bookmarks/Factory/BookmarksBarMenuFactoryTests.swift
@@ -0,0 +1,59 @@
+//
+//  BookmarksBarMenuFactoryTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+final class BookmarksBarMenuFactoryTests: XCTestCase {
+
+    func testReturnAddFolderAndManageBookmarksWhenAddToMenuWithManageBookmarksSectionIsCalled() {
+        // GIVEN
+        let menu = NSMenu(title: "")
+        let targetMock = BookmarksBarTargetMock()
+        XCTAssertTrue(menu.items.isEmpty)
+
+        // WHEN
+        BookmarksBarMenuFactory.addToMenuWithManageBookmarksSection(menu, target: targetMock, addFolderSelector: #selector(targetMock.addFolder(_:)), manageBookmarksSelector: #selector(targetMock.manageBookmarks))
+
+        // THEN
+        XCTAssertEqual(menu.items.count, 4)
+        XCTAssertEqual(menu.items[1].title, "")
+        XCTAssertNil(menu.items[1].action)
+        XCTAssertEqual(menu.items[2].title, UserText.addFolder)
+        XCTAssertEqual(menu.items[2].action, #selector(targetMock.addFolder(_:)))
+        XCTAssertEqual(menu.items[3].title, UserText.bookmarksManageBookmarks)
+        XCTAssertEqual(menu.items[3].action, #selector(targetMock.manageBookmarks))
+    }
+
+    func testShouldNotReturnAddFolderAndManageBookmarksWhenAddToMenuIsCalled() {
+        // GIVEN
+        let menu = NSMenu(title: "")
+        XCTAssertTrue(menu.items.isEmpty)
+
+        // WHEN
+        BookmarksBarMenuFactory.addToMenu(menu)
+
+        // THEN
+        XCTAssertEqual(menu.items.count, 1)
+    }
+}
+
+private class BookmarksBarTargetMock: NSObject {
+    @objc func addFolder(_ sender: NSMenuItem) {}
+    @objc func manageBookmarks() {}
+}
diff --git a/UnitTests/Bookmarks/Model/BaseBookmarkEntityTests.swift b/UnitTests/Bookmarks/Model/BaseBookmarkEntityTests.swift
new file mode 100644
index 0000000000..11ffefab31
--- /dev/null
+++ b/UnitTests/Bookmarks/Model/BaseBookmarkEntityTests.swift
@@ -0,0 +1,247 @@
+//
+//  BaseBookmarkEntityTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+final class BaseBookmarkEntityTests: XCTestCase {
+
+    // MARK: - Folders
+
+    func testTwoBookmarkFolderWithSamePropertiesReturnTrueWhenIsEqualCalled() {
+        // GIVEN
+        let parentFolder = BookmarkFolder(id: "Parent", title: "Parent")
+        let lhs = BookmarkFolder(id: "1", title: "Child", parentFolderUUID: parentFolder.id, children: [])
+        let rhs = BookmarkFolder(id: "1", title: "Child", parentFolderUUID: parentFolder.id, children: [])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testTwoBookmarkFolderWithDifferentIdReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let parentFolder = BookmarkFolder(id: "Parent", title: "Parent")
+        let lhs = BookmarkFolder(id: "1", title: "Child", parentFolderUUID: parentFolder.id, children: [])
+        let rhs = BookmarkFolder(id: "2", title: "Child", parentFolderUUID: parentFolder.id, children: [])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testTwoBookmarkFolderWithDifferentTitleReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let parentFolder = BookmarkFolder(id: "Parent", title: "Parent")
+        let lhs = BookmarkFolder(id: "1", title: "Child", parentFolderUUID: parentFolder.id, children: [])
+        let rhs = BookmarkFolder(id: "1", title: "Child 1", parentFolderUUID: parentFolder.id, children: [])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testTwoBookmarkFolderWithDifferentParentReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let parentFolder = BookmarkFolder(id: "Parent", title: "Parent")
+        let lhs = BookmarkFolder(id: "1", title: "Child", parentFolderUUID: parentFolder.id, children: [])
+        let rhs = BookmarkFolder(id: "1", title: "Child", parentFolderUUID: #function, children: [])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testTwoBookmarkParentFolderWithSameSubfoldersReturnTrueWhenIsEqualCalled() {
+        // GIVEN
+        let folder1 = BookmarkFolder(id: "1", title: "Child", parentFolderUUID: "Parent", children: [])
+        let folder2 = BookmarkFolder(id: "2", title: "Child", parentFolderUUID: "Parent", children: [])
+        let lhs = BookmarkFolder(id: "1-Parent", title: "Parent", children: [folder1, folder2])
+        let rhs = BookmarkFolder(id: "1-Parent", title: "Parent", children: [folder1, folder2])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testTwoBookmarkParentFolderWithDifferentSubfoldersReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let folder1 = BookmarkFolder(id: "1", title: "Child", parentFolderUUID: "Parent", children: [])
+        let folder2 = BookmarkFolder(id: "2", title: "Child", parentFolderUUID: "Parent", children: [])
+        let lhs = BookmarkFolder(id: "1-Parent", title: "Parent", children: [folder1, folder2])
+        let rhs = BookmarkFolder(id: "1-Parent", title: "Parent", children: [folder1, folder2, BookmarkFolder(id: "3", title: "")])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testTwoBookmarkParentFolderWithSameBookmarksReturnTrueWhenIsEqualCalled() {
+        // GIVEN
+        let bookmark1 = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "1-Parent")
+        let bookmark2 = Bookmark(id: "2", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "1-Parent")
+        let lhs = BookmarkFolder(id: "1-Parent", title: "Parent", children: [bookmark1, bookmark2])
+        let rhs = BookmarkFolder(id: "1-Parent", title: "Parent", children: [bookmark1, bookmark2])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testTwoBookmarkParentFolderWithDifferentBookmarksReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let bookmark1 = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "1-Parent")
+        let bookmark2 = Bookmark(id: "2", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "1-Parent")
+        let lhs = BookmarkFolder(id: "1-Parent", title: "Parent", children: [bookmark1, bookmark2])
+        let rhs = BookmarkFolder(id: "1-Parent", title: "Parent", children: [bookmark1, bookmark2, BookmarkFolder(id: "4", title: "New")])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    // MARK: - Bookmarks
+
+    func testTwoBookmarkWithSamePropertiesReturnTrueWhenIsEqualCalled() {
+        // GIVEN
+        let parentFolder = BookmarkFolder(id: "Parent", title: "Parent")
+        let lhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: parentFolder.id)
+        let rhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: parentFolder.id)
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testTwoBookmarkWithDifferentIdReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let lhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "z")
+        let rhs = Bookmark(id: "2", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "z")
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testTwoBookmarkWithDifferentURLReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let lhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "z")
+        let rhs = Bookmark(id: "1", url: URL.devMode, title: "DDG", isFavorite: true, parentFolderUUID: "z")
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testTwoBookmarkWithDifferentTitleReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let lhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "z")
+        let rhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG 2", isFavorite: true, parentFolderUUID: "z")
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testTwoBookmarkWithDifferentIsFavoriteReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let lhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "z")
+        let rhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: false, parentFolderUUID: "z")
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testTwoBookmarkWithDifferentParentFolderReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let lhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true, parentFolderUUID: "z")
+        let rhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: false, parentFolderUUID: "z-a")
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testTwoBookmarkFoldersAddedToRootFolderReturnTrueWhenLeftParentIsBookmarksRootAndRightIsNil() {
+        // GIVEN
+        let lhs = BookmarkFolder(id: "1", title: "A", parentFolderUUID: "bookmarks_root", children: [])
+        let rhs = BookmarkFolder(id: "1", title: "A", parentFolderUUID: nil, children: [])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testTwoBookmarkFoldersAddedToRootFolderReturnTrueWhenLeftParentIsNilAndRightParentIsRootBookmarks() {
+        // GIVEN
+        let lhs = BookmarkFolder(id: "1", title: "A", parentFolderUUID: nil, children: [])
+        let rhs = BookmarkFolder(id: "1", title: "A", parentFolderUUID: "bookmarks_root", children: [])
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    // MARK: - Base Entity
+
+    func testDifferentBookmarkEntitiesReturnFalseWhenIsEqualCalled() {
+        // GIVEN
+        let lhs = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let rhs = BookmarkFolder(id: "1", title: "DDG")
+
+        // WHEN
+        let result = lhs == rhs
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+}
diff --git a/UnitTests/Bookmarks/Model/BookmarkListTests.swift b/UnitTests/Bookmarks/Model/BookmarkListTests.swift
index e959ff9878..f0f8cda903 100644
--- a/UnitTests/Bookmarks/Model/BookmarkListTests.swift
+++ b/UnitTests/Bookmarks/Model/BookmarkListTests.swift
@@ -23,15 +23,20 @@ import XCTest
 
 final class BookmarkListTests: XCTestCase {
 
-    func testWhenBookmarkIsInserted_ThenItIsPartOfTheList() {
+    func testWhenBookmarkIsInserted_ThenItIsPartOfTheList() throws {
         var bookmarkList = BookmarkList()
 
         let bookmark = Bookmark.aBookmark
         bookmarkList.insert(bookmark)
 
+        let result = try XCTUnwrap(bookmarkList[bookmark.url])
         XCTAssert(bookmarkList.bookmarks().count == 1)
         XCTAssert((bookmarkList.bookmarks()).first == bookmark.identifiableBookmark)
-        XCTAssertNotNil(bookmarkList[bookmark.url])
+        XCTAssertEqual(result.id, bookmark.id)
+        XCTAssertEqual(result.title, bookmark.title)
+        XCTAssertEqual(result.url, bookmark.url)
+        XCTAssertEqual(result.isFavorite, bookmark.isFavorite)
+        XCTAssertEqual(result.parentFolderUUID, bookmark.parentFolderUUID)
     }
 
     func testWhenBookmarkIsAlreadyPartOfTheListInserted_ThenItCantBeInserted() {
@@ -93,7 +98,7 @@ final class BookmarkListTests: XCTestCase {
         XCTAssertNil(updateUrlResult)
     }
 
-    func testWhenBookmarkUrlIsUpdated_ThenJustTheBookmarkUrlIsUpdated() {
+    func testWhenBookmarkUrlIsUpdated_ThenJustTheBookmarkUrlIsUpdated() throws {
         var bookmarkList = BookmarkList()
 
         let bookmarks = [
@@ -104,11 +109,14 @@ final class BookmarkListTests: XCTestCase {
         bookmarks.forEach { bookmarkList.insert($0) }
         let bookmarkToReplace = bookmarks[2]
 
-        let newBookmark = bookmarkList.updateUrl(of: bookmarkToReplace, to: URL.duckDuckGoAutocomplete.absoluteString)
+        let newBookmark = try XCTUnwrap(bookmarkList.updateUrl(of: bookmarkToReplace, to: URL.duckDuckGoAutocomplete.absoluteString))
 
+        let result = try XCTUnwrap(bookmarkList[newBookmark.url])
         XCTAssert(bookmarkList.bookmarks().count == bookmarks.count)
         XCTAssertNil(bookmarkList[bookmarkToReplace.url])
-        XCTAssertNotNil(bookmarkList[newBookmark!.url])
+        XCTAssertEqual(result.title, "Title")
+        XCTAssertEqual(result.url, URL.duckDuckGoAutocomplete.absoluteString)
+        XCTAssertTrue(result.isFavorite)
     }
 
     func testWhenBookmarkUrlIsUpdatedToAlreadyBookmarkedUrl_ThenUpdatingMustFail() {
@@ -127,10 +135,51 @@ final class BookmarkListTests: XCTestCase {
 
         XCTAssert(bookmarkList.bookmarks().count == bookmarks.count)
         XCTAssertNotNil(bookmarkList[firstUrl.absoluteString])
+        XCTAssertEqual(bookmarkList[firstUrl.absoluteString]?.url, firstUrl.absoluteString)
         XCTAssertNotNil(bookmarkList[bookmarkToReplace.url])
+        XCTAssertEqual(bookmarkList[bookmarkToReplace.url]?.url, URL.duckDuckGo.absoluteString)
         XCTAssertNil(newBookmark)
     }
 
+    func testWhenBookmarkURLTitleAndIsFavoriteIsUpdated_ThenURLTitleAndIsFavoriteIsUpdated() throws {
+        // GIVEN
+        var bookmarkList = BookmarkList()
+        let bookmarks = [
+            Bookmark(id: UUID().uuidString, url: "wikipedia.org", title: "Wikipedia", isFavorite: true),
+            Bookmark(id: UUID().uuidString, url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true),
+            Bookmark(id: UUID().uuidString, url: "apple.com", title: "Apple", isFavorite: true)
+        ]
+        bookmarks.forEach { bookmarkList.insert($0) }
+        let bookmarkToReplace = bookmarks[2]
+        XCTAssertEqual(bookmarkList.bookmarks().count, bookmarks.count)
+        XCTAssertEqual(bookmarkList["wikipedia.org"]?.url, "wikipedia.org")
+        XCTAssertEqual(bookmarkList["wikipedia.org"]?.title, "Wikipedia")
+        XCTAssertEqual(bookmarkList["wikipedia.org"]?.isFavorite, true)
+        XCTAssertEqual(bookmarkList[URL.duckDuckGo.absoluteString]?.url, URL.duckDuckGo.absoluteString)
+        XCTAssertEqual(bookmarkList[URL.duckDuckGo.absoluteString]?.title, "DDG")
+        XCTAssertEqual(bookmarkList[URL.duckDuckGo.absoluteString]?.isFavorite, true)
+        XCTAssertEqual(bookmarkList["apple.com"]?.url, "apple.com")
+        XCTAssertEqual(bookmarkList["apple.com"]?.title, "Apple")
+        XCTAssertEqual(bookmarkList["apple.com"]?.isFavorite, true)
+
+        // WHEN
+        let newBookmark = try XCTUnwrap(bookmarkList.update(bookmark: bookmarkToReplace, newURL: "www.example.com", newTitle: "Example", newIsFavorite: false))
+
+        // THEN
+        let result = try XCTUnwrap(bookmarkList[newBookmark.url])
+        XCTAssertEqual(bookmarkList.bookmarks().count, bookmarks.count)
+        XCTAssertNil(bookmarkList[bookmarkToReplace.url])
+        XCTAssertEqual(bookmarkList["wikipedia.org"]?.url, "wikipedia.org")
+        XCTAssertEqual(bookmarkList["wikipedia.org"]?.title, "Wikipedia")
+        XCTAssertEqual(bookmarkList["wikipedia.org"]?.isFavorite, true)
+        XCTAssertEqual(bookmarkList[URL.duckDuckGo.absoluteString]?.url, URL.duckDuckGo.absoluteString)
+        XCTAssertEqual(bookmarkList[URL.duckDuckGo.absoluteString]?.title, "DDG")
+        XCTAssertEqual(bookmarkList[URL.duckDuckGo.absoluteString]?.isFavorite, true)
+        XCTAssertEqual(result.url, "www.example.com")
+        XCTAssertEqual(result.title, "Example")
+        XCTAssertEqual(result.isFavorite, false)
+    }
+
 }
 
 fileprivate extension Bookmark {
diff --git a/UnitTests/Bookmarks/Model/BookmarkNodeTests.swift b/UnitTests/Bookmarks/Model/BookmarkNodeTests.swift
index 8a9060c2f9..fd795b2ebb 100644
--- a/UnitTests/Bookmarks/Model/BookmarkNodeTests.swift
+++ b/UnitTests/Bookmarks/Model/BookmarkNodeTests.swift
@@ -217,4 +217,174 @@ class BookmarkNodeTests: XCTestCase {
         XCTAssertNotEqual(rootNode.findOrCreateChildNode(with: TestObject()), childNode)
     }
 
+    // MARK: - Equality Bookmarks
+
+    func testWhenTwoNodesWithSameIdAndSameBookmarkAsRepresentedObject_ThenIsEqualShouldBeTrue() {
+        // GIVEN
+        let lhsBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let rhsBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let lhsNode = BookmarkNode(representedObject: lhsBookmark, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsBookmark, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testWhenTwoNodesWithDifferentIdAndSameBookmarkAsRepresentedObject_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let rhsBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let lhsNode = BookmarkNode(representedObject: lhsBookmark, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsBookmark, parent: nil, uniqueId: 2)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenTwoNodesContainBookmarkAsRepresentedObjectWithDifferentId_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let rhsBookmark = Bookmark(id: "2", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let lhsNode = BookmarkNode(representedObject: lhsBookmark, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsBookmark, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenTwoNodesContainBookmarkAsRepresentedObjectWithDifferentURL_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let rhsBookmark = Bookmark(id: "2", url: URL.ddgLearnMore.absoluteString, title: "DDG", isFavorite: true)
+        let lhsNode = BookmarkNode(representedObject: lhsBookmark, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsBookmark, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenTwoNodesContainBookmarkAsRepresentedObjectWithDifferentTitle_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let rhsBookmark = Bookmark(id: "2", url: URL.duckDuckGo.absoluteString, title: "DDG 2", isFavorite: true)
+        let lhsNode = BookmarkNode(representedObject: lhsBookmark, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsBookmark, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenTwoNodesContainBookmarkAsRepresentedObjectWithDifferentIsFavorite_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)
+        let rhsBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: false)
+        let lhsNode = BookmarkNode(representedObject: lhsBookmark, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsBookmark, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenTwoNodesWithSameIdAndSameFolderAsRepresentedObject_ThenIsEqualShouldBeTrue() {
+        // GIVEN
+        let lhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "1", children: [])
+        let rhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "1", children: [])
+        let lhsNode = BookmarkNode(representedObject: lhsFolder, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsFolder, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testWhenTwoNodesWithDifferentIdAndSameFolderAsRepresentedObject_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "1", children: [])
+        let rhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "1", children: [])
+        let lhsNode = BookmarkNode(representedObject: lhsFolder, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsFolder, parent: nil, uniqueId: 2)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenTwoNodesContainFolderAsRepresentedObjectWithDifferentId_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "1", children: [])
+        let rhsFolder = BookmarkFolder(id: "2", title: "Folder", parentFolderUUID: "1", children: [])
+        let lhsNode = BookmarkNode(representedObject: lhsFolder, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsFolder, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenTwoNodesContainFolderAsRepresentedObjectWithDifferentName_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "1", children: [])
+        let rhsFolder = BookmarkFolder(id: "1", title: "Folder 1", parentFolderUUID: "1", children: [])
+        let lhsNode = BookmarkNode(representedObject: lhsFolder, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsFolder, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenTwoNodesContainBookmarkAsRepresentedObjectWithDifferentParentFolder_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "1", children: [])
+        let rhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "2", children: [])
+        let lhsNode = BookmarkNode(representedObject: lhsFolder, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsFolder, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenTwoNodesContainFolderAsRepresentedObjectWithDifferentChildren_ThenIsEqualShouldBeFalse() {
+        // GIVEN
+        let lhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "1", children: [Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: true)])
+        let rhsFolder = BookmarkFolder(id: "1", title: "Folder", parentFolderUUID: "2", children: [])
+        let lhsNode = BookmarkNode(representedObject: lhsFolder, parent: nil, uniqueId: 1)
+        let rhsNode = BookmarkNode(representedObject: rhsFolder, parent: nil, uniqueId: 1)
+
+        // WHEN
+        let result = lhsNode == rhsNode
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
 }
diff --git a/UnitTests/Bookmarks/Model/BookmarkOutlineViewDataSourceTests.swift b/UnitTests/Bookmarks/Model/BookmarkOutlineViewDataSourceTests.swift
index 8595ebdcc7..d1cc5fa4d8 100644
--- a/UnitTests/Bookmarks/Model/BookmarkOutlineViewDataSourceTests.swift
+++ b/UnitTests/Bookmarks/Model/BookmarkOutlineViewDataSourceTests.swift
@@ -110,7 +110,7 @@ class BookmarkOutlineViewDataSourceTests: XCTestCase {
         let mockDestinationNode = treeController.node(representing: mockDestinationFolder)!
         let dataSource = BookmarkOutlineViewDataSource(contentMode: .foldersOnly, bookmarkManager: bookmarkManager, treeController: treeController)
 
-        let pasteboardFolder = PasteboardFolder(id: UUID().uuidString, name: "Pasteboard Folder")
+        let pasteboardFolder = PasteboardFolder(folder: .init(id: UUID().uuidString, title: "Pasteboard Folder"))
         let result = dataSource.validateDrop(for: [pasteboardFolder], destination: mockDestinationNode)
 
         XCTAssertEqual(result, .move)
@@ -130,7 +130,7 @@ class BookmarkOutlineViewDataSourceTests: XCTestCase {
         let dataSource = BookmarkOutlineViewDataSource(contentMode: .foldersOnly, bookmarkManager: bookmarkManager, treeController: treeController)
         let mockDestinationNode = treeController.node(representing: mockDestinationFolder)!
 
-        let pasteboardFolder = PasteboardFolder(id: mockDestinationFolder.id, name: "Pasteboard Folder")
+        let pasteboardFolder = PasteboardFolder(folder: mockDestinationFolder)
         let result = dataSource.validateDrop(for: [pasteboardFolder], destination: mockDestinationNode)
 
         XCTAssertEqual(result, .none)
@@ -153,12 +153,64 @@ class BookmarkOutlineViewDataSourceTests: XCTestCase {
         let mockDestinationNode = treeController.node(representing: childFolder)!
 
         // Simulate dragging the root folder onto the child folder:
-        let draggedFolder = PasteboardFolder(id: rootFolder.id, name: "Root")
+        let draggedFolder = PasteboardFolder(folder: rootFolder)
         let result = dataSource.validateDrop(for: [draggedFolder], destination: mockDestinationNode)
 
         XCTAssertEqual(result, .none)
     }
 
+    func testWhenCellFiresDelegate_ThenOnMenuRequestedActionShouldFire() throws {
+        // GIVEN
+        let mockFolder = BookmarkFolder.mock
+        let mockOutlineView = NSOutlineView(frame: .zero)
+        let treeController = createTreeController(with: [mockFolder])
+        let mockFolderNode = treeController.node(representing: mockFolder)!
+        var didFireClosure = false
+        var capturedCell: BookmarkOutlineCellView?
+        let dataSource = BookmarkOutlineViewDataSource(contentMode: .foldersOnly, bookmarkManager: LocalBookmarkManager(), treeController: treeController) { cell in
+            didFireClosure = true
+            capturedCell = cell
+        }
+        let cell = try XCTUnwrap(dataSource.outlineView(mockOutlineView, viewFor: nil, item: mockFolderNode) as? BookmarkOutlineCellView)
+
+        // WHEN
+        cell.delegate?.outlineCellViewRequestedMenu(cell)
+
+        // THEN
+        XCTAssertTrue(didFireClosure)
+        XCTAssertEqual(cell, capturedCell)
+    }
+
+    func testWhenShowMenuButtonOnHoverIsTrue_ThenCellShouldHaveShouldMenuButtonFlagTrue() throws {
+        // GIVEN
+        let mockFolder = BookmarkFolder.mock
+        let mockOutlineView = NSOutlineView(frame: .zero)
+        let treeController = createTreeController(with: [mockFolder])
+        let mockFolderNode = treeController.node(representing: mockFolder)!
+        let dataSource = BookmarkOutlineViewDataSource(contentMode: .bookmarksAndFolders, bookmarkManager: LocalBookmarkManager(), treeController: treeController, showMenuButtonOnHover: true)
+
+        // WHEN
+        let cell = try XCTUnwrap(dataSource.outlineView(mockOutlineView, viewFor: nil, item: mockFolderNode) as? BookmarkOutlineCellView)
+
+        // THEN
+        XCTAssertTrue(cell.shouldShowMenuButton)
+    }
+
+    func testWhenShowMenuButtonOnHoverIsFalse_ThenCellShouldHaveShouldMenuButtonFlagFalse() throws {
+        // GIVEN
+        let mockFolder = BookmarkFolder.mock
+        let mockOutlineView = NSOutlineView(frame: .zero)
+        let treeController = createTreeController(with: [mockFolder])
+        let mockFolderNode = treeController.node(representing: mockFolder)!
+        let dataSource = BookmarkOutlineViewDataSource(contentMode: .foldersOnly, bookmarkManager: LocalBookmarkManager(), treeController: treeController, showMenuButtonOnHover: false)
+
+        // WHEN
+        let cell = try XCTUnwrap(dataSource.outlineView(mockOutlineView, viewFor: nil, item: mockFolderNode) as? BookmarkOutlineCellView)
+
+        // THEN
+        XCTAssertFalse(cell.shouldShowMenuButton)
+    }
+
     // MARK: - Private
 
     private func createTreeController(with bookmarks: [BaseBookmarkEntity]) -> BookmarkTreeController {
diff --git a/UnitTests/Bookmarks/Model/BookmarkSidebarTreeControllerTests.swift b/UnitTests/Bookmarks/Model/BookmarkSidebarTreeControllerTests.swift
index 6c9e8c59da..4b95d7ca90 100644
--- a/UnitTests/Bookmarks/Model/BookmarkSidebarTreeControllerTests.swift
+++ b/UnitTests/Bookmarks/Model/BookmarkSidebarTreeControllerTests.swift
@@ -28,24 +28,18 @@ class BookmarkSidebarTreeControllerTests: XCTestCase {
         let defaultNodes = treeController.rootNode.childNodes
         let representedObjects = defaultNodes.representedObjects()
 
-        // The sidebar defines three hardcoded nodes:
+        // The sidebar defines one hardcoded nodes:
         //
-        // 1. Favorites node
-        // 2. Spacer node
-        // 3. Bookmarks node
+        // 1. Bookmarks node
 
-        XCTAssertEqual(defaultNodes.count, 3)
+        XCTAssertEqual(defaultNodes.count, 1)
 
-        XCTAssertFalse(defaultNodes[0].canHaveChildNodes)
-        XCTAssertFalse(defaultNodes[1].canHaveChildNodes)
-        XCTAssertTrue(defaultNodes[2].canHaveChildNodes)
+        XCTAssertTrue(defaultNodes[0].canHaveChildNodes)
 
-        XCTAssert(representedObjects[0] === PseudoFolder.favorites)
-        XCTAssert(representedObjects[1] === SpacerNode.blank)
-        XCTAssert(representedObjects[2] === PseudoFolder.bookmarks)
+        XCTAssert(representedObjects.first === PseudoFolder.bookmarks)
     }
 
-    func testWhenBookmarkStoreHasNoTopLevelFolders_ThenTheDefaultBookmarksNodeHasNoChildren() {
+    func testWhenBookmarkStoreHasNoTopLevelFolders_ThenTheDefaultBookmarksNodeHasNoChildren() throws {
         let bookmarkStoreMock = BookmarkStoreMock()
         let faviconManagerMock = FaviconManagerMock()
         let bookmarkManager = LocalBookmarkManager(bookmarkStore: bookmarkStoreMock, faviconManagement: faviconManagerMock)
@@ -56,11 +50,13 @@ class BookmarkSidebarTreeControllerTests: XCTestCase {
         let dataSource = BookmarkSidebarTreeController(bookmarkManager: bookmarkManager)
         let treeController = BookmarkTreeController(dataSource: dataSource)
         let defaultNodes = treeController.rootNode.childNodes
-        XCTAssertEqual(defaultNodes.count, 3)
+        XCTAssertEqual(defaultNodes.count, 1)
 
         // The sidebar tree controller only shows folders, so if there are only bookmarks then the bookmarks default folder will be empty.
-        let bookmarksNode = defaultNodes[2]
-        XCTAssert(bookmarksNode.childNodes.isEmpty)
+        let bookmarksNode = defaultNodes[0]
+        let pseudoFolder = try XCTUnwrap(bookmarksNode.representedObject as? PseudoFolder)
+        XCTAssertTrue(bookmarksNode.childNodes.isEmpty)
+        XCTAssertEqual(pseudoFolder.name, "Bookmarks")
     }
 
     func testWhenBookmarkStoreHasTopLevelFolders_ThenTheDefaultBookmarksNodeHasThemAsChildren() {
@@ -75,9 +71,9 @@ class BookmarkSidebarTreeControllerTests: XCTestCase {
         let dataSource = BookmarkSidebarTreeController(bookmarkManager: bookmarkManager)
         let treeController = BookmarkTreeController(dataSource: dataSource)
         let defaultNodes = treeController.rootNode.childNodes
-        XCTAssertEqual(defaultNodes.count, 3)
+        XCTAssertEqual(defaultNodes.count, 1)
 
-        let bookmarksNode = defaultNodes[2]
+        let bookmarksNode = defaultNodes[0]
         XCTAssertEqual(bookmarksNode.childNodes.count, 1)
 
         let childNode = bookmarksNode.childNodes[0]
@@ -98,9 +94,9 @@ class BookmarkSidebarTreeControllerTests: XCTestCase {
         let dataSource = BookmarkSidebarTreeController(bookmarkManager: bookmarkManager)
         let treeController = BookmarkTreeController(dataSource: dataSource)
         let defaultNodes = treeController.rootNode.childNodes
-        XCTAssertEqual(defaultNodes.count, 3)
+        XCTAssertEqual(defaultNodes.count, 1)
 
-        let bookmarksNode = defaultNodes[2]
+        let bookmarksNode = defaultNodes[0]
         XCTAssertTrue(bookmarksNode.canHaveChildNodes)
         XCTAssertEqual(bookmarksNode.childNodes.count, 1)
 
diff --git a/UnitTests/Bookmarks/Model/BookmarkTests.swift b/UnitTests/Bookmarks/Model/BookmarkTests.swift
index cd21752a06..e6cf1df214 100644
--- a/UnitTests/Bookmarks/Model/BookmarkTests.swift
+++ b/UnitTests/Bookmarks/Model/BookmarkTests.swift
@@ -90,7 +90,7 @@ class BookmarkTests: XCTestCase {
         XCTAssertEqual(folder.childFolders.count, 0)
         XCTAssertEqual(folder.childBookmarks.count, 1)
         XCTAssertEqual(folder.children, [
-            BaseBookmarkEntity.from(managedObject: bookmarkManagedObject, favoritesDisplayMode: .displayNative(.desktop))
+            BaseBookmarkEntity.from(managedObject: bookmarkManagedObject, parentFolderUUID: folder.id, favoritesDisplayMode: .displayNative(.desktop))
         ])
         XCTAssertNil(folder.parentFolderUUID)
 
diff --git a/UnitTests/Bookmarks/Model/ContextualMenuTests.swift b/UnitTests/Bookmarks/Model/ContextualMenuTests.swift
new file mode 100644
index 0000000000..89da2c186a
--- /dev/null
+++ b/UnitTests/Bookmarks/Model/ContextualMenuTests.swift
@@ -0,0 +1,267 @@
+//
+//  ContextualMenuTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+final class ContextualMenuTests: XCTestCase {
+
+    func testWhenAskingBookmarkMenuItemsAndIsNotFavoriteThenItShouldReturnTheItemsInTheCorrectOrder() {
+        // GIVEN
+        let isFavorite = false
+
+        // WHEN
+        let items = ContextualMenu.bookmarkMenuItems(isFavorite: isFavorite)
+
+        // THEN
+        XCTAssertEqual(items.count, 12)
+        assertMenu(item: items[0], withTitle: UserText.openInNewTab, selector: #selector(BookmarkMenuItemSelectors.openBookmarkInNewTab(_:)))
+        assertMenu(item: items[1], withTitle: UserText.openInNewWindow, selector: #selector(BookmarkMenuItemSelectors.openBookmarkInNewWindow(_:)))
+        assertMenu(item: items[2], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[3], withTitle: UserText.addToFavorites, selector: #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)))
+        assertMenu(item: items[4], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[5], withTitle: UserText.editBookmark, selector: #selector(BookmarkMenuItemSelectors.editBookmark(_:)))
+        assertMenu(item: items[6], withTitle: UserText.bookmarksBarContextMenuCopy, selector: #selector(BookmarkMenuItemSelectors.copyBookmark(_:)))
+        assertMenu(item: items[7], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(BookmarkMenuItemSelectors.deleteBookmark(_:)))
+        assertMenu(item: items[8], withTitle: UserText.bookmarksBarContextMenuMoveToEnd, selector: #selector(BookmarkMenuItemSelectors.moveToEnd(_:)))
+        assertMenu(item: items[9], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[10], withTitle: UserText.addFolder, selector: #selector(BookmarkMenuItemSelectors.newFolder(_:)))
+        assertMenu(item: items[11], withTitle: UserText.bookmarksManageBookmarks, selector: #selector(BookmarkMenuItemSelectors.manageBookmarks(_:)))
+
+    }
+
+    func testWhenAskingBookmarkMenuItemsAndIsFavoriteThenItShouldReturnTheItemsInTheCorrectOrder() {
+        // GIVEN
+        let isFavorite = true
+
+        // WHEN
+        let items = ContextualMenu.bookmarkMenuItems(isFavorite: isFavorite)
+
+        // THEN
+        assertMenu(item: items[0], withTitle: UserText.openInNewTab, selector: #selector(BookmarkMenuItemSelectors.openBookmarkInNewTab(_:)))
+        assertMenu(item: items[1], withTitle: UserText.openInNewWindow, selector: #selector(BookmarkMenuItemSelectors.openBookmarkInNewWindow(_:)))
+        assertMenu(item: items[2], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[3], withTitle: UserText.removeFromFavorites, selector: #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)))
+        assertMenu(item: items[4], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[5], withTitle: UserText.editBookmark, selector: #selector(BookmarkMenuItemSelectors.editBookmark(_:)))
+        assertMenu(item: items[6], withTitle: UserText.bookmarksBarContextMenuCopy, selector: #selector(BookmarkMenuItemSelectors.copyBookmark(_:)))
+        assertMenu(item: items[7], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(BookmarkMenuItemSelectors.deleteBookmark(_:)))
+        assertMenu(item: items[8], withTitle: UserText.bookmarksBarContextMenuMoveToEnd, selector: #selector(BookmarkMenuItemSelectors.moveToEnd(_:)))
+        assertMenu(item: items[9], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[10], withTitle: UserText.addFolder, selector: #selector(BookmarkMenuItemSelectors.newFolder(_:)))
+        assertMenu(item: items[11], withTitle: UserText.bookmarksManageBookmarks, selector: #selector(BookmarkMenuItemSelectors.manageBookmarks(_:)))
+    }
+
+    func testWhenAskingFolderItemThenItShouldReturnTheItemsInTheCorrectOrders() {
+        // WHEN
+        let items = ContextualMenu.folderMenuItems()
+
+        // THEN
+        XCTAssertEqual(items.count, 9)
+        assertMenu(item: items[0], withTitle: UserText.openAllInNewTabs, selector: #selector(FolderMenuItemSelectors.openInNewTabs(_:)))
+        assertMenu(item: items[1], withTitle: UserText.openAllTabsInNewWindow, selector: #selector(FolderMenuItemSelectors.openAllInNewWindow(_:)))
+        assertMenu(item: items[2], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[3], withTitle: UserText.editBookmark, selector: #selector(FolderMenuItemSelectors.editFolder(_:)))
+        assertMenu(item: items[4], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(FolderMenuItemSelectors.deleteFolder(_:)))
+        assertMenu(item: items[5], withTitle: UserText.bookmarksBarContextMenuMoveToEnd, selector: #selector(FolderMenuItemSelectors.moveToEnd(_:)))
+        assertMenu(item: items[6], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[7], withTitle: UserText.addFolder, selector: #selector(FolderMenuItemSelectors.newFolder(_:)))
+        assertMenu(item: items[8], withTitle: UserText.bookmarksManageBookmarks, selector: #selector(FolderMenuItemSelectors.manageBookmarks(_:)))
+    }
+
+    func testWhenCreateMenuForEmptySelectionThenItReturnsAMenuWithAddFolderOnly() throws {
+        // WHEN
+        let menu = ContextualMenu.menu(for: [])
+
+        // THEN
+        XCTAssertEqual(menu?.items.count, 1)
+        let menuItem = try XCTUnwrap(menu?.items.first)
+        assertMenu(item: menuItem, withTitle: UserText.addFolder, selector: #selector(FolderMenuItemSelectors.newFolder(_:)))
+    }
+
+    func testWhenCreateMenuForBookmarkWithoutParentThenReturnsAMenuWithTheBookmarkMenuItems() throws {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: false)
+
+        // WHEN
+        let menu = ContextualMenu.menu(for: [bookmark])
+
+        // THEN
+        let items = try XCTUnwrap(menu?.items)
+        XCTAssertEqual(items.count, 12)
+        assertMenu(item: items[0], withTitle: UserText.openInNewTab, selector: #selector(BookmarkMenuItemSelectors.openBookmarkInNewTab(_:)), representedObject: bookmark)
+        assertMenu(item: items[1], withTitle: UserText.openInNewWindow, selector: #selector(BookmarkMenuItemSelectors.openBookmarkInNewWindow(_:)), representedObject: bookmark)
+        assertMenu(item: items[2], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[3], withTitle: UserText.addToFavorites, selector: #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), representedObject: bookmark)
+        assertMenu(item: items[4], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[5], withTitle: UserText.editBookmark, selector: #selector(BookmarkMenuItemSelectors.editBookmark(_:)), representedObject: bookmark)
+        assertMenu(item: items[6], withTitle: UserText.bookmarksBarContextMenuCopy, selector: #selector(BookmarkMenuItemSelectors.copyBookmark(_:)), representedObject: bookmark)
+        assertMenu(item: items[7], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(BookmarkMenuItemSelectors.deleteBookmark(_:)), representedObject: bookmark)
+        assertMenu(item: items[8], withTitle: UserText.bookmarksBarContextMenuMoveToEnd, selector: #selector(BookmarkMenuItemSelectors.moveToEnd(_:)), representedObject: BookmarkEntityInfo(entity: bookmark, parent: nil))
+        assertMenu(item: items[9], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[10], withTitle: UserText.addFolder, selector: #selector(BookmarkMenuItemSelectors.newFolder(_:)))
+        assertMenu(item: items[11], withTitle: UserText.bookmarksManageBookmarks, selector: #selector(BookmarkMenuItemSelectors.manageBookmarks(_:)))
+    }
+
+    func testWhenCreateMenuForBookmarkWithParentThenReturnsAMenuWithTheBookmarkMenuItems() throws {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DDG", isFavorite: false, parentFolderUUID: "A")
+        let parent = BookmarkFolder(id: "A", title: "Folder", children: [bookmark])
+        let parentNode = BookmarkNode(representedObject: parent, parent: nil)
+        let node = BookmarkNode(representedObject: bookmark, parent: parentNode)
+
+        // WHEN
+        let menu = ContextualMenu.menu(for: [node])
+
+        // THEN
+        let items = try XCTUnwrap(menu?.items)
+        XCTAssertEqual(items.count, 12)
+        assertMenu(item: items[0], withTitle: UserText.openInNewTab, selector: #selector(BookmarkMenuItemSelectors.openBookmarkInNewTab(_:)), representedObject: bookmark)
+        assertMenu(item: items[1], withTitle: UserText.openInNewWindow, selector: #selector(BookmarkMenuItemSelectors.openBookmarkInNewWindow(_:)), representedObject: bookmark)
+        assertMenu(item: items[2], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[3], withTitle: UserText.addToFavorites, selector: #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), representedObject: bookmark)
+        assertMenu(item: items[4], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[5], withTitle: UserText.editBookmark, selector: #selector(BookmarkMenuItemSelectors.editBookmark(_:)), representedObject: bookmark)
+        assertMenu(item: items[6], withTitle: UserText.bookmarksBarContextMenuCopy, selector: #selector(BookmarkMenuItemSelectors.copyBookmark(_:)), representedObject: bookmark)
+        assertMenu(item: items[7], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(BookmarkMenuItemSelectors.deleteBookmark(_:)), representedObject: bookmark)
+        assertMenu(item: items[8], withTitle: UserText.bookmarksBarContextMenuMoveToEnd, selector: #selector(BookmarkMenuItemSelectors.moveToEnd(_:)), representedObject: BookmarkEntityInfo(entity: bookmark, parent: parent))
+        assertMenu(item: items[9], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[10], withTitle: UserText.addFolder, selector: #selector(BookmarkMenuItemSelectors.newFolder(_:)), representedObject: parent)
+        assertMenu(item: items[11], withTitle: UserText.bookmarksManageBookmarks, selector: #selector(BookmarkMenuItemSelectors.manageBookmarks(_:)))
+    }
+
+    func testWhenCreateMenuForFolderNodeThenReturnsAMenuWithTheFolderMenuItems() throws {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: "Child")
+        let parent = BookmarkFolder(id: "1", title: "Parent", children: [folder])
+        let parentNode = BookmarkNode(representedObject: parent, parent: nil)
+        let node = BookmarkNode(representedObject: folder, parent: parentNode)
+
+        // WHEN
+        let menu = ContextualMenu.menu(for: [node])
+
+        // THEN
+        let items = try XCTUnwrap(menu?.items)
+        XCTAssertEqual(items.count, 9)
+        assertMenu(item: items[0], withTitle: UserText.openAllInNewTabs, selector: #selector(FolderMenuItemSelectors.openInNewTabs(_:)), representedObject: folder)
+        assertMenu(item: items[1], withTitle: UserText.openAllTabsInNewWindow, selector: #selector(FolderMenuItemSelectors.openAllInNewWindow(_:)), representedObject: folder)
+        assertMenu(item: items[2], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[3], withTitle: UserText.editBookmark, selector: #selector(FolderMenuItemSelectors.editFolder(_:)), representedObject: BookmarkEntityInfo(entity: folder, parent: parent))
+        assertMenu(item: items[4], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(FolderMenuItemSelectors.deleteFolder(_:)), representedObject: folder)
+        assertMenu(item: items[5], withTitle: UserText.bookmarksBarContextMenuMoveToEnd, selector: #selector(FolderMenuItemSelectors.moveToEnd(_:)), representedObject: BookmarkEntityInfo(entity: folder, parent: parent))
+        assertMenu(item: items[6], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[7], withTitle: UserText.addFolder, selector: #selector(FolderMenuItemSelectors.newFolder(_:)), representedObject: folder)
+        assertMenu(item: items[8], withTitle: UserText.bookmarksManageBookmarks, selector: #selector(FolderMenuItemSelectors.manageBookmarks(_:)))
+    }
+
+    func testWhenCreateMenuForMultipleUnfavoriteBookmarksThenReturnsMenuWithOpenInNewTabsAddToFavoritesAndDelete() throws {
+        // GIVEN
+        let bookmark1 = Bookmark(id: "1", url: "", title: "", isFavorite: false)
+        let bookmark2 = Bookmark(id: "2", url: "", title: "", isFavorite: false)
+
+        // WHEN
+        let menu = ContextualMenu.menu(for: [bookmark1, bookmark2])
+
+        // THEN
+        let items = try XCTUnwrap(menu?.items)
+        XCTAssertEqual(items.count, 4)
+        assertMenu(item: items[0], withTitle: UserText.bookmarksOpenInNewTabs, selector: #selector(FolderMenuItemSelectors.openInNewTabs(_:)), representedObject: [bookmark1, bookmark2])
+        assertMenu(item: items[1], withTitle: UserText.addToFavorites, selector: #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), representedObject: [bookmark1, bookmark2])
+        assertMenu(item: items[2], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[3], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(BookmarkMenuItemSelectors.deleteEntities(_:)), representedObject: [bookmark1, bookmark2])
+    }
+
+    func testWhenCreateMenuForMultipleFavoriteBookmarksThenReturnsMenuWithOpenInNewTabsRemoveFromFavoritesAndDelete() throws {
+        // GIVEN
+        let bookmark1 = Bookmark(id: "1", url: "", title: "", isFavorite: true)
+        let bookmark2 = Bookmark(id: "2", url: "", title: "", isFavorite: true)
+
+        // WHEN
+        let menu = ContextualMenu.menu(for: [bookmark1, bookmark2])
+
+        // THEN
+        let items = try XCTUnwrap(menu?.items)
+        XCTAssertEqual(items.count, 4)
+        assertMenu(item: items[0], withTitle: UserText.bookmarksOpenInNewTabs, selector: #selector(FolderMenuItemSelectors.openInNewTabs(_:)), representedObject: [bookmark1, bookmark2])
+        assertMenu(item: items[1], withTitle: UserText.removeFromFavorites, selector: #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), representedObject: [bookmark1, bookmark2])
+        assertMenu(item: items[2], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[3], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(BookmarkMenuItemSelectors.deleteEntities(_:)), representedObject: [bookmark1, bookmark2])
+    }
+
+    func testWhenCreateMenuForMultipleMixedFavoriteBookmarksThenReturnsMenuWithOpenInNewTabsAndDelete() throws {
+        // GIVEN
+        let bookmark1 = Bookmark(id: "1", url: "", title: "", isFavorite: true)
+        let bookmark2 = Bookmark(id: "2", url: "", title: "", isFavorite: false)
+
+        // WHEN
+        let menu = ContextualMenu.menu(for: [bookmark1, bookmark2])
+
+        // THEN
+        let items = try XCTUnwrap(menu?.items)
+        XCTAssertEqual(items.count, 3)
+        assertMenu(item: items[0], withTitle: UserText.bookmarksOpenInNewTabs, selector: #selector(FolderMenuItemSelectors.openInNewTabs(_:)), representedObject: [bookmark1, bookmark2])
+        assertMenu(item: items[1], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[2], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(BookmarkMenuItemSelectors.deleteEntities(_:)), representedObject: [bookmark1, bookmark2])
+    }
+
+    func testWhenCreateMenuForBookmarkAndFolderThenReturnsMenuWithOpenInNewTabsOnlyForBookmarkAndDelete() throws {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: "", title: "Bookmark", isFavorite: true)
+        let folder = BookmarkFolder(id: "1", title: "Folder")
+
+        // WHEN
+        let menu = ContextualMenu.menu(for: [bookmark, folder])
+
+        // THEN
+        let items = try XCTUnwrap(menu?.items)
+        XCTAssertEqual(items.count, 3)
+        assertMenu(item: items[0], withTitle: UserText.bookmarksOpenInNewTabs, selector: #selector(FolderMenuItemSelectors.openInNewTabs(_:)), representedObject: [bookmark])
+        assertMenu(item: items[1], withTitle: "", selector: nil) // Separator
+        assertMenu(item: items[2], withTitle: UserText.bookmarksBarContextMenuDelete, selector: #selector(BookmarkMenuItemSelectors.deleteEntities(_:)), representedObject: [bookmark, folder])
+    }
+
+}
+
+private extension ContextualMenuTests {
+
+    func assertMenu<T: Equatable>(item: NSMenuItem, withTitle title: String, selector: Selector?, representedObject: T = Empty() ) {
+        XCTAssertEqual(item.title, title)
+        XCTAssertEqual(item.action, selector)
+        if representedObject is Empty {
+            XCTAssertNil(item.representedObject)
+        } else {
+            XCTAssertEqualValue(item.representedObject, representedObject)
+        }
+    }
+
+}
+
+private struct Empty: Equatable {}
+
+private func XCTAssertEqualValue<T>(_ expression1: @autoclosure () throws -> Any?, _ expression2: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #filePath, line: UInt = #line) where T: Equatable {
+    do {
+        guard let firstValue = try expression1() as? T else {
+            XCTFail("Type of expression1 \(type(of: try? expression1())) and expression2 \(type(of: try? expression2())) are different.")
+            return
+        }
+        let secondValue = try expression2()
+        XCTAssertEqual(firstValue, secondValue, message(), file: file, line: line)
+    } catch {
+        XCTFail("Failed evaluating expression.")
+    }
+}
diff --git a/UnitTests/Bookmarks/Model/LocalBookmarkManagerTests.swift b/UnitTests/Bookmarks/Model/LocalBookmarkManagerTests.swift
index b82636a7c5..97ce23202d 100644
--- a/UnitTests/Bookmarks/Model/LocalBookmarkManagerTests.swift
+++ b/UnitTests/Bookmarks/Model/LocalBookmarkManagerTests.swift
@@ -16,6 +16,7 @@
 //  limitations under the License.
 //
 
+import Combine
 import Foundation
 
 import XCTest
@@ -157,6 +158,26 @@ final class LocalBookmarkManagerTests: XCTestCase {
         XCTAssert(bookmarkStoreMock.updateBookmarkCalled)
     }
 
+    func testWhenBookmarkFolderIsUpdatedAndMoved_ThenManagerUpdatesItAlsoInStore() throws {
+        let (bookmarkManager, bookmarkStoreMock) = LocalBookmarkManager.aManager
+        let parent = BookmarkFolder(id: "1", title: "Parent")
+        let folder = BookmarkFolder(id: "2", title: "Child")
+        var bookmarkList: BookmarkList?
+        let cancellable = bookmarkManager.listPublisher
+            .dropFirst()
+            .sink { list in
+            bookmarkList = list
+        }
+
+        bookmarkManager.update(folder: folder, andMoveToParent: .parent(uuid: parent.id))
+
+        withExtendedLifetime(cancellable) {}
+        XCTAssertTrue(bookmarkStoreMock.updateFolderAndMoveToParentCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedFolder, folder)
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolderType, .parent(uuid: parent.id))
+        XCTAssertNotNil(bookmarkList)
+    }
+
 }
 
 fileprivate extension LocalBookmarkManager {
diff --git a/UnitTests/Bookmarks/Services/LocalBookmarkStoreTests.swift b/UnitTests/Bookmarks/Services/LocalBookmarkStoreTests.swift
index 0dff288b23..2ebff62e7d 100644
--- a/UnitTests/Bookmarks/Services/LocalBookmarkStoreTests.swift
+++ b/UnitTests/Bookmarks/Services/LocalBookmarkStoreTests.swift
@@ -56,7 +56,7 @@ final class LocalBookmarkStoreTests: XCTestCase {
         let savingExpectation = self.expectation(description: "Saving")
         let loadingExpectation = self.expectation(description: "Loading")
 
-        let bookmark = Bookmark(id: UUID().uuidString, url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: true)
+        let bookmark = Bookmark(id: UUID().uuidString, url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: true, parentFolderUUID: "bookmarks_root")
 
         bookmarkStore.save(bookmark: bookmark, parent: nil, index: nil) { (success, error) in
             XCTAssert(success)
@@ -128,7 +128,7 @@ final class LocalBookmarkStoreTests: XCTestCase {
 
             savingExpectation.fulfill()
 
-            let modifiedBookmark = Bookmark(id: bookmark.id, url: URL.duckDuckGo.absoluteString, title: "New Title", isFavorite: false)
+            let modifiedBookmark = Bookmark(id: bookmark.id, url: URL.duckDuckGo.absoluteString, title: "New Title", isFavorite: false, parentFolderUUID: "bookmarks_root")
             bookmarkStore.update(bookmark: modifiedBookmark)
 
             bookmarkStore.loadAll(type: .bookmarks) { bookmarks, error in
@@ -152,7 +152,7 @@ final class LocalBookmarkStoreTests: XCTestCase {
         let savingExpectation = self.expectation(description: "Saving")
         let loadingExpectation = self.expectation(description: "Loading")
 
-        let folder = BookmarkFolder(id: UUID().uuidString, title: "Folder")
+        let folder = BookmarkFolder(id: UUID().uuidString, title: "Folder", parentFolderUUID: "bookmarks_root")
 
         bookmarkStore.save(folder: folder, parent: nil) { (success, error) in
             XCTAssert(success)
@@ -181,8 +181,9 @@ final class LocalBookmarkStoreTests: XCTestCase {
         let saveChildExpectation = self.expectation(description: "Save Child Folder")
         let loadingExpectation = self.expectation(description: "Loading")
 
-        let parentFolder = BookmarkFolder(id: UUID().uuidString, title: "Parent")
-        let childFolder = BookmarkFolder(id: UUID().uuidString, title: "Child")
+        let parentId = UUID().uuidString
+        let childFolder = BookmarkFolder(id: UUID().uuidString, title: "Child", parentFolderUUID: parentId)
+        let parentFolder = BookmarkFolder(id: parentId, title: "Parent", parentFolderUUID: "bookmarks_root", children: [childFolder])
 
         bookmarkStore.save(folder: parentFolder, parent: nil) { (success, error) in
             XCTAssert(success)
@@ -224,8 +225,9 @@ final class LocalBookmarkStoreTests: XCTestCase {
         let saveBookmarkExpectation = self.expectation(description: "Save Bookmark")
         let loadingExpectation = self.expectation(description: "Loading")
 
-        let folder = BookmarkFolder(id: UUID().uuidString, title: "Parent")
-        let bookmark = Bookmark(id: UUID().uuidString, url: "https://example.com", title: "Example", isFavorite: false)
+        let parentId = UUID().uuidString
+        let bookmark = Bookmark(id: UUID().uuidString, url: "https://example.com", title: "Example", isFavorite: false, parentFolderUUID: parentId)
+        let folder = BookmarkFolder(id: parentId, title: "Parent", parentFolderUUID: "bookmarks_root", children: [bookmark])
 
         bookmarkStore.save(folder: folder, parent: nil) { (success, error) in
             XCTAssert(success)
@@ -468,6 +470,148 @@ final class LocalBookmarkStoreTests: XCTestCase {
         XCTAssertEqual(topLevelEntityIDs, [testState.initialParentFolder.id, testState.bookmark3.id])
     }
 
+    func testWhenUpdatingBookmarkFolder_ThenBookmarkFolderTitleIsUpdated() async throws {
+        let context = container.viewContext
+        let bookmarkStore = LocalBookmarkStore(context: context)
+        let folder1 = BookmarkFolder(id: UUID().uuidString, title: "Folder 1", parentFolderUUID: "bookmarks_root")
+
+        // Save the initial bookmarks state:
+
+        _ = await bookmarkStore.save(folder: folder1, parent: nil)
+
+        // Fetch persisted bookmark folders back from the store:
+
+        let folders = try await bookmarkStore.loadAll(type: .topLevelEntities).get().compactMap { $0 as? BookmarkFolder }
+
+        XCTAssertEqual(folders.count, 1)
+        XCTAssertEqual(folders.first, folder1)
+
+        // Update the folder title and parent:
+
+        let folderToMove = folder1
+        folderToMove.title = #function
+        bookmarkStore.update(folder: folder1)
+
+        // Check the new bookmark folders order:
+
+        let newFolders = try await bookmarkStore.loadAll(type: .topLevelEntities).get().compactMap { $0 as? BookmarkFolder }
+
+        XCTAssertEqual(newFolders.count, 1)
+        XCTAssertEqual(newFolders.first, folderToMove)
+    }
+
+    func testWhenUpdatingAndMovingBookmarkFolder_ThenBookmarkFolderIsMovedAndTitleUpdated() async throws {
+        let context = container.viewContext
+        let bookmarkStore = LocalBookmarkStore(context: context)
+
+        let folder1 = BookmarkFolder(id: UUID().uuidString, title: "Folder 1", parentFolderUUID: "bookmarks_root")
+        let folder2 = BookmarkFolder(id: UUID().uuidString, title: "Folder 2", parentFolderUUID: "bookmarks_root")
+        let folder3 = BookmarkFolder(id: UUID().uuidString, title: "Folder 3", parentFolderUUID: "bookmarks_root")
+
+        // Save the initial bookmarks state:
+
+        _ = await bookmarkStore.save(folder: folder1, parent: nil)
+        _ = await bookmarkStore.save(folder: folder2, parent: nil)
+        _ = await bookmarkStore.save(folder: folder3, parent: nil)
+
+        // Fetch persisted bookmark folders back from the store:
+
+        let folders = try await bookmarkStore.loadAll(type: .topLevelEntities).get().compactMap { $0 as? BookmarkFolder }
+
+        XCTAssertEqual(folders.count, 3)
+        XCTAssertEqual(folders[0], folder1)
+        XCTAssertEqual(folders[1], folder2)
+        XCTAssertEqual(folders[2], folder3)
+
+        // Update the folder title and parent:
+
+        let folderToMove = folder1
+        folderToMove.title = #function
+        bookmarkStore.update(folder: folder1, andMoveToParent: .parent(uuid: folder2.id))
+        let expectedFolderAfterMove = BookmarkFolder(id: folder1.id, title: folder1.title, parentFolderUUID: folder2.id, children: folder1.children)
+
+        // Check the new bookmark folders order:
+
+        let newFolders = try await bookmarkStore.loadAll(type: .topLevelEntities).get().compactMap { $0 as? BookmarkFolder }
+
+        XCTAssertEqual(newFolders.count, 2)
+        XCTAssertEqual(newFolders[0].id, folder2.id)
+        XCTAssertEqual(newFolders[0].children, [expectedFolderAfterMove])
+        XCTAssertEqual(newFolders[1], folder3)
+    }
+
+    func testWhenMovingBookmarkFolderToSubfolder_ThenBookmarkFolderLocationIsUpdated() async throws {
+        let context = container.viewContext
+        let bookmarkStore = LocalBookmarkStore(context: context)
+
+        let folder1 = BookmarkFolder(id: UUID().uuidString, title: "Folder 1", parentFolderUUID: "bookmarks_root")
+        let folder2 = BookmarkFolder(id: UUID().uuidString, title: "Folder 2", parentFolderUUID: "bookmarks_root")
+
+        // Save the initial bookmarks state:
+
+        _ = await bookmarkStore.save(folder: folder1, parent: nil)
+        _ = await bookmarkStore.save(folder: folder2, parent: nil)
+
+        // Fetch persisted bookmark folders back from the store:
+
+        let folders = try await bookmarkStore.loadAll(type: .topLevelEntities).get().compactMap { $0 as? BookmarkFolder }
+
+        XCTAssertEqual(folders.count, 2)
+        XCTAssertEqual(folders.first, folder1)
+        XCTAssertEqual(folders.last, folder2)
+
+        // Update the folder parent:
+
+        _ = await bookmarkStore.move(objectUUIDs: [folder2.id], toIndex: nil, withinParentFolder: .parent(uuid: folder1.id))
+        let expectedChildFolderAfterMove = BookmarkFolder(id: folder2.id, title: folder2.title, parentFolderUUID: folder1.id, children: folder2.children)
+        let expectedParentFolderAfterMove = BookmarkFolder(id: folder1.id, title: folder1.title, parentFolderUUID: folder1.parentFolderUUID, children: [expectedChildFolderAfterMove])
+
+        // Check the new bookmark folders order:
+
+        let newFolders = try await bookmarkStore.loadAll(type: .topLevelEntities).get().compactMap { $0 as? BookmarkFolder }
+
+        XCTAssertEqual(newFolders.count, 1)
+        XCTAssertEqual(newFolders.first, expectedParentFolderAfterMove)
+        XCTAssertEqual(newFolders.first?.children, [expectedChildFolderAfterMove])
+    }
+
+    func testWhenMovingBookmarkFolderToRootFolder_ThenBookmarkFolderLocationIsUpdated() async throws {
+        let context = container.viewContext
+        let bookmarkStore = LocalBookmarkStore(context: context)
+
+        let folder2Id = UUID().uuidString
+        let folder1 = BookmarkFolder(id: UUID().uuidString, title: "Folder 1", parentFolderUUID: folder2Id)
+        let folder2 = BookmarkFolder(id: folder2Id, title: "Folder 2", parentFolderUUID: "bookmarks_root", children: [folder1])
+
+        // Save the initial bookmarks state:
+
+        _ = await bookmarkStore.save(folder: folder2, parent: nil)
+        _ = await bookmarkStore.save(folder: folder1, parent: folder2)
+
+        // Fetch persisted bookmark folders back from the store:
+
+        let folders = try await bookmarkStore.loadAll(type: .topLevelEntities).get().compactMap { $0 as? BookmarkFolder }
+
+        XCTAssertEqual(folders.count, 1)
+        XCTAssertEqual(folders.first, folder2)
+        XCTAssertEqual(folders.first?.children, [folder1])
+
+        // Update the folder parent:
+
+        _ = await bookmarkStore.move(objectUUIDs: [folder1.id], toIndex: 0, withinParentFolder: .root)
+
+        // Check the new bookmark folders order:
+
+        let newFolders = try await bookmarkStore.loadAll(type: .topLevelEntities).get().compactMap { $0 as? BookmarkFolder }
+        let expectedFolder1AfterMove = BookmarkFolder(id: folder1.id, title: folder1.title, parentFolderUUID: "bookmarks_root", children: folder1.children)
+        let expectedFolder2AfterMove = BookmarkFolder(id: folder2.id, title: folder2.title, parentFolderUUID: "bookmarks_root", children: [])
+
+        XCTAssertEqual(newFolders.count, 2)
+        XCTAssertEqual(newFolders.first, expectedFolder1AfterMove)
+        XCTAssertEqual(newFolders.last, expectedFolder2AfterMove)
+        XCTAssertEqual(newFolders.last?.children, [])
+    }
+
     // MARK: Favorites
 
     func testThatTopLevelEntitiesDoNotContainFavoritesFolder() async {
diff --git a/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogCoordinatorViewModelTests.swift b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogCoordinatorViewModelTests.swift
new file mode 100644
index 0000000000..53072513c4
--- /dev/null
+++ b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogCoordinatorViewModelTests.swift
@@ -0,0 +1,170 @@
+//
+//  AddEditBookmarkDialogCoordinatorViewModelTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+import Combine
+@testable import DuckDuckGo_Privacy_Browser
+
+@MainActor
+final class AddEditBookmarkDialogCoordinatorViewModelTests: XCTestCase {
+    private var sut: AddEditBookmarkDialogCoordinatorViewModel<AddEditBookmarkDialogViewModelMock, AddEditBookmarkFolderDialogViewModelMock>!
+    private var bookmarkViewModelMock: AddEditBookmarkDialogViewModelMock!
+    private var bookmarkFolderViewModelMock: AddEditBookmarkFolderDialogViewModelMock!
+    private var cancellables: Set<AnyCancellable>!
+
+    override func setUpWithError() throws {
+        try super.setUpWithError()
+
+        cancellables = []
+        bookmarkViewModelMock = .init()
+        bookmarkFolderViewModelMock = .init()
+        sut = .init(bookmarkModel: bookmarkViewModelMock, folderModel: bookmarkFolderViewModelMock)
+    }
+
+    override func tearDownWithError() throws {
+        cancellables = nil
+        bookmarkViewModelMock = nil
+        bookmarkFolderViewModelMock = nil
+        sut = nil
+        try super.tearDownWithError()
+    }
+
+    func testShouldReturnViewStateBookmarkWhenInit() {
+        XCTAssertEqual(sut.viewState, .bookmark)
+    }
+
+    func testShouldReturnViewStateBookmarkWhenDismissActionIsCalled() {
+        // GIVEN
+        sut.addFolderAction()
+        XCTAssertEqual(sut.viewState, .folder)
+
+        // WHEN
+        sut.dismissAction()
+
+        // THEN
+        XCTAssertEqual(sut.viewState, .bookmark)
+
+    }
+
+    func testShouldSetSelectedFolderOnFolderViewModelAndReturnFolderViewStateWhenAddFolderActionIsCalled() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: "Folder")
+        bookmarkViewModelMock.selectedFolder = folder
+        XCTAssertNil(bookmarkFolderViewModelMock.selectedFolder)
+
+        // WHEN
+        sut.addFolderAction()
+
+        // THEN
+        XCTAssertEqual(bookmarkFolderViewModelMock.selectedFolder, folder)
+    }
+
+    func testShouldReceiveEventsWhenBookmarkModelChanges() {
+        // GIVEN
+        let expectation = self.expectation(description: #function)
+        var didCallChangeValue = false
+        sut.objectWillChange.sink { _ in
+            didCallChangeValue = true
+            expectation.fulfill()
+        }
+        .store(in: &cancellables)
+
+        // WHEN
+        sut.bookmarkModel.objectWillChange.send()
+
+        // THEN
+        waitForExpectations(timeout: 1.0)
+        XCTAssertTrue(didCallChangeValue)
+    }
+
+    func testShouldReceiveEventsWhenBookmarkFolderModelChanges() {
+        // GIVEN
+        let expectation = self.expectation(description: #function)
+        var didCallChangeValue = false
+        sut.objectWillChange.sink { _ in
+            didCallChangeValue = true
+            expectation.fulfill()
+        }
+        .store(in: &cancellables)
+
+        // WHEN
+        sut.folderModel.objectWillChange.send()
+
+        // THEN
+        waitForExpectations(timeout: 1.0)
+        XCTAssertTrue(didCallChangeValue)
+    }
+
+    func testShouldSetSelectedFolderOnBookmarkViewModelWhenAddFolderPublisherSendsEvent() {
+        // GIVEN
+        let expectation = self.expectation(description: #function)
+        bookmarkViewModelMock.selectedFolderExpectation = expectation
+        let folder = BookmarkFolder(id: "ABCDE", title: #function)
+        XCTAssertNil(bookmarkViewModelMock.selectedFolder)
+
+        // WHEN
+        sut.folderModel.subject.send(folder)
+
+        // THEN
+        waitForExpectations(timeout: 1.0)
+        XCTAssertEqual(bookmarkViewModelMock.selectedFolder, folder)
+    }
+
+}
+
+final class AddEditBookmarkDialogViewModelMock: BookmarkDialogEditing {
+    var bookmarkName: String = ""
+    var bookmarkURLPath: String = ""
+    var isBookmarkFavorite: Bool = false
+    var isURLFieldHidden: Bool = false
+    var title: String = ""
+    var folders: [DuckDuckGo_Privacy_Browser.FolderViewModel] = []
+    var selectedFolder: DuckDuckGo_Privacy_Browser.BookmarkFolder? {
+        didSet {
+            selectedFolderExpectation?.fulfill()
+        }
+    }
+    var cancelActionTitle: String = ""
+    var isOtherActionDisabled: Bool = false
+    var defaultActionTitle: String = ""
+    var isDefaultActionDisabled: Bool = false
+
+    func cancel(dismiss: () -> Void) {}
+    func addOrSave(dismiss: () -> Void) {}
+
+    var selectedFolderExpectation: XCTestExpectation?
+}
+
+final class AddEditBookmarkFolderDialogViewModelMock: BookmarkFolderDialogEditing {
+    let subject = PassthroughSubject<BookmarkFolder, Never>()
+
+    var addFolderPublisher: AnyPublisher<DuckDuckGo_Privacy_Browser.BookmarkFolder, Never> {
+        subject.eraseToAnyPublisher()
+    }
+    var folderName: String = ""
+    var title: String = ""
+    var folders: [DuckDuckGo_Privacy_Browser.FolderViewModel] = []
+    var selectedFolder: DuckDuckGo_Privacy_Browser.BookmarkFolder?
+    var cancelActionTitle: String = ""
+    var isOtherActionDisabled: Bool = false
+    var defaultActionTitle: String = ""
+    var isDefaultActionDisabled: Bool = false
+
+    func cancel(dismiss: () -> Void) {}
+    func addOrSave(dismiss: () -> Void) {}
+}
diff --git a/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogViewModelTests.swift b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogViewModelTests.swift
new file mode 100644
index 0000000000..b409df5b9c
--- /dev/null
+++ b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogViewModelTests.swift
@@ -0,0 +1,745 @@
+//
+//  AddEditBookmarkDialogViewModelTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+@MainActor
+final class AddEditBookmarkDialogViewModelTests: XCTestCase {
+    private var bookmarkManager: LocalBookmarkManager!
+    private var bookmarkStoreMock: BookmarkStoreMock!
+
+    override func setUpWithError() throws {
+        try super.setUpWithError()
+        bookmarkStoreMock = BookmarkStoreMock()
+        bookmarkStoreMock.bookmarks = [BookmarkFolder.mock]
+        bookmarkManager = .init(bookmarkStore: bookmarkStoreMock, faviconManagement: FaviconManagerMock())
+        bookmarkManager.loadBookmarks()
+    }
+
+    override func tearDownWithError() throws {
+        bookmarkStoreMock = nil
+        bookmarkManager = nil
+        try super.tearDownWithError()
+    }
+
+    // MARK: - Copy
+
+    func testReturnAddBookmarkTitleWhenModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.title
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Title.addBookmark)
+    }
+
+    func testReturnEditBookmarkTitleWhenModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: .mock), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.title
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Title.editBookmark)
+    }
+
+    func testReturnCancelActionTitleWhenModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.cancelActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.cancel)
+    }
+
+    func testReturnCancelActionTitleWhenModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: .mock), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.cancelActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.cancel)
+    }
+
+    func testReturnAddBookmarkActionTitleWhenModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.defaultActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Action.addBookmark)
+    }
+
+    func testReturnSaveActionTitleWhenModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: .mock), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.defaultActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.save)
+    }
+
+    // MARK: State
+
+    func testShouldSetBookmarkNameToEmptyWhenInitModeIsAddAndTabInfoIsNil() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.bookmarkName
+
+        // THEN
+        XCTAssertTrue(result.isEmpty)
+    }
+
+    func testShouldSetNameAndURLToValueWhenInitModeIsAddTabInfoIsNotNilAndURLIsNotAlreadyBookmarked() {
+        // GIVEN
+        let tab = Tab(content: .url(URL.duckDuckGo, source: .link), title: "Test")
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(tabWebsite: WebsiteInfo(tab)), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let name = sut.bookmarkName
+        let url = sut.bookmarkURLPath
+
+        // THEN
+        XCTAssertEqual(name, "Test")
+        XCTAssertEqual(url, URL.duckDuckGo.absoluteString)
+    }
+
+    func testShouldSetNameAndURLToEmptyWhenInitModeIsAddTabInfoIsNotNilAndURLIsAlreadyBookmarked() throws {
+        // GIVEN
+        let tab = Tab(content: .url(URL.duckDuckGo, source: .link), title: "Test")
+        let websiteInfo = try XCTUnwrap(WebsiteInfo(tab))
+        let bookmark = Bookmark(id: "1", url: websiteInfo.url.absoluteString, title: websiteInfo.title ?? "", isFavorite: false)
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(tabWebsite: WebsiteInfo(tab)), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let name = sut.bookmarkName
+        let url = sut.bookmarkURLPath
+
+        // THEN
+        XCTAssertEqual(name, "")
+        XCTAssertEqual(url, "")
+    }
+
+    func testShouldSetBookmarkNameToValueWhenInitAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false)
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.bookmarkName
+
+        // THEN
+        XCTAssertEqual(result, #function)
+    }
+
+    func testShouldSetFoldersFromBookmarkListWhenInitAndModeIsAdd() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.folders
+
+        // THEN
+        XCTAssertEqual(result.count, 1)
+        XCTAssertEqual(result.first?.entity, folder)
+    }
+
+    func testShouldSetFoldersFromBookmarkListWhenInitAndModeIsEdit() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: .mock), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.folders
+
+        // THEN
+        XCTAssertEqual(result.count, 1)
+        XCTAssertEqual(result.first?.entity, folder)
+    }
+
+    func testShouldSetSelectedFolderToNilWhenBookmarkParentFolderIsNilAndModeIsAdd() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertNil(result)
+    }
+
+    func testShouldSetSelectedFolderToValueWhenParentFolderIsNotNilAndModeIsAdd() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(parentFolder: folder), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertEqual(result, folder)
+    }
+
+    func testShouldSetSelectedFolderToNilWhenParentFolderIsNilAndModeIsEdit() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false, parentFolderUUID: "2")
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertNil(result)
+    }
+
+    func testShouldSetSelectedFolderToValueWhenParentFolderIsNotNilAndModeIsEdit() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false, parentFolderUUID: "1")
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertEqual(result, folder)
+    }
+
+    func testShouldSetIsBookmarkFavoriteToTrueWhenModeIsAddAndShouldPresetFavoriteIsTrue() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(shouldPresetFavorite: true), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.isBookmarkFavorite
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testShouldNotSetIsBookmarkFavoriteToTrueWhenModeIsAddAndShouldPresetFavoriteIsFalse() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(shouldPresetFavorite: false), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.isBookmarkFavorite
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    // MARK: - Actions
+
+    func testReturnIsCancelActionDisabledFalseWhenModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.isOtherActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testReturnIsCancelActionDisabledFalseWhenModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: .mock), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.isOtherActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledTrueWhenBookmarkNameIsEmptyAndModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = ""
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledTrueWhenBookmarkNameIsEmptyAndModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: .mock), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = ""
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledFalseWhenBookmarkNameIsNotEmptyAndModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = " DuckDuckGo "
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledFalseWhenBookmarkNameIsNotEmptyAndModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: .mock), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = " DuckDuckGo "
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledTrueWhenBookmarURLIsEmptyAndModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = "DuckDuckGo"
+        sut.bookmarkURLPath = ""
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledTrueWhenBookmarkURLIsEmptyAndModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: .mock), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = "DuckDuckGo"
+        sut.bookmarkURLPath = ""
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledFalseWhenBookmarkURLIsNotEmptyAndModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = " DuckDuckGo "
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledFalseWhenBookmarkURLIsNotEmptyAndModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: .mock), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = " DuckDuckGo "
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testShouldCallDismissWhenCancelIsCalled() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        var didCallDismiss = false
+
+        // WHEN
+        sut.cancel {
+            didCallDismiss = true
+        }
+
+        // THEN
+        XCTAssertTrue(didCallDismiss)
+    }
+
+    func testShouldCallDismissWhenAddOrSaveIsCalled() {
+        // GIVEN
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = "DuckDuckGo"
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+        var didCallDismiss = false
+
+        // WHEN
+        sut.addOrSave {
+            didCallDismiss = true
+        }
+
+        // THEN
+        XCTAssertTrue(didCallDismiss)
+    }
+
+    func testShouldAskBookmarkStoreToSaveBookmarkWhenModeIsAddAndURLIsNotAnExistingBookmark() {
+        // GIVEN
+        let folder = BookmarkFolder(id: #file, title: #function)
+        let existingBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: true)
+        bookmarkStoreMock.bookmarks = [existingBookmark]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(parentFolder: folder), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = "DDG"
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolder)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertTrue(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertTrue(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedObjectUUIDs, [existingBookmark.id])
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolderType, .parent(uuid: folder.id))
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedBookmark?.title, "DDG")
+        XCTAssertEqual(bookmarkStoreMock.capturedBookmark?.url, URL.duckDuckGo.absoluteString)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolder)
+    }
+
+    func testShouldAskBookmarkStoreToUpdateBookmarkWhenModeIsAddAndURLIsAnExistingBookmark() {
+        // GIVEN
+        let folder = BookmarkFolder(id: #file, title: #function)
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(parentFolder: folder), bookmarkManager: bookmarkManager)
+        sut.bookmarkName = #function
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolder)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertTrue(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedBookmark?.title, #function)
+        XCTAssertEqual(bookmarkStoreMock.capturedBookmark?.url, URL.duckDuckGo.absoluteString)
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolder, folder)
+    }
+
+    func testShouldAskBookmarkStoreToUpdateBookmarkWhenURLIsUpdatedAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false)
+        let expectedBookmark = Bookmark(id: "1", url: URL.exti, title: #function, isFavorite: false)
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        sut.bookmarkURLPath = expectedBookmark.url
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertTrue(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedBookmark, expectedBookmark)
+    }
+
+    func testShouldNotAskBookmarkStoreToUpdateBookmarkWhenURLIsNotUpdatedAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false)
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        sut.bookmarkURLPath = URL.duckDuckGo.absoluteString
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+    }
+
+    func testShouldAskBookmarkStoreToUpdateBookmarkWhenNameIsUpdatedAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false)
+        let expectedBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: false)
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        sut.bookmarkName = expectedBookmark.title
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertTrue(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedBookmark, expectedBookmark)
+    }
+
+    func testShouldNotAskBookmarkStoreToUpdateBookmarkWhenNameIsNotUpdatedAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false)
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        sut.bookmarkName = #function
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+    }
+
+    func testShouldAskBookmarkStoreToUpdateBookmarkWhenIsFavoriteIsUpdatedAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false)
+        let expectedBookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: true)
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        sut.isBookmarkFavorite = expectedBookmark.isFavorite
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertTrue(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedBookmark, expectedBookmark)
+    }
+
+    func testShouldNotAskBookmarkStoreToUpdateBookmarkWhenIsFavoriteIsNotUpdatedAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false)
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        sut.isBookmarkFavorite = false
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+    }
+
+    func testShouldAskBookmarkStoreToUpdateBookmarkWhenURLAndTitleAndIsFavoriteIsUpdatedAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false)
+        let expectedBookmark = Bookmark(id: "1", url: URL.exti, title: "DDG", isFavorite: true)
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        sut.bookmarkURLPath = expectedBookmark.url
+        sut.bookmarkName = expectedBookmark.title
+        sut.isBookmarkFavorite = expectedBookmark.isFavorite
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedBookmark)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertTrue(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedBookmark, expectedBookmark)
+    }
+
+    func testShouldAskBookmarkStoreToMoveBookmarkWhenSelectedFolderIsDifferentFromOriginalFolderAndModeIsEdit() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "ABCDE", title: "Test Folder")
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false)
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        bookmarkStoreMock.bookmarks = [folder, bookmark]
+        bookmarkManager.loadBookmarks()
+        sut.selectedFolder = folder
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedObjectUUIDs)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertTrue(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedObjectUUIDs, [bookmark.id])
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolderType, .parent(uuid: folder.id))
+    }
+
+    func testShouldAskBookmarkStoreToMoveBookmarkWhenSelectedFolderIsNilAndOriginalFolderIsNotRootFolderAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false, parentFolderUUID: "ABCDE")
+        let folder = BookmarkFolder(id: "ABCDE", title: "Test Folder", children: [bookmark])
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        bookmarkStoreMock.bookmarks = [folder, bookmark]
+        bookmarkManager.loadBookmarks()
+        sut.selectedFolder = nil
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedObjectUUIDs)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertTrue(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedObjectUUIDs, [bookmark.id])
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolderType, .root)
+    }
+
+    func testShouldNotAskBookmarkStoreToMoveBookmarkWhenSelectedFolderIsNotDifferentFromOriginalFolderAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false, parentFolderUUID: "ABCDE")
+        let folder = BookmarkFolder(id: "ABCDE", title: "Test Folder", children: [bookmark])
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        sut.selectedFolder = folder
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedObjectUUIDs)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedObjectUUIDs)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+    }
+
+    func testShouldNotAskBookmarkStoreToMoveBookmarkWhenSelectedFolderIsNilAndOriginalFolderIsRootAndModeIsEdit() {
+        // GIVEN
+        let bookmark = Bookmark(id: "1", url: URL.duckDuckGo.absoluteString, title: #function, isFavorite: false, parentFolderUUID: "bookmarks_root")
+        let sut = AddEditBookmarkDialogViewModel(mode: .edit(bookmark: bookmark), bookmarkManager: bookmarkManager)
+        bookmarkStoreMock.bookmarks = [bookmark]
+        bookmarkManager.loadBookmarks()
+        sut.selectedFolder = nil
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedObjectUUIDs)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateBookmarkCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedObjectUUIDs)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+    }
+}
diff --git a/UnitTests/Bookmarks/ViewModels/AddEditBookmarkFolderDialogViewModelTests.swift b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkFolderDialogViewModelTests.swift
new file mode 100644
index 0000000000..a48f18d2ab
--- /dev/null
+++ b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkFolderDialogViewModelTests.swift
@@ -0,0 +1,425 @@
+//
+//  AddEditBookmarkFolderDialogViewModelTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+@MainActor
+final class AddEditBookmarkFolderDialogViewModelTests: XCTestCase {
+    private var bookmarkManager: LocalBookmarkManager!
+    private var bookmarkStoreMock: BookmarkStoreMock!
+
+    override func setUpWithError() throws {
+        try super.setUpWithError()
+        bookmarkStoreMock = BookmarkStoreMock()
+        bookmarkStoreMock.bookmarks = [BookmarkFolder.mock]
+        bookmarkManager = .init(bookmarkStore: bookmarkStoreMock, faviconManagement: FaviconManagerMock())
+        bookmarkManager.loadBookmarks()
+    }
+
+    override func tearDownWithError() throws {
+        bookmarkStoreMock = nil
+        bookmarkManager = nil
+        try super.tearDownWithError()
+    }
+
+    // MARK: - Copy
+
+    func testReturnAddBookmarkFolderTitleWhenModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.title
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Title.addFolder)
+    }
+
+    func testReturnEditBookmarkFolderTitleWhenModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: .mock, parentFolder: nil), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.title
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Title.editFolder)
+    }
+
+    func testReturnCancelActionTitleWhenModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.cancelActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.cancel)
+    }
+
+    func testReturnCancelActionTitleWhenModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: .mock, parentFolder: nil), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.cancelActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.cancel)
+    }
+
+    func testReturnAddBookmarkFolderActionTitleWhenModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.defaultActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Action.addFolder)
+    }
+
+    func testReturnSaveActionTitleWhenModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: .mock, parentFolder: nil), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.defaultActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.save)
+    }
+
+    // MARK: State
+
+    func testShouldSetFolderNameToEmptyWhenInitAndModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(parentFolder: .mock), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.folderName
+
+        // THEN
+        XCTAssertTrue(result.isEmpty)
+    }
+
+    func testShouldSetFolderNameToValueWhenInitAndModeIsEdit() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: folder, parentFolder: .mock), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.folderName
+
+        // THEN
+        XCTAssertEqual(result, #function)
+    }
+
+    func testShouldSetFoldersFromBookmarkListWhenInitAndModeIsAdd() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.folders
+
+        // THEN
+        XCTAssertEqual(result.count, 1)
+        XCTAssertEqual(result.first?.entity, folder)
+    }
+
+    func testShouldSetFoldersFromBookmarkListWhenInitAndModeIsEdit() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: .mock, parentFolder: nil), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.folders
+
+        // THEN
+        XCTAssertEqual(result.count, 1)
+        XCTAssertEqual(result.first?.entity, folder)
+    }
+
+    func testShouldSetSelectedFolderToNilWhenParentFolderIsNilAndModeIsAdd() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertNil(result)
+    }
+
+    func testShouldSetSelectedFolderToValueWhenParentFolderIsNotNilAndModeIsAdd() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(parentFolder: .mock), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertEqual(result, .mock)
+    }
+
+    func testShouldSetSelectedFolderToNilWhenParentFolderIsNilAndModeIsEdit() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: folder, parentFolder: nil), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertNil(result)
+    }
+
+    func testShouldSetSelectedFolderToValueWhenParentFolderIsNotNilAndModeIsEdit() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: folder, parentFolder: .mock), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertEqual(result, .mock)
+    }
+
+    // MARK: - Actions
+
+    func testReturnIsCancelActionDisabledFalseWhenModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.isOtherActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testReturnIsCancelActionDisabledFalseWhenModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: .mock, parentFolder: nil), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.isOtherActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledTrueWhenFolderNameIsEmptyAndModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        sut.folderName = ""
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledTrueWhenFolderNameIsEmptyAndModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: .mock, parentFolder: nil), bookmarkManager: bookmarkManager)
+        sut.folderName = ""
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledFalseWhenFolderNameIsNotEmptyAndModeIsAdd() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        sut.folderName = " Test "
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testReturnIsDefaultActionButtonDisabledFalseWhenFolderNameIsNotEmptyAndModeIsEdit() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: .mock, parentFolder: nil), bookmarkManager: bookmarkManager)
+        sut.folderName = " Test "
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testShouldCallDismissWhenCancelIsCalled() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        var didCallDismiss = false
+
+        // WHEN
+        sut.cancel {
+            didCallDismiss = true
+        }
+
+        // THEN
+        XCTAssertTrue(didCallDismiss)
+    }
+
+    func testShouldCallDismissWhenAddOrSaveIsCalled() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(), bookmarkManager: bookmarkManager)
+        var didCallDismiss = false
+        sut.folderName = "DuckDuckGo"
+
+        // WHEN
+        sut.addOrSave {
+            didCallDismiss = true
+        }
+
+        // THEN
+        XCTAssertTrue(didCallDismiss)
+    }
+
+    func testShouldAskBookmarkStoreToSaveFolderWhenAddOrSaveIsCalledAndModeIsAdd() {
+        // GIVEN
+        let folder = BookmarkFolder(id: #file, title: #function)
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .add(parentFolder: folder), bookmarkManager: bookmarkManager)
+        sut.folderName = #function
+        XCTAssertFalse(bookmarkStoreMock.saveFolderCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolder)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolder)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.updateFolderCalled)
+        XCTAssertTrue(bookmarkStoreMock.saveFolderCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedFolder?.title, sut.folderName)
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolder, folder)
+    }
+
+    func testShouldAskBookmarkStoreToUpdateFolderWhenNameIsChanged() {
+        // GIVEN
+        let folder = BookmarkFolder(id: #file, title: #function)
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: folder, parentFolder: nil), bookmarkManager: bookmarkManager)
+        sut.folderName = "TEST"
+        XCTAssertFalse(bookmarkStoreMock.updateFolderCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolder)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertTrue(bookmarkStoreMock.updateFolderCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedFolder?.title, sut.folderName)
+    }
+
+    func testShouldNotAskBookmarkStoreToUpdateFolderWhenNameIsNotChanged() {
+        // GIVEN
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: .mock, parentFolder: nil), bookmarkManager: bookmarkManager)
+        XCTAssertFalse(bookmarkStoreMock.updateFolderCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolder)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveFolderCalled)
+        XCTAssertFalse(bookmarkStoreMock.updateFolderCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolder?.title)
+    }
+
+    func testShouldAskBookmarkStoreToMoveFolderToSubfolderWhenSelectedFolderIsDifferentFromOriginalFolder() {
+        // GIVEN
+        let location = BookmarkFolder(id: #file, title: #function)
+        let folder = BookmarkFolder.mock
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: folder, parentFolder: nil), bookmarkManager: bookmarkManager)
+        sut.selectedFolder = location
+        XCTAssertFalse(bookmarkStoreMock.updateFolderAndMoveToParentCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolder)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveFolderCalled)
+        XCTAssertTrue(bookmarkStoreMock.updateFolderAndMoveToParentCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedFolder, folder)
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolderType, .parent(uuid: #file))
+    }
+
+    func testShouldAskBookmarkStoreToMoveFolderToRootFolderWhenSelectedFolderIsDifferentFromOriginalFolder() {
+        // GIVEN
+        let folder = BookmarkFolder.mock
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: folder, parentFolder: .mock), bookmarkManager: bookmarkManager)
+        sut.selectedFolder = nil
+        XCTAssertFalse(bookmarkStoreMock.updateFolderAndMoveToParentCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolder)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveFolderCalled)
+        XCTAssertTrue(bookmarkStoreMock.updateFolderAndMoveToParentCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedFolder, folder)
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolderType, .root)
+    }
+
+    func testShouldNotAskBookmarkStoreToMoveFolderWhenSelectedFolderIsNotDifferentFromOriginalFolder() {
+        // GIVEN
+        let folder = BookmarkFolder.mock
+        let sut = AddEditBookmarkFolderDialogViewModel(mode: .edit(folder: folder, parentFolder: nil), bookmarkManager: bookmarkManager)
+        sut.selectedFolder = nil
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedObjectUUIDs)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.addOrSave {}
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.saveFolderCalled)
+        XCTAssertFalse(bookmarkStoreMock.moveObjectUUIDCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedObjectUUIDs)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+    }
+
+}
diff --git a/UnitTests/BookmarksBar/ViewModel/BookmarksBarViewModelTests.swift b/UnitTests/BookmarksBar/ViewModel/BookmarksBarViewModelTests.swift
index 32d827186b..269980c361 100644
--- a/UnitTests/BookmarksBar/ViewModel/BookmarksBarViewModelTests.swift
+++ b/UnitTests/BookmarksBar/ViewModel/BookmarksBarViewModelTests.swift
@@ -91,6 +91,199 @@ class BookmarksBarViewModelTests: XCTestCase {
         XCTAssert(bookmarksBarViewModel.clippedItems.isEmpty)
     }
 
+    // MARK: - Bookmarks Delegate
+
+    func testWhenItemFiresClickedActionThenDelegateReceivesClickItemActionAndPreventClickIsFalse() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewItemClicked(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .clickItem)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+
+    }
+
+    func testWhenItemFiresOpenInNewTabActionThenDelegateReceivesOpenInNewTabAction() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewItemOpenInNewTabAction(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .openInNewTab)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+    }
+
+    func testWhenItemFiresOpenInNewWindowActionThenDelegateReceivesOpenInNewWindowAction() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewItemOpenInNewWindowAction(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .openInNewWindow)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+    }
+
+    func testWhenItemFiresToggleFavoritesActionThenDelegateReceivesToggleFavoritesAction() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewItemToggleFavoritesAction(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .toggleFavorites)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+    }
+
+    func testWhenItemFiresEditActionThenDelegateReceivesEditAction() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewEditAction(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .edit)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+    }
+
+    func testWhenItemFiresMoveToEndActionThenDelegateReceivesMoveToEndAction() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewItemMoveToEndAction(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .moveToEnd)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+    }
+
+    func testWhenItemFiresCopyBookmarkURLActionThenDelegateReceivesCopyBookmarkURLAction() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewItemCopyBookmarkURLAction(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .copyURL)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+    }
+
+    func testWhenItemFiresDeleteEntityActionThenDelegateReceivesDeleteEntityAction() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewItemDeleteEntityAction(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .deleteEntity)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+    }
+
+    func testWhenItemFiresAddEntityActionThenDelegateReceivesAddEntityAction() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewItemAddEntityAction(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .addFolder)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+    }
+
+    func testWhenItemFiresManageBookmarksActionThenDelegateReceivesManageBookmarksAction() {
+        // GIVEN
+        let sut = BookmarksBarViewModel(bookmarkManager: createMockBookmarksManager(), tabCollectionViewModel: .mock())
+        let collectionViewItem = BookmarksBarCollectionViewItem()
+        let delegateMock = BookmarksBarViewModelDelegateMock()
+        sut.delegate = delegateMock
+        XCTAssertFalse(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertNil(delegateMock.capturedAction)
+        XCTAssertNil(delegateMock.capturedItem)
+
+        // WHEN
+        sut.bookmarksBarCollectionViewItemManageBookmarksAction(collectionViewItem)
+
+        // THEN
+        XCTAssertTrue(delegateMock.didCallViewModelReceivedAction)
+        XCTAssertEqual(delegateMock.capturedAction, .manageBookmarks)
+        XCTAssertEqual(delegateMock.capturedItem, collectionViewItem)
+    }
+
     private func createMockBookmarksManager(mockBookmarkStore: BookmarkStoreMock = BookmarkStoreMock()) -> BookmarkManager {
         let mockFaviconManager = FaviconManagerMock()
         return LocalBookmarkManager(bookmarkStore: mockBookmarkStore, faviconManagement: mockFaviconManager)
@@ -107,3 +300,24 @@ fileprivate extension TabCollectionViewModel {
     }
 
 }
+
+// MARK: - BookmarksBarViewModelDelegateMock
+
+final class BookmarksBarViewModelDelegateMock: BookmarksBarViewModelDelegate {
+    private(set) var didCallViewModelReceivedAction = false
+    private(set) var capturedAction: BookmarksBarViewModel.BookmarksBarItemAction?
+    private(set) var capturedItem: BookmarksBarCollectionViewItem?
+
+    func bookmarksBarViewModelReceived(action: BookmarksBarViewModel.BookmarksBarItemAction, for item: BookmarksBarCollectionViewItem) {
+        didCallViewModelReceivedAction = true
+        capturedAction = action
+        capturedItem = item
+    }
+
+    func bookmarksBarViewModelWidthForContainer() -> CGFloat {
+        0
+    }
+
+    func bookmarksBarViewModelReloadedData() {}
+
+}
diff --git a/UnitTests/ContentBlocker/ContentBlockingUpdatingTests.swift b/UnitTests/ContentBlocker/ContentBlockingUpdatingTests.swift
index 79020eea36..08421e6bc4 100644
--- a/UnitTests/ContentBlocker/ContentBlockingUpdatingTests.swift
+++ b/UnitTests/ContentBlocker/ContentBlockingUpdatingTests.swift
@@ -25,7 +25,7 @@ import BrowserServicesKit
 
 final class ContentBlockingUpdatingTests: XCTestCase {
 
-    let preferences = PrivacySecurityPreferences.shared
+    let preferences = WebTrackingProtectionPreferences.shared
     let rulesManager = ContentBlockerRulesManagerMock()
     var updating: UserContentUpdating!
 
@@ -37,7 +37,7 @@ final class ContentBlockingUpdatingTests: XCTestCase {
                                                                                                                                               embeddedDataProvider: AppTrackerDataSetProvider(),
                                                                                                                                               errorReporting: nil),
                                        configStorage: MockConfigurationStore(),
-                                       privacySecurityPreferences: preferences,
+                                       webTrackingProtectionPreferences: preferences,
                                        tld: TLD())
     }
 
@@ -107,7 +107,7 @@ final class ContentBlockingUpdatingTests: XCTestCase {
         }
 
         rulesManager.updatesSubject.send(Self.testUpdate())
-        preferences.gpcEnabled = !preferences.gpcEnabled
+        preferences.isGPCEnabled = !preferences.isGPCEnabled
 
         withExtendedLifetime(c) {
             waitForExpectations(timeout: 0, handler: nil)
diff --git a/UnitTests/DBP/DataBrokerProtectionVisibilityTests.swift b/UnitTests/DBP/DataBrokerProtectionVisibilityTests.swift
new file mode 100644
index 0000000000..7ed9637dd2
--- /dev/null
+++ b/UnitTests/DBP/DataBrokerProtectionVisibilityTests.swift
@@ -0,0 +1,149 @@
+//
+//  DataBrokerProtectionVisibilityTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+import BrowserServicesKit
+import Subscription
+
+@testable import DuckDuckGo_Privacy_Browser
+
+final class DataBrokerProtectionVisibilityTests: XCTestCase {
+
+    private var mockFeatureDisabler: MockFeatureDisabler!
+    private var mockFeatureAvailability: MockFeatureAvailability!
+    private var waitlistStorage: MockWaitlistStorage!
+
+    private func userDefaults() -> UserDefaults {
+        UserDefaults(suiteName: "testing_\(UUID().uuidString)")!
+    }
+
+    override func setUpWithError() throws {
+        mockFeatureDisabler = MockFeatureDisabler()
+        mockFeatureAvailability = MockFeatureAvailability()
+        waitlistStorage = MockWaitlistStorage()
+    }
+
+    override func tearDownWithError() throws {
+        mockFeatureDisabler.reset()
+        mockFeatureAvailability.reset()
+        waitlistStorage.deleteWaitlistState()
+    }
+
+    /// Waitlist is OFF, Not redeemed
+    /// PP flag is OF
+    func testWhenWaitlistHasNoInviteCodeAndFeatureDisabled_thenCleanUpIsNotCalled() throws {
+        let featureVisibility = DefaultDataBrokerProtectionFeatureVisibility(featureDisabler: mockFeatureDisabler,
+                                                                             userDefaults: userDefaults(),
+                                                                             waitlistStorage: waitlistStorage,
+                                                                             subscriptionAvailability: mockFeatureAvailability)
+
+        XCTAssertFalse(featureVisibility.cleanUpDBPForPrivacyProIfNecessary())
+        XCTAssertFalse(mockFeatureDisabler.disableAndDeleteWasCalled)
+    }
+
+    /// Waitlist is OFF, Not redeemed
+    /// PP flag is ON
+    func testWhenWaitlistHasNoInviteCodeAndFeatureEnabled_thenCleanUpIsNotCalled() throws {
+        mockFeatureAvailability.mockFeatureAvailable = true
+
+        let featureVisibility = DefaultDataBrokerProtectionFeatureVisibility(featureDisabler: mockFeatureDisabler,
+                                                                             userDefaults: userDefaults(),
+                                                                             waitlistStorage: waitlistStorage,
+                                                                             subscriptionAvailability: mockFeatureAvailability)
+
+        XCTAssertFalse(featureVisibility.cleanUpDBPForPrivacyProIfNecessary())
+        XCTAssertFalse(mockFeatureDisabler.disableAndDeleteWasCalled)
+    }
+
+    /// Waitlist is ON, redeemed
+    /// PP flag is OFF
+    func testWhenWaitlistHasInviteCodeAndFeatureDisabled_thenCleanUpIsNotCalled() throws {
+        waitlistStorage.store(waitlistToken: "potato")
+        waitlistStorage.store(inviteCode: "banana")
+        waitlistStorage.store(waitlistTimestamp: 123)
+
+        let featureVisibility = DefaultDataBrokerProtectionFeatureVisibility(featureDisabler: mockFeatureDisabler,
+                                                                             userDefaults: userDefaults(),
+                                                                             waitlistStorage: waitlistStorage,
+                                                                             subscriptionAvailability: mockFeatureAvailability)
+
+        XCTAssertFalse(featureVisibility.cleanUpDBPForPrivacyProIfNecessary())
+        XCTAssertFalse(mockFeatureDisabler.disableAndDeleteWasCalled)
+    }
+
+    /// Waitlist is ON, redeemed
+    /// PP flag is ON
+    func testWhenWaitlistHasInviteCodeAndFeatureEnabled_thenCleanUpIsCalled() throws {
+        waitlistStorage.store(waitlistToken: "potato")
+        waitlistStorage.store(inviteCode: "banana")
+        waitlistStorage.store(waitlistTimestamp: 123)
+        mockFeatureAvailability.mockFeatureAvailable = true
+
+        let featureVisibility = DefaultDataBrokerProtectionFeatureVisibility(featureDisabler: mockFeatureDisabler,
+                                                                             userDefaults: userDefaults(),
+                                                                             waitlistStorage: waitlistStorage,
+                                                                             subscriptionAvailability: mockFeatureAvailability)
+
+        XCTAssertTrue(featureVisibility.cleanUpDBPForPrivacyProIfNecessary())
+        XCTAssertTrue(mockFeatureDisabler.disableAndDeleteWasCalled)
+    }
+
+    /// Waitlist is ON, redeemed
+    /// PP flag is ON
+    func testWhenWaitlistHasInviteCodeAndFeatureEnabled_thenCleanUpIsCalledTwice() throws {
+        waitlistStorage.store(waitlistToken: "potato")
+        waitlistStorage.store(inviteCode: "banana")
+        waitlistStorage.store(waitlistTimestamp: 123)
+        mockFeatureAvailability.mockFeatureAvailable = true
+
+        let featureVisibility = DefaultDataBrokerProtectionFeatureVisibility(featureDisabler: mockFeatureDisabler,
+                                                                             userDefaults: userDefaults(),
+                                                                             waitlistStorage: waitlistStorage,
+                                                                             subscriptionAvailability: mockFeatureAvailability)
+
+        XCTAssertTrue(featureVisibility.cleanUpDBPForPrivacyProIfNecessary())
+        XCTAssertTrue(mockFeatureDisabler.disableAndDeleteWasCalled)
+
+        XCTAssertFalse(featureVisibility.cleanUpDBPForPrivacyProIfNecessary())
+    }
+}
+
+private class MockFeatureDisabler: DataBrokerProtectionFeatureDisabling {
+    var disableAndDeleteWasCalled = false
+
+    func disableAndDelete() {
+        disableAndDeleteWasCalled = true
+    }
+
+    func reset() {
+        disableAndDeleteWasCalled = false
+    }
+}
+
+private class MockFeatureAvailability: SubscriptionFeatureAvailability {
+    var mockFeatureAvailable: Bool = false
+    var mockSubscriptionPurchaseAllowed: Bool = false
+
+    var isFeatureAvailable: Bool { mockFeatureAvailable }
+    var isSubscriptionPurchaseAllowed: Bool { mockSubscriptionPurchaseAllowed }
+
+    func reset() {
+        mockFeatureAvailable = false
+        mockSubscriptionPurchaseAllowed = false
+    }
+}
diff --git a/UnitTests/DataExport/MockSecureVault.swift b/UnitTests/DataExport/MockSecureVault.swift
index d9dd3ad32d..c92a6f6189 100644
--- a/UnitTests/DataExport/MockSecureVault.swift
+++ b/UnitTests/DataExport/MockSecureVault.swift
@@ -77,6 +77,12 @@ final class MockSecureVault<T: AutofillDatabaseProvider>: AutofillSecureVault {
         return accountID
     }
 
+    func updateLastUsedFor(accountId: Int64) throws {
+        if var account = storedAccounts.first(where: { $0.id == String(accountId) }) {
+            account.lastUsed = Date()
+        }
+    }
+
     func deleteWebsiteCredentialsFor(accountId: Int64) throws {
         storedCredentials[accountId] = nil
     }
@@ -174,6 +180,10 @@ final class MockSecureVault<T: AutofillDatabaseProvider>: AutofillSecureVault {
         []
     }
 
+    func accountTitlesForSyncableCredentials(modifiedBefore date: Date) throws -> [String] {
+        []
+    }
+
     func deleteSyncableCredentials(_ syncableCredentials: SecureVaultModels.SyncableCredentials, in database: Database) throws {
         if let accountId = syncableCredentials.metadata.objectId {
             try deleteWebsiteCredentialsFor(accountId: accountId)
@@ -298,6 +308,12 @@ class MockDatabaseProvider: AutofillDatabaseProvider {
         return _accounts
     }
 
+    func updateLastUsedForAccountId(_ accountId: Int64) throws {
+        if var account = _accounts.first(where: { $0.id == String(accountId) }) {
+            account.lastUsed = Date()
+        }
+    }
+
     func deleteWebsiteCredentialsForAccountId(_ accountId: Int64) throws {
         self._accounts = self._accounts.filter { $0.id != String(accountId) }
     }
@@ -413,6 +429,10 @@ class MockDatabaseProvider: AutofillDatabaseProvider {
         []
     }
 
+    func modifiedSyncableCredentials(before date: Date) throws -> [SecureVaultModels.SyncableCredentials] {
+        []
+    }
+
     func syncableCredentialsForSyncIds(_ syncIds: any Sequence<String>, in database: Database) throws -> [SecureVaultModels.SyncableCredentials] {
         []
     }
diff --git a/UnitTests/DataImport/ChromiumLoginReaderTests.swift b/UnitTests/DataImport/ChromiumLoginReaderTests.swift
index ba59c59bba..4c5d835e7a 100644
--- a/UnitTests/DataImport/ChromiumLoginReaderTests.swift
+++ b/UnitTests/DataImport/ChromiumLoginReaderTests.swift
@@ -22,7 +22,9 @@ import XCTest
 
 private struct ChromiumLoginStore {
     static let legacy: Self = .init(directory: "Legacy", decryptionKey: "0geUdf5dTuZmIrtd8Omf/Q==")
+    static let legacyExcluded: Self = .init(directory: "Legacy Excluded", decryptionKey: "0geUdf5dTuZmIrtd8Omf/Q==")
     static let v32: Self = .init(directory: "v32", decryptionKey: "IcBAbGhvYp70AP+5W5ojcw==")
+    static let v32Excluded: Self = .init(directory: "v32 Excluded", decryptionKey: "IcBAbGhvYp70AP+5W5ojcw==")
 
     let directory: String
     let decryptionKey: String
@@ -64,6 +66,22 @@ class ChromiumLoginReaderTests: XCTestCase {
         XCTAssertEqual(logins[2].password, "password")
     }
 
+    func testImportFromVersion32_WithOnlyExcludedSites_IgnoresExcludedCredentials() throws {
+        // Given
+        let expectedResult: DataImportResult<[ImportedLoginCredential]> = .success([])
+        let reader = ChromiumLoginReader(
+            chromiumDataDirectoryURL: ChromiumLoginStore.v32Excluded.databaseDirectoryURL,
+            source: .chrome,
+            decryptionKey: ChromiumLoginStore.v32Excluded.decryptionKey
+        )
+
+        // When
+        let actualResult = reader.readLogins()
+
+        // Then
+        XCTAssertEqual(expectedResult, actualResult)
+    }
+
     func testImportFromLegacyVersion() throws {
 
         let reader = ChromiumLoginReader(
@@ -83,6 +101,22 @@ class ChromiumLoginReaderTests: XCTestCase {
         XCTAssertEqual(logins[0].password, "password")
     }
 
+    func testImportFromLegacyVersion_WithOnlyExcludedSites_IgnoresExcludedCredentials() {
+        // Given
+        let expectedResult: DataImportResult<[ImportedLoginCredential]> = .success([])
+        let reader = ChromiumLoginReader(
+            chromiumDataDirectoryURL: ChromiumLoginStore.legacyExcluded.databaseDirectoryURL,
+            source: .chrome,
+            decryptionKey: ChromiumLoginStore.legacyExcluded.decryptionKey
+        )
+
+        // When
+        let actualResult = reader.readLogins()
+
+        // Then
+        XCTAssertEqual(expectedResult, actualResult)
+    }
+
     func testWhenImportingChromiumData_AndTheUserCancelsTheKeychainPrompt_ThenAnErrorIsReturned() {
         let mockPrompt = MockChromiumPrompt(returnValue: .userDeniedKeychainPrompt)
         let reader = ChromiumLoginReader(
diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/Legacy Excluded/Login Data b/UnitTests/DataImport/DataImportResources/TestChromeData/Legacy Excluded/Login Data
new file mode 100644
index 0000000000000000000000000000000000000000..0acb8dc848e3636e8d752fcf7b06458492928ab0
GIT binary patch
literal 40960
zcmeI)PjA~~90%~nO%`Vb1BH&NNJS4jK&zT|gBwVUbPJ}CrEN$zda@kH%d9$f=ErGP
z4sf8Hc0jNb>Wv$`fSz_5;>Lj!N5pLsmq~jA<@eZenzUWk6>XI1`$UgZKmYtZpXZ6}
z+HF2tDY=ouuLWV#iuk)M&lH7y$T?$7#&L?zQ+$!)D-^R7)1ah340-2l?&>F6)@Rww
zHp}j23z_?wZN=Yv4XOJKW~sr*+t1*zFr+6TP|4*c-kMZ|>(`x|UeIuTVG6h52Y#}n
zUaS-g)goUkUn+ji2MX||ayNlbCsoYQvApKY@~Pa!?5wgDSvAiQH$3|6o5H!#c6@vP
zZm!#WwXjes@_l8eeXHr{RC8uFo13^Wsj#@0-BMON3gUgU+pF`*`zd1j?nzJ`yUlOD
z%%~HSlgh2Du}IR*WSborf0D+hgV3dkFx#QWuM{d5KQ2^wd8x|FtEH08Ejx09flQsZ
zg%e6F)A5|9<40+=zMKuqYdd@CElY?_5Y`XY=;b6e7D`JCIv4F)(~S-m?w|Lx@xH#+
zEt-0pRz>90X$e(}MzMb=HP5owJy%e!S=%(_C=Mwl?CUhBLo#|jjW%1oe4R&b(-E?<
z-XZn))MHX_ES`)f?wHu51=&}q?uwRYZJJUt9gNOhd%yNIr|yK-!C4UNZp-|_2?Nvi
zTzft3vCbQg->cB_0;_I{$coxxuS6>l!lh43Y!J_6%W^}}?XBDEBwwy9UM^JD_@~7+
zURbRzEtY8oT`rcZI*-TXSt1%3dv7-QrQ%10)l!w8(|I%4aQ%i^^8$OF?CHeZJ<@7<
zab>mGzXJP~P<L_lrNm1_=e>#OmFQm=Gc(8j<e(x1AOHafKmY;|fB*y_009U<00RFT
z0WJ3`Q?j>N_BL%0AOL}<C@>N{#e@Avhf;P7<IL2UrWv`@`FwuM$!nUHr_RWz{9tHj
zrex2QZz<j~DDP{QdriJmFtq(uu18Tzyf;7J>2&5or(SoXIXh_1$G7L_hh|RG^Ga17
ziNaZmX<^^#h`CK_q~`io6oh;29lhKLwI_!ogM374F`HgdZ$ENw#yh*ayI;kL-Hm*N
znnu~i{vaQiq#<ozmTR$2oGjDQJG?UC-?T6LA^YyPJ&$_z_sR;*+B-CB3Wcq@Lerrr
z<19D+Xt+n0uxy)dvL{bQTAhva=N62+@BjGV^*@a5t>vFC-1~lL6Kwv?zka><AlAXO
z%84Hg{mW)>T9a~;@9r<Z%bij6XQrqPrZ#AU009U<00Izzz!3%3A6jl@YRr(QU&f3D
zRbJ5=N_tuI_?NFaYUYY;Fm2-D*R6vWS3}EZHT5o?|96<WL$BZB&SC=r2tWV=5P-mm
z6c`=JOe)Erq{{1p502l-QT0zc|KDNi9ois300Izz00ba#;sxHw?A;AG^oD}GHaI){
z_x}?=NOTYa5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwx`qYAu0
z1)rlhN^y*${JvkArcr!}qWnkG(-bol<v*ax?**3M2mCTc1PDL?0uX=z1Rwwb2tWV=
z5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf
kKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rhi1AJH3Z1ONa4

literal 0
HcmV?d00001

diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/Legacy/Login Data b/UnitTests/DataImport/DataImportResources/TestChromeData/Legacy/Login Data
index d1e638bf0cc38240ff3c0cd2beb7ab0b59c94af3..f59f562ef053406026e5f105cc3a6059ca0ebf87 100644
GIT binary patch
delta 410
zcmZoTz|?SnX@WGP;zSu|Rz(KAaIcLi3&c5?Snn~giLu_>%*av1Jh@K#Nj>8>cXv@)
zL0(>WHck!>j+RsoUS3`f1_lNYW}NBHD=G_QFfjH5ako2A4oEkHXdrOsMc0y1Qc_TC
zrLSLJUanV^nv#-PqL-YXtDlpfo|&hQO_CEXJNcm87Yj3XNvPSp9GoB*zyJpWHr;T|
zo5kebF>)}mw=l4;Vs8QZ&WwGsle&~&psb)fBiIagAn6QrG9y-VRN2ASVwZ%upMCQx
vb#V?>cA!ai6C1528L$9tyve|RlN}VEo7v@+u$m3h&ce*g$iDfWxl#rIC+TQo

delta 119
zcmZoTz|?SnX@WGP%tRSyRv8ApaF2~C3&c4X*~A#w#F%R~GjbF$Pp*@GvUvhyHzO01
z=)^|#&0=!z7&#c(S23`!Vz&pXFk_$Wq%Jjag5Ty<>f#)%EDQ_`b`u+|CK<2*Ro!D?
WzsG(IsA?}eqvS+Kk<Ital`;T<R3ME2

diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data b/UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data
new file mode 100644
index 0000000000000000000000000000000000000000..6a4ffefe50d8c8490d7a8071714c0442d4959781
GIT binary patch
literal 40960
zcmeI5Pi))P8Nf+V){~PkiB<=M=N_J$1(pywo?~P{ll6~cvyL}ajum;EyAA{`(GFpX
zR7EPOcj=U*Eef>gxrd@X73i=_55+D42CUeCtcPvbZ5X;8mcuR^2INqnhwOWgB1QeR
z(lyH}d@m9IeD8bT``+(8hUE8<$159o(=+IfQ?KeCT@sRlC<@O~DhR?P{HEX+q{DC!
z4^Ch&Mvey^P6}s!_`M0HOuk?`$Nk+Pb(A9kB!C2v01`j~51)WMAwwk+`L#g)N&W^q
zOh^C;AOR$R1dzbjg23aFbRlKwuBVlqYEAddZOhQE8Fklm?4`vcF=-|hoSi)`N+(m*
zs$SDvPxl(`{Nf>KqeSiq<PP~ax%;(fFgl3@kN^@u0!RP}1O#TJ3*vyM0O_zaBetFa
zVn?NulaVI?_WmD>Ul1lfg$*VofCL^P0rBp}#);X~S$Q>)gmkMU%W^U~B_yU2S3R%h
z!aUkPHsoO%=NA@i<GOnWG=H@r%U}zRegj8x+bT$Y%Ovu^dYBc^`jBhM;LRj>1A_OX
zf}3*ko6+;OyYiIG-3^@Chc}aL)7Cwweg+N~EN9oWhiV85=imC-Uq1PS!XzVUb;uL2
zA6kf;6@*dsVqlNWak9kbHFcp3f4uPAGhXH=_wV0-g$r97Ht!kyn2l&U6*&oPGo6}n
zo#y~Vp{Bd;b*Elof-h^E)z5sk8<xfFuypHeg7wES=vcqQUJHhg{Nf1xL5H$s9b$g;
z-rMg##14_55dpNXszW%L)+Vt1Rdq-|+ib#oSC|*-f&qg`hmQAPe-(~=nF|s}umu<L
zSz-f%4K%%O=v>feGib0yRl5how;+?kPrUiLd;a6%Gq<;HOvc|mmHyXv-+1NEug6nQ
zOZFe{9ewBL?EODR9Dz9GmvD#)2_OL^fCP{L5_n(&FV3b`*`2t=_E*`{;|nrBf@gRB
zFuY3G6En*TB=D^M;E%`2OJL{NNOp!l)+N~czew&0@D~#jKmter2_OL^FvbK9iPE&l
zgJo{gfB(NNkk82NF>W$84GACtB!C2vz}OI&l@16bBoEZ!@Be%fVr-~jLy!OxKmter
z2_S)k2(b7+-v1Axg!xDS2_OL^fCR>i0N(${t3R<dNB{{S0VIF~Mj^oF|MC5Q6jG>z
z1dsp{Kmtf$d<fwEe|-89TY?0T01`j~NMKX~GWlGXkYN44UGn?*3^^~|ks7g2WAnm0
z;@^dnkjawt!Kmg?4+$WFM?v87L_#@zTHNw<SpU;~$%3zXXs+>6!?4TUr-|jFnk%Wa
zl)IQ$X_s!=)~iMqN@iYrTq4T!wD{&@+@}8@hWu^3!-6lPX{T<&x;|Q?ZqXm)ip!UB
zMOs)d(ZXgvpQU=)g9S;WnOWL!jXJANGc2QO*j`X9l5<VB8b(_ltew+aBFyniT+FXu
z%u=_pT{XR4W!K!b!5LU{#i|CzBfeI2fLDfG&#2I~LP=d!qfObi^zxo%x{#}F?`y0T
zeYD*2RcKV7jL=hWzZT|asb^LVml+GI%<|8&XyA=b{q|H$w`S@48iN-2ouy{E8|;oz
zG3u}sY`5IqGi%yUjk=?iEwj8AIG3fnh8-5DS&m+5EfCw*s5!37mzE7Xt)`oGx8;}_
zI!!MZ*PhQ6x9IoPEt=abt*;eeusp98N?FRe@<r;R%?!cQ74^B?X1+wfouyUhnrZK9
z+m=(_1I+M!ng9Xon-F2ushB%v8(Cjln}xNFO*J|`BLl28^db^IfU-2KBh-kFnoQ<&
zJfS=@EefVxF<x$6M0&$>__^j^6WXG`pV$$Ja^i&8T;P{d)$pJLJw4WO88JzE&)BE=
z^}=fR1w>noh|tYaf2c>)Gjp+oa^b`vr&tZzBHOa1me|rmLNNbNe)lN;(ZV{B01`j~
zNB{{Sf&ZGocOKkA5dSBCdhoJX0tp}iB!C2v0226rA}~L)GjhBr91&j?$S+7NQJI*I
z{~`W@REf_?Q{oq~zd{D4hflyu5oLZ>Y|io65yZ2sie}n74s0N{)IOhT#f#PoE9#GE
zTkh-8^+H5O)9jnh8jD%Mm!9ed1QWU4P>^Zr$A~gJE8diOP^xXNee{iv099MwZ9E7Q
zhT*rK+6HPwgP@V(e)LsiLD4=%gNWWiP0TDEPbjOigW_TB25F1!<Hrg|6Ur$?^douf
zLs_oohqn1~s-qL4*{lQjc@PP&I91)WGtFm@5JgeM8=4=SXBN5M(GI*^6h<livO$nH
zLMDvAc7?_vHe5AbSGV9hU=4_+x8l|i*sSrm>rj-P9(M;rGntH>P@Yl-ar7Z9^4&4G
zTzF*BJ4}>?b7C{)4`Qcoz);j6zUhxv({_zAj7t`0uR!eI)GhZ&2U_Ud&LWI&zhX39
zgXPn0Pcti-)k6v8$L9t)+OM>>*iU-+#-&N3oI5ApTH>A7Pp6;kP)C>c(};K*^bswp
z&#6VVu&iF8t;rN<>gMGYHcPXdyRw{HQCZ_x)VvyzK)75j7WpL3T4AlUmdoe2SPUJ6
z>IzH?_=HVwU;9!QndxfPM!y-5Xq-N{62l(osW+2p&LoMlv?Mlv;*bA*yR1Rr-mo+l
zie}RrZm(#v17sfsnjUS^p|hr*3o6r`BSd-fNwI0Ry<_9iGhsTW!@(YDve(BR9h!FG
zvlsfV!G?a=;gK+Y_asSBWv{2jL_(RH7F~WpwI&$+ISK!SbX-0i3T*VWMpn9G8Y6uF
z|Lo!4=CB4NfCP{L5<mh-;D1EmiQ)AG^Z&!OFc%3R0VIF~kN^@GCj!Cy|2VY?+kym;
f01`j~NB{{8CxG|=;e0R`2_OL^fCP}hI1=~|nNt8i

literal 0
HcmV?d00001

diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data for Account b/UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data for Account
new file mode 100644
index 0000000000000000000000000000000000000000..3cd1c61467128db9a6e4d022234bd4522b69b7e6
GIT binary patch
literal 40960
zcmeI54R93I9l-bFa+`#Nd=R*NK;1w!IdUPnd;keXyd*~wxm=P<_^w^{?lxh~-UqjP
ziGg9@_)wHUnW2u=)+s75l;VIeQlKzcTdbghLY>w^g-VN46&$Ic!btme_wI6+TtFN%
z!tme8?Z<on_xAt)z4x-a|NrdU))osdadf-K=VB$g6pP1j9D9(aF$^QnF9ZET%P_Q~
z2_2v<9<e{zE`d#$^-!EFOkI;@Qq|31;*bsmfB+Bx0zd!=3_XG5xMXw^l6noJE>dUF
z1{NRy1b_e#00KbZjvz3aB&VbatSB)KkITzSyj|d!F3u<N9(SoRi6C>*LPsU3I5{rO
z<zl^zD6x`XEHow}8%gR2MjfF(r~Z9M7z|1R0U!VbfB+Bx0wDr9<P?06y8v<+nS%%K
z0f^z`xP*v10Qvc!(3as;rnW3p6>Nb35C8%|00_h)5SUM7wX}@PO({vP(<a2nC$uFe
zC&$NUVA>4r0!i|Ul|@Bvu3MbYgPut3yqlFgz6ofzNbq#<?wd=n4hMQR<$P||#g&%O
zUB=?|m+$M$)94KI?Bg~2SO0#)4eP*)D%URl;&%&Zq&pQue>rX~$FbdhK~S=h{E~T3
zEeh{HwfZ6!;BeW-f{=~zLu#W#@c5nI$xzq4moCys^KWaYU_Nm!WT<Q2jxzcApP(9X
zs*&2Pq{9jb00AHX1b_e#xHSSZDfzCb4!_~;iE<Ov?-u8V1qf^|s<$AeF5!k^G3r%s
zD{fdyjsL%jQD0Dhqh7r=b3qyi00AHX1b_e#_+bc)BFWMOvB&LTTplMUFfLAFovg%W
z6J!Ohq;qbGmv~MLXAy}wnT0F23nHOD{~yGtGt|K!#sWAi5C8%|00;m9AaF|ra><+c
z8VH)aiPu1l|64HXKCR`J&JDsq00;m9AOHk{1Ol@N4Yr~b#p^E^8s13UoK(BlUAE->
z6z=}4!e{sV<9fE{?>n$rzx{flt?mWe192<1Z<_nns*S5h@7-IA9pA;Rocj3NGgB_n
zC2LOZ-nsblk+bja`Xsw}o#Tb#j`#K$X06@danYan^4@va`0Ss(^=3)M#MKLS9r$`%
zO48D?TgP5GEfMz1nfk5!TD#YOcE!{z?90S@H$Q9tOn>IB*PqKvI`#46&mYjaQYJm7
zIeg_mA8b1Mj^SA5=O?bOeC6XOethMysq*Byx@E$Jd(AtyY-OKrU%ctlpVVLYYx?2E
zSv6Nb49voVmc_;8Y<OkC)jyuYdU_A8c>bpwPW}1ZwDzOhMx_@{DPQ-xn6&>-2Y>Wp
z@}6<;J$>m{dt5%tyOm!$mwxg_wf+4kMtrz+L#4FoVurKsnQ`kcKXm$^n>O2eKOH}P
z{D~=xr|()da${H9FMf0Gz?vmX*PPwc@_u&ClH=cOcfN>!F!9{^b(*QaG>uq0W?y>!
zQK{!r^IxvT?XBXH#yqeYH!ZAW=Fhq3Bze8QId^^G+ShikJ#;AW+=arA7Hy;t9oT*9
z=LL=1T8`~_(z@G!Y}woX-AzxPUi04qV%Z}*Ka#Kixb_bi`hx`s00AHX1c1PuLty#+
z=+eA$N#Yhf{^j#T`mgcyUOb*iw<c;632%2QmRg#fo`7Ao>c2b{hvkNL#%3h6&L2@O
zr={Xqsa4YxOfR+0FUd?C6;Gr+JSL$+&dEgb!6kjNT%X-JSbc++q_O&MdRJWhUy)bc
zq+{8$%WJ&VMn^%7Fl(l{+s5(Jipn2#71W!{%Dvq+U1h$xVpsFR;-=ZvjeK))wP<Re
zKC{tVVXAda6vP7F)yYrx@%Gy8PS@O?M@ps{%Ub=#w$|>dDjFZ3=_+$H6wUOuwp$vE
zT`k>{dW2~e_Li!ul99$@qtRGVQ8uyMSTeDEa%stAWBDZc`j004fdvQv0U!VbfB+D<
ziwMZ^f4KhNMGX$70s$ZZ1b_e#Km_3W58VI=00AHX1c1QZM<AK{3X3Dr{C^$PaZL_Y
zNgg5n#G6DR_6+_nY#hpz7jnzp2L>z#0(TOD<~Xgcpa7pEv1tBJaiM^|>cNQILO<tr
z^gq<r*vzIjGu>vYwwURDvib6?D+W|j|JZ1f(q(1gy(5%5)fa};wI-?tHI2^q_;@tG
z3*+|*^h}ejrru<utxavTb%w=apjn56CM1o_G|-_*UKmc`T<ATeP_c-dE>`e!ed%6S
z6uUh>=fD!-9JNHXrK#FLi+;O{mj()pe1{t;<KtMt6{<W!SM&lE$2d@~#5w5(Yn!>w
z9BGPOU>%(TFQQz=-owaN#E=pl3y@JUGQyflJ>GD>ftGj|dPxga7Cxmx`78?~zs^Og
z_BeUbE3iF`+(se24K(lQ54N3iay~Q_Z2xqzllL-<IG=}c2)v^+q@027;N0N?UctjU
zgA>H|Nq9Y?s7x&zZZt2;`^2DPd{}9^+1Ai#vdy8Vo9ED`8Es7sR@7M<&DJ&pt#DN)
zsf#o-44$qvPczN1w9&-|+U4ou-5rcw@HjdVX7qiU5CXYv!U)kzZ+tu7hb(4YGpr3Q
zGt80wGoph9yIw?!(t!+g_#9!0$X=t@7ihG)saZJ2yPe#l!9m3OC698<sAGaLs@u4B
zoYIXPi3f_5p(MYgC;y13VI-&IcXB<nrO8^?e*n=zBO>S;Xtk?Hi0ktRt!~Q5!IYBE
zz!>E<iT<@IQGba4-%0=EL02FE1b_e#00Q3+0r3BSKOCVJAOHk_01yBIcM^eQjSWk}
zS7Fq4iqJaavNZ2#=8{fL9+`n(BhH`<ScaZ}lt$?abMZi);yXhAEWyd}?sgAaA>UHp
zaYoQz)L^YO&!+p*RXMuJ8j(il%inZnWS<rK(vy!v&P1i&aDqO-rck=vTzo~c;*{#E
zu5T|r%0bna-oNsYn=tHt8*sKkB_f@m5ye&SD<eBaV-yW}^loONzBE;<tIHkCAJ%6O
zW9-`>VI8j3-K)b@PoDgtERj)N+sb}gR3k)Y%MG9$hdkj<kBjBq`oM!pluoC^mout!
zUanD*8y<yMNeX)@)v_TcZv>gJ|FxfM9QlS_yeP5)`VN>M`O<@aYvkDUDt^}+qKwwK
zzcW;?*C%UrRl31Ast}CICIt-_#j_|4qjW{(cpy#f#2z1qx*~)8n`&?6-6H2e{ZjU`
zJLNgbSV2sRLW>$Vx`@m-Rxvu?%lc3i4DZy}C2Do^$_G<4R%yl<D|OiN`UFZ>UXHIU
zRT?dpOsurTs3wgi5ut6UjcA*Bn%QQy)|gxAU@!%lI-|K(j?&baT5C+TX4&{!v&9^d
zg52e1n@tJgG*}zj8cY_;9NCAC63w+JET9tRr5@%x4Kf~08Rw4`0g3d}hel$!1qPf~
zuMgzJQ@YYpJn*pE{|C-i7h?jugeZ_P1nB&47j%f87jM9T(g*S=N>@>V2lzhi2F#fk
zdnUd3fjSN-N#~2`^9O7PCwKjDgGadW`v*y6_q-DF=^p~n+q7C;UKTDY11cC`P-7D6
z0TnfTq6FmL6YN>}QDF>t{vZ0wJDdRs00AHX1c1QpMgZdfw_A&VK0p8n00AHX1csgf
pJpT_pV>km400KY&2mpcGjR0K#Z?_f!eSiQE00KY&2n;=e{{!tc{`UX?

literal 0
HcmV?d00001

diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/v32/Login Data b/UnitTests/DataImport/DataImportResources/TestChromeData/v32/Login Data
index 76ab8de045152236833e62ee84aebff573ed9e65..6ffc00b624f06022593919113f0210425583e72e 100644
GIT binary patch
delta 281
zcmZoTz|?SnX@WE(=R_H2R!#=JaIcLi3&gpYnL`*@3z>VELpC;YGS^oyFff$3^U8_>
z=^P-=aOdUaHD=)D;N$@Ez#tSP#ET-tz`()4kx^pCDG8PXN+YR<N|qE9Tj}eUmzV1m
zrKY50mgptt=j!L=r)TErHz#pO1qO;L3L0&mCY{H^#muhC!0yeym|b;aBNw}|8PHlI
zSy5g_Ag!g!4z_|ZqXdtEoSVJXw{Y-tashQPvu|f$-_CxIea~h=j+N}}EX=%&oQlko
N1J&g>-!)gx0022tIGX?f

delta 90
zcmV-g0Hyzczyg540+1U42$38^1qc8xS4pvCpce=N1B?I#aRZF8fq(<Ej2n0a2m%L7
w00&D4qp^WM2eV5jv<M9d3IG5A0tdVR2i^y~vk?fe2Ld4jlTjxhv)wl%XjuLjTL1t6

diff --git a/UnitTests/Geolocation/CLLocationManagerMock.swift b/UnitTests/Geolocation/CLLocationManagerMock.swift
index bf61216d4f..6921d58667 100644
--- a/UnitTests/Geolocation/CLLocationManagerMock.swift
+++ b/UnitTests/Geolocation/CLLocationManagerMock.swift
@@ -103,4 +103,21 @@ final class CLLocationManagerMock: CLLocationManager {
         isUpdatingHeading = true
     }
 
+    override func requestLocation() {
+        fatalError("Unexpected call")
+    }
+
+    var whenInUseAuthorizationRequested: (() -> Void)!
+    override func requestWhenInUseAuthorization() {
+        whenInUseAuthorizationRequested!()
+    }
+
+    override func requestAlwaysAuthorization() {
+        fatalError("Unexpected call")
+    }
+
+    override func requestTemporaryFullAccuracyAuthorization(withPurposeKey purposeKey: String, completion: (((any Error)?) -> Void)? = nil) {
+        fatalError("Unexpected call")
+    }
+
 }
diff --git a/UnitTests/Geolocation/GeolocationServiceTests.swift b/UnitTests/Geolocation/GeolocationServiceTests.swift
index af0e5fe74a..b0547f2a95 100644
--- a/UnitTests/Geolocation/GeolocationServiceTests.swift
+++ b/UnitTests/Geolocation/GeolocationServiceTests.swift
@@ -196,8 +196,13 @@ final class GeolocationServiceTests: XCTestCase {
     }
 
     func testWhenLastSubscriberUnsubscribedThenLocationManagerStopped() {
+        let eAuthRequested = expectation(description: "Authorization requested")
+        locationManagerMock.whenInUseAuthorizationRequested = { eAuthRequested.fulfill() }
+
         let c1 = service.locationPublisher.sink { _ in }
         _=service.locationPublisher.sink { _ in }
+        waitForExpectations(timeout: 0)
+
         let c3 = service.locationPublisher.sink { [locationManagerMock] _ in
             XCTAssertTrue(locationManagerMock!.isUpdatingLocation)
         }
@@ -211,6 +216,8 @@ final class GeolocationServiceTests: XCTestCase {
         let loc1 = CLLocation(latitude: 51.1, longitude: 23.4)
         let loc2 = CLLocation(latitude: 11.1, longitude: -12.2)
 
+        let eAuthRequested = expectation(description: "Authorization requested")
+        locationManagerMock.whenInUseAuthorizationRequested = { eAuthRequested.fulfill() }
         let c1 = service.locationPublisher.sink { _ in }
         var c2: AnyCancellable! = service.locationPublisher.sink { _ in }
         let e = expectation(description: "expect still receiving location")
@@ -235,6 +242,7 @@ final class GeolocationServiceTests: XCTestCase {
 
     func testWhenResubscribedThenLastLocationIsPublished() {
         let location = CLLocation(latitude: 51.1, longitude: 23.4)
+        locationManagerMock.whenInUseAuthorizationRequested = { }
         let c1 = service.locationPublisher.sink { _ in }
         locationManagerMock.currentLocation = location
         c1.cancel()
@@ -248,8 +256,9 @@ final class GeolocationServiceTests: XCTestCase {
         waitForExpectations(timeout: 0)
     }
 
-    func testWhenAtoppedThenNoErrorIsPublished() {
+    func testWhenStoppedThenNoErrorIsPublished() {
         let location = CLLocation(latitude: 51.1, longitude: 23.4)
+        locationManagerMock.whenInUseAuthorizationRequested = { }
         let c1 = service.locationPublisher.sink { _ in }
         locationManagerMock.currentLocation = location
         c1.cancel()
@@ -267,6 +276,8 @@ final class GeolocationServiceTests: XCTestCase {
     }
 
     func testWhenHighAccuracyRequestedThenAccuracyIsSetToBest() {
+        let eAuthRequested = expectation(description: "Authorization requested")
+        locationManagerMock.whenInUseAuthorizationRequested = { eAuthRequested.fulfill() }
         let c1 = service.locationPublisher.sink { _ in }
         XCTAssertEqual(locationManagerMock.desiredAccuracy, kCLLocationAccuracyHundredMeters)
 
@@ -276,6 +287,7 @@ final class GeolocationServiceTests: XCTestCase {
         c2.cancel()
         XCTAssertEqual(locationManagerMock.desiredAccuracy, kCLLocationAccuracyHundredMeters)
         withExtendedLifetime(c1) {}
+        waitForExpectations(timeout: 0)
     }
 
 }
diff --git a/UnitTests/HomePage/ContinueSetUpModelTests.swift b/UnitTests/HomePage/ContinueSetUpModelTests.swift
index e9411db6e1..c182554a38 100644
--- a/UnitTests/HomePage/ContinueSetUpModelTests.swift
+++ b/UnitTests/HomePage/ContinueSetUpModelTests.swift
@@ -68,29 +68,33 @@ final class ContinueSetUpModelTests: XCTestCase {
     var tabCollectionVM: TabCollectionViewModel!
     var emailManager: EmailManager!
     var emailStorage: MockEmailStorage!
-    var privacyPreferences: PrivacySecurityPreferences!
     var duckPlayerPreferences: DuckPlayerPreferencesPersistor!
+    var coookiePopupProtectionPreferences: MockCookiePopupProtectionPreferencesPersistor!
     var privacyConfigManager: MockPrivacyConfigurationManager!
+    var randomNumberGenerator: MockRandomNumberGenerator!
     let userDefaults = UserDefaults(suiteName: "\(Bundle.main.bundleIdentifier!).\(NSApplication.runType)")!
 
     @MainActor override func setUp() {
         UserDefaultsWrapper<Any>.clearAll()
         userDefaults.set(Date(), forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
         userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay0in10Percent.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay14in10Percent.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
         capturingDefaultBrowserProvider = CapturingDefaultBrowserProvider()
         capturingDataImportProvider = CapturingDataImportProvider()
         tabCollectionVM = TabCollectionViewModel()
         emailStorage = MockEmailStorage()
         emailManager = EmailManager(storage: emailStorage)
-        privacyPreferences = PrivacySecurityPreferences.shared
         duckPlayerPreferences = DuckPlayerPreferencesPersistorMock()
         privacyConfigManager = MockPrivacyConfigurationManager()
         let config = MockPrivacyConfiguration()
         config.featureSettings = [
             "surveyCardDay0": "enabled",
-            "surveyCardDay7": "enabled"
+            "surveyCardDay14": "enabled"
         ] as! [String: String]
         privacyConfigManager.privacyConfig = config
+        randomNumberGenerator = MockRandomNumberGenerator()
 
 #if NETWORK_PROTECTION && DBP
         let messaging = HomePageRemoteMessaging(
@@ -118,10 +122,10 @@ final class ContinueSetUpModelTests: XCTestCase {
             dataImportProvider: capturingDataImportProvider,
             tabCollectionViewModel: tabCollectionVM,
             emailManager: emailManager,
-            privacyPreferences: privacyPreferences,
             duckPlayerPreferences: duckPlayerPreferences,
             homePageRemoteMessaging: messaging,
-            privacyConfigurationManager: privacyConfigManager
+            privacyConfigurationManager: privacyConfigManager,
+            randomNumberGenerator: randomNumberGenerator
         )
     }
 
@@ -132,7 +136,6 @@ final class ContinueSetUpModelTests: XCTestCase {
         tabCollectionVM = nil
         emailManager = nil
         emailStorage = nil
-        privacyPreferences = nil
         vm = nil
     }
 
@@ -156,14 +159,12 @@ final class ContinueSetUpModelTests: XCTestCase {
         capturingDefaultBrowserProvider.isDefault = true
         capturingDataImportProvider.didImport = true
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = true
-        privacyPreferences.autoconsentEnabled = true
 
         vm = HomePage.Models.ContinueSetUpModel(
             defaultBrowserProvider: capturingDefaultBrowserProvider,
             dataImportProvider: capturingDataImportProvider,
             tabCollectionViewModel: tabCollectionVM,
             emailManager: emailManager,
-            privacyPreferences: privacyPreferences,
             duckPlayerPreferences: duckPlayerPreferences,
             homePageRemoteMessaging: createMessaging()
         )
@@ -178,11 +179,42 @@ final class ContinueSetUpModelTests: XCTestCase {
 
         vm.shouldShowAllFeatures = true
 
-        expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
+        expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
 
         XCTAssertEqual(vm.visibleFeaturesMatrix, expectedMatrix)
     }
 
+    @MainActor func testWhenInstallDateIsLessThanADayAgoThenRandomGeneratorIsRequestARandomNumberInTheCorrectRange() {
+        XCTAssertEqual(randomNumberGenerator.capturedRange, 0..<100)
+    }
+
+    @MainActor func WhenInstallDateIsMoreThan14daysAgoDay14ThenRandomGeneratorIsRequestARandomNumberInTheCorrectRange() {
+        let twoWeeksAgo = Calendar.current.date(byAdding: .day, value: -16, to: Date())!
+        userDefaults.set(twoWeeksAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
+
+        XCTAssertEqual(randomNumberGenerator.capturedRange, 0..<100)
+    }
+
+    @MainActor func testWhenInstallDateIsLessThanADayAgoButUserNotIn10PercentNoSurveyCardIsShown() {
+        let aDayAgo = Calendar.current.date(byAdding: .day, value: -1, to: Date())!
+        userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        var randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 10
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, randomNumberGenerator: randomGenerator)
+        vm.shouldShowAllFeatures = true
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
+
+        userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
+    }
+
     @MainActor func testWhenInstallDateIsMoreThanADayAgoButLessThanAWeekAgoNoSurveyCardIsShown() {
         let aDayAgo = Calendar.current.date(byAdding: .day, value: -1, to: Date())!
         userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
@@ -190,49 +222,78 @@ final class ContinueSetUpModelTests: XCTestCase {
         vm.shouldShowAllFeatures = true
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
 
         userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
     }
 
-    @MainActor func testWhenInstallDateIsMoreThanAWeekAgoDay7SurveyCardIsShown() {
-        let aDayAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date())!
-        userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+    @MainActor func testWhenInstallDateIsMoreThan14daysAgoDay14SurveyCardIsShown() {
+        let twoWeeksAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())!
+        userDefaults.set(twoWeeksAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
+        vm.shouldShowAllFeatures = true
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
+        XCTAssertTrue(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
+    }
+
+    @MainActor func testWhenInstallDateIsMoreThan14daysAgoDay14ButUserNotIn10percentSurveyCardIsNotShown() {
+        let twoWeeksAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())!
+        userDefaults.set(twoWeeksAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay14in10Percent.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
+
+        let randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 10
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, randomNumberGenerator: randomGenerator)
+        vm.shouldShowAllFeatures = true
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
+    }
+
+    @MainActor func testWhenInstallDateIsMoreThan15daysAgoDay14SurveyCardIsShown() {
+        let twoWeeksAgo = Calendar.current.date(byAdding: .day, value: -16, to: Date())!
+        userDefaults.set(twoWeeksAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
         vm.shouldShowAllFeatures = true
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertTrue(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
     }
 
-    @MainActor func testWhenInstallDateIsMoreThanAWeekAgoAndUserInteractedWithDay0SurveyDay7SurveyCardIsNotShown() {
+    @MainActor func testWhenInstallDateIsMoreThan14daysAgoAndUserInteractedWithDay0SurveyDay14SurveyCardIsNotShown() {
         let statisticStore = MockStatisticsStore()
         vm.statisticsStore = statisticStore
         vm.performAction(for: .surveyDay0)
-        let aDayAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date())!
+        let aDayAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())!
         userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
         vm.shouldShowAllFeatures = true
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
     }
 
-    @MainActor func testWhenInstallDateIsMoreThanAWeekAgoAndUserDismissedDay0SurveyDay7SurveyCardIsNotShown() {
+    @MainActor func testWhenInstallDateIsMoreThanAWeekAgoAndUserDismissedDay0SurveyDay14SurveyCardIsNotShown() {
         let statisticStore = MockStatisticsStore()
         vm.statisticsStore = statisticStore
         vm.removeItem(for: .surveyDay0)
-        let aDayAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date())!
+        let aDayAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())!
         userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
         vm.shouldShowAllFeatures = true
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
     }
 
     @MainActor func testWhenInitializedNotForTheFirstTimeTheMatrixHasAllElementsInTheRightOrder() {
@@ -247,7 +308,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     func testWhenTogglingShowAllFeatureThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
 
         vm.shouldShowAllFeatures = true
 
@@ -275,7 +336,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenIsDefaultBrowserAndTogglingShowAllFeatureThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.defaultBrowser, .surveyDay7])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.defaultBrowser, .surveyDay14])
 
         capturingDefaultBrowserProvider.isDefault = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(defaultBrowserProvider: capturingDefaultBrowserProvider, appGroupUserDefaults: userDefaults)
@@ -303,7 +364,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasUsedImportAndTogglingShowAllFeatureThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .importBookmarksAndPasswords])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .importBookmarksAndPasswords])
 
         capturingDataImportProvider.didImport = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(dataImportProvider: capturingDataImportProvider, appGroupUserDefaults: userDefaults)
@@ -325,7 +386,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasEmailProtectionEnabledThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .emailProtection])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .emailProtection])
 
         emailStorage.isEmailProtectionEnabled = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(emailManager: emailManager, appGroupUserDefaults: userDefaults)
@@ -340,22 +401,6 @@ final class ContinueSetUpModelTests: XCTestCase {
         XCTAssertTrue(vm.visibleFeaturesMatrix[0].count <= vm.itemsPerRow)
     }
 
-    @MainActor func testWhenUserHasCookieConsentEnabledThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
-
-        privacyPreferences.autoconsentEnabled = true
-        vm = HomePage.Models.ContinueSetUpModel.fixture(privacyPreferences: privacyPreferences, appGroupUserDefaults: userDefaults)
-
-        vm.shouldShowAllFeatures = true
-
-        XCTAssertTrue(doTheyContainTheSameElements(matrix1: vm.visibleFeaturesMatrix, matrix2: expectedMatrix))
-
-        vm.shouldShowAllFeatures = false
-
-        XCTAssertEqual(vm.visibleFeaturesMatrix.count, 1)
-        XCTAssertTrue(vm.visibleFeaturesMatrix[0].count <= vm.itemsPerRow)
-    }
-
     @MainActor func testWhenAskedToPerformActionForDuckPlayerThenItOpensYoutubeVideo() {
         vm.performAction(for: .duckplayer)
 
@@ -363,7 +408,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerEnabledAndOverlayButtonNotPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .duckplayer])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .duckplayer])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = false
         duckPlayerPreferences.duckPlayerModeBool = true
@@ -380,7 +425,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerDisabledAndOverlayButtonNotPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .duckplayer])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .duckplayer])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = false
         duckPlayerPreferences.duckPlayerModeBool = false
@@ -397,7 +442,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerOnAlwaysAskAndOverlayButtonNotPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = false
         duckPlayerPreferences.duckPlayerModeBool = nil
@@ -414,7 +459,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerOnAlwaysAskAndOverlayButtonIsPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .duckplayer])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .duckplayer])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = true
         duckPlayerPreferences.duckPlayerModeBool = nil
@@ -437,34 +482,32 @@ final class ContinueSetUpModelTests: XCTestCase {
         vm.statisticsStore = statisticStore
 
         vm.performAction(for: .surveyDay0)
-        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day0SurveyURL + "&atb=" + atb))
+        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day0SurveyURL))
     }
 
-    @MainActor func testWhenAskedToPerformActionForSurveyDay7ShowsTheSurveySite() {
+    @MainActor func testWhenAskedToPerformActionForSurveyDay14ShowsTheSurveySite() {
         let atb = "someAtb"
         let statisticStore = MockStatisticsStore()
         statisticStore.atb = atb
         vm.statisticsStore = statisticStore
 
-        vm.performAction(for: .surveyDay7)
-        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day7SurveyURL + "&atb=" + atb))
+        vm.performAction(for: .surveyDay14)
+        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day14SurveyURL))
     }
 
     @MainActor func testThatWhenIfAllFeatureActiveThenVisibleMatrixIsEmpty() {
         capturingDefaultBrowserProvider.isDefault = true
         emailStorage.isEmailProtectionEnabled = true
-        privacyPreferences.autoconsentEnabled = true
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = true
         capturingDataImportProvider.didImport = true
         userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageShowSurveyDay0.rawValue)
-        userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageShowSurveyDay7.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageShowSurveyDay14.rawValue)
 
         vm = HomePage.Models.ContinueSetUpModel(
             defaultBrowserProvider: capturingDefaultBrowserProvider,
             dataImportProvider: capturingDataImportProvider,
             tabCollectionViewModel: tabCollectionVM,
             emailManager: emailManager,
-            privacyPreferences: privacyPreferences,
             duckPlayerPreferences: duckPlayerPreferences,
             homePageRemoteMessaging: createMessaging()
         )
@@ -474,7 +517,7 @@ final class ContinueSetUpModelTests: XCTestCase {
 
     @MainActor func testDismissedItemsAreRemovedFromVisibleMatrixAndChoicesArePersisted() {
         vm.shouldShowAllFeatures = true
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
         XCTAssertEqual(expectedMatrix, vm.visibleFeaturesMatrix)
 
         vm.removeItem(for: .surveyDay0)
@@ -483,8 +526,8 @@ final class ContinueSetUpModelTests: XCTestCase {
         userDefaults.set(Calendar.current.date(byAdding: .month, value: -1, to: Date())!, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
 
-        vm.removeItem(for: .surveyDay7)
-        XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.surveyDay7))
+        vm.removeItem(for: .surveyDay14)
+        XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.surveyDay14))
 
         vm.removeItem(for: .defaultBrowser)
         XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.defaultBrowser))
@@ -561,14 +604,14 @@ extension HomePage.Models.ContinueSetUpModel {
         defaultBrowserProvider: DefaultBrowserProvider = CapturingDefaultBrowserProvider(),
         dataImportProvider: DataImportStatusProviding = CapturingDataImportProvider(),
         emailManager: EmailManager = EmailManager(storage: MockEmailStorage()),
-        privacyPreferences: PrivacySecurityPreferences = PrivacySecurityPreferences.shared,
         duckPlayerPreferences: DuckPlayerPreferencesPersistor = DuckPlayerPreferencesPersistorMock(),
         privacyConfig: MockPrivacyConfiguration = MockPrivacyConfiguration(),
-        appGroupUserDefaults: UserDefaults
+        appGroupUserDefaults: UserDefaults,
+        randomNumberGenerator: RandomNumberGenerating = MockRandomNumberGenerator()
     ) -> HomePage.Models.ContinueSetUpModel {
         privacyConfig.featureSettings = [
             "surveyCardDay0": "enabled",
-            "surveyCardDay7": "enabled",
+            "surveyCardDay14": "enabled",
             "networkProtection": "disabled"
         ] as! [String: String]
         let manager = MockPrivacyConfigurationManager()
@@ -600,9 +643,18 @@ extension HomePage.Models.ContinueSetUpModel {
             dataImportProvider: dataImportProvider,
             tabCollectionViewModel: TabCollectionViewModel(),
             emailManager: emailManager,
-            privacyPreferences: privacyPreferences,
             duckPlayerPreferences: duckPlayerPreferences,
             homePageRemoteMessaging: messaging,
-            privacyConfigurationManager: manager)
+            privacyConfigurationManager: manager,
+            randomNumberGenerator: randomNumberGenerator)
+    }
+}
+
+class MockRandomNumberGenerator: RandomNumberGenerating {
+    var numberToReturn = 0
+    var capturedRange: Range<Int>?
+    func random(in range: Range<Int>) -> Int {
+        capturedRange = range
+        return numberToReturn
     }
 }
diff --git a/UnitTests/HomePage/Mocks/MockBookmarkManager.swift b/UnitTests/HomePage/Mocks/MockBookmarkManager.swift
index c6a0840629..28f65fdf59 100644
--- a/UnitTests/HomePage/Mocks/MockBookmarkManager.swift
+++ b/UnitTests/HomePage/Mocks/MockBookmarkManager.swift
@@ -59,8 +59,12 @@ class MockBookmarkManager: BookmarkManager {
 
     func update(bookmark: DuckDuckGo_Privacy_Browser.Bookmark) {}
 
+    func update(bookmark: DuckDuckGo_Privacy_Browser.Bookmark, withURL url: URL, title: String, isFavorite: Bool) {}
+
     func update(folder: DuckDuckGo_Privacy_Browser.BookmarkFolder) {}
 
+    func update(folder: DuckDuckGo_Privacy_Browser.BookmarkFolder, andMoveToParent parent: DuckDuckGo_Privacy_Browser.ParentFolderType) {}
+
     func updateUrl(of bookmark: DuckDuckGo_Privacy_Browser.Bookmark, to newUrl: URL) -> DuckDuckGo_Privacy_Browser.Bookmark? {
         return nil
     }
diff --git a/UnitTests/Menus/MoreOptionsMenuTests.swift b/UnitTests/Menus/MoreOptionsMenuTests.swift
index cf74805e7b..95fe1e0739 100644
--- a/UnitTests/Menus/MoreOptionsMenuTests.swift
+++ b/UnitTests/Menus/MoreOptionsMenuTests.swift
@@ -18,6 +18,10 @@
 
 import XCTest
 
+#if SUBSCRIPTION
+import Subscription
+#endif
+
 #if NETWORK_PROTECTION
 import NetworkProtection
 #endif
@@ -62,7 +66,7 @@ final class MoreOptionsMenuTests: XCTestCase {
         internalUserDecider = InternalUserDeciderMock()
 
 #if NETWORK_PROTECTION
-        networkProtectionVisibilityMock = NetworkProtectionVisibilityMock(visible: false)
+        networkProtectionVisibilityMock = NetworkProtectionVisibilityMock(isInstalled: false, visible: false)
 #endif
     }
 
@@ -80,7 +84,7 @@ final class MoreOptionsMenuTests: XCTestCase {
 #if NETWORK_PROTECTION
         moreOptionMenu = MoreOptionsMenu(tabCollectionViewModel: tabCollectionViewModel,
                                          passwordManagerCoordinator: passwordManagerCoordinator,
-                                         networkProtectionFeatureVisibility: NetworkProtectionVisibilityMock(visible: true),
+                                         networkProtectionFeatureVisibility: NetworkProtectionVisibilityMock(isInstalled: false, visible: true),
                                          sharingMenu: NSMenu(),
                                          internalUserDecider: internalUserDecider)
 #else
@@ -105,10 +109,18 @@ final class MoreOptionsMenuTests: XCTestCase {
         XCTAssertEqual(moreOptionMenu.items[12].title, UserText.emailOptionsMenuItem)
 
 #if NETWORK_PROTECTION
-        XCTAssertTrue(moreOptionMenu.items[13].isSeparatorItem)
-        XCTAssertTrue(moreOptionMenu.items[14].title.hasPrefix(UserText.networkProtection))
-        XCTAssertTrue(moreOptionMenu.items[15].isSeparatorItem)
-        XCTAssertEqual(moreOptionMenu.items[16].title, UserText.settings)
+        if AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).isUserAuthenticated {
+            XCTAssertTrue(moreOptionMenu.items[13].isSeparatorItem)
+            XCTAssertTrue(moreOptionMenu.items[14].title.hasPrefix(UserText.networkProtection))
+            XCTAssertTrue(moreOptionMenu.items[15].title.hasPrefix(UserText.identityTheftRestorationOptionsMenuItem))
+            XCTAssertTrue(moreOptionMenu.items[16].isSeparatorItem)
+            XCTAssertEqual(moreOptionMenu.items[17].title, UserText.settings)
+        } else {
+            XCTAssertTrue(moreOptionMenu.items[13].isSeparatorItem)
+            XCTAssertTrue(moreOptionMenu.items[14].title.hasPrefix(UserText.networkProtection))
+            XCTAssertTrue(moreOptionMenu.items[15].isSeparatorItem)
+            XCTAssertEqual(moreOptionMenu.items[16].title, UserText.settings)
+        }
 #else
         XCTAssertTrue(moreOptionMenu.items[13].isSeparatorItem)
         XCTAssertEqual(moreOptionMenu.items[14].title, UserText.settings)
@@ -120,7 +132,7 @@ final class MoreOptionsMenuTests: XCTestCase {
 #if NETWORK_PROTECTION
         moreOptionMenu = MoreOptionsMenu(tabCollectionViewModel: tabCollectionViewModel,
                                          passwordManagerCoordinator: passwordManagerCoordinator,
-                                         networkProtectionFeatureVisibility: NetworkProtectionVisibilityMock(visible: false),
+                                         networkProtectionFeatureVisibility: NetworkProtectionVisibilityMock(isInstalled: false, visible: false),
                                          sharingMenu: NSMenu(),
                                          internalUserDecider: internalUserDecider)
 #else
@@ -143,8 +155,20 @@ final class MoreOptionsMenuTests: XCTestCase {
         XCTAssertEqual(moreOptionMenu.items[10].title, UserText.passwordManagement)
         XCTAssertTrue(moreOptionMenu.items[11].isSeparatorItem)
         XCTAssertEqual(moreOptionMenu.items[12].title, UserText.emailOptionsMenuItem)
+#if SUBSCRIPTION
+        XCTAssertTrue(moreOptionMenu.items[13].isSeparatorItem)
+
+        if AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).isUserAuthenticated {
+            XCTAssertTrue(moreOptionMenu.items[14].title.hasPrefix(UserText.identityTheftRestorationOptionsMenuItem))
+            XCTAssertTrue(moreOptionMenu.items[15].isSeparatorItem)
+            XCTAssertEqual(moreOptionMenu.items[16].title, UserText.settings)
+        } else {
+            XCTAssertEqual(moreOptionMenu.items[14].title, UserText.settings)
+        }
+#else
         XCTAssertTrue(moreOptionMenu.items[13].isSeparatorItem)
         XCTAssertEqual(moreOptionMenu.items[14].title, UserText.settings)
+#endif
     }
 
     // MARK: Zoom
@@ -166,8 +190,7 @@ final class MoreOptionsMenuTests: XCTestCase {
 
     @MainActor
     func testWhenClickingOnPreferenceMenuItemThenTheActionDelegateIsAlerted() {
-        moreOptionMenu.performActionForItem(at: 14)
-
+        moreOptionMenu.performActionForItem(at: moreOptionMenu.items.count - 1)
         XCTAssertTrue(capturingActionDelegate.optionsButtonMenuRequestedPreferencesCalled)
     }
 
@@ -176,26 +199,44 @@ final class MoreOptionsMenuTests: XCTestCase {
 #if NETWORK_PROTECTION
 final class NetworkProtectionVisibilityMock: NetworkProtectionFeatureVisibility {
 
+    var isInstalled: Bool
     var visible: Bool
 
-    init(visible: Bool) {
+    init(isInstalled: Bool, visible: Bool) {
+        self.isInstalled = isInstalled
         self.visible = visible
     }
 
+    func isVPNVisible() -> Bool {
+        return visible
+    }
+
     func shouldUninstallAutomatically() -> Bool {
         return !visible
     }
 
-    func isNetworkProtectionVisible() -> Bool {
+    func isNetworkProtectionBetaVisible() -> Bool {
         return visible
     }
 
-    func disableForAllUsers() {
+    func canStartVPN() async throws -> Bool {
+        return false
+    }
+
+    func disableForAllUsers() async {
         // intentional no-op
     }
 
     func disableForWaitlistUsers() {
         // intentional no-op
     }
+
+    var isEligibleForThankYouMessage: Bool {
+        false
+    }
+
+    func disableIfUserHasNoAccess() async -> Bool {
+        return false
+    }
 }
 #endif
diff --git a/UnitTests/NavigationBar/Mocks/MockAutofillPopoverPresenter.swift b/UnitTests/NavigationBar/Mocks/MockAutofillPopoverPresenter.swift
new file mode 100644
index 0000000000..c25d96950e
--- /dev/null
+++ b/UnitTests/NavigationBar/Mocks/MockAutofillPopoverPresenter.swift
@@ -0,0 +1,53 @@
+//
+//  MockAutofillPopoverPresenter.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import BrowserServicesKit
+@testable import DuckDuckGo_Privacy_Browser
+import Foundation
+
+final class MockAutofillPopoverPresenter: AutofillPopoverPresenter {
+
+    var didShowWithCategory = false
+    var didShowWithSelectedAccount = false
+    var didDismiss = false
+    var isDirty = false
+    var isShown = false
+
+    var passwordDomain: String?
+
+    var popoverIsDirty: Bool {
+        isDirty
+    }
+    var popoverIsShown: Bool {
+        isShown
+    }
+
+    var popoverPresentingWindow: NSWindow?
+
+    func show(positionedBelow view: NSView, withDomain domain: String?, selectedCategory category: DuckDuckGo_Privacy_Browser.SecureVaultSorting.Category?) {
+        didShowWithCategory = true
+    }
+
+    func show(positionedBelow view: NSView, withSelectedAccount: BrowserServicesKit.SecureVaultModels.WebsiteAccount) {
+        didShowWithSelectedAccount = true
+    }
+
+    func dismiss() {
+        didDismiss = true
+    }
+}
diff --git a/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift b/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift
new file mode 100644
index 0000000000..461c0109be
--- /dev/null
+++ b/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift
@@ -0,0 +1,104 @@
+//
+//  NavigationBarPopoversTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import BrowserServicesKit
+@testable import DuckDuckGo_Privacy_Browser
+import XCTest
+
+private final class MockNSPopoverDelegate: NSObject, NSPopoverDelegate {}
+
+final class NavigationBarPopoversTests: XCTestCase {
+
+    private var sut: NavigationBarPopovers!
+    private var autofillPopoverPresenter: MockAutofillPopoverPresenter!
+
+    override func setUpWithError() throws {
+        autofillPopoverPresenter = MockAutofillPopoverPresenter()
+
+        #if NETWORK_PROTECTION
+            sut = NavigationBarPopovers(networkProtectionPopoverManager: NetPPopoverManagerMock(), autofillPopoverPresenter: autofillPopoverPresenter)
+        #else
+            sut = NavigationBarPopovers(passwordPopoverPresenter: popoverPresenter)
+        #endif
+    }
+
+    func testSetsPasswordPopoverDomainOnPopover() throws {
+        // Given
+        let domain = "test"
+
+        // When
+        sut.passwordManagementDomain = domain
+
+        // Then
+        XCTAssertEqual(autofillPopoverPresenter.passwordDomain, domain)
+    }
+
+    func testGetsPasswordPopoverDirtyState() throws {
+        // When
+        var dirtyResult = sut.isPasswordManagementDirty
+
+        // Then
+        XCTAssertFalse(dirtyResult)
+
+        // Given
+        autofillPopoverPresenter.isDirty = true
+
+        // When
+        dirtyResult = sut.isPasswordManagementDirty
+
+        // Then
+        XCTAssertTrue(dirtyResult)
+    }
+
+    func testGetsPasswordPopoverShownState() throws {
+        // When
+        var displayedResult = sut.isPasswordManagementPopoverShown
+
+        // Then
+        XCTAssertFalse(displayedResult)
+
+        // Given
+        autofillPopoverPresenter.isShown = true
+
+        // When
+        displayedResult = sut.isPasswordManagementPopoverShown
+
+        // Then
+        XCTAssertTrue(displayedResult)
+    }
+
+    func testShowsPasswordPopoverWithCategory() throws {
+        // When
+        sut.showPasswordManagementPopover(selectedCategory: nil, usingView: NSView(), withDelegate: MockNSPopoverDelegate())
+
+        // Then
+        XCTAssertTrue(autofillPopoverPresenter.didShowWithCategory)
+    }
+
+    func testShowsPasswordPopoverWithSelectedWebsite() throws {
+        // Given
+        let account = SecureVaultModels.WebsiteAccount(id: "")
+
+        // When
+        sut.showPasswordManagerPopover(selectedWebsiteAccount: account, usingView: NSView(), withDelegate: MockNSPopoverDelegate())
+
+        // Then
+        XCTAssertTrue(autofillPopoverPresenter.didShowWithSelectedAccount)
+    }
+
+}
diff --git a/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift b/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
new file mode 100644
index 0000000000..225fc36fcd
--- /dev/null
+++ b/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
@@ -0,0 +1,325 @@
+//
+//  NetworkProtectionPixelEventTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if NETWORK_PROTECTION
+
+import NetworkProtection
+import PixelKit
+import PixelKitTestingUtilities
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+final class NetworkProtectionPixelEventTests: XCTestCase {
+
+    private enum TestError: CustomNSError {
+        case testError
+        case underlyingError
+
+        /// The domain of the error.
+        static var errorDomain: String {
+            "testDomain"
+        }
+
+        /// The error code within the given domain.
+        var errorCode: Int {
+            switch self {
+            case .testError: return 1
+            case .underlyingError: return 2
+            }
+        }
+
+        /// The user-info dictionary.
+        var errorUserInfo: [String: Any] {
+            switch self {
+            case .testError:
+                return [NSUnderlyingErrorKey: TestError.underlyingError]
+            case .underlyingError:
+                return [:]
+            }
+        }
+    }
+
+    // MARK: - Test Firing Pixels
+
+    /// This test verifies validates expectations when firing `NetworkProtectionPixelEvent`.
+    ///
+    /// This test verifies a few different things:
+    ///  - That the pixel name is not changed by mistake.
+    ///  - That when the pixel is fired its name and parameters are exactly what's expected.
+    ///
+    func testVPNPixelFireExpectations() {
+        fire(NetworkProtectionPixelEvent.networkProtectionActiveUser,
+             and: .expect(pixelName: "m_mac_netp_daily_active"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionNewUser,
+             and: .expect(pixelName: "m_mac_netp_daily_active_u"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionControllerStartAttempt,
+             and: .expect(pixelName: "m_mac_netp_controller_start_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_controller_start_failure",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionControllerStartSuccess,
+             and: .expect(pixelName: "m_mac_netp_controller_start_success"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartAttempt,
+             and: .expect(pixelName: "m_mac_netp_tunnel_start_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_tunnel_start_failure",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartSuccess,
+             and: .expect(pixelName: "m_mac_netp_tunnel_start_success"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateAttempt,
+             and: .expect(pixelName: "m_mac_netp_tunnel_update_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_tunnel_update_failure",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateSuccess,
+             and: .expect(pixelName: "m_mac_netp_tunnel_update_success"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptConnecting,
+             and: .expect(pixelName: "m_mac_netp_ev_enable_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptSuccess,
+             and: .expect(pixelName: "m_mac_netp_ev_enable_attempt_success"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptFailure,
+             and: .expect(pixelName: "m_mac_netp_ev_enable_attempt_failure"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelFailureDetected,
+             and: .expect(pixelName: "m_mac_netp_ev_tunnel_failure"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelFailureRecovered,
+             and: .expect(pixelName: "m_mac_netp_ev_tunnel_failure_recovered"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionLatency(quality: .excellent),
+             and: .expect(pixelName: "m_mac_netp_ev_\(NetworkProtectionLatencyMonitor.ConnectionQuality.excellent.rawValue)_latency"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionLatencyError,
+             and: .expect(pixelName: "m_mac_netp_ev_latency_error"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationNoServerRegistrationInfo,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_no_server_registration_info"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_select_closest_server"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_peer_public_key"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetPeerHostName,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_peer_host_name"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_interface_address_range"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchServerList(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_server_list",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseServerListResponse,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_server_list_response_failed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToEncodeRegisterKeyRequest,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_encoding_register_request_body_failed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchRegisteredServers(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_registered_servers",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseRegisteredServersResponse,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_device_registration_response_failed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToEncodeRedeemRequest,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_encoding_redeem_request_body_failed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientInvalidInviteCode,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_invalid_invite_code"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToRedeemInviteCode(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_redeem_invite_code",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseRedeemResponse(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_redeem_response_failed",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchLocations(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_location_list",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseLocationsResponse(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_location_list_response_failed",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientInvalidAuthToken,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_invalid_auth_token"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainErrorFailedToCastKeychainValueToData(field: "field"),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_failed_to_cast_keychain_value_to_data",
+                          customFields: [
+                            PixelKit.Parameters.keychainFieldName: "field",
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainReadError(field: "field", status: 1),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_read_failed",
+                          customFields: [
+                            PixelKit.Parameters.keychainFieldName: "field",
+                            PixelKit.Parameters.errorCode: "1",
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainWriteError(field: "field", status: 1),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_write_failed",
+                          customFields: [
+                            PixelKit.Parameters.keychainFieldName: "field",
+                            PixelKit.Parameters.errorCode: "1",
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainUpdateError(field: "field", status: 1),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_update_failed",
+                          customFields: [
+                            PixelKit.Parameters.keychainFieldName: "field",
+                            PixelKit.Parameters.errorCode: "1",
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainDeleteError(status: 1),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_delete_failed",
+                          customFields: [
+                            PixelKit.Parameters.errorCode: "1"
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor,
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_locate_tunnel_file_descriptor"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorInvalidState(reason: "reason"),
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_invalid_state",
+                          customFields: [
+                            PixelKit.Parameters.reason: "reason"
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorFailedDNSResolution,
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_failed_dns_resolution"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotSetNetworkSettings(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_set_network_settings",
+                                 error: TestError.testError,
+                                 underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotStartWireguardBackend(code: 1),
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_start_wireguard_backend",
+                          customFields: [
+                            PixelKit.Parameters.errorCode: "1"
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionNoAuthTokenFoundError,
+             and: .expect(pixelName: "m_mac_netp_no_auth_token_found_error"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionRekeyAttempt,
+             and: .expect(pixelName: "m_mac_netp_rekey_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionRekeyCompleted,
+             and: .expect(pixelName: "m_mac_netp_rekey_completed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionRekeyFailure(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_rekey_failure",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionSystemExtensionActivationFailure,
+             and: .expect(pixelName: "m_mac_netp_system_extension_activation_failure"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionUnhandledError(function: "function", line: 1, error: TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_unhandled_error",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError,
+                          customFields: [
+                            PixelKit.Parameters.function: "function",
+                            PixelKit.Parameters.line: "1",
+                          ]),
+             file: #filePath,
+             line: #line)
+    }
+}
+
+#endif
diff --git a/UnitTests/NetworkProtection/NetworkProtectionRemoteMessagingTests.swift b/UnitTests/NetworkProtection/NetworkProtectionRemoteMessagingTests.swift
index 33eec679ee..761f184335 100644
--- a/UnitTests/NetworkProtection/NetworkProtectionRemoteMessagingTests.swift
+++ b/UnitTests/NetworkProtection/NetworkProtectionRemoteMessagingTests.swift
@@ -37,7 +37,7 @@ final class NetworkProtectionRemoteMessagingTests: XCTestCase {
         let storage = MockNetworkProtectionRemoteMessagingStorage()
         let waitlistStorage = MockWaitlistStorage()
         let activationDateStorage = MockWaitlistActivationDateStore()
-        let visibility = NetworkProtectionVisibilityMock(visible: true)
+        let visibility = NetworkProtectionVisibilityMock(isInstalled: false, visible: true)
 
         let messaging = DefaultNetworkProtectionRemoteMessaging(
             messageRequest: request,
@@ -67,7 +67,7 @@ final class NetworkProtectionRemoteMessagingTests: XCTestCase {
         let storage = MockNetworkProtectionRemoteMessagingStorage()
         let waitlistStorage = MockWaitlistStorage()
         let activationDateStorage = MockWaitlistActivationDateStore()
-        let visibility = NetworkProtectionVisibilityMock(visible: true)
+        let visibility = NetworkProtectionVisibilityMock(isInstalled: false, visible: true)
 
         request.result = .success([])
         waitlistStorage.store(waitlistToken: "token")
@@ -103,7 +103,7 @@ final class NetworkProtectionRemoteMessagingTests: XCTestCase {
         let storage = MockNetworkProtectionRemoteMessagingStorage()
         let waitlistStorage = MockWaitlistStorage()
         let activationDateStorage = MockWaitlistActivationDateStore()
-        let visibility = NetworkProtectionVisibilityMock(visible: true)
+        let visibility = NetworkProtectionVisibilityMock(isInstalled: false, visible: true)
 
         let messages = [mockMessage(id: "123")]
 
@@ -144,7 +144,7 @@ final class NetworkProtectionRemoteMessagingTests: XCTestCase {
         let storage = MockNetworkProtectionRemoteMessagingStorage()
         let waitlistStorage = MockWaitlistStorage()
         let activationDateStorage = MockWaitlistActivationDateStore()
-        let visibility = NetworkProtectionVisibilityMock(visible: true)
+        let visibility = NetworkProtectionVisibilityMock(isInstalled: false, visible: true)
 
         waitlistStorage.store(waitlistToken: "token")
         waitlistStorage.store(waitlistTimestamp: 123)
@@ -183,7 +183,7 @@ final class NetworkProtectionRemoteMessagingTests: XCTestCase {
         let storage = MockNetworkProtectionRemoteMessagingStorage()
         let waitlistStorage = MockWaitlistStorage()
         let activationDateStorage = MockWaitlistActivationDateStore()
-        let visibility = NetworkProtectionVisibilityMock(visible: true)
+        let visibility = NetworkProtectionVisibilityMock(isInstalled: false, visible: true)
 
         let dismissedMessage = mockMessage(id: "123")
         let activeMessage = mockMessage(id: "456")
@@ -212,7 +212,7 @@ final class NetworkProtectionRemoteMessagingTests: XCTestCase {
         let storage = MockNetworkProtectionRemoteMessagingStorage()
         let waitlistStorage = MockWaitlistStorage()
         let activationDateStorage = MockWaitlistActivationDateStore()
-        let visibility = NetworkProtectionVisibilityMock(visible: true)
+        let visibility = NetworkProtectionVisibilityMock(isInstalled: false, visible: true)
 
         let hiddenMessage = mockMessage(id: "123", daysSinceNetworkProtectionEnabled: 10)
         let activeMessage = mockMessage(id: "456")
@@ -238,7 +238,7 @@ final class NetworkProtectionRemoteMessagingTests: XCTestCase {
         let storage = MockNetworkProtectionRemoteMessagingStorage()
         let waitlistStorage = MockWaitlistStorage()
         let activationDateStorage = MockWaitlistActivationDateStore()
-        let visibility = NetworkProtectionVisibilityMock(visible: false)
+        let visibility = NetworkProtectionVisibilityMock(isInstalled: false, visible: false)
 
         let hiddenMessage = mockMessage(id: "123", requiresNetPAccess: true)
         try? storage.store(messages: [hiddenMessage])
@@ -262,7 +262,7 @@ final class NetworkProtectionRemoteMessagingTests: XCTestCase {
         let storage = MockNetworkProtectionRemoteMessagingStorage()
         let waitlistStorage = MockWaitlistStorage()
         let activationDateStorage = MockWaitlistActivationDateStore()
-        let visibility = NetworkProtectionVisibilityMock(visible: true)
+        let visibility = NetworkProtectionVisibilityMock(isInstalled: false, visible: true)
 
         let message = mockMessage(id: "123", requiresNetPUsage: false, requiresNetPAccess: true)
         try? storage.store(messages: [message])
diff --git a/UnitTests/Preferences/AccessibilityPreferencesTests.swift b/UnitTests/Preferences/AccessibilityPreferencesTests.swift
new file mode 100644
index 0000000000..819f2c6a0a
--- /dev/null
+++ b/UnitTests/Preferences/AccessibilityPreferencesTests.swift
@@ -0,0 +1,44 @@
+//
+//  AccessibilityPreferencesTests.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+class MockAccessibilityPreferencesPersistor: AccessibilityPreferencesPersistor {
+    var defaultPageZoom: CGFloat = DefaultZoomValue.percent100.rawValue
+}
+
+class AccessibilityPreferencesTests: XCTestCase {
+
+    func testWhenInitializedThenItLoadsPersistedDefaultPageZoom() {
+        let mockPersistor = MockAccessibilityPreferencesPersistor()
+        mockPersistor.defaultPageZoom = DefaultZoomValue.percent150.rawValue
+        let accessibilityPreferences = AccessibilityPreferences(persistor: mockPersistor)
+
+        XCTAssertEqual(accessibilityPreferences.defaultPageZoom, DefaultZoomValue.percent150)
+    }
+
+    func testWhenDefaultPageZoomUpdatedThenPersistorUpdates() {
+        let mockPersistor = MockAccessibilityPreferencesPersistor()
+        let accessibilityPreferences = AccessibilityPreferences(persistor: mockPersistor)
+        accessibilityPreferences.defaultPageZoom = .percent75
+
+        XCTAssertEqual(mockPersistor.defaultPageZoom, DefaultZoomValue.percent75.rawValue)
+    }
+
+}
diff --git a/UnitTests/Preferences/AppearancePreferencesTests.swift b/UnitTests/Preferences/AppearancePreferencesTests.swift
index 6ffbaec043..34e725fde4 100644
--- a/UnitTests/Preferences/AppearancePreferencesTests.swift
+++ b/UnitTests/Preferences/AppearancePreferencesTests.swift
@@ -25,20 +25,16 @@ struct AppearancePreferencesPersistorMock: AppearancePreferencesPersistor {
     var isContinueSetUpVisible: Bool
     var isRecentActivityVisible: Bool
     var showFullURL: Bool
-    var showAutocompleteSuggestions: Bool
     var currentThemeName: String
     var favoritesDisplayMode: String?
-    var defaultPageZoom: CGFloat
     var showBookmarksBar: Bool
     var bookmarksBarAppearance: BookmarksBarAppearance
     var homeButtonPosition: HomeButtonPosition
 
     init(
         showFullURL: Bool = false,
-        showAutocompleteSuggestions: Bool = true,
         currentThemeName: String = ThemeName.systemDefault.rawValue,
         favoritesDisplayMode: String? = FavoritesDisplayMode.displayNative(.desktop).description,
-        defaultPageZoom: CGFloat = DefaultZoomValue.percent100.rawValue,
         isContinueSetUpVisible: Bool = true,
         isFavoriteVisible: Bool = true,
         isRecentActivityVisible: Bool = true,
@@ -47,10 +43,8 @@ struct AppearancePreferencesPersistorMock: AppearancePreferencesPersistor {
         homeButtonPosition: HomeButtonPosition = .right
     ) {
         self.showFullURL = showFullURL
-        self.showAutocompleteSuggestions = showAutocompleteSuggestions
         self.currentThemeName = currentThemeName
         self.favoritesDisplayMode = favoritesDisplayMode
-        self.defaultPageZoom = defaultPageZoom
         self.isContinueSetUpVisible = isContinueSetUpVisible
         self.isFavoriteVisible = isFavoriteVisible
         self.isRecentActivityVisible = isRecentActivityVisible
@@ -66,10 +60,8 @@ final class AppearancePreferencesTests: XCTestCase {
         var model = AppearancePreferences(
             persistor: AppearancePreferencesPersistorMock(
                 showFullURL: false,
-                showAutocompleteSuggestions: true,
                 currentThemeName: ThemeName.systemDefault.rawValue,
                 favoritesDisplayMode: FavoritesDisplayMode.displayNative(.desktop).description,
-                defaultPageZoom: DefaultZoomValue.percent100.rawValue,
                 isContinueSetUpVisible: true,
                 isFavoriteVisible: true,
                 isRecentActivityVisible: true,
@@ -78,10 +70,8 @@ final class AppearancePreferencesTests: XCTestCase {
         )
 
         XCTAssertEqual(model.showFullURL, false)
-        XCTAssertEqual(model.showAutocompleteSuggestions, true)
         XCTAssertEqual(model.currentThemeName, ThemeName.systemDefault)
         XCTAssertEqual(model.favoritesDisplayMode, .displayNative(.desktop))
-        XCTAssertEqual(model.defaultPageZoom, DefaultZoomValue.percent100)
         XCTAssertEqual(model.isFavoriteVisible, true)
         XCTAssertEqual(model.isContinueSetUpVisible, true)
         XCTAssertEqual(model.isRecentActivityVisible, true)
@@ -90,10 +80,8 @@ final class AppearancePreferencesTests: XCTestCase {
         model = AppearancePreferences(
             persistor: AppearancePreferencesPersistorMock(
                 showFullURL: true,
-                showAutocompleteSuggestions: false,
                 currentThemeName: ThemeName.light.rawValue,
                 favoritesDisplayMode: FavoritesDisplayMode.displayUnified(native: .desktop).description,
-                defaultPageZoom: DefaultZoomValue.percent50.rawValue,
                 isContinueSetUpVisible: false,
                 isFavoriteVisible: false,
                 isRecentActivityVisible: false,
@@ -101,10 +89,8 @@ final class AppearancePreferencesTests: XCTestCase {
             )
         )
         XCTAssertEqual(model.showFullURL, true)
-        XCTAssertEqual(model.showAutocompleteSuggestions, false)
         XCTAssertEqual(model.currentThemeName, ThemeName.light)
         XCTAssertEqual(model.favoritesDisplayMode, .displayUnified(native: .desktop))
-        XCTAssertEqual(model.defaultPageZoom, DefaultZoomValue.percent50)
         XCTAssertEqual(model.isFavoriteVisible, false)
         XCTAssertEqual(model.isContinueSetUpVisible, false)
         XCTAssertEqual(model.isRecentActivityVisible, false)
@@ -143,18 +129,6 @@ final class AppearancePreferencesTests: XCTestCase {
         XCTAssertEqual(NSApp.appearance?.name, ThemeName.systemDefault.appearance?.name)
     }
 
-    func testWhenZoomLevelChangedInAppearancePreferencesThenThePersisterAndUserDefaultsZoomValuesAreUpdated() {
-        UserDefaultsWrapper<Any>.clearAll()
-        let randomZoomLevel = DefaultZoomValue.allCases.randomElement()!
-        let persister = AppearancePreferencesUserDefaultsPersistor()
-        let model = AppearancePreferences(persistor: persister)
-        model.defaultPageZoom = randomZoomLevel
-
-        XCTAssertEqual(persister.defaultPageZoom, randomZoomLevel.rawValue)
-        let savedZoomValue = UserDefaultsWrapper(key: .defaultPageZoom, defaultValue: DefaultZoomValue.percent100.rawValue).wrappedValue
-        XCTAssertEqual(savedZoomValue, randomZoomLevel.rawValue)
-    }
-
     func testWhenNewTabPreferencesAreUpdatedThenPersistedValuesAreUpdated() throws {
         let model = AppearancePreferences(persistor: AppearancePreferencesPersistorMock())
 
diff --git a/UnitTests/Preferences/AutofillPreferencesModelTests.swift b/UnitTests/Preferences/AutofillPreferencesModelTests.swift
index 044a56b252..79341abe79 100644
--- a/UnitTests/Preferences/AutofillPreferencesModelTests.swift
+++ b/UnitTests/Preferences/AutofillPreferencesModelTests.swift
@@ -46,13 +46,17 @@ final class UserAuthenticatorMock: UserAuthenticating {
     }
 }
 
-@MainActor
 final class AutofillPreferencesModelTests: XCTestCase {
 
+    func neverPromptWebsitesManager() throws -> AutofillNeverPromptWebsitesManager {
+        try AutofillNeverPromptWebsitesManager(secureVault: MockSecureVaultFactory.makeVault(errorReporter: nil))
+    }
+
+    @MainActor
     func testThatPreferencesArePersisted() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         model.askToSaveUsernamesAndPasswords.toggle()
         XCTAssertEqual(persistor.askToSaveUsernamesAndPasswords, model.askToSaveUsernamesAndPasswords)
@@ -64,10 +68,11 @@ final class AutofillPreferencesModelTests: XCTestCase {
         XCTAssertEqual(persistor.askToSavePaymentMethods, model.askToSavePaymentMethods)
     }
 
+    @MainActor
     func testWhenUserIsAuthenticatedThenAutoLockCanBeDisabled() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         userAuthenticator._authenticateUser = { _ in return .success}
 
@@ -76,10 +81,11 @@ final class AutofillPreferencesModelTests: XCTestCase {
         XCTAssertEqual(persistor.isAutoLockEnabled, model.isAutoLockEnabled)
     }
 
+    @MainActor
     func testWhenUserIsNotAuthenticatedThenAutoLockCannotBeDisabled() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         userAuthenticator._authenticateUser = { _ in return .failure}
 
@@ -88,10 +94,11 @@ final class AutofillPreferencesModelTests: XCTestCase {
         XCTAssertEqual(persistor.isAutoLockEnabled, model.isAutoLockEnabled)
     }
 
+    @MainActor
     func testWhenUserIsAuthenticatedThenAutoLockThresholdCanBeChanged() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         userAuthenticator._authenticateUser = { _ in return .success}
 
@@ -101,10 +108,11 @@ final class AutofillPreferencesModelTests: XCTestCase {
         XCTAssertEqual(persistor.autoLockThreshold, model.autoLockThreshold)
     }
 
+    @MainActor
     func testWhenUserIsNotAuthenticatedThenAutoLockThresholdCannotBeChanged() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         userAuthenticator._authenticateUser = { _ in return .failure}
 
diff --git a/UnitTests/Preferences/CookiePopupProtectionPreferencesTests.swift b/UnitTests/Preferences/CookiePopupProtectionPreferencesTests.swift
new file mode 100644
index 0000000000..fa8cf471cc
--- /dev/null
+++ b/UnitTests/Preferences/CookiePopupProtectionPreferencesTests.swift
@@ -0,0 +1,44 @@
+//
+//  CookiePopupProtectionPreferencesTests.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+class MockCookiePopupProtectionPreferencesPersistor: CookiePopupProtectionPreferencesPersistor {
+    var autoconsentEnabled: Bool = false
+}
+
+class CookiePopupProtectionPreferencesTests: XCTestCase {
+
+    func testWhenInitializedThenItLoadsPersistedAutoconsentSetting() {
+        let mockPersistor = MockCookiePopupProtectionPreferencesPersistor()
+        mockPersistor.autoconsentEnabled = true
+        let cookiePopupPreferences = CookiePopupProtectionPreferences(persistor: mockPersistor)
+
+        XCTAssertTrue(cookiePopupPreferences.isAutoconsentEnabled)
+    }
+
+    func testWhenIsAutoconsentEnabledUpdatedThenPersistorUpdates() {
+        let mockPersistor = MockCookiePopupProtectionPreferencesPersistor()
+        let cookiePopupPreferences = CookiePopupProtectionPreferences(persistor: mockPersistor)
+        cookiePopupPreferences.isAutoconsentEnabled = false
+
+        XCTAssertFalse(mockPersistor.autoconsentEnabled)
+    }
+
+}
diff --git a/UnitTests/Preferences/DataClearingPreferencesTests.swift b/UnitTests/Preferences/DataClearingPreferencesTests.swift
new file mode 100644
index 0000000000..5563fb6e90
--- /dev/null
+++ b/UnitTests/Preferences/DataClearingPreferencesTests.swift
@@ -0,0 +1,43 @@
+//
+//  DataClearingPreferencesTests.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+class MockFireButtonPreferencesPersistor: FireButtonPreferencesPersistor {
+    var loginDetectionEnabled: Bool = false
+}
+
+class DataClearingPreferencesTests: XCTestCase {
+
+    func testWhenInitializedThenItLoadsPersistedLoginDetectionSetting() {
+        let mockPersistor = MockFireButtonPreferencesPersistor()
+        mockPersistor.loginDetectionEnabled = true
+        let dataClearingPreferences = DataClearingPreferences(persistor: mockPersistor)
+
+        XCTAssertTrue(dataClearingPreferences.isLoginDetectionEnabled)
+    }
+
+    func testWhenIsLoginDetectionEnabledUpdatedThenPersistorUpdates() {
+        let mockPersistor = MockFireButtonPreferencesPersistor()
+        let dataClearingPreferences = DataClearingPreferences(persistor: mockPersistor)
+        dataClearingPreferences.isLoginDetectionEnabled = true
+
+        XCTAssertTrue(mockPersistor.loginDetectionEnabled)
+    }
+}
diff --git a/UnitTests/Preferences/PreferencesSidebarModelTests.swift b/UnitTests/Preferences/PreferencesSidebarModelTests.swift
index cb9a8f0c60..09c31efdb0 100644
--- a/UnitTests/Preferences/PreferencesSidebarModelTests.swift
+++ b/UnitTests/Preferences/PreferencesSidebarModelTests.swift
@@ -40,7 +40,7 @@ final class PreferencesSidebarModelTests: XCTestCase {
     }
 
     func testWhenInitializedThenFirstPaneInFirstSectionIsSelected() throws {
-        let sections: [PreferencesSection] = [.init(id: .regularPreferencePanes, panes: [.appearance, .downloads, .autofill])]
+        let sections: [PreferencesSection] = [.init(id: .regularPreferencePanes, panes: [.appearance, .autofill])]
         let model = PreferencesSidebarModel(loadSections: sections)
 
         XCTAssertEqual(model.selectedPane, .appearance)
@@ -72,7 +72,7 @@ final class PreferencesSidebarModelTests: XCTestCase {
     }
 
     func testWhenSelectPaneIsCalledWithNonexistentPaneThenItHasNoEffect() throws {
-        let sections: [PreferencesSection] = [.init(id: .regularPreferencePanes, panes: [.appearance, .downloads])]
+        let sections: [PreferencesSection] = [.init(id: .regularPreferencePanes, panes: [.appearance, .autofill])]
         let model = PreferencesSidebarModel(loadSections: sections)
 
         model.selectPane(.general)
@@ -80,7 +80,7 @@ final class PreferencesSidebarModelTests: XCTestCase {
     }
 
     func testWhenSelectedTabIndexIsChangedThenSelectedPaneIsNotAffected() throws {
-        let sections: [PreferencesSection] = [.init(id: .regularPreferencePanes, panes: [.general, .appearance, .downloads, .autofill])]
+        let sections: [PreferencesSection] = [.init(id: .regularPreferencePanes, panes: [.general, .appearance, .autofill])]
         let tabs: [Tab.TabContent] = [.anySettingsPane, .bookmarks]
         let model = PreferencesSidebarModel(loadSections: sections, tabSwitcherTabs: tabs)
 
diff --git a/UnitTests/Preferences/PrivacyProtectionStatusTests.swift b/UnitTests/Preferences/PrivacyProtectionStatusTests.swift
new file mode 100644
index 0000000000..4ec5f7af1f
--- /dev/null
+++ b/UnitTests/Preferences/PrivacyProtectionStatusTests.swift
@@ -0,0 +1,67 @@
+//
+//  PrivacyProtectionStatusTests.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+import Combine
+@testable import DuckDuckGo_Privacy_Browser
+
+class PrivacyProtectionStatusTests: XCTestCase {
+
+    var cancellables: Set<AnyCancellable> = []
+
+    override func tearDown() {
+        super.tearDown()
+        cancellables.removeAll()
+    }
+
+    func testWhenStatusUpdatedFromPublisherThenReflectsNewStatus() {
+        // Example of how you might test updates from a publisher
+        let subject = PassthroughSubject<Bool, Never>()
+        let status = PrivacyProtectionStatus(statusPublisher: subject) { isOn in
+            return isOn ? .on : .off
+        }
+
+        // Initial value should be nil
+        XCTAssertNil(status.status)
+
+        let expectation = XCTestExpectation(description: "Status updates to .on")
+        status.$status.sink { newStatus in
+            if newStatus == .on {
+                expectation.fulfill()
+            }
+        }.store(in: &cancellables)
+
+        subject.send(true)
+
+        wait(for: [expectation], timeout: 1.0)
+    }
+
+    func testWhenInitializedWithStaticStatusIndicatorThenSetsStatusCorrectly() {
+        // Test initialization with a static status indicator
+        let status = PrivacyProtectionStatus(statusIndicator: .on)
+
+        XCTAssertEqual(status.status, .on)
+    }
+
+    func testWhenInitializedWithoutStatusThenStatusIsNil() {
+        // Test initialization without a status
+        let status = PrivacyProtectionStatus()
+
+        XCTAssertNil(status.status)
+    }
+}
diff --git a/UnitTests/Preferences/SearchPreferencesTests.swift b/UnitTests/Preferences/SearchPreferencesTests.swift
new file mode 100644
index 0000000000..60f5e3a87c
--- /dev/null
+++ b/UnitTests/Preferences/SearchPreferencesTests.swift
@@ -0,0 +1,44 @@
+//
+//  SearchPreferencesTests.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+class MockSearchPreferencesPersistor: SearchPreferencesPersistor {
+    var showAutocompleteSuggestions: Bool = false
+}
+
+class SearchPreferencesTests: XCTestCase {
+
+    func testWhenInitializedThenItLoadsPersistedValues() {
+        let mockPersistor = MockSearchPreferencesPersistor()
+        mockPersistor.showAutocompleteSuggestions = true
+        let searchPreferences = SearchPreferences(persistor: mockPersistor)
+
+        XCTAssertTrue(searchPreferences.showAutocompleteSuggestions)
+    }
+
+    func testWhenShowAutocompleteSuggestionsUpdatedThenPersistorUpdates() {
+        let mockPersistor = MockSearchPreferencesPersistor()
+        let searchPreferences = SearchPreferences(persistor: mockPersistor)
+        searchPreferences.showAutocompleteSuggestions = true
+
+        XCTAssertTrue(mockPersistor.showAutocompleteSuggestions)
+    }
+
+}
diff --git a/UnitTests/Preferences/WebTrackingProtectionPreferencesTests.swift b/UnitTests/Preferences/WebTrackingProtectionPreferencesTests.swift
new file mode 100644
index 0000000000..428634e4e8
--- /dev/null
+++ b/UnitTests/Preferences/WebTrackingProtectionPreferencesTests.swift
@@ -0,0 +1,44 @@
+//
+//  WebTrackingProtectionPreferencesTests.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+class MockWebTrackingProtectionPreferencesPersistor: WebTrackingProtectionPreferencesPersistor {
+    var gpcEnabled: Bool = false
+}
+
+class WebTrackingProtectionPreferencesTests: XCTestCase {
+
+    func testWhenInitializedThenItLoadsPersistedGPCSetting() {
+        let mockPersistor = MockWebTrackingProtectionPreferencesPersistor()
+        mockPersistor.gpcEnabled = true
+        let webTrackingPreferences = WebTrackingProtectionPreferences(persistor: mockPersistor)
+
+        XCTAssertTrue(webTrackingPreferences.isGPCEnabled)
+    }
+
+    func testWhenIsGPCEnabledUpdatedThenPersistorUpdates() {
+        let mockPersistor = MockWebTrackingProtectionPreferencesPersistor()
+        let webTrackingPreferences = WebTrackingProtectionPreferences(persistor: mockPersistor)
+        webTrackingPreferences.isGPCEnabled = true
+
+        XCTAssertTrue(mockPersistor.gpcEnabled)
+    }
+
+}
diff --git a/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift b/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift
index 7adfb26758..bc52a33041 100644
--- a/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift
+++ b/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift
@@ -90,6 +90,10 @@ final class BrokenSiteReportingReferenceTests: XCTestCase {
                                             reportFlow: .appMenu,
                                             errors: errors,
                                             httpStatusCodes: test.httpErrorCodes ?? [],
+                                            openerContext: nil,
+                                            vpnOn: false,
+                                            jsPerformance: nil,
+                                            userRefreshCount: 0,
                                             didOpenReportInfo: false,
                                             toggleReportCounter: nil)
 
diff --git a/UnitTests/Suggestions/Model/SuggestionContainerTests.swift b/UnitTests/Suggestions/Model/SuggestionContainerTests.swift
index 3db48611ba..db15131a1c 100644
--- a/UnitTests/Suggestions/Model/SuggestionContainerTests.swift
+++ b/UnitTests/Suggestions/Model/SuggestionContainerTests.swift
@@ -17,7 +17,7 @@
 //
 
 import XCTest
-import BrowserServicesKit
+import Suggestions
 @testable import DuckDuckGo_Privacy_Browser
 
 final class SuggestionContainerTests: XCTestCase {
diff --git a/UnitTests/Suggestions/Model/SuggestionLoadingMock.swift b/UnitTests/Suggestions/Model/SuggestionLoadingMock.swift
index 717d0c05b2..30248315c7 100644
--- a/UnitTests/Suggestions/Model/SuggestionLoadingMock.swift
+++ b/UnitTests/Suggestions/Model/SuggestionLoadingMock.swift
@@ -17,7 +17,7 @@
 //
 
 import XCTest
-import BrowserServicesKit
+import Suggestions
 @testable import DuckDuckGo_Privacy_Browser
 
 final class SuggestionLoadingMock: SuggestionLoading {
diff --git a/UnitTests/Suggestions/ViewModel/SuggestionContainerViewModelTests.swift b/UnitTests/Suggestions/ViewModel/SuggestionContainerViewModelTests.swift
index 802bc2cf1f..cee0f7bec3 100644
--- a/UnitTests/Suggestions/ViewModel/SuggestionContainerViewModelTests.swift
+++ b/UnitTests/Suggestions/ViewModel/SuggestionContainerViewModelTests.swift
@@ -18,7 +18,7 @@
 
 import XCTest
 import Combine
-import BrowserServicesKit
+import Suggestions
 @testable import DuckDuckGo_Privacy_Browser
 
 final class SuggestionContainerViewModelTests: XCTestCase {
diff --git a/UnitTests/Suggestions/ViewModel/SuggestionViewModelTests.swift b/UnitTests/Suggestions/ViewModel/SuggestionViewModelTests.swift
index af77dca2d5..ae95463fd3 100644
--- a/UnitTests/Suggestions/ViewModel/SuggestionViewModelTests.swift
+++ b/UnitTests/Suggestions/ViewModel/SuggestionViewModelTests.swift
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 
-import BrowserServicesKit
+import Suggestions
 import XCTest
 
 @testable import DuckDuckGo_Privacy_Browser
diff --git a/UnitTests/Sync/SyncPreferencesTests.swift b/UnitTests/Sync/SyncPreferencesTests.swift
index 76cfc93428..1a0557f5b3 100644
--- a/UnitTests/Sync/SyncPreferencesTests.swift
+++ b/UnitTests/Sync/SyncPreferencesTests.swift
@@ -41,6 +41,7 @@ final class SyncPreferencesTests: XCTestCase {
     let managementDialogModel = ManagementDialogModel()
     var ddgSyncing: MockDDGSyncing!
     var syncBookmarksAdapter: SyncBookmarksAdapter!
+    var syncCredentialsAdapter: SyncCredentialsAdapter!
     var appearancePersistor = MockPersistor()
     var appearancePreferences: AppearancePreferences!
     var syncPreferences: SyncPreferences!
@@ -55,10 +56,12 @@ final class SyncPreferencesTests: XCTestCase {
         ddgSyncing = MockDDGSyncing(authState: .inactive, scheduler: scheduler, isSyncInProgress: false)
 
         syncBookmarksAdapter = SyncBookmarksAdapter(database: bookmarksDatabase, appearancePreferences: appearancePreferences)
+        syncCredentialsAdapter = SyncCredentialsAdapter(secureVaultFactory: AutofillSecureVaultFactory)
 
         syncPreferences = SyncPreferences(
             syncService: ddgSyncing,
             syncBookmarksAdapter: syncBookmarksAdapter,
+            syncCredentialsAdapter: syncCredentialsAdapter,
             appearancePreferences: appearancePreferences,
             managementDialogModel: managementDialogModel,
             userAuthenticator: MockUserAuthenticator()
diff --git a/UnitTests/Tab/ViewModel/TabViewModelTests.swift b/UnitTests/Tab/ViewModel/TabViewModelTests.swift
index 7dd1ce9b73..9dbaa4a0fd 100644
--- a/UnitTests/Tab/ViewModel/TabViewModelTests.swift
+++ b/UnitTests/Tab/ViewModel/TabViewModelTests.swift
@@ -214,7 +214,7 @@ final class TabViewModelTests: XCTestCase {
     @MainActor
     func testThatDefaultValueForTabsWebViewIsOne() {
         UserDefaultsWrapper<Any>.clearAll()
-        let tabVM = TabViewModel(tab: Tab(), appearancePreferences: AppearancePreferences())
+        let tabVM = TabViewModel(tab: Tab(), appearancePreferences: AppearancePreferences(), accessibilityPreferences: AccessibilityPreferences())
 
         XCTAssertEqual(tabVM.tab.webView.zoomLevel, DefaultZoomValue.percent100)
     }
@@ -224,7 +224,7 @@ final class TabViewModelTests: XCTestCase {
         UserDefaultsWrapper<Any>.clearAll()
         let tabVM = TabViewModel(tab: Tab())
         let randomZoomLevel = DefaultZoomValue.allCases.randomElement()!
-        AppearancePreferences.shared.defaultPageZoom = randomZoomLevel
+        AccessibilityPreferences.shared.defaultPageZoom = randomZoomLevel
 
         XCTAssertEqual(tabVM.tab.webView.zoomLevel, randomZoomLevel)
     }
@@ -233,7 +233,7 @@ final class TabViewModelTests: XCTestCase {
     func testWhenAppearancePreferencesZoomLevelIsSetAndANewTabIsOpenThenItsWebViewHasTheLatestValueOfZoomLevel() {
         UserDefaultsWrapper<Any>.clearAll()
         let randomZoomLevel = DefaultZoomValue.allCases.randomElement()!
-        AppearancePreferences.shared.defaultPageZoom = randomZoomLevel
+        AccessibilityPreferences.shared.defaultPageZoom = randomZoomLevel
 
         let tabVM = TabViewModel(tab: Tab(), appearancePreferences: AppearancePreferences())
 
diff --git a/UnitTests/Tab/WebViewTests.swift b/UnitTests/Tab/WebViewTests.swift
index df9920004e..aedaeccc0d 100644
--- a/UnitTests/Tab/WebViewTests.swift
+++ b/UnitTests/Tab/WebViewTests.swift
@@ -134,7 +134,7 @@ final class WebViewTests: XCTestCase {
         let tabVM = TabViewModel(tab: Tab())
         let randomZoomLevel = DefaultZoomValue.percent300
         // Select Default zoom
-        AppearancePreferences.shared.defaultPageZoom = randomZoomLevel
+        AccessibilityPreferences.shared.defaultPageZoom = randomZoomLevel
 
         // Zooming out
         tabVM.tab.webView.zoomOut()
@@ -147,7 +147,7 @@ final class WebViewTests: XCTestCase {
         XCTAssertEqual(tabVM.tab.webView.zoomLevel, randomZoomLevel)
 
         // Set new default zoom
-        AppearancePreferences.shared.defaultPageZoom = .percent75
+        AccessibilityPreferences.shared.defaultPageZoom = .percent75
         XCTAssertEqual(tabVM.tab.webView.zoomLevel, .percent75)
     }
 
diff --git a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+WithoutPinnedTabsManager.swift b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+WithoutPinnedTabsManager.swift
index 091bd0d2b1..875c7746a4 100644
--- a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+WithoutPinnedTabsManager.swift
+++ b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+WithoutPinnedTabsManager.swift
@@ -147,9 +147,9 @@ extension TabCollectionViewModelTests {
         tabCollectionViewModel.tabCollection.append(tab: .init(content: .settings(pane: .appearance)))
         tabCollectionViewModel.tabCollection.append(tab: .init(content: .newtab))
 
-        XCTAssertTrue(tabCollectionViewModel.selectDisplayableTabIfPresent(.settings(pane: .privacy)))
+        XCTAssertTrue(tabCollectionViewModel.selectDisplayableTabIfPresent(.settings(pane: .general)))
         XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: 1))
-        XCTAssertEqual(tabCollectionViewModel.selectedTabViewModel?.tab.content, .settings(pane: .privacy))
+        XCTAssertEqual(tabCollectionViewModel.selectedTabViewModel?.tab.content, .settings(pane: .general))
     }
 
     func test_WithoutPinnedTabsManager_WhenPreferencesTabIsPresentThenOpeningPreferencesWithAnyPaneDoesNotUpdatePaneOnExistingTab() {
diff --git a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests.swift b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests.swift
index c27417fba0..efc39feac0 100644
--- a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests.swift
+++ b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests.swift
@@ -138,9 +138,9 @@ final class TabCollectionViewModelTests: XCTestCase {
         tabCollectionViewModel.tabCollection.append(tab: .init(content: .settings(pane: .appearance)))
         tabCollectionViewModel.tabCollection.append(tab: .init(content: .newtab))
 
-        XCTAssertTrue(tabCollectionViewModel.selectDisplayableTabIfPresent(.settings(pane: .privacy)))
+        XCTAssertTrue(tabCollectionViewModel.selectDisplayableTabIfPresent(.settings(pane: .general)))
         XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: 1))
-        XCTAssertEqual(tabCollectionViewModel.selectedTabViewModel?.tab.content, .settings(pane: .privacy))
+        XCTAssertEqual(tabCollectionViewModel.selectedTabViewModel?.tab.content, .settings(pane: .general))
     }
 
     func testWhenPreferencesTabIsPresentThenOpeningPreferencesWithAnyPaneDoesNotUpdatePaneOnExistingTab() {
diff --git a/UnitTests/VPNFeedbackForm/VPNFeedbackFormViewModelTests.swift b/UnitTests/VPNFeedbackForm/VPNFeedbackFormViewModelTests.swift
index e4794c1972..5ad28ed209 100644
--- a/UnitTests/VPNFeedbackForm/VPNFeedbackFormViewModelTests.swift
+++ b/UnitTests/VPNFeedbackForm/VPNFeedbackFormViewModelTests.swift
@@ -87,7 +87,8 @@ private class MockVPNMetadataCollector: VPNMetadataCollector {
 
         let appInfo = VPNMetadata.AppInfo(
             appVersion: "1.2.3",
-            lastVersionRun: "1.2.3",
+            lastAgentVersionRun: "1.2.3",
+            lastExtensionVersionRun: "1.2.3",
             isInternalUser: false,
             isInApplicationsDirectory: true
         )
diff --git a/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift b/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift
index 6848c4c481..c5c389feac 100644
--- a/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift
+++ b/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift
@@ -47,6 +47,10 @@ class WebsiteBreakageReportTests: XCTestCase {
             reportFlow: .appMenu,
             errors: nil,
             httpStatusCodes: nil,
+            openerContext: nil,
+            vpnOn: false,
+            jsPerformance: nil,
+            userRefreshCount: 0,
             didOpenReportInfo: false,
             toggleReportCounter: nil
         )
@@ -92,6 +96,10 @@ class WebsiteBreakageReportTests: XCTestCase {
             reportFlow: .appMenu,
             errors: nil,
             httpStatusCodes: nil,
+            openerContext: nil,
+            vpnOn: false,
+            jsPerformance: nil,
+            userRefreshCount: 0,
             didOpenReportInfo: false,
             toggleReportCounter: nil
         )
diff --git a/VPNProxyExtension/VPNProxyExtension.entitlements b/VPNProxyExtension/VPNProxyExtension.entitlements
index 968c758f97..2ae6ef9e72 100644
--- a/VPNProxyExtension/VPNProxyExtension.entitlements
+++ b/VPNProxyExtension/VPNProxyExtension.entitlements
@@ -2,12 +2,18 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.networking.networkextension</key>
+	<array>
+		<string>app-proxy-provider</string>
+	</array>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(TeamIdentifierPrefix)com.duckduckgo.macos.browser.network-protection</string>
 		<string>$(NETP_APP_GROUP)</string>
+		<string>$(SUBSCRIPTION_APP_GROUP)</string>
 	</array>
-	<key>com.apple.security.app-sandbox</key>
+	<key>com.apple.security.network.client</key>
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
@@ -15,11 +21,5 @@
 	<array>
 		<string>$(NETP_APP_GROUP)</string>
 	</array>
-	<key>com.apple.developer.networking.networkextension</key>
-	<array>
-		<string>app-proxy-provider</string>
-	</array>
-	<key>com.apple.security.network.client</key>
-	<true/>
 </dict>
 </plist>
diff --git a/fastlane/metadata/en-US/description.txt b/fastlane/metadata/en-US/description.txt
index f02a497921..d97590ce20 100644
--- a/fastlane/metadata/en-US/description.txt
+++ b/fastlane/metadata/en-US/description.txt
@@ -1,33 +1,39 @@
-DuckDuckGo for Mac is a free browsing app that gives you comprehensive online privacy protection. With one download, you get a private everyday Internet browser that offers seamless protection while you search and browse - plus access to free tracking protection for your email inbox, secure password management, new beta features, and more.
- 
-FEATURE HIGHLIGHTS
-• Search Privately by Default - DuckDuckGo Private Search comes built in, so you can easily search the web without being tracked.
+DuckDuckGo for Mac is a free browser that provides the most comprehensive online privacy protection in one app. Unlike most popular browsers, it has powerful privacy protections by default, including our search engine that doesn’t track your history and over a dozen other built-in protections. Millions of people use DuckDuckGo as their go-to browser to protect their everyday online activities, from searching to browsing, emailing, and more.
 
-• Block Most Trackers Before They Load - Stay secure with our cutting-edge tracker-blocking technology. 3rd-Party Tracker Loading Protection goes above and beyond what most popular web browsers offer by default, stopping most hidden tracking scripts from loading and collecting your personal data.
+FEATURE HIGHLIGHTS 
 
-• Enable Built-in Email Protection (Beta) – Get free Duck Addresses (@duck.com) to block most email trackers – which we’ve caught in 85% of emails – and hide your existing email address when signing up for things online, all without switching email providers.
+• Search Privately by Default: DuckDuckGo Private Search comes built-in, so you can easily search online without being tracked. 
 
-• Clean Up YouTube with Duck Player - Watch YouTube videos more privately in Duck Player. We’ll protect you from targeted ads and cookies with a distraction-free interface that incorporates YouTube’s strictest privacy settings for embedded video.
+• Block Most Trackers Before They Load: Our 3rd-Party Tracker Loading Protection exceeds what most popular browsers offer by default, stopping most hidden tracking scripts from loading and collecting your personal data. 
 
-• Automatically Enforce Encryption - Force many sites you visit to automatically use an encrypted (HTTPS) connection, which helps shield your data from Wi-Fi snoopers and network onlookers like your Internet provider.
+• Enable Built-in Email Protection: Block most email trackers and hide your existing email address with @duck.com addresses. 
 
-• Escape Fingerprinting – Make it harder for companies to create a unique identifier for you by blocking their attempts to combine specific information about your web browser and device settings.
+• Watch YouTube videos more privately: Duck Player protects you from targeted ads and cookies with a distraction-free interface that incorporates YouTube’s strictest privacy settings for embedded video. 
 
-• Import Bookmarks and Passwords – Using another browser or password manager to store passwords? It’s quick and easy to bring all your login info to DuckDuckGo’s secure password manager. Bookmarks, too!
- 
-• We feature many protections not available on most Internet browsers (even in incognito mode), including protection from link tracking, Google AMP tracking, and more.
- 
-EVERYDAY PRIVACY CONTROLS
-• Hit Fire Button, Burn Data - Clear your tabs and browsing data fast with our Fire Button.
+• Automatically Enforce Encryption: Shield your data from network and Wi-Fi snoopers by forcing many sites to use an HTTPS connection. 
 
-• Banish Cookie Pop-Ups – When we detect cookie consent pop-ups on sites you visit, we’ll work in the background to automatically set your preferences, minimizing cookies and maximizing privacy -- then close the pop-ups.
+• Escape Fingerprinting: Make it harder for companies to create a unique identifier for you by blocking attempts to combine info about your browser and device. 
+ 
+• Import Bookmarks and Passwords: Easily bring your bookmarks and login info from another browser to DuckDuckGo. Plus, Sync bookmarks and passwords across your devices. 
+ 
+• We feature many protections not available on most browsers, even in private browsing mode, including protection from link tracking, AMP tracking, and more. 
+ 
 
-• Signal Your Privacy Preference with Global Privacy Control (GPC) - Built into our app, GPC intends to help you express your opt-out rights automatically by telling websites not to sell or share your personal information. Whether it can be used to enforce your legal rights (for example, current or future CCPA, GDPR requirements) depends on the laws in your jurisdiction.
- 
-Note about our 3rd-Party Tracker Loading Protection following DuckDuckGo ad clicks: Our 3rd-Party Tracker Protection goes above and beyond what you get in most popular browsers by default, but we’re constantly working to make it more comprehensive. Currently, if an advertiser wants to detect conversions on their own website for our private DuckDuckGo search ads, our 3rd-Party Tracker Loading Protection will not stop bat.bing.com requests from loading on the advertiser’s website following DuckDuckGo ad clicks, but those requests are stopped in all other contexts. This is because DuckDuckGo private search advertising is in partnership with Microsoft. As part of that partnership, viewing ads on DuckDuckGo is anonymous and Microsoft has committed to not profile our users’ ad clicks.
+EVERYDAY PRIVACY CONTROLS 
 
-Read more about this and our free Tracking Protections at https://help.duckduckgo.com/privacy/web-tracking-protections
- 
-You don't need to wait to take back your privacy. Join the millions of people using DuckDuckGo and protect many of your everyday online activities with one app. It's privacy, simplified.
+• Clear your tabs and browsing data in a flash with the Fire Button. 
+ 
+• Banish cookie pop-ups and automatically set your preferences to minimize cookies and maximize privacy. 
+ 
+• Signal your privacy preference with Global Privacy Control (GPC) built into our app. GPC intends to help you express your opt-out rights automatically by telling websites not to sell or share your personal info. Whether it can be used to enforce your legal rights depends on the laws in your jurisdiction. 
+ 
+Privacy Pro Pricing & Terms
 
-Privacy Policy: https://duckduckgo.com/privacy/
+Payment will be charged automatically to your iTunes account until you cancel, which you can do in app settings. Your personal info is not required to subscribe. You have the option to provide an email address to activate your subscription on other devices, and we will only use that email address to verify your subscription. For terms of service and privacy policy, visit https://duckduckgo.com/pro/privacy-terms
+ 
+You don't need to wait to take back your privacy. Join the millions of people using DuckDuckGo and protect many of your everyday online activities with one app. It's privacy, simplified. 
+
+Read about our free Tracking Protections at https://help.duckduckgo.com/privacy/web-tracking-protections 
+
+Privacy Policy: https://duckduckgo.com/privacy/ 
+Terms of Service: https://duckduckgo.com/terms
\ No newline at end of file
diff --git a/fastlane/metadata/en-US/keywords.txt b/fastlane/metadata/en-US/keywords.txt
index 7b159e2258..66fd67af09 100644
--- a/fastlane/metadata/en-US/keywords.txt
+++ b/fastlane/metadata/en-US/keywords.txt
@@ -1 +1 @@
-web,private,search,email,secure,online,tracker,duc,duck,go,data,ddg,incognito,ad,block,fast,internet
+web,encrypt,search,email,secure,online,tracker,duc,duck,go,data,ddg,incognito,ad,block,vpn,internet
diff --git a/package-lock.json b/package-lock.json
index 597b71e54c..a506b40d5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "macos-browser",
       "version": "1.0.0",
       "dependencies": {
-        "@duckduckgo/autoconsent": "^10.2.0"
+        "@duckduckgo/autoconsent": "^10.3.0"
       },
       "devDependencies": {
         "@rollup/plugin-json": "^4.1.0",
@@ -53,9 +53,9 @@
       }
     },
     "node_modules/@duckduckgo/autoconsent": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/@duckduckgo/autoconsent/-/autoconsent-10.2.0.tgz",
-      "integrity": "sha512-Q4sSGrvA5nWl5auJzttPQu1t25ff9N8Xj/UYglNKNqcnMAx/KxAIP5KbAFgf7JBru+q9Dq7muaEEB4FPU31fEw=="
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@duckduckgo/autoconsent/-/autoconsent-10.3.0.tgz",
+      "integrity": "sha512-dUf37qkaYDuXEytU9mNNLGw28S1t1M1dFnvMHZDV9BpINVJeAl1ye7CmlABuGlDs6URrp2ZLZ5IxcKQhQglYcw=="
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.2",
diff --git a/package.json b/package.json
index 2fb1f7eb4e..ee09d66203 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,6 @@
     "rollup-plugin-terser": "^7.0.2"
   },
   "dependencies": {
-    "@duckduckgo/autoconsent": "^10.2.0"
+    "@duckduckgo/autoconsent": "^10.3.0"
   }
 }

From 0573d21e3a4299a649af32a124ca4e4f9fb973c6 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <THISISDINOSAUR@users.noreply.github.com>
Date: Tue, 2 Apr 2024 16:07:00 +0100
Subject: [PATCH 23/28] Delete
 DuckDuckGo/Subscription/SubscriptionFeatureAvailability.swift

Resolve some merge issues
---
 .../SubscriptionFeatureAvailability.swift     | 69 -------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 DuckDuckGo/Subscription/SubscriptionFeatureAvailability.swift

diff --git a/DuckDuckGo/Subscription/SubscriptionFeatureAvailability.swift b/DuckDuckGo/Subscription/SubscriptionFeatureAvailability.swift
deleted file mode 100644
index d0aab53af3..0000000000
--- a/DuckDuckGo/Subscription/SubscriptionFeatureAvailability.swift
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-//  SubscriptionFeatureAvailability.swift
-//
-//  Copyright © 2024 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import AppKit
-
-#if SUBSCRIPTION
-import Subscription
-#endif
-
-#if NETWORK_PROTECTION
-import NetworkProtection
-#endif
-
-protocol SubscriptionFeatureAvailability {
-    func isFeatureAvailable() -> Bool
-}
-
-struct DefaultSubscriptionFeatureAvailability: SubscriptionFeatureAvailability {
-
-    func isFeatureAvailable() -> Bool {
-#if SUBSCRIPTION_OVERRIDE_ENABLED
-        return true
-#elseif SUBSCRIPTION
-        print("isUserAuthenticated: [\(AccountManager().isUserAuthenticated)] | isSubscriptionInternalTestingEnabled: [\(isSubscriptionInternalTestingEnabled)] isInternalUser: [\(isInternalUser)] | isVPNActivated: [\(isVPNActivated)] | isDBPActivated: [\(isDBPActivated)]")
-        return AccountManager().isUserAuthenticated || (isSubscriptionInternalTestingEnabled && isInternalUser && !isVPNActivated && !isDBPActivated)
-#else
-        return false
-#endif
-    }
-
-    private var isSubscriptionInternalTestingEnabled: Bool {
-        UserDefaultsWrapper(key: .subscriptionInternalTesting, defaultValue: false).wrappedValue
-    }
-
-    private var isInternalUser: Bool {
-        NSApp.delegateTyped.internalUserDecider.isInternalUser
-    }
-
-    private var isVPNActivated: Bool {
-#if NETWORK_PROTECTION
-        return NetworkProtectionKeychainTokenStore().isFeatureActivated
-#else
-        return false
-#endif
-    }
-
-    private var isDBPActivated: Bool {
-#if DBP
-        return (try? DataBrokerProtectionManager.shared.dataManager.fetchProfile(ignoresCache: true)) != nil
-#else
-        return false
-#endif
-    }
-}

From 387fad0b846dad5a5685fb0c4e42917ef7512edb Mon Sep 17 00:00:00 2001
From: Elle Sullivan <THISISDINOSAUR@users.noreply.github.com>
Date: Tue, 2 Apr 2024 16:07:49 +0100
Subject: [PATCH 24/28] Apply suggestions from code review

Resolve minor merge issues
---
 .../xcshareddata/xcschemes/sandbox-test-tool.xcscheme           | 2 +-
 DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme
index eb7e5e26bb..41730d7069 100644
--- a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme
+++ b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1530"
-   version = "1.8">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift b/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift
index 355d6d8d8d..1478151aca 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift
@@ -233,7 +233,7 @@ final class DataBrokerProtectionDebugMenu: NSMenu {
                     os_log("scan operations finished, operation errors count: %{public}@", log: .dataBrokerProtection, operationErrors.count)
                 }
             } else {
-                os_log("scan operations finished", log: .dataBrokerProtection)
+                os_log("Scan operations finished", log: .dataBrokerProtection)
             }
         }
     }

From 839e06ec86c7c58a60c423fb6a08206e6ab602a9 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Tue, 2 Apr 2024 16:11:17 +0100
Subject: [PATCH 25/28] Resolve merge issues

---
 .../Tab/View/BrowserTabViewController.swift   |  23 ---
 .../DataBrokerRunCustomJSONViewModel.swift    | 159 ------------------
 2 files changed, 182 deletions(-)

diff --git a/DuckDuckGo/Tab/View/BrowserTabViewController.swift b/DuckDuckGo/Tab/View/BrowserTabViewController.swift
index 57268ce061..d3e4ebbc31 100644
--- a/DuckDuckGo/Tab/View/BrowserTabViewController.swift
+++ b/DuckDuckGo/Tab/View/BrowserTabViewController.swift
@@ -163,10 +163,6 @@ final class BrowserTabViewController: NSViewController {
                                                selector: #selector(onSubscriptionAccountDidSignOut),
                                                name: .accountDidSignOut,
                                                object: nil)
-        NotificationCenter.default.addObserver(self,
-                                               selector: #selector(onSubscriptionDidChange),
-                                               name: .subscriptionDidChange,
-                                               object: nil)
 #endif
     }
 
@@ -258,25 +254,6 @@ final class BrowserTabViewController: NSViewController {
         }
     }
 
-    @objc
-    private func onSubscriptionDidChange(_ notification: Notification) {
-        guard let subscription = (notification.userInfo?[UserDefaultsCacheKey.subscription] as? DDGSubscription), !subscription.isActive else { return }
-
-        Task { @MainActor in
-            tabCollectionViewModel.removeAll { tabContent in
-                if case .subscription = tabContent {
-                    return true
-                } else if case .identityTheftRestoration = tabContent {
-                    return true
-                } else if case .dataBrokerProtection = tabContent {
-                    return true
-                } else {
-                    return false
-                }
-            }
-        }
-    }
-
 #endif
 
     private func subscribeToSelectedTabViewModel() {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
index 9253887e3f..e7b72fb99b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
@@ -336,165 +336,6 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         }
     }
 
-    func runAllBrokers() {
-        isRunningOnAllBrokers = true
-
-        let brokerProfileQueryData = createBrokerProfileQueryData()
-
-        Task.detached {
-            var scanResults = [DebugScanReturnValue]()
-            let semaphore = DispatchSemaphore(value: 10)
-            try await withThrowingTaskGroup(of: DebugScanReturnValue.self) { group in
-                for queryData in brokerProfileQueryData {
-                    semaphore.wait()
-                    let debugScanOperation = DebugScanOperation(privacyConfig: self.privacyConfigManager, prefs: self.contentScopeProperties, query: queryData) {
-                        true
-                    }
-
-                    group.addTask {
-                        defer {
-                            semaphore.signal()
-                        }
-                        do {
-                            return try await debugScanOperation.run(inputValue: (), showWebView: false)
-                        } catch {
-                            return DebugScanReturnValue(brokerURL: "ERROR - with broker: \(queryData.dataBroker.name)", extractedProfiles: [ExtractedProfile](), brokerProfileQueryData: queryData)
-                        }
-                    }
-                }
-
-                for try await result in group {
-                    scanResults.append(result)
-                }
-
-                self.formCSV(with: scanResults)
-
-                self.finishLoading()
-            }
-        }
-    }
-
-    private func finishLoading() {
-        DispatchQueue.main.async {
-            self.alert = AlertUI.finishedScanningAllBrokers()
-            self.showAlert = true
-            self.isRunningOnAllBrokers = false
-        }
-    }
-
-    private func formCSV(with scanResults: [DebugScanReturnValue]) {
-        var csvText = csvColumns.map { $0 }.joined(separator: ",")
-        csvText.append("\n")
-
-        for result in scanResults {
-            if let error = result.error {
-                csvText.append(append(error: error, for: result))
-            } else {
-                csvText.append(append(result))
-            }
-        }
-
-        save(csv: csvText)
-    }
-
-    private func append(error: Error, for result: DebugScanReturnValue) -> String {
-        if let dbpError = error as? DataBrokerProtectionError {
-            if dbpError.is404 {
-                return createRowFor(matched: false, result: result, error: "404 - No results")
-            } else {
-                return createRowFor(matched: false, result: result, error: "\(dbpError.title)-\(dbpError.description)")
-            }
-        } else {
-            return createRowFor(matched: false, result: result, error: error.localizedDescription)
-        }
-    }
-
-    private func append(_ result: DebugScanReturnValue) -> String {
-        var resultsText = ""
-
-        if let meta = result.meta{
-            do {
-                let jsonData = try JSONSerialization.data(withJSONObject: meta, options: [])
-                let decoder = JSONDecoder()
-                let decodedMeta = try decoder.decode(Metadata.self, from: jsonData)
-
-                for extractedResult in decodedMeta.extractResults {
-                    resultsText.append(createRowFor(matched: extractedResult.result, result: result, extractedResult: extractedResult))
-                }
-            } catch {
-                print("Error decoding JSON: \(error)")
-            }
-        } else {
-            print("No meta object")
-        }
-
-        return resultsText
-    }
-
-    private func createRowFor(matched: Bool,
-                              result: DebugScanReturnValue,
-                              error: String? = nil,
-                              extractedResult: ExtractResult? = nil) -> String {
-        let matchedString = matched ? "TRUE" : "FALSE"
-        let profileQuery = result.brokerProfileQueryData.profileQuery
-
-        var csvRow = ""
-
-        csvRow.append("\(profileQuery.fullName),") // Name (input)
-        csvRow.append("\(profileQuery.age),") // Age (input)
-        csvRow.append("\(profileQuery.city),") // City (input)
-        csvRow.append("\(profileQuery.state),") // State (input)
-
-        if let extractedResult = extractedResult {
-            csvRow.append("\(extractedResult.scrapedData.nameCSV),") // Name (scraped)
-            csvRow.append("\(extractedResult.scrapedData.ageCSV),") // Age (scraped)
-            csvRow.append("\(extractedResult.scrapedData.addressesCSV),") // Address (scraped)
-            csvRow.append("\(extractedResult.scrapedData.relativesCSV),") // Relatives (matched)
-        } else {
-            csvRow.append(",") // Name (scraped)
-            csvRow.append(",") // Age (scraped)
-            csvRow.append(",") // Address (scraped)
-            csvRow.append(",") // Relatives (scraped)
-        }
-
-        csvRow.append("\(result.brokerURL),") // Broker URL
-        csvRow.append("\(result.brokerProfileQueryData.dataBroker.name),") // Broker Name
-        csvRow.append("\(profileQuery.id ?? 0)_\(result.brokerProfileQueryData.dataBroker.name),") // Screenshot name
-
-        if let error = error {
-            csvRow.append("\(error),") // Error
-        } else {
-            csvRow.append(",") // Error empty
-        }
-
-        if let extractedResult = extractedResult {
-            csvRow.append("\(extractedResult.matchedFields.joined(separator: "-")),") // matched_fields
-        } else {
-            csvRow.append(",") // matched_fields
-        }
-
-        csvRow.append("\(matchedString),") // result_match
-        csvRow.append(",") // expected_match
-        csvRow.append("\n")
-
-        return csvRow
-    }
-
-    private func save(csv: String) {
-        do {
-            if let desktopPath = FileManager.default.urls(for: .desktopDirectory, in: .userDomainMask).first?.relativePath {
-                let path = desktopPath + "/PIR-Debug"
-                let fileName = "output.csv"
-                let fileURL = URL(fileURLWithPath: "\(path)/\(fileName)")
-                try csv.write(to: fileURL, atomically: true, encoding: .utf8)
-            } else {
-                os_log("Error getting path")
-            }
-        } catch {
-            os_log("Error writing to file: \(error)")
-        }
-    }
-
     func runJSON(jsonString: String) {
         if let data = jsonString.data(using: .utf8) {
             do {

From 468cd2537ff6ce2fa3ccd394b859df80c442a78c Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Tue, 2 Apr 2024 16:30:24 +0100
Subject: [PATCH 26/28] Add additional method to operations collection delegate

---
 .../Operations/DataBrokerOperationsCollection.swift      | 5 +++++
 .../Scheduler/DataBrokerProtectionProcessor.swift        | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
index 063490dcab..78b76af560 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
@@ -22,7 +22,10 @@ import Common
 protocol DataBrokerOperationsCollectionErrorDelegate: AnyObject {
     func dataBrokerOperationsCollection(_ dataBrokerOperationsCollection: DataBrokerOperationsCollection,
                                         didError error: Error,
+                                        whileRunningBrokerOperationData: BrokerOperationData,
                                         withDataBrokerName dataBrokerName: String?)
+    func dataBrokerOperationsCollection(_ dataBrokerOperationsCollection: DataBrokerOperationsCollection,
+                                        didErrorBeforeStartingBrokerOperations error: Error)
 }
 
 final class DataBrokerOperationsCollection: Operation {
@@ -143,6 +146,7 @@ final class DataBrokerOperationsCollection: Operation {
             allBrokerProfileQueryData = try database.fetchAllBrokerProfileQueryData()
         } catch {
             os_log("DataBrokerOperationsCollection error: runOperation, error: %{public}@", log: .error, error.localizedDescription)
+            errorDelegate?.dataBrokerOperationsCollection(self, didErrorBeforeStartingBrokerOperations: error)
             return
         }
 
@@ -195,6 +199,7 @@ final class DataBrokerOperationsCollection: Operation {
                 self.error = error
                 errorDelegate?.dataBrokerOperationsCollection(self,
                                                               didError: error,
+                                                              whileRunningBrokerOperationData: operationData,
                                                               withDataBrokerName: brokerProfileQueriesData.first?.dataBroker.name)
             }
         }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
index c2fe0f88a1..f10ca642e5 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
@@ -190,7 +190,14 @@ final class DataBrokerProtectionProcessor {
 
 extension DataBrokerProtectionProcessor: DataBrokerOperationsCollectionErrorDelegate {
 
-    func dataBrokerOperationsCollection(_ dataBrokerOperationsCollection: DataBrokerOperationsCollection, didError error: Error, withDataBrokerName dataBrokerName: String?) {
+    func dataBrokerOperationsCollection(_ dataBrokerOperationsCollection: DataBrokerOperationsCollection, didErrorBeforeStartingBrokerOperations error: Error) {
+
+    }
+
+    func dataBrokerOperationsCollection(_ dataBrokerOperationsCollection: DataBrokerOperationsCollection,
+                                        didError error: Error,
+                                        whileRunningBrokerOperationData: BrokerOperationData,
+                                        withDataBrokerName dataBrokerName: String?) {
         if let error = error as? DataBrokerProtectionError,
            let dataBrokerName = dataBrokerName {
             pixelHandler.fire(.error(error: error, dataBroker: dataBrokerName))

From ff20faf63ca5f41f7f9ccf4396dc604195a0ec3e Mon Sep 17 00:00:00 2001
From: Elle Sullivan <ellesailenesullivan@gmail.com>
Date: Tue, 2 Apr 2024 17:39:21 +0100
Subject: [PATCH 27/28] Add new DBP error catagory for DB errors

---
 .../Pixels/DataBrokerProtectionPixels.swift   |  2 ++
 ...kerProtectionStageDurationCalculator.swift |  3 +++
 ...otectionStageDurationCalculatorTests.swift | 20 +++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
index 6c90e8b573..45f7b44807 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
@@ -26,6 +26,7 @@ enum ErrorCategory: Equatable {
     case validationError
     case clientError(httpCode: Int)
     case serverError(httpCode: Int)
+    case databaseError(domain: String, code: Int)
     case unclassified
 
     var toString: String {
@@ -35,6 +36,7 @@ enum ErrorCategory: Equatable {
         case .unclassified: return "unclassified"
         case .clientError(let httpCode): return "client-error-\(httpCode)"
         case .serverError(let httpCode): return "server-error-\(httpCode)"
+        case .databaseError(let domain, let code): return "database-error-\(domain)-\(code)"
         }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
index f73f3706ad..7776f7ca1c 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
@@ -20,6 +20,7 @@ import Foundation
 import Common
 import BrowserServicesKit
 import PixelKit
+import SecureStorage
 
 enum Stage: String {
     case start
@@ -184,6 +185,8 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
             default:
                 errorCategory = .validationError
             }
+        } else if let databaseError = error as? SecureStorageError {
+            errorCategory = .databaseError(domain: SecureStorageError.errorDomain, code: databaseError.errorCode)
         } else {
             if let nsError = error as NSError? {
                 if nsError.domain == NSURLErrorDomain {
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift
index 8b899e12a1..7ba868976f 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift
@@ -18,6 +18,7 @@
 
 import BrowserServicesKit
 import Foundation
+import SecureStorage
 import XCTest
 
 @testable import DataBrokerProtection
@@ -120,6 +121,25 @@ final class DataBrokerProtectionStageDurationCalculatorTests: XCTestCase {
         }
     }
 
+    func testWhenErrorIsSecureVaultError_thenWeFireScanErorrPixelWithDatabaseErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+        let error = SecureStorageError.encodingFailed
+
+        sut.fireScanError(error: error)
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, "database-error-SecureVaultError-13")
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
     func testWhenErrorIsNotDBPErrorAndNotURL_thenWeFireScanErrorPixelWithUnclassifiedErrorCategory() {
         let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
         let error = NSError(domain: NSCocoaErrorDomain, code: -1)

From 47f3f31b06e7bcb8f0d93dd0d05610d53e04bce0 Mon Sep 17 00:00:00 2001
From: Elle Sullivan <THISISDINOSAUR@users.noreply.github.com>
Date: Mon, 8 Apr 2024 18:32:10 +0100
Subject: [PATCH 28/28] Modify DBP DataManager interface to make cache setting
 more explicit (#2559)

Task/Issue URL:
https://app.asana.com/0/276630244458377/1206989849340633/f
Tech Design URL:
CC:

**Description**:
Makes some small changes to the DataManager interface to make cache
behaviors more explicit
Note that the base branch is not main, I wrote it on top of
https://github.com/duckduckgo/macos-browser/pull/2384 since they both
modify the same area.

**Steps to test this PR**:
1. Test the DBP flows, paying specific attention to any potential UI
stuttering (which is what the caching was introduced to fix)

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
---
 .../DBP/DataBrokerProtectionAppEvents.swift   |  2 +-
 .../DataBrokerProtectionDataManager.swift     | 40 ++++++++++++-------
 .../DataBrokerDatabaseBrowserViewModel.swift  |  2 +-
 .../DataBrokerForceOptOutViewModel.swift      |  2 +-
 .../Model/DBPUIViewModel.swift                |  2 +-
 .../DataBrokerProtectionViewController.swift  |  4 +-
 6 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift b/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
index 4c5b0591e1..352e8419ab 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
@@ -49,7 +49,7 @@ struct DataBrokerProtectionAppEvents {
 
             // If we don't have profileQueries it means there's no user profile saved in our DB
             // In this case, let's disable the agent and delete any left-over data because there's nothing for it to do
-            if let profileQueries = try? await DataBrokerProtectionManager.shared.dataManager.fetchBrokerProfileQueryData(ignoresCache: true),
+            if let profileQueries = try? DataBrokerProtectionManager.shared.dataManager.fetchBrokerProfileQueryData(ignoresCache: true),
                profileQueries.count > 0 {
                 restartBackgroundAgent(loginItemsManager: loginItemsManager)
             } else {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
index 5f64595a74..6ff680717b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
@@ -25,18 +25,16 @@ public protocol DataBrokerProtectionDataManaging {
 
     init(pixelHandler: EventMapping<DataBrokerProtectionPixels>, fakeBrokerFlag: DataBrokerDebugFlag)
     func saveProfile(_ profile: DataBrokerProtectionProfile) async throws
-    func fetchProfile(ignoresCache: Bool) throws -> DataBrokerProtectionProfile?
-    func fetchBrokerProfileQueryData(ignoresCache: Bool) async throws -> [BrokerProfileQueryData]
+    func fetchProfile() throws -> DataBrokerProtectionProfile?
+    func prepareProfileCache() throws
+    func fetchBrokerProfileQueryData(ignoresCache: Bool) throws -> [BrokerProfileQueryData]
+    func prepareBrokerProfileQueryDataCache() throws
     func hasMatches() throws -> Bool
 }
 
 extension DataBrokerProtectionDataManaging {
-    func fetchProfile() throws -> DataBrokerProtectionProfile? {
-        try fetchProfile(ignoresCache: false)
-    }
-
-    func fetchBrokerProfileQueryData() async throws -> [BrokerProfileQueryData] {
-        try await fetchBrokerProfileQueryData(ignoresCache: false)
+    func fetchBrokerProfileQueryData() throws -> [BrokerProfileQueryData] {
+        try fetchBrokerProfileQueryData(ignoresCache: false)
     }
 }
 
@@ -70,8 +68,8 @@ public class DataBrokerProtectionDataManager: DataBrokerProtectionDataManaging {
         cache.profile = profile
     }
 
-    public func fetchProfile(ignoresCache: Bool = false) throws -> DataBrokerProtectionProfile? {
-        if !ignoresCache, cache.profile != nil {
+    public func fetchProfile() throws -> DataBrokerProtectionProfile? {
+        if cache.profile != nil {
             os_log("Returning cached profile", log: .dataBrokerProtection)
             return cache.profile
         }
@@ -85,7 +83,15 @@ public class DataBrokerProtectionDataManager: DataBrokerProtectionDataManaging {
         }
     }
 
-    public func fetchBrokerProfileQueryData(ignoresCache: Bool = false) async throws -> [BrokerProfileQueryData] {
+    public func prepareProfileCache() throws {
+        if let profile = try database.fetchProfile() {
+            cache.profile = profile
+        } else {
+            os_log("No profile found", log: .dataBrokerProtection)
+        }
+    }
+
+    public func fetchBrokerProfileQueryData(ignoresCache: Bool = false) throws -> [BrokerProfileQueryData] {
         if !ignoresCache, !cache.brokerProfileQueryData.isEmpty {
             os_log("Returning cached brokerProfileQueryData", log: .dataBrokerProtection)
             return cache.brokerProfileQueryData
@@ -96,14 +102,17 @@ public class DataBrokerProtectionDataManager: DataBrokerProtectionDataManaging {
         return queryData
     }
 
+    public func prepareBrokerProfileQueryDataCache() throws {
+        cache.brokerProfileQueryData = try database.fetchAllBrokerProfileQueryData()
+    }
+
     public func hasMatches() throws -> Bool {
         return try database.hasMatches()
     }
 }
 
 extension DataBrokerProtectionDataManager: InMemoryDataCacheDelegate {
-    public func flushCache(profile: DataBrokerProtectionProfile?) async throws {
-        guard let profile = profile else { return }
+    public func saveCachedProfileToDatabase(_ profile: DataBrokerProtectionProfile) async throws {
         try await saveProfile(profile)
 
         delegate?.dataBrokerProtectionDataManagerDidUpdateData()
@@ -118,7 +127,7 @@ extension DataBrokerProtectionDataManager: InMemoryDataCacheDelegate {
 }
 
 public protocol InMemoryDataCacheDelegate: AnyObject {
-    func flushCache(profile: DataBrokerProtectionProfile?) async throws
+    func saveCachedProfileToDatabase(_ profile: DataBrokerProtectionProfile) async throws
     func removeAllData() throws
 }
 
@@ -142,7 +151,8 @@ public final class InMemoryDataCache {
 
 extension InMemoryDataCache: DBPUICommunicationDelegate {
     func saveProfile() async throws {
-        try await delegate?.flushCache(profile: profile)
+        guard let profile = profile else { return }
+        try await delegate?.saveCachedProfileToDatabase(profile)
     }
 
     private func indexForName(matching name: DBPUIUserProfileName, in profile: DataBrokerProtectionProfile) -> Int? {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
index 7b7f458afd..a3bf0d1547 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
@@ -48,7 +48,7 @@ final class DataBrokerDatabaseBrowserViewModel: ObservableObject {
         guard let dataManager = self.dataManager else { return }
 
         Task {
-            guard let data = try? await dataManager.fetchBrokerProfileQueryData(ignoresCache: true) else {
+            guard let data = try? dataManager.fetchBrokerProfileQueryData(ignoresCache: true) else {
                 assertionFailure("DataManager error during DataBrokerDatavaseBrowserViewModel.updateTables")
                 return
             }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
index 2069f8904f..322af7070d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
@@ -31,7 +31,7 @@ final class DataBrokerForceOptOutViewModel: ObservableObject {
 
     private func loadNotRemovedOptOutData() {
         Task { @MainActor in
-            guard let brokerProfileData = try? await dataManager.fetchBrokerProfileQueryData(ignoresCache: true) else {
+            guard let brokerProfileData = try? dataManager.fetchBrokerProfileQueryData(ignoresCache: true) else {
                 assertionFailure()
                 return
             }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
index fe1f46f531..570a8f1e60 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
@@ -80,7 +80,7 @@ extension DBPUIViewModel: DBPUIScanOps {
 
     func updateCacheWithCurrentScans() async {
         do {
-            _ = try await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
+            try dataManager.prepareBrokerProfileQueryDataCache()
         } catch {
             os_log("DBPUIViewModel error: updateCacheWithCurrentScans, error: %{public}@", log: .error, error.localizedDescription)
             pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DBPUIViewModel.updateCacheWithCurrentScans"))
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
index 4b3c0003d7..67940bd5c6 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
@@ -50,8 +50,10 @@ final public class DataBrokerProtectionViewController: NSViewController {
                                              prefs: prefs,
                                              webView: webView)
 
+        // Prepare the profile cache to avoid stuttering later
+        // It's in a task to avoid stuttering now
         Task {
-            _ = try? dataManager.fetchProfile(ignoresCache: true)
+            try? dataManager.prepareProfileCache()
         }
 
         super.init(nibName: nil, bundle: nil)